From a7f60e0752195c52b381442ccf214bf67c4a6d32 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sun, 16 Aug 2015 01:10:06 +0200 Subject: [PATCH] GT5.08.27 --- .gitignore | 1 + main/java/gregtech/GT_Mod.java | 4 ++- main/java/gregtech/api/enums/Materials.java | 16 ++++++------ main/java/gregtech/api/enums/Textures.java | 4 +-- .../api/gui/GT_GUIContainer_BasicMachine.java | 23 ++++++++++++++++++ .../GT_MetaPipeEntity_Item.java | 1 + .../GT_MetaTileEntity_BasicBatteryBuffer.java | 7 +++--- main/java/gregtech/api/util/GT_Recipe.java | 1 + main/java/gregtech/common/GT_RecipeAdder.java | 20 +++++++++++++++ .../GT_MetaTileEntity_FusionComputer.java | 5 +++- .../GT_MetaTileEntity_FusionComputer1.java | 7 ++++++ .../GT_MetaTileEntity_FusionComputer2.java | 6 +++++ .../GT_MetaTileEntity_FusionComputer3.java | 7 ++++++ .../GT_MetaTileEntity_ProcessingArray.java | 2 ++ .../GT_MetaTileEntity_QuantumChest.java | 3 ++- .../GT_MetaTileEntity_QuantumTank.java | 2 +- .../common/tools/GT_Tool_Turbine.java | 3 ++- .../common/tools/GT_Tool_Turbine_Huge.java | 4 +++ .../common/tools/GT_Tool_Turbine_Large.java | 4 +++ .../common/tools/GT_Tool_Turbine_Normal.java | 4 +++ .../common/tools/GT_Tool_Turbine_Small.java | 5 ++++ .../loaders/misc/GT_Achievements.java | 10 ++++++-- .../preload/GT_Loader_MetaTileEntities.java | 2 +- .../gregtech/textures/blocks/fluids/Thumbs.db | Bin 6144 -> 8192 bytes .../blocks/iconsets/OVERLAY_FUSION1.png | Bin 0 -> 662 bytes .../iconsets/OVERLAY_FUSION1.png.mcmeta | 5 ++++ .../blocks/iconsets/OVERLAY_FUSION2.png | Bin 0 -> 662 bytes .../iconsets/OVERLAY_FUSION2.png.mcmeta | 5 ++++ .../blocks/iconsets/OVERLAY_FUSION3.png | Bin 0 -> 662 bytes .../iconsets/OVERLAY_FUSION3.png.mcmeta | 5 ++++ .../blocks/iconsets/OVERLAY_QCHEST.png | Bin 0 -> 662 bytes .../blocks/iconsets/OVERLAY_QCHEST.png.mcmeta | 5 ++++ .../blocks/iconsets/OVERLAY_QTANK.png | Bin 0 -> 662 bytes .../blocks/iconsets/OVERLAY_QTANK.png.mcmeta | 5 ++++ .../textures/blocks/iconsets/Thumbs.db | Bin 292352 -> 296960 bytes .../assets/gregtech/textures/entity/Thumbs.db | Bin 3072 -> 3072 bytes .../textures/gui/basicmachines/Thumbs.db | Bin 218112 -> 218112 bytes .../textures/items/iconsets/TURBINE_HUGE.png | Bin 0 -> 1227 bytes .../items/iconsets/TURBINE_HUGE_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/iconsets/TURBINE_LARGE.png | Bin 0 -> 1227 bytes .../items/iconsets/TURBINE_LARGE_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/iconsets/TURBINE_SMALL.png | Bin 0 -> 1227 bytes .../items/iconsets/TURBINE_SMALL_OVERLAY.png | Bin 0 -> 143 bytes .../textures/items/iconsets/Thumbs.db | Bin 36864 -> 40448 bytes 44 files changed, 145 insertions(+), 21 deletions(-) create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png create mode 100644 main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png.mcmeta create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE_OVERLAY.png create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png create mode 100644 main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL_OVERLAY.png diff --git a/.gitignore b/.gitignore index 3997bead..a9d66647 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ +*.db *.db \ No newline at end of file diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index 1b91d8ea..ecf34ded 100644 --- a/main/java/gregtech/GT_Mod.java +++ b/main/java/gregtech/GT_Mod.java @@ -759,11 +759,13 @@ for (Map.Entry entry : outputs.entrySet()) { ItemStack tInput = GT_OreDictUnificator.get(OrePrefixes.dust, tMaterial, 1L); if (tInput != null) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[] { tInput }, new ItemStack[] { tOutput }, ItemList.Tool_DataOrb.get(1L, new Object[0]), null, null, (int)(tMaterial.getMass() * 8192L), 32, 0); + GT_Recipe.GT_Recipe_Map.sRepicatorFakeRecipes.addFakeRecipe(false, null , new ItemStack[] { tInput }, new ItemStack[] { tOutput } , new FluidStack[]{Materials.UUMatter.getFluid(tMaterial.getMass())}, null, (int)(tMaterial.getMass() * 512L), 32, 0); } tInput = GT_OreDictUnificator.get(OrePrefixes.cell, tMaterial, 1L); if (tInput != null) { GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[] { tInput }, new ItemStack[] { tOutput }, ItemList.Tool_DataOrb.get(1L, new Object[0]), null, null, (int)(tMaterial.getMass() * 8192L), 32, 0); - } + GT_Recipe.GT_Recipe_Map.sRepicatorFakeRecipes.addFakeRecipe(false, null , new ItemStack[] { tInput }, new ItemStack[] { tOutput } , new FluidStack[]{Materials.UUMatter.getFluid(tMaterial.getMass())}, null, (int)(tMaterial.getMass() * 512L), 32, 0); + } } } GT_Recipe.GT_Recipe_Map.sRockBreakerFakeRecipes.addFakeRecipe(false, new ItemStack[] { ItemList.Display_ITS_FREE.getWithName(0L, "Place Lava on Side", new Object[0]) }, new ItemStack[] { new ItemStack(Blocks.cobblestone, 1) }, null, null, null, 16, 32, 0); diff --git a/main/java/gregtech/api/enums/Materials.java b/main/java/gregtech/api/enums/Materials.java index 0d60f1b5..c38728b8 100644 --- a/main/java/gregtech/api/enums/Materials.java +++ b/main/java/gregtech/api/enums/Materials.java @@ -210,7 +210,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Adamite ( -1, TextureSet.SET_NONE , 1.0F, 0, 3, 1 |8 , 255, 255, 255, 0, "Adamite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeLightGray ), Adluorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8 , 255, 255, 255, 0, "Adluorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Agate ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Agate" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), - Alduorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |8|16 , 255, 255, 255, 0, "Alduorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Alduorite ( 485, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 |8|16 , 159, 180, 180, 0, "Alduorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Amber ( 514, TextureSet.SET_RUBY , 4.0F, 128, 2, 1 |4|8 |64 , 255, 128, 0, 127, "Amber" , 5, 3, -1, 0, F, T, 1, 1, 1, Dyes.dyeOrange , Arrays.asList(new TC_AspectStack(TC_Aspects.VINCULUM, 2), new TC_AspectStack(TC_Aspects.VITREUS, 1))), Ammonium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Ammonium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Amordrine ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 255, 255, 0, "Amordrine" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), @@ -278,9 +278,9 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Hematite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1|2 |8 , 255, 255, 255, 0, "Hematite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Hepatizon ( 957, TextureSet.SET_METALLIC , 12.0F, 128, 2, 1|2 |8|16 |64 , 117, 94, 117, 0, "Hepatizon" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), HSLA ( 322, TextureSet.SET_METALLIC , 6.0F, 500, 2, 1|2 |64|128 , 128, 128, 128, 0, "HSLA Steel" , 0, 0, 1811, 1000, T, F, 3, 1, 1, Dyes._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 1), new TC_AspectStack(TC_Aspects.ORDO, 1))), - Ignatius ( 950, TextureSet.SET_METALLIC , 12.0F, 512, 2, 1 |16 , 255, 169, 83, 0, "Ignatius" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Ignatius ( 950, TextureSet.SET_METALLIC , 12.0F, 512, 2, 1|2 |16 , 255, 169, 83, 0, "Ignatius" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Infernal ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 0 , 255, 255, 255, 0, "Infernal" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), - Infuscolium ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Infuscolium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), + Infuscolium ( 490, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |8|16 |64 , 146, 33, 86, 0, "Infuscolium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), InfusedGold ( 323, TextureSet.SET_SHINY , 12.0F, 64, 3, 1|2 |8 |64|128 , 255, 200, 60, 0, "Infused Gold" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeYellow ), InfusedAir ( 540, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 255, 0, 0, "Aer" , 5, 160, -1, 0, F, T, 3, 1, 1, Dyes.dyeYellow , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.AER, 2))), InfusedFire ( 541, TextureSet.SET_SHARDS , 8.0F, 64, 3, 1 |4|8 |64|128 , 255, 0, 0, 0, "Ignis" , 5, 320, -1, 0, F, T, 3, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.PRAECANTIO, 1), new TC_AspectStack(TC_Aspects.IGNIS, 2))), @@ -294,10 +294,10 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { Invisium ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 , 255, 255, 255, 0, "Invisium" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes._NULL ), Jade ( 537, TextureSet.SET_SHINY , 1.0F, 0, 2, 1 |8 , 0, 100, 0, 0, "Jade" , 0, 0, -1, 0, F, F, 5, 1, 1, Dyes.dyeGreen , Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 6), new TC_AspectStack(TC_Aspects.VITREUS, 3))), Jasper ( 511, TextureSet.SET_EMERALD , 1.0F, 0, 2, 1 |4|8 , 200, 80, 80, 100, "Jasper" , 0, 0, -1, 0, F, T, 3, 1, 1, Dyes.dyeRed , Arrays.asList(new TC_AspectStack(TC_Aspects.LUCRUM, 4), new TC_AspectStack(TC_Aspects.VITREUS, 2))), - Kalendrite ( 953, TextureSet.SET_METALLIC , 5.0F, 2560, 3, 1 |16 , 170, 91, 189, 0, "Kalendrite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Kalendrite ( 953, TextureSet.SET_METALLIC , 5.0F, 2560, 3, 1|2 |16 , 170, 91, 189, 0, "Kalendrite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Komatiite ( 869, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Komatiite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), Lava ( 700, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 255, 64, 0, 0, "Lava" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeOrange ), - Lemurite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 1 |16 , 255, 255, 255, 0, "Lemurite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Lemurite ( 486, TextureSet.SET_METALLIC , 1.0F, 0, 2, 1 |16 , 219, 219, 219, 0, "Lemurite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Limestone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Limestone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Lodestone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Lodestone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Luminite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 250, 250, 250, 0, "Luminite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeWhite ), @@ -307,7 +307,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { MeteoricIron ( 340, TextureSet.SET_METALLIC , 6.0F, 384, 2, 1|2 |8 |64 , 100, 50, 80, 0, "Meteoric Iron" , 0, 0, 1811, 0, F, F, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MAGNETO, 1))), MeteoricSteel ( 341, TextureSet.SET_METALLIC , 6.0F, 768, 2, 1|2 |64 , 50, 25, 40, 0, "Meteoric Steel" , 0, 0, 1811, 1000, T, F, 1, 1, 1, Dyes.dyeGray , Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 2), new TC_AspectStack(TC_Aspects.MAGNETO, 1), new TC_AspectStack(TC_Aspects.ORDO, 1))), Meteorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 80, 35, 60, 0, "Meteorite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyePurple ), - Meutoite ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8|16 , 255, 255, 255, 0, "Meutoite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Meutoite ( 487, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1 |8|16 , 95, 82, 105, 0, "Meutoite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Migmatite ( 872, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Migmatite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Mimichite ( -1, TextureSet.SET_GEM_VERTICAL , 1.0F, 0, 1, 1 |4|8 , 255, 255, 255, 0, "Mimichite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Moonstone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8 , 255, 255, 255, 0, "Moonstone" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeWhite , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.ALIENIS, 1))), @@ -339,7 +339,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { RefinedGlowstone (-326, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1|2 , 255, 255, 0, 0, "Refined Glowstone" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), RefinedObsidian (-327, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1|2 , 80, 50, 100, 0, "Refined Obsidian" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyePurple ), Rhyolite ( 875, TextureSet.SET_DULL , 1.0F, 0, 1, 1 , 255, 255, 255, 0, "Rhyolite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), - Rubracium ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 1 |8|16 , 255, 255, 255, 0, "Rubracium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Rubracium ( 488, TextureSet.SET_METALLIC , 1.0F, 0, 1, 1 |8|16 , 151, 45, 45, 0, "Rubracium" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), RyuDragonRyder ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Ryu Dragon Ryder" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Sand ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 0, "Sand" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes.dyeYellow ), Sanguinite ( 955, TextureSet.SET_METALLIC , 3.0F, 4480, 4, 1|2 |8 , 185, 0, 0, 0, "Sanguinite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), @@ -359,7 +359,7 @@ public enum Materials implements IColorModulationContainer, ISubTagContainer { UUMatter ( 703, TextureSet.SET_FLUID , 1.0F, 0, 1, 16 , 128, 0, 196, 0, "UU-Matter" , 0, 0, -1, 0, F, F, 10, 1, 1, Dyes.dyePink ), Void ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 200, "Void" , 0, 0, -1, 0, F, T, 1, 1, 1, Dyes._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.VACUOS, 1))), Voidstone ( -1, TextureSet.SET_NONE , 1.0F, 0, 1, 0 , 255, 255, 255, 200, "Voidstone" , 0, 0, -1, 0, F, T, 1, 1, 1, Dyes._NULL , Arrays.asList(new TC_AspectStack(TC_Aspects.VITREUS, 1), new TC_AspectStack(TC_Aspects.VACUOS, 1))), - Vulcanite ( -1, TextureSet.SET_NONE , 6.0F, 64, 2, 1|2 |8 |64 , 255, 255, 255, 0, "Vulcanite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), + Vulcanite ( 489, TextureSet.SET_METALLIC , 6.0F, 64, 2, 1|2 |8|16 |64 , 255, 132, 72, 0, "Vulcanite" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Vyroxeres ( 951, TextureSet.SET_METALLIC , 9.0F, 768, 3, 1|2 |8 |64 , 85, 224, 1, 0, "Vyroxeres" , 0, 0, -1, 0, F, F, 1, 1, 1, Dyes._NULL ), Wimalite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 8 , 255, 255, 255, 0, "Wimalite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeYellow ), Yellorite ( -1, TextureSet.SET_NONE , 1.0F, 0, 2, 8 , 255, 255, 255, 0, "Yellorite" , 0, 0, -1, 0, F, F, 3, 1, 1, Dyes.dyeYellow ), diff --git a/main/java/gregtech/api/enums/Textures.java b/main/java/gregtech/api/enums/Textures.java index 5ebbd26d..43c33fc8 100644 --- a/main/java/gregtech/api/enums/Textures.java +++ b/main/java/gregtech/api/enums/Textures.java @@ -52,7 +52,7 @@ public class Textures { , STEAM_TURBINE_BACK, STEAM_TURBINE_FRONT, STEAM_TURBINE_SIDE, STEAM_TURBINE_BOTTOM, STEAM_TURBINE_TOP, STEAM_TURBINE_BACK_ACTIVE, STEAM_TURBINE_FRONT_ACTIVE, STEAM_TURBINE_SIDE_ACTIVE, STEAM_TURBINE_BOTTOM_ACTIVE, STEAM_TURBINE_TOP_ACTIVE , MACHINE_COIL_CUPRONICKEL, MACHINE_COIL_KANTHAL, MACHINE_COIL_NICHROME, MACHINE_COIL_SUPERCONDUCTOR , OVERLAY_LOCKER, OVERLAY_LOCKER_000, OVERLAY_LOCKER_001, OVERLAY_LOCKER_002, OVERLAY_LOCKER_003, OVERLAY_LOCKER_004, OVERLAY_LOCKER_005, OVERLAY_LOCKER_006, OVERLAY_LOCKER_007, OVERLAY_LOCKER_008, OVERLAY_LOCKER_009, OVERLAY_LOCKER_010, OVERLAY_LOCKER_011, OVERLAY_LOCKER_012, OVERLAY_LOCKER_013 - , OVERLAY_LENS, OVERLAY_PIPE, OVERLAY_PIPE_IN, OVERLAY_PIPE_OUT, OVERLAY_MUFFLER, OVERLAY_CONTROLLER, OVERLAY_ACTIVITYDETECTOR, OVERLAY_ENERGYDETECTOR, OVERLAY_FLUIDDETECTOR, OVERLAY_ITEMDETECTOR, OVERLAY_SCREEN, OVERLAY_SHUTTER, OVERLAY_CLOSET, OVERLAY_DUCTTAPE, OVERLAY_MAINTENANCE, OVERLAY_CONVEYOR, OVERLAY_PUMP, OVERLAY_ARM, OVERLAY_DRAIN, OVERLAY_CRAFTING + , OVERLAY_LENS, OVERLAY_PIPE, OVERLAY_PIPE_IN, OVERLAY_PIPE_OUT, OVERLAY_MUFFLER, OVERLAY_CONTROLLER, OVERLAY_ACTIVITYDETECTOR, OVERLAY_ENERGYDETECTOR, OVERLAY_FLUIDDETECTOR, OVERLAY_ITEMDETECTOR, OVERLAY_FUSION1, OVERLAY_FUSION2, OVERLAY_FUSION3, OVERLAY_SCREEN, OVERLAY_QTANK, OVERLAY_QCHEST, OVERLAY_SHUTTER, OVERLAY_CLOSET, OVERLAY_DUCTTAPE, OVERLAY_MAINTENANCE, OVERLAY_CONVEYOR, OVERLAY_PUMP, OVERLAY_ARM, OVERLAY_DRAIN, OVERLAY_CRAFTING , OVERLAY_ENERGY_IN, OVERLAY_ENERGY_OUT , OVERLAY_ENERGY_IN_MULTI, OVERLAY_ENERGY_OUT_MULTI , OVERLAY_FRONT_LARGE_BOILER, OVERLAY_FRONT_LARGE_BOILER_ACTIVE, OVERLAY_FRONT_VACUUM_FREEZER, OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE, OVERLAY_FRONT_MULTI_SMELTER, OVERLAY_FRONT_MULTI_SMELTER_ACTIVE, OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE, OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE, OVERLAY_FRONT_IMPLOSION_COMPRESSOR, OVERLAY_FRONT_IMPLOSION_COMPRESSOR_ACTIVE , OVERLAY_TOP_POTIONBREWER , OVERLAY_TOP_REPLICATOR , OVERLAY_TOP_MASSFAB , OVERLAY_TOP_STEAM_HAMMER , OVERLAY_TOP_STEAM_FURNACE , OVERLAY_TOP_STEAM_ALLOY_SMELTER , OVERLAY_TOP_STEAM_MACERATOR , OVERLAY_TOP_STEAM_COMPRESSOR , OVERLAY_TOP_STEAM_EXTRACTOR , OVERLAY_TOP_DISASSEMBLER , OVERLAY_TOP_BOXINATOR , OVERLAY_TOP_ROCK_BREAKER , OVERLAY_TOP_SCANNER @@ -377,7 +377,7 @@ public class Textures { , HANDLE_SWORD, HANDLE_FILE, HANDLE_SAW, HANDLE_SCREWDRIVER, HANDLE_BUZZSAW, HANDLE_ELECTRIC_SCREWDRIVER, HANDLE_SOLDERING , POWER_UNIT_LV, POWER_UNIT_MV, POWER_UNIT_HV , DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8 - , ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8, TURBINE + , ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8, TURBINE, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE ; public static final IIconContainer[] diff --git a/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java b/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java index a06151b5..7898f3b6 100644 --- a/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java +++ b/main/java/gregtech/api/gui/GT_GUIContainer_BasicMachine.java @@ -1,6 +1,10 @@ package gregtech.api.gui; import static gregtech.api.enums.GT_Values.RES_PATH_GUI; + +import java.util.ArrayList; +import java.util.List; + import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.entity.player.InventoryPlayer; @@ -31,6 +35,25 @@ public class GT_GUIContainer_BasicMachine extends GT_GUIContainerMetaTile_Machin @Override protected void drawGuiContainerForegroundLayer(int par1, int par2) { fontRendererObj.drawString(mName, 8, 4, 4210752); + drawTooltip(par1, par2); + } + + private void drawTooltip(int x2, int y2){ + int xStart = (width - xSize) / 2; + int yStart = (height - ySize) / 2; + int x = x2 - xStart; + int y = y2 - yStart +5; + List list = new ArrayList(); + if (y >= 67 && y <= 84) { + if (x >= 7 && x <= 24){ + list.add("Fluid Auto-Output"); + } + if (x >= 25 && x <= 42){ + list.add("Item Auto-Output"); + } + } + if (!list.isEmpty()) + drawHoveringText(list, x, y, fontRendererObj); } @Override diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java index e5c9496c..59ff78e3 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java @@ -1,5 +1,6 @@ package gregtech.api.metatileentity.implementations; +import gregtech.api.GregTech_API; import gregtech.api.enums.*; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java index 63cd01f5..72df4d7c 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicBatteryBuffer.java @@ -9,6 +9,7 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.items.GT_MetaBase_Item; +import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import net.minecraft.entity.player.EntityPlayer; @@ -199,10 +200,10 @@ public class GT_MetaTileEntity_BasicBatteryBuffer extends GT_MetaTileEntity_Tier } return new String[] { - getMetaName(), + getLocalName(), "Stored Items:", - Long.toString(mStored), - Long.toString(mMax)}; + GT_Utility.formatNumbers(mStored)+" EU /", + GT_Utility.formatNumbers(mMax)+" EU"}; } @Override diff --git a/main/java/gregtech/api/util/GT_Recipe.java b/main/java/gregtech/api/util/GT_Recipe.java index 154d1135..130a63d7 100644 --- a/main/java/gregtech/api/util/GT_Recipe.java +++ b/main/java/gregtech/api/util/GT_Recipe.java @@ -51,6 +51,7 @@ public class GT_Recipe { public static final GT_Recipe_Map sScannerFakeRecipes = new GT_Recipe_Map (new HashSet( 3), "gt.recipe.scanner" , "Scanner" , null , RES_PATH_GUI+"basicmachines/Scanner" , 1, 1, 1, 0, 1, E , 1, E , T, T); public static final GT_Recipe_Map sRockBreakerFakeRecipes = new GT_Recipe_Map (new HashSet( 3), "gt.recipe.rockbreaker" , "Rock Breaker" , null , RES_PATH_GUI+"basicmachines/RockBreaker" , 1, 1, 0, 0, 1, E , 1, E , T, T); public static final GT_Recipe_Map sByProductList = new GT_Recipe_Map (new HashSet( 1000), "gt.recipe.byproductlist" , "Ore Byproduct List" , null , RES_PATH_GUI+"basicmachines/Default" , 1, 6, 1, 0, 1, E , 1, E , T, T); + public static final GT_Recipe_Map sRepicatorFakeRecipes = new GT_Recipe_Map (new HashSet( 100), "gt.recipe.replicator" , "Replicator" , null , RES_PATH_GUI+"basicmachines/Replicator" , 0, 1, 0, 1, 1, E , 1, E , T, T); public static final GT_Recipe_Map sPlasmaArcFurnaceRecipes = new GT_Recipe_Map (new HashSet(10000), "gt.recipe.plasmaarcfurnace" , "Plasma Arc Furnace" , null , RES_PATH_GUI+"basicmachines/PlasmaArcFurnace" , 1, 4, 1, 1, 1, E , 1, E , T, T); public static final GT_Recipe_Map sArcFurnaceRecipes = new GT_Recipe_Map (new HashSet(10000), "gt.recipe.arcfurnace" , "Arc Furnace" , null , RES_PATH_GUI+"basicmachines/ArcFurnace" , 1, 4, 1, 1, 3, E , 1, E , T, T); diff --git a/main/java/gregtech/common/GT_RecipeAdder.java b/main/java/gregtech/common/GT_RecipeAdder.java index 719d517b..bb9a1732 100644 --- a/main/java/gregtech/common/GT_RecipeAdder.java +++ b/main/java/gregtech/common/GT_RecipeAdder.java @@ -445,6 +445,13 @@ public class GT_RecipeAdder if ((aMold == null) || (aInput == null) || (aOutput == null)) { return false; } + if(aInput.isFluidEqual(Materials.PhasedGold.getMolten(144))){ + aInput = Materials.VibrantAlloy.getMolten(aInput.amount); + } + if(aInput.isFluidEqual(Materials.PhasedIron.getMolten(144))){ + aInput = Materials.PulsatingIron.getMolten(aInput.amount); + } + if ((aDuration = GregTech_API.sRecipeFile.get("fluidsolidifier", aOutput, aDuration)) <= 0) { return false; } @@ -457,6 +464,12 @@ public class GT_RecipeAdder if ((aInput == null) || (aOutput == null)) { return false; } + if(aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))){ + aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount); + } + if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){ + aOutput = Materials.PulsatingIron.getMolten(aOutput.amount); + } if ((aDuration = GregTech_API.sRecipeFile.get("fluidsmelter", aInput, aDuration)) <= 0) { return false; } @@ -469,9 +482,16 @@ public class GT_RecipeAdder if ((aInput == null) || (aOutput == null)) { return false; } + if(aOutput.isFluidEqual(Materials.PhasedGold.getMolten(1))){ + aOutput = Materials.VibrantAlloy.getMolten(aOutput.amount); + } + if(aOutput.isFluidEqual(Materials.PhasedIron.getMolten(1))){ + aOutput = Materials.PulsatingIron.getMolten(aOutput.amount); + } if ((aDuration = GregTech_API.sRecipeFile.get("fluidextractor", aInput, aDuration)) <= 0) { return false; } + GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes.addRecipe(true, new ItemStack[] { aInput }, new ItemStack[] { aRemains }, null, new int[] { aChance }, null, new FluidStack[] { aOutput }, aDuration, aEUt, 0); return true; } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index d2ecf40a..ae30b44a 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -9,6 +9,7 @@ import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_Container_MultiMachine; import gregtech.api.gui.GT_GUIContainer_MultiMachine; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; @@ -222,7 +223,7 @@ public abstract class GT_MetaTileEntity_FusionComputer { ITexture[] sTexture; if(aSide==aFacing){ - sTexture = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN) }; + sTexture = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)),new GT_RenderedTexture(getIconOverlay()) }; }else{ if(!aActive){ sTexture = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))};}else{ @@ -231,6 +232,8 @@ public abstract class GT_MetaTileEntity_FusionComputer } return sTexture; } + + public abstract IIconContainer getIconOverlay(); @Override public boolean isCorrectMachinePart(ItemStack aStack) {return true;} diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java index b99a6678..3c23afcb 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer1.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import net.minecraft.block.Block; @@ -43,4 +45,9 @@ public class GT_MetaTileEntity_FusionComputer1 extends GT_MetaTileEntity_FusionC return GregTech_API.sBlockCasings1; } + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION1; + } + } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java index 0f7fab7b..d101875b 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer2.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import net.minecraft.block.Block; @@ -43,4 +45,8 @@ public class GT_MetaTileEntity_FusionComputer2 extends GT_MetaTileEntity_FusionC return GregTech_API.sBlockCasings4; } + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION2; + } } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java index 42371fbe..b7334bd4 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer3.java @@ -1,6 +1,8 @@ package gregtech.common.tileentities.machines.multi; import gregtech.api.GregTech_API; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import net.minecraft.block.Block; @@ -43,5 +45,10 @@ public class GT_MetaTileEntity_FusionComputer3 extends GT_MetaTileEntity_FusionC return GregTech_API.sBlockCasings4; } + @Override + public IIconContainer getIconOverlay() { + return Textures.BlockIcons.OVERLAY_FUSION3; + } + } diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 8096f483..61ff12fc 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -110,6 +110,8 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl return GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; }else if(tmp.startsWith("bender")){ return GT_Recipe.GT_Recipe_Map.sBenderRecipes; + }else if(tmp.startsWith("wiremill")){ + return GT_Recipe.GT_Recipe_Map.sWiremillRecipes; } return null; } diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index be75334a..08428153 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -226,7 +226,8 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity,byte aSide, byte aFacing, byte aColorIndex, boolean aActive,boolean aRedstone) { - return aSide == aBaseMetaTileEntity.getFrontFacing() ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};//aSide != aFacing ? mMachineBlock != 0 ? new ITexture[] {Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]} : new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]} : mMachineBlock != 0 ? aActive ? getTexturesActive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : getTexturesInactive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : aActive ? getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]) : getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]); + if(aBaseMetaTileEntity.getFrontFacing()==0&&aSide==4){return new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST)}; } + return aSide == aBaseMetaTileEntity.getFrontFacing() ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QCHEST)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]};//aSide != aFacing ? mMachineBlock != 0 ? new ITexture[] {Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]} : new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]} : mMachineBlock != 0 ? aActive ? getTexturesActive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : getTexturesInactive(Textures.BlockIcons.CASING_BLOCKS[mMachineBlock]) : aActive ? getTexturesActive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]) : getTexturesInactive(Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]); } @Override diff --git a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java index c7e855eb..a27feb58 100644 --- a/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java +++ b/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java @@ -28,7 +28,7 @@ public class GT_MetaTileEntity_QuantumTank @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SCREEN)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]}; + return aSide ==1 ? new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1],new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_QTANK)} :new ITexture[] {Textures.BlockIcons.MACHINE_CASINGS[mTier][aColorIndex+1]}; } @Override diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java index 89df4bfc..7640c4fe 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java @@ -13,13 +13,14 @@ import net.minecraft.util.IChatComponent; public abstract class GT_Tool_Turbine extends GT_Tool{ public abstract float getBaseDamage(); @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) {return false;} - @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? Textures.ItemIcons.TURBINE : null;} + @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? getTurbineIcon(): null;} @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;} public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED + aEntity.getCommandSenderName()+"s" + EnumChatFormatting.WHITE + " head into a turbine"); } + public abstract IIconContainer getTurbineIcon(); public abstract float getSpeedMultiplier(); public abstract float getMaxDurabilityMultiplier(); public ItemStack getBrokenItem(ItemStack aStack){return null;} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java index 0bf3b783..f2ec5a73 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 4.0F;} @Override public float getMaxDurabilityMultiplier() {return 4.0F;} @Override public float getBaseDamage() {return 3.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_HUGE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java index 57947aea..ed0713cd 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Large extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 3.0F;} @Override public float getMaxDurabilityMultiplier() {return 3.0F;} @Override public float getBaseDamage() {return 5.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_LARGE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java index 8327a743..a29ad632 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java @@ -1,7 +1,11 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 2.0F;} @Override public float getMaxDurabilityMultiplier() {return 2.0F;} @Override public float getBaseDamage() {return 2.5F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE;} } diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java index fb93a2b2..4292ab73 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java @@ -1,7 +1,12 @@ package gregtech.common.tools; +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; + public class GT_Tool_Turbine_Small extends GT_Tool_Turbine { @Override public float getSpeedMultiplier() {return 1.0F;} @Override public float getMaxDurabilityMultiplier() {return 1.0F;} @Override public float getBaseDamage() {return 0.0F;} + @Override public IIconContainer getTurbineIcon() {return Textures.ItemIcons.TURBINE_SMALL;} + } diff --git a/main/java/gregtech/loaders/misc/GT_Achievements.java b/main/java/gregtech/loaders/misc/GT_Achievements.java index dd2074d7..4c3be9b1 100644 --- a/main/java/gregtech/loaders/misc/GT_Achievements.java +++ b/main/java/gregtech/loaders/misc/GT_Achievements.java @@ -295,11 +295,17 @@ public int adjY = 9; if (player == null||stack==null) { return; } + ItemData data = GT_OreDictUnificator.getItemData(stack); + if (data != null) { + if (data.mPrefix == OrePrefixes.dust&&data.mMaterial.mMaterial == Materials.Bronze) { + issueAchievement(player, "bronze"); + }else if(data.mPrefix == OrePrefixes.circuit&&data.mMaterial.mMaterial == Materials.Advanced){ + issueAchievement(player, "stepforward"); + } + } if(stack.getUnlocalizedName().startsWith("gt.metaitem.")){ if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ issueAchievement(player, "bronze"); - }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.2300")){ - issueAchievement(player, "bronze"); }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.32700")){ issueAchievement(player, "smallparts"); }else if(stack.getUnlocalizedName().equals("gt.metaitem.01.23354")){ diff --git a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index 70865acd..b8f82971 100644 --- a/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -947,7 +947,7 @@ public class GT_Loader_MetaTileEntities ItemList.MagicEnergyAbsorber_MV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1128, "basicgenerator.magicenergyabsorber.tier.02", "Adept Magic Energy Absorber",2).getStackForm(1L)); ItemList.MagicEnergyAbsorber_HV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1129, "basicgenerator.magicenergyabsorber.tier.03", "Master Magic Energy Absorber",3).getStackForm(1L)); ItemList.MagicEnergyAbsorber_EV.set(new GT_MetaTileEntity_MagicalEnergyAbsorber(1130, "basicgenerator.magicenergyabsorber.tier.04", "Grandmaster Magic Energy Absorber",4).getStackForm(1L)); - if (GregTech_API.sThaumcraftCompat == null){ + if (!Loader.isModLoaded("Thaumcraft")){ GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Advanced), Character.valueOf('T'), ItemList.Field_Generator_LV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Platinum) }); GT_ModHandler.addCraftingRecipe(ItemList.MagicEnergyConverter_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "CTC", "FMF", "CBC", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('B'), new ItemStack(Blocks.beacon), Character.valueOf('C'), OrePrefixes.circuit.get(Materials.Data), Character.valueOf('T'), ItemList.Field_Generator_MV, Character.valueOf('F'), OrePrefixes.plate.get(Materials.Iridium) }); diff --git a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db index 60d412366120732244320f23dc1035670d5ab674..1f30c4642e0b0f5df29d30d43fcc3f6bbe0d24f6 100644 GIT binary patch delta 876 zcmZoLXmHrT!ogGoV<2gvyM|NnnpAk7D2Z#HB)&NzuBhwnj-N?O5^3yjP_ zQ3sL9RV<#oj6j8OFu9RMWAYD{(-2V>pem3QP*i2}7gi2NR|lYoBM>_Qu`>|60I@3& zy8*E~5PJZzClGr9u{RL=0I@F+`vI{(5C;J9zlnkSH*p-`pL{@sLm(Ao2N0wj?Msf{ z_vFju8zLI&MhvD5W(@H_Y|fC(kOIVpKvo)q36PZpgvLN#DucyjMHWd$t;q*jjM?mg zM%1!Q-YD+H1NRHa;Ty&MCr@BeB|@-~#bA@DJ5&8H%^i35JeEKF^?i`L-of6T@8?uq zDNfuGAJ_h;R?B0N?lhU^_kHu`U11cK*Y${7-dADwCwRg}6{d>UjrS&QR=86c`mX9< zsgg~WUC#4c4N6n;WQr%>?!Po&rt(}>iNx{z_^QN1E7hmHugrPpEu8|C6RT^E?i_efOp?w3a=sp7;E#$f`C!@ePto?(m8RNFd#CKL`uSN&yO!^; zyTZWwoaIw(M(7=b<;!E{1gtT>T*hAIGs$>@2IDEWs?@5B$3K?5J*UZ#{?A$DUh}dH z#+wIE%N06plrLU>ZED&2n13Smvy11#Xl720W;m_vNa!<@18q{a*Yh*e-?Je0_VX!T$eEa54nu9}$bm M2gDt)VgnXd0N;IryZ`_I delta 81 zcmZp0XfW8o!o>3L|NsA!IhYg}|7~_;+Rr#KL1Ge14xhp=p$Uc!7Z{lt7#I%lPp)F| koa`)NIN5-OW%3V}(;)WdFRUDl8$(zaH*o+JJdkhz0K=#pkpKVy diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png new file mode 100644 index 0000000000000000000000000000000000000000..0f183c031302c19da6553c1b65f48622b49b8d42 GIT binary patch literal 662 zcmV;H0%`q;P)7Dv z0kOC!M2ryI6+xLdL3kF<%DcVU*$pXTu>%KlbL^Y%`}Ns(VrHCWt#QV6q1hZAeKl1j zsuEPu7|`%{A63zyXiUGU@_2Jo05CJmjDv%Z1`PUa&9gKt{|tVaW|WVAuEOs1+&=^Pt(+B1=jJ^PsD(PsM|L7DgV7Jm}%UQ(aORpvy5T{9NIEBF7Y$b+_m+qoE&<^!+b w1h^)`3p3sTpAvA2Jjli1etXCod9bwp0E>(HKzm5)zyJUM07*qoM6N<$f@dHoyZ`_I literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png.mcmeta new file mode 100644 index 00000000..5e86a7cd --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION1.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png new file mode 100644 index 0000000000000000000000000000000000000000..0f183c031302c19da6553c1b65f48622b49b8d42 GIT binary patch literal 662 zcmV;H0%`q;P)7Dv z0kOC!M2ryI6+xLdL3kF<%DcVU*$pXTu>%KlbL^Y%`}Ns(VrHCWt#QV6q1hZAeKl1j zsuEPu7|`%{A63zyXiUGU@_2Jo05CJmjDv%Z1`PUa&9gKt{|tVaW|WVAuEOs1+&=^Pt(+B1=jJ^PsD(PsM|L7DgV7Jm}%UQ(aORpvy5T{9NIEBF7Y$b+_m+qoE&<^!+b w1h^)`3p3sTpAvA2Jjli1etXCod9bwp0E>(HKzm5)zyJUM07*qoM6N<$f@dHoyZ`_I literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png.mcmeta new file mode 100644 index 00000000..5e86a7cd --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION2.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png new file mode 100644 index 0000000000000000000000000000000000000000..0f183c031302c19da6553c1b65f48622b49b8d42 GIT binary patch literal 662 zcmV;H0%`q;P)7Dv z0kOC!M2ryI6+xLdL3kF<%DcVU*$pXTu>%KlbL^Y%`}Ns(VrHCWt#QV6q1hZAeKl1j zsuEPu7|`%{A63zyXiUGU@_2Jo05CJmjDv%Z1`PUa&9gKt{|tVaW|WVAuEOs1+&=^Pt(+B1=jJ^PsD(PsM|L7DgV7Jm}%UQ(aORpvy5T{9NIEBF7Y$b+_m+qoE&<^!+b w1h^)`3p3sTpAvA2Jjli1etXCod9bwp0E>(HKzm5)zyJUM07*qoM6N<$f@dHoyZ`_I literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png.mcmeta new file mode 100644 index 00000000..5e86a7cd --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_FUSION3.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png new file mode 100644 index 0000000000000000000000000000000000000000..0f183c031302c19da6553c1b65f48622b49b8d42 GIT binary patch literal 662 zcmV;H0%`q;P)7Dv z0kOC!M2ryI6+xLdL3kF<%DcVU*$pXTu>%KlbL^Y%`}Ns(VrHCWt#QV6q1hZAeKl1j zsuEPu7|`%{A63zyXiUGU@_2Jo05CJmjDv%Z1`PUa&9gKt{|tVaW|WVAuEOs1+&=^Pt(+B1=jJ^PsD(PsM|L7DgV7Jm}%UQ(aORpvy5T{9NIEBF7Y$b+_m+qoE&<^!+b w1h^)`3p3sTpAvA2Jjli1etXCod9bwp0E>(HKzm5)zyJUM07*qoM6N<$f@dHoyZ`_I literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png.mcmeta new file mode 100644 index 00000000..5e86a7cd --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QCHEST.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png new file mode 100644 index 0000000000000000000000000000000000000000..0f183c031302c19da6553c1b65f48622b49b8d42 GIT binary patch literal 662 zcmV;H0%`q;P)7Dv z0kOC!M2ryI6+xLdL3kF<%DcVU*$pXTu>%KlbL^Y%`}Ns(VrHCWt#QV6q1hZAeKl1j zsuEPu7|`%{A63zyXiUGU@_2Jo05CJmjDv%Z1`PUa&9gKt{|tVaW|WVAuEOs1+&=^Pt(+B1=jJ^PsD(PsM|L7DgV7Jm}%UQ(aORpvy5T{9NIEBF7Y$b+_m+qoE&<^!+b w1h^)`3p3sTpAvA2Jjli1etXCod9bwp0E>(HKzm5)zyJUM07*qoM6N<$f@dHoyZ`_I literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png.mcmeta b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png.mcmeta new file mode 100644 index 00000000..5e86a7cd --- /dev/null +++ b/main/resources/assets/gregtech/textures/blocks/iconsets/OVERLAY_QTANK.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation":{ + "frametime":8 + } +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db index 9f4d93392f2f5418b66825162ff71924655a128b..afa9370a5cd702335d5c7d0e3f91df8f4cd2c63a 100644 GIT binary patch delta 12279 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 delta 13512 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 UtZ0RZ&RQdiMfm^xp7l5RKk8>2yZ`_I diff --git a/main/resources/assets/gregtech/textures/entity/Thumbs.db b/main/resources/assets/gregtech/textures/entity/Thumbs.db index ee9662e59bb6543d8ca20e31dc2f97fcca466198..e2db25ee53fbf73b662824ba7961740ebe05434c 100644 GIT binary patch delta 47 zcmV+~0MP${7=ReCYy<`%^XciT*Ryg2o&yLFo)mre22eP&7znrl2u{A92?oDJV6)f> FC<4N05y1ce delta 47 zcmV+~0MP${7=ReCYy<{C6{Np*inDSAo&yMyOT2)5*3Nvh7znrl2-jt^C5k+EwX@g> FC<3}g67B#1 diff --git a/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db index 1bda625942592454c9a3151afb2161a8b695a7d9..a5d43c9e55c663b411db972fd4e77c05f3217a4d 100644 GIT binary patch delta 1869 zcmY+E3s4hB7{}R7kR`bTL<*;k@{l5rBs@wK0bx{HtJM-8r4bkv@mV_R*i*x!nkpS1 zDAb-#4#cWxD;BlNSvNX3iZEKi3TTy6@i|)Csdi{R3N0wz3(WMAnVZS}_U`}v@4NrE zwrbi|O`n*q2E({ub>I+N;sM{9c5bzLCf8t$+>=yci*5Ta91L5i-_BJZ(r+N{dU zRRW)sKp|%9;v0`9XY~oXlSlV5UL| z@Kr)KC*5gT%F&_u>Auq@AO38tz${GgM78ag+eX(H<_nfQhZa?(O@G`R;ki*@);T;; zbJ9X#?us)91ksk~NjsZpa#7tjsJhMUboYkKX33ztSS6K8bg28njGXM8@zDaa-AbXd z<_>*8ImFJk-{wi%&nJF|z9>oV7WhLw6#D$&dob*H#WaCGS>r{6H;G!ZQjxtdSZ9oq zN*BzOI{`^b$kv-F4FS$aFmj^v%<; z;l-FK2YTR)Q;I^;&Q<_t*z6MdGmyn7m;F6}Otv}(OM5^zg}{!J8L9y9sn}8ttllVV zc24Ni%;QxYvwb2S?f~5ykD-0zsSa%>4rl;+ng$+3jBycc1uZlPAqctPHo2_B z%h+6Yt`v*@u!lz1jvJm8`x{HJ7z#YaL9^;Q&8NE$m@r=q6MRs34ZfPvb1e*uyP#EzqL()& zr2q9p1-9&$myy3@&U7^QB-+Iq=sfZz@#3ub_Ihj?r|R)SwFj5_>^{-=4Ys_is;2(~ DrK}RX delta 1812 zcmY*Z4Nw(T6n^)<2VCFVMUp2j`9Sgq1o;z13FR*ZvQ(bRFi&&*1&0yP(j9$_qaZmI zJ~MLFU6A}4C{UunjV@%Q{5UF3f;iezh&iQ*0uiq8)Qs*vZD!e-o!$GLbHDGNbI&=s z<#cX2UA0&TT)FEyA1A}e(p@%gn{FAmAb2Jhs?%|H-Mfx|*2zpU8jWTgc}K`Y+^34N zlL?{~p5g!e*d@A)46+;0otB2Y_x1#ga14qQR~oSa)g`oM#@vmK6d9jd8aWU8^<`Ph zhB+xHg9h$|Ekwo0vB74pSr^L5Minm6Y{D&oSj`#pDZ#PBF3Q275yt`w>Ez&S~6-4=*Aa)EA!73pA(s#wPVo6 zp55YbX75E&%FP%<12@7Hu4ZHR6Ae8~o!HVX3Z-@mUCUpR)uk1Wi$ZmUE3FA6 zZ1dHO?1fi3xnQPzh+*s~V}qF*Pk@PPP;M|G*Q&g<>cPfSBGX9HK78)y5-PY<2Of-@lW_Ms%ZPpZ=r%oqW=fZUd!DvLh3wUv_+{W0(X zpV7!E?}x~)_OJ)M5Cke{jSG>ZRgyd#49t{r@BV634hD`BU^WDFQYaz&Eupu>s|#D^ z1FI`CMl~J3kIf%q=^aJ&tA<;1dc6NVi-ib0xKEj*<<7&lZk1T%8cb>U^RuV)HK!1 z`8?$@wv+?wSQMK%sWP``VH(FAh{K+>U|8=mr@8Cm<+^2fLK6t2X^n|+#He_9whgo@ z&Be3VU*?gQuLBbrzqo&ai}hg|MV-6>w1uy9vNQSQK zcR_G_!yznrKs$~0Zol^a$pfdFu{0Hu(hLdcaK6p#n}DTIWtsm#lQK(~QosqNB?bnyI?39O}1 z&#kSCpfB=KXVk%Y7`RLlXNm>0z!X__YUHcEDbs%tW5G5^|u_6;zS) zvICw+px4zfo2_`yAds&L#&R|+)}z$Hv58$1Jq}`FAB=EAo#)E_*qK`3ho!^NYCxUE z!Cxl%b`4_7No848b18PnbhL$+Dj=EN69}E3nv(q*nha>I$Hr&Elo$0_z>rMB(zP2B zY|d-6*wO&W(5%nd7b`>wzF25cV$X^(78#REep7}PF8l=sK&5oB+yOfc$nI5m3%Z$U)h;sDOTdf~VUsOEO*SkAXsr}_me%;^c*@_5EpxSYSEN~PUcq!EXJbo(ww(SCyS?kT diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE.png new file mode 100644 index 0000000000000000000000000000000000000000..7be4cc29d32f25ff02274d4854b82bfe725f1a8a GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eqQ$1ZALn`Lv_MhfGV8G*KY+JtmfX|x)QeV}xF0axM-_KBZ?U!iObB)>NOg^V7 z%^Ke_9+OzIOXr%HL2CzJlDa_3f*#%_jPry#N?fgOE#0z7uXk4YbP0l+XkKKu^D1 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_HUGE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE.png new file mode 100644 index 0000000000000000000000000000000000000000..7be4cc29d32f25ff02274d4854b82bfe725f1a8a GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eqQ$1ZALn`Lv_MhfGV8G*KY+JtmfX|x)QeV}xF0axM-_KBZ?U!iObB)>NOg^V7 z%^Ke_9+OzIOXr%HL2CzJlDa_3f*#%_jPry#N?fgOE#0z7uXk4YbP0l+XkKKu^D1 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE_OVERLAY.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_LARGE_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL.png new file mode 100644 index 0000000000000000000000000000000000000000..7be4cc29d32f25ff02274d4854b82bfe725f1a8a GIT binary patch literal 1227 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GXl4m>B|mLR^7dMn*;^CMITPW)>C} zR#sLvHa2#4b`A~>PEJlPE-r3vZXO;UUS3{4K0bbaegOdiK|w(wAt7O5VG$7#QBhGb zF)?v*aR~_tNl8g5DJf}bX&D(ASy@>*IXQWGc?AUpMMXs=B_(BLWfc__RaI3rH8pj0 zbqx&-O-)TLEiG+rZ5@`{Rz%F4>Bs;cVh>YAFG+S=N> zy1M%M`i6#v#>U2`rl#iR=9ZS0*4Eaxwzl^6_KuE@&d$!RuCDIx?w+2W-rnB6zP|qc z{s|K%Oq@7z(xgd~Cr_R-Wy;j4Q>RUvHhuc^88c?goH=vWtXZ>X&z>`9&fK|k=gpfp zfByUh3l=O~xNy;;MT-|NUb1A#(xpq6EnBvH`SKMjR;*mPa@DF;t5>gHvu4fOwQJX{ zTep7w`VAX4Y}~kU)22^3g)|NZ;-|Ns9-8)9pLS%9G=$S;@y$REjoYx)-(V0pk<;1OBOz`!jG!i)^F z=12eqQ$1ZALn`Lv_MhfGV8G*KY+JtmfX|x)QeV}xF0axM-_KBZ?U!iObB)>NOg^V7 z%^Ke_9+OzIOXr%HL2CzJlDa_3f*#%_jPry#N?fgOE#0z7uXk4YbP0l+XkKKu^D1 literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL_OVERLAY.png b/main/resources/assets/gregtech/textures/items/iconsets/TURBINE_SMALL_OVERLAY.png new file mode 100644 index 0000000000000000000000000000000000000000..d83a131004a555d47a5656fbeecf79ad3a7ccc7f GIT binary patch literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE77|LvJo8#)`E46+Wa eU|h_`BgV{-Jd0WOjqPWUItEWyKbLh*2~7YD10q2H literal 0 HcmV?d00001 diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db index 7d2d69b3e03b4a5a65a525c5bbf0fc9c88e4e121..cc2f343151f9f71667b89772076a72da36af42e5 100644 GIT binary patch delta 3334 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 LSyhSp|B3$q7hdd? delta 2652 zcmZ9O30M?I7RTuku#7!00isPDl~M3Oju|2Xa>FP$G>1AUD!5#Jj)KqzR}mzh2qZ`; z84S@~jR_txBdwuhP!3nu&kNTNwTY8WG^+_1f^i#V*R1ZFBbnCvzWShk@6~%%|5sH# zo7*Lu|01c6AV!^x{6J#+;^oVixK|P~#`w>C8ylM!yHkH`uuUXpV1?~uht4MZu>*}a zh*4na%)}dP<4N#)`8EuVe{t%V8F<7t0iTzuFk?rP3&AkfYIJ7>JGlhqFOi*Mg57zR zLhA{%>zBL*SBDC(uzZ!0kUar!V;fHJ&64bq6tesqT7vWi5)0ju#2qsvO-2H65krB@ zKyQfwBTbPKVL&3pRFKM1ukN4OsJ^QMQw}5OLapn2&Yw(o#1x9enT};BIVYv)OQG^3 z%sX-@{NB&Ie@WRn8tY^nYCr6gm#}|T1EySB8l0k~gmFcbI6C8$fiKy4VZn(uX`^_> z=$s<8c>_p-mIL1JKu(hq04ZW9$U%BP z3$eOR1Umb5DokufgL}rlw@EQgWvW5nq%!oGYC+HARww#Szj7E;ZXBxg z`C9uFS@IA*ShO1uXwU}esq}s1};L(4r3iF;E3T(7} z8u0bUdaRpu%pBQ^CZ~dDD)c{e699%-z#owDPBGWeI}3H|&hlJqL=2{U^|EG5qJ{}u zqaAL?O96s}r#4rgt{Oy`_tlb7;4w>_fKk$9#_I_LB_yc#!|PP(<|D0YM)&u&Z>#g~ zsx#Ng59%~7 zAM^fN(i5^7pAqYJ=FsFK029Sf0Js2voft9!aEj7^j1yBKz<}niDb-A>j#gnlkV7>) z3J&DYj#0y)uyrmiL18U#N+g%KN>&pB?@rICs1ifaukn}<)sjkxG))|h34Yw>()4g>VB>%H%_oqe2 zYge)wHLT_6;_qS=?Xz0of+;bYA1t+ThJeQR*DB9^csh(DdodM^6j_MXHwG5(1l0c( z-xvc5?drI?I_lSQmXC!+caou6&Oz~_c5n?6+ zk&CI2Xg-5XQZw?NI~|Sjt*tTL94P^A(0H%u)aL5k-iyXRL`B(c<*VnW8k9Amq9X!n6ww*pVB%Njvn1g&U|JJ&LZ zbxS#v?deyn@0n8$1HG)sqF#i0sQ;wmW(Z3ypGBCThipr}Y?_=00cq$~wQ?-N#EYqr zV?b$v!8ws`gqr17K;1pI*~@=&S=eXVc4lrFfkN#L-VN(xC793Cl9OS!w>ScmpMhM( zK*%?JSb5b zX%GaIfA*u#y^1S*64n(RC(|J|DUQz+TXtF8V}9b+W}*Av%pCpn>egPNDxuJ!6KcpK|BaL844ql&2i&kk0z5u_S$`7*50aB#?!wXggclBW3l zIT-mkVt$k5Q&3@ABg<4~Nl^1R)c+mIjes9BFgd(>sH!;9S7EvlzaN2l5$A7hy6zW_ z`7K)V9m}q*CERK$VUk!6!AOIE7|(^(cN%)t_&@? kqNs@aY2AslUMG&Qn)eF{ENhyLmA2&n0T&=rtpET3