Merge remote-tracking branch 'origin/textures-from-pr-3381' into dev

# Conflicts:
#	src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java

src/main/java/gregtech/api/enums/Textures.java

@@ -890,6 +890,21 @@ public enum BlockIcons implements IIconContainer, Runnable {
         OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE,
         OVERLAY_SIDE_INDUSTRIAL_APIARY_ACTIVE_GLOW,
 
+        OVERLAY_TOP_RTG_ACTIVE,
+        OVERLAY_TOP_RTG_ACTIVE_GLOW,
+        OVERLAY_TOP_RTG,
+        OVERLAY_SIDE_RTG_ACTIVE,
+        OVERLAY_SIDE_RTG_ACTIVE_GLOW,
+        OVERLAY_SIDE_RTG,
+
+        OVERLAY_CHARCOAL_PIT,
+        OVERLAY_CHARCOAL_PIT_ACTIVE,
+        OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW,
+
+        OVERLAY_FRONT_SEISMIC_PROSPECTOR,
+        OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE,
+        OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW,
+
         OVERLAY_ADV_PUMP,
         OVERLAY_TELEPORTER,
         OVERLAY_TELEPORTER_GLOW,

src/main/java/gregtech/common/tileentities/machines/basic/MTEAdvSeismicProspector.java

@@ -1,21 +1,9 @@
 package gregtech.common.tileentities.machines.basic;
 
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_GLOW;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SEISMIC_PROSPECTOR;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW;
+import static gregtech.api.enums.Textures.BlockIcons.VOID;
 import static gregtech.common.UndergroundOil.undergroundOilReadInformation;
 
 import java.util.ArrayList;
@@ -66,54 +54,19 @@ public MTEAdvSeismicProspector(int aID, String aName, String aNameRegional, int
             "",
             1, // input slot count
             1, // output slot count
+            TextureFactory.of(VOID),
+            TextureFactory.of(VOID),
             TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE),
+                TextureFactory.of(OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE),
                 TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_ROCK_BREAKER_ACTIVE_GLOW)
+                    .addIcon(OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE_GLOW)
                     .glow()
                     .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_SIDE_ROCK_BREAKER),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_SIDE_ROCK_BREAKER_GLOW)
-                    .glow()
-                    .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_ROCK_BREAKER_ACTIVE_GLOW)
-                    .glow()
-                    .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_TOP_ROCK_BREAKER),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_TOP_ROCK_BREAKER_GLOW)
-                    .glow()
-                    .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW)
-                    .glow()
-                    .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW)
-                    .glow()
-                    .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE_GLOW)
-                    .glow()
-                    .build()),
-            TextureFactory.of(
-                TextureFactory.of(OVERLAY_BOTTOM_ROCK_BREAKER),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_BOTTOM_ROCK_BREAKER_GLOW)
-                    .glow()
-                    .build()));
+            TextureFactory.of(OVERLAY_FRONT_SEISMIC_PROSPECTOR),
+            TextureFactory.of(VOID),
+            TextureFactory.of(VOID),
+            TextureFactory.of(VOID),
+            TextureFactory.of(VOID));
         radius = aRadius;
         step = aStep;
     }

src/main/java/gregtech/common/tileentities/machines/multi/MTECharcoalPit.java

@@ -1,9 +1,8 @@
 package gregtech.common.tileentities.machines.multi;
 
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW;
-import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_GLOW;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_CHARCOAL_PIT;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_CHARCOAL_PIT_ACTIVE;
+import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW;
 import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages;
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
@@ -29,7 +28,6 @@
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.MTETooltipMultiBlockBase;
-import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
 import gregtech.api.render.TextureFactory;
@@ -232,11 +230,6 @@ public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
     }
 
-    @Override
-    public RecipeMap<?> getRecipeMap() {
-        return null;
-    }
-
     @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
         return new MTECharcoalPit(mName);
@@ -266,15 +259,11 @@ public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirec
         int colorIndex, boolean aActive, boolean redstoneLevel) {
         if (side == ForgeDirection.UP) {
             if (aActive) return new ITexture[] { casingTexturePages[0][10],
-                TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE), TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_ROCK_BREAKER_ACTIVE_GLOW)
+                TextureFactory.of(OVERLAY_CHARCOAL_PIT_ACTIVE), TextureFactory.builder()
+                    .addIcon(OVERLAY_CHARCOAL_PIT_ACTIVE_GLOW)
                     .glow()
                     .build() };
-            return new ITexture[] { casingTexturePages[0][10], TextureFactory.of(OVERLAY_FRONT_ROCK_BREAKER),
-                TextureFactory.builder()
-                    .addIcon(OVERLAY_FRONT_ROCK_BREAKER_GLOW)
-                    .glow()
-                    .build(), };
+            return new ITexture[] { casingTexturePages[0][10], TextureFactory.of(OVERLAY_CHARCOAL_PIT) };
         }
         return new ITexture[] { casingTexturePages[0][10] };
     }

src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/MTERTGenerator.java

@@ -218,68 +218,68 @@ public int getEfficiency() {
 
     @Override
     public ITexture[] getFront(byte aColor) {
-        return new ITexture[] { super.getFront(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
-            TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG) };
     }
 
     @Override
     public ITexture[] getBack(byte aColor) {
-        return new ITexture[] { super.getBack(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG) };
     }
 
     @Override
     public ITexture[] getBottom(byte aColor) {
-        return new ITexture[] { super.getBottom(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG) };
     }
 
     @Override
     public ITexture[] getTop(byte aColor) {
-        return new ITexture[] { super.getTop(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP),
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG) };
     }
 
     @Override
     public ITexture[] getSides(byte aColor) {
-        return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG),
+            gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
     }
 
     @Override
     public ITexture[] getFrontActive(byte aColor) {
-        return new ITexture[] { super.getFrontActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_MASSFAB_ACTIVE) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE), TextureFactory.builder()
+            .addIcon(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE_GLOW)
+            .glow()
+            .build() };
     }
 
     @Override
     public ITexture[] getBackActive(byte aColor) {
-        return new ITexture[] { super.getBackActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE), TextureFactory.builder()
+            .addIcon(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE_GLOW)
+            .glow()
+            .build() };
     }
 
     @Override
     public ITexture[] getBottomActive(byte aColor) {
-        return new ITexture[] { super.getBottomActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE), TextureFactory.builder()
+            .addIcon(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE_GLOW)
+            .glow()
+            .build() };
     }
 
     @Override
     public ITexture[] getTopActive(byte aColor) {
-        return new ITexture[] { super.getTopActive(aColor)[0],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_FLUID_SIDE_ACTIVE) };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE), TextureFactory.builder()
+            .addIcon(Textures.BlockIcons.OVERLAY_TOP_RTG_ACTIVE_GLOW)
+            .glow()
+            .build() };
     }
 
     @Override
     public ITexture[] getSidesActive(byte aColor) {
-        return new ITexture[] { gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(0)],
-            TextureFactory.of(Textures.BlockIcons.NAQUADAH_REACTOR_SOLID_TOP_ACTIVE),
-            Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
+        return new ITexture[] { TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE), TextureFactory.builder()
+            .addIcon(Textures.BlockIcons.OVERLAY_SIDE_RTG_ACTIVE_GLOW)
+            .glow()
+            .build(), gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI[getTier()] };
     }
 
     @Override
@@ -297,11 +297,9 @@ public int getFuelValue(ItemStack aStack) {
             this.mCurrentRecipe = tFuel;
             int voltage = tFuel.mEUt;
             this.mVoltage = voltage;
-            // this.mDaysRemaining = tFuel.mSpecialValue*365;
 
             // Do some voodoo.
             byte mTier2;
-            // mTier2 = ReflectionUtils.getField(this.getClass(), "mTier");
             try {
                 if (ItemStack.areItemStacksEqual(tFuel.mInputs[0], GregtechItemList.Pellet_RTG_AM241.get(1))) {
                     mTier2 = 1;

src/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FRONT_SEISMIC_PROSPECTOR_ACTIVE.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}