From 6cddb3e2387574602b5136de23417f759ccd81d9 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 30 Sep 2024 22:12:21 +0200 Subject: [PATCH] NEI stuff, textures --- .../handler/nei/ArcFurnaceFluidHandler.java | 2 +- .../handler/nei/ArcFurnaceSolidHandler.java | 2 +- .../com/hbm/handler/nei/ArcWelderHandler.java | 2 +- .../com/hbm/handler/nei/AshpitHandler.java | 2 +- .../com/hbm/handler/nei/BoilingHandler.java | 2 +- .../com/hbm/handler/nei/CokingHandler.java | 2 +- .../hbm/handler/nei/CombinationHandler.java | 2 +- .../handler/nei/ElectrolyserFluidHandler.java | 2 +- .../handler/nei/ElectrolyserMetalHandler.java | 2 +- .../handler/nei/ExposureChamberHandler.java | 2 +- .../hbm/handler/nei/FractioningHandler.java | 2 +- .../hbm/handler/nei/LiquefactionHandler.java | 2 +- .../com/hbm/handler/nei/MixerHandler.java | 2 +- .../com/hbm/handler/nei/OutgasserHandler.java | 2 +- .../java/com/hbm/handler/nei/PyroHandler.java | 2 +- .../hbm/handler/nei/RotaryFurnaceHandler.java | 62 ++++++++++++++++++ .../com/hbm/handler/nei/SawmillHandler.java | 2 +- .../handler/nei/SolderingStationHandler.java | 2 +- .../handler/nei/SolidificationHandler.java | 2 +- .../hbm/handler/nei/ZirnoxRecipeHandler.java | 2 +- src/main/java/com/hbm/items/ModItems.java | 6 ++ src/main/java/com/hbm/main/NEIRegistry.java | 1 + .../TileEntityMachineRotaryFurnace.java | 9 ++- .../assets/hbm/textures/items/ammo.png | Bin 7407 -> 11221 bytes .../hbm/textures/items/chem_icon_SATURN.png | Bin 369 -> 366 bytes .../hbm/textures/items/ingot_saturnite.png | Bin 390 -> 317 bytes .../hbm/textures/items/plate_saturnite.png | Bin 375 -> 310 bytes 27 files changed, 92 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/hbm/handler/nei/RotaryFurnaceHandler.java diff --git a/src/main/java/com/hbm/handler/nei/ArcFurnaceFluidHandler.java b/src/main/java/com/hbm/handler/nei/ArcFurnaceFluidHandler.java index 228cb786c..b7290eedb 100644 --- a/src/main/java/com/hbm/handler/nei/ArcFurnaceFluidHandler.java +++ b/src/main/java/com/hbm/handler/nei/ArcFurnaceFluidHandler.java @@ -6,7 +6,7 @@ import com.hbm.inventory.recipes.ArcFurnaceRecipes; public class ArcFurnaceFluidHandler extends NEIUniversalHandler { public ArcFurnaceFluidHandler() { - super("Arc Furnace (Fluid)", ModBlocks.machine_arc_furnace, ArcFurnaceRecipes.getFluidRecipes()); + super(ModBlocks.machine_arc_furnace.getLocalizedName(), ModBlocks.machine_arc_furnace, ArcFurnaceRecipes.getFluidRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/ArcFurnaceSolidHandler.java b/src/main/java/com/hbm/handler/nei/ArcFurnaceSolidHandler.java index b2b21ffd9..7345e4f72 100644 --- a/src/main/java/com/hbm/handler/nei/ArcFurnaceSolidHandler.java +++ b/src/main/java/com/hbm/handler/nei/ArcFurnaceSolidHandler.java @@ -6,7 +6,7 @@ import com.hbm.inventory.recipes.ArcFurnaceRecipes; public class ArcFurnaceSolidHandler extends NEIUniversalHandler { public ArcFurnaceSolidHandler() { - super("Arc Furnace (Solid)", ModBlocks.machine_arc_furnace, ArcFurnaceRecipes.getSolidRecipes()); + super(ModBlocks.machine_arc_furnace.getLocalizedName(), ModBlocks.machine_arc_furnace, ArcFurnaceRecipes.getSolidRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/ArcWelderHandler.java b/src/main/java/com/hbm/handler/nei/ArcWelderHandler.java index e598840fc..b1eb411bf 100644 --- a/src/main/java/com/hbm/handler/nei/ArcWelderHandler.java +++ b/src/main/java/com/hbm/handler/nei/ArcWelderHandler.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; public class ArcWelderHandler extends NEIUniversalHandler { public ArcWelderHandler() { - super("Arc Welder", ModBlocks.machine_arc_welder, ArcWelderRecipes.getRecipes()); + super(ModBlocks.machine_arc_welder.getLocalizedName(), ModBlocks.machine_arc_welder, ArcWelderRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/AshpitHandler.java b/src/main/java/com/hbm/handler/nei/AshpitHandler.java index d7cf8af20..6e4313a84 100644 --- a/src/main/java/com/hbm/handler/nei/AshpitHandler.java +++ b/src/main/java/com/hbm/handler/nei/AshpitHandler.java @@ -17,7 +17,7 @@ import net.minecraft.item.ItemStack; public class AshpitHandler extends NEIUniversalHandler { public AshpitHandler() { - super("Ashpit", ModBlocks.machine_ashpit, getRecipes()); + super(ModBlocks.machine_ashpit.getLocalizedName(), ModBlocks.machine_ashpit, getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/BoilingHandler.java b/src/main/java/com/hbm/handler/nei/BoilingHandler.java index a048cfb44..0ac8427c8 100644 --- a/src/main/java/com/hbm/handler/nei/BoilingHandler.java +++ b/src/main/java/com/hbm/handler/nei/BoilingHandler.java @@ -13,7 +13,7 @@ import com.hbm.items.machine.ItemFluidIcon; public class BoilingHandler extends NEIUniversalHandler { public BoilingHandler() { - super("Boiler", ModBlocks.machine_boiler, generateRecipes()); + super(ModBlocks.machine_boiler.getLocalizedName(), ModBlocks.machine_boiler, generateRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/CokingHandler.java b/src/main/java/com/hbm/handler/nei/CokingHandler.java index a0227147e..41d0c72ce 100644 --- a/src/main/java/com/hbm/handler/nei/CokingHandler.java +++ b/src/main/java/com/hbm/handler/nei/CokingHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.CokerRecipes; public class CokingHandler extends NEIUniversalHandler { public CokingHandler() { - super("Coking", ModBlocks.machine_coker, CokerRecipes.getRecipes()); + super(ModBlocks.machine_coker.getLocalizedName(), ModBlocks.machine_coker, CokerRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/CombinationHandler.java b/src/main/java/com/hbm/handler/nei/CombinationHandler.java index 0c07afbbc..b303a2b53 100644 --- a/src/main/java/com/hbm/handler/nei/CombinationHandler.java +++ b/src/main/java/com/hbm/handler/nei/CombinationHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.CombinationRecipes; public class CombinationHandler extends NEIUniversalHandler { public CombinationHandler() { - super("Combination Furnace", ModBlocks.furnace_combination, CombinationRecipes.getRecipes()); + super(ModBlocks.furnace_combination.getLocalizedName(), ModBlocks.furnace_combination, CombinationRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java b/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java index 11af20db8..5072b1bfb 100644 --- a/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java +++ b/src/main/java/com/hbm/handler/nei/ElectrolyserFluidHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.ElectrolyserFluidRecipes; public class ElectrolyserFluidHandler extends NEIUniversalHandler { public ElectrolyserFluidHandler() { - super("Electrolysis", ModBlocks.machine_electrolyser, ElectrolyserFluidRecipes.getRecipes()); + super(ModBlocks.machine_electrolyser.getLocalizedName(), ModBlocks.machine_electrolyser, ElectrolyserFluidRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java b/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java index f1d5b6e68..b695f86b9 100644 --- a/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java +++ b/src/main/java/com/hbm/handler/nei/ElectrolyserMetalHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.ElectrolyserMetalRecipes; public class ElectrolyserMetalHandler extends NEIUniversalHandler { public ElectrolyserMetalHandler() { - super("Electrolysis", ModBlocks.machine_electrolyser, ElectrolyserMetalRecipes.getRecipes()); + super(ModBlocks.machine_electrolyser.getLocalizedName(), ModBlocks.machine_electrolyser, ElectrolyserMetalRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/ExposureChamberHandler.java b/src/main/java/com/hbm/handler/nei/ExposureChamberHandler.java index 4969763e4..a9f16bb50 100644 --- a/src/main/java/com/hbm/handler/nei/ExposureChamberHandler.java +++ b/src/main/java/com/hbm/handler/nei/ExposureChamberHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.ExposureChamberRecipes; public class ExposureChamberHandler extends NEIUniversalHandler { public ExposureChamberHandler() { - super("Exposure Chamber", ModBlocks.machine_exposure_chamber, ExposureChamberRecipes.getRecipes()); + super(ModBlocks.machine_exposure_chamber.getLocalizedName(), ModBlocks.machine_exposure_chamber, ExposureChamberRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/FractioningHandler.java b/src/main/java/com/hbm/handler/nei/FractioningHandler.java index 158ab9b4d..fb54c4d51 100644 --- a/src/main/java/com/hbm/handler/nei/FractioningHandler.java +++ b/src/main/java/com/hbm/handler/nei/FractioningHandler.java @@ -6,7 +6,7 @@ import com.hbm.inventory.recipes.FractionRecipes; public class FractioningHandler extends NEIUniversalHandler { public FractioningHandler() { - super("Fractioning", ModBlocks.machine_fraction_tower, FractionRecipes.getFractionRecipesForNEI()); + super(ModBlocks.machine_fraction_tower.getLocalizedName(), ModBlocks.machine_fraction_tower, FractionRecipes.getFractionRecipesForNEI()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/LiquefactionHandler.java b/src/main/java/com/hbm/handler/nei/LiquefactionHandler.java index b3f31e9cb..5d0398d4c 100644 --- a/src/main/java/com/hbm/handler/nei/LiquefactionHandler.java +++ b/src/main/java/com/hbm/handler/nei/LiquefactionHandler.java @@ -6,7 +6,7 @@ import com.hbm.inventory.recipes.LiquefactionRecipes; public class LiquefactionHandler extends NEIUniversalHandler { public LiquefactionHandler() { - super("Liquefaction", ModBlocks.machine_liquefactor, LiquefactionRecipes.getRecipes()); + super(ModBlocks.machine_liquefactor.getLocalizedName(), ModBlocks.machine_liquefactor, LiquefactionRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/MixerHandler.java b/src/main/java/com/hbm/handler/nei/MixerHandler.java index 320cde187..b93ff9ca1 100644 --- a/src/main/java/com/hbm/handler/nei/MixerHandler.java +++ b/src/main/java/com/hbm/handler/nei/MixerHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.MixerRecipes; public class MixerHandler extends NEIUniversalHandler { public MixerHandler() { - super("Mixer", ModBlocks.machine_mixer, MixerRecipes.getRecipes()); + super(ModBlocks.machine_mixer.getLocalizedName(), ModBlocks.machine_mixer, MixerRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/OutgasserHandler.java b/src/main/java/com/hbm/handler/nei/OutgasserHandler.java index e3965aea1..6a7575609 100644 --- a/src/main/java/com/hbm/handler/nei/OutgasserHandler.java +++ b/src/main/java/com/hbm/handler/nei/OutgasserHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.OutgasserRecipes; public class OutgasserHandler extends NEIUniversalHandler { public OutgasserHandler() { - super("Irradiation", ModBlocks.rbmk_outgasser, OutgasserRecipes.getRecipes()); + super(ModBlocks.rbmk_outgasser.getLocalizedName(), ModBlocks.rbmk_outgasser, OutgasserRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/PyroHandler.java b/src/main/java/com/hbm/handler/nei/PyroHandler.java index f4a992ad4..b81813e53 100644 --- a/src/main/java/com/hbm/handler/nei/PyroHandler.java +++ b/src/main/java/com/hbm/handler/nei/PyroHandler.java @@ -9,7 +9,7 @@ import com.hbm.inventory.recipes.PyroOvenRecipes; public class PyroHandler extends NEIUniversalHandler { public PyroHandler() { - super("Pyrolysis", ModBlocks.machine_pyrooven, PyroOvenRecipes.getRecipes()); + super(ModBlocks.machine_pyrooven.getLocalizedName(), ModBlocks.machine_pyrooven, PyroOvenRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/RotaryFurnaceHandler.java b/src/main/java/com/hbm/handler/nei/RotaryFurnaceHandler.java new file mode 100644 index 000000000..ca6c3b628 --- /dev/null +++ b/src/main/java/com/hbm/handler/nei/RotaryFurnaceHandler.java @@ -0,0 +1,62 @@ +package com.hbm.handler.nei; + +import java.awt.Rectangle; +import java.util.Locale; + +import com.hbm.blocks.ModBlocks; +import com.hbm.inventory.fluid.Fluids; +import com.hbm.inventory.gui.GUIMachineRotaryFurnace; +import com.hbm.inventory.recipes.RotaryFurnaceRecipes; +import com.hbm.inventory.recipes.RotaryFurnaceRecipes.RotaryFurnaceRecipe; +import com.hbm.items.machine.ItemScraps; +import com.hbm.util.I18nUtil; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.item.ItemStack; + +public class RotaryFurnaceHandler extends NEIUniversalHandler { + + public RotaryFurnaceHandler() { + super(ModBlocks.machine_rotary_furnace.getLocalizedName(), ModBlocks.machine_rotary_furnace, RotaryFurnaceRecipes.getRecipes()); + } + + @Override + public String getKey() { + return "ntmRotaryFurnace"; + } + + @Override + public void loadTransferRects() { + super.loadTransferRects(); + transferRectsGui.add(new RecipeTransferRect(new Rectangle(58, 19, 32, 10), "ntmRotaryFurnace")); + guiGui.add(GUIMachineRotaryFurnace.class); + RecipeTransferRectHandler.registerRectsToGuis(guiGui, transferRectsGui); + } + + @Override + public void drawExtras(int recipe) { + + RecipeSet rec = (RecipeSet) this.arecipes.get(recipe); + Object[] original = (Object[]) rec.originalInputInstance; + ItemStack output = rec.output[0].item; + + outer: for(RotaryFurnaceRecipe arc : RotaryFurnaceRecipes.recipes) { + + if(ItemStack.areItemStacksEqual(ItemScraps.create(arc.output, true), output) && arc.ingredients.length == original.length - (arc.fluid == null ? 0 : 1)) { + + for(int i = 0; i < rec.input.length - (arc.fluid == null ? 0 : 1); i++) { + if(arc.ingredients[i] != original[i]) continue outer; + } + + FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; + String duration = String.format(Locale.US, "%,d", arc.duration) + " ticks"; + String consumption = I18nUtil.resolveKey(Fluids.STEAM.getUnlocalizedName()) + ": " + String.format(Locale.US, "%,d", arc.steam) + " mB/t"; + int side = 160; + fontRenderer.drawString(duration, side - fontRenderer.getStringWidth(duration), 43, 0x404040); + fontRenderer.drawString(consumption, side - fontRenderer.getStringWidth(consumption), 55, 0x404040); + return; + } + } + } +} diff --git a/src/main/java/com/hbm/handler/nei/SawmillHandler.java b/src/main/java/com/hbm/handler/nei/SawmillHandler.java index e573e9f42..43d79bf87 100644 --- a/src/main/java/com/hbm/handler/nei/SawmillHandler.java +++ b/src/main/java/com/hbm/handler/nei/SawmillHandler.java @@ -6,7 +6,7 @@ import com.hbm.tileentity.machine.TileEntitySawmill; public class SawmillHandler extends NEIUniversalHandler { public SawmillHandler() { - super("Sawmill", ModBlocks.machine_sawmill, TileEntitySawmill.getRecipes()); + super(ModBlocks.machine_sawmill.getLocalizedName(), ModBlocks.machine_sawmill, TileEntitySawmill.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/SolderingStationHandler.java b/src/main/java/com/hbm/handler/nei/SolderingStationHandler.java index a48f5f620..a1f127692 100644 --- a/src/main/java/com/hbm/handler/nei/SolderingStationHandler.java +++ b/src/main/java/com/hbm/handler/nei/SolderingStationHandler.java @@ -15,7 +15,7 @@ import net.minecraft.item.ItemStack; public class SolderingStationHandler extends NEIUniversalHandler { public SolderingStationHandler() { - super("Soldering Station", ModBlocks.machine_soldering_station, SolderingRecipes.getRecipes()); + super(ModBlocks.machine_soldering_station.getLocalizedName(), ModBlocks.machine_soldering_station, SolderingRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/SolidificationHandler.java b/src/main/java/com/hbm/handler/nei/SolidificationHandler.java index 181f7dfa8..5eda6e643 100644 --- a/src/main/java/com/hbm/handler/nei/SolidificationHandler.java +++ b/src/main/java/com/hbm/handler/nei/SolidificationHandler.java @@ -6,7 +6,7 @@ import com.hbm.inventory.recipes.SolidificationRecipes; public class SolidificationHandler extends NEIUniversalHandler { public SolidificationHandler() { - super("Solidification", ModBlocks.machine_solidifier, SolidificationRecipes.getRecipes()); + super(ModBlocks.machine_solidifier.getLocalizedName(), ModBlocks.machine_solidifier, SolidificationRecipes.getRecipes()); } @Override diff --git a/src/main/java/com/hbm/handler/nei/ZirnoxRecipeHandler.java b/src/main/java/com/hbm/handler/nei/ZirnoxRecipeHandler.java index a39208d98..b5ab368d5 100644 --- a/src/main/java/com/hbm/handler/nei/ZirnoxRecipeHandler.java +++ b/src/main/java/com/hbm/handler/nei/ZirnoxRecipeHandler.java @@ -6,7 +6,7 @@ import com.hbm.tileentity.machine.TileEntityReactorZirnox; public class ZirnoxRecipeHandler extends NEIUniversalHandler { public ZirnoxRecipeHandler() { - super("ZIRNOX", ModBlocks.reactor_zirnox, TileEntityReactorZirnox.fuelMap); + super(ModBlocks.reactor_zirnox.getLocalizedName(), ModBlocks.reactor_zirnox, TileEntityReactorZirnox.fuelMap); } @Override diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index f14c4b01a..fc268d07a 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -189,6 +189,8 @@ public class ModItems { public static Item nugget_tetraneutronium; public static Item powder_tetraneutronium; public static Item ingot_starmetal; + public static Item ingot_gunmetal; + public static Item ingot_weaponsteel; public static Item ingot_saturnite; public static Item plate_saturnite; public static Item ingot_ferrouranium; @@ -2617,6 +2619,8 @@ public class ModItems { nugget_dineutronium = new ItemCustomLore().setUnlocalizedName("nugget_dineutronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":nugget_dineutronium"); powder_dineutronium = new ItemCustomLore().setUnlocalizedName("powder_dineutronium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":powder_dineutronium"); ingot_starmetal = new ItemStarmetal().setUnlocalizedName("ingot_starmetal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_starmetal"); + ingot_gunmetal = new Item().setUnlocalizedName("ingot_gunmetal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gunmetal"); + ingot_weaponsteel = new Item().setUnlocalizedName("ingot_weaponsteel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_gunsteel"); ingot_saturnite = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("ingot_saturnite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_saturnite"); plate_saturnite = new ItemCustomLore().setRarity(EnumRarity.rare).setUnlocalizedName("plate_saturnite").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":plate_saturnite"); ingot_ferrouranium = new ItemCustomLore().setUnlocalizedName("ingot_ferrouranium").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":ingot_ferrouranium"); @@ -5570,6 +5574,8 @@ public class ModItems { GameRegistry.registerItem(ingot_desh, ingot_desh.getUnlocalizedName()); GameRegistry.registerItem(ingot_ferrouranium, ingot_ferrouranium.getUnlocalizedName()); GameRegistry.registerItem(ingot_starmetal, ingot_starmetal.getUnlocalizedName()); + GameRegistry.registerItem(ingot_gunmetal, ingot_gunmetal.getUnlocalizedName()); + GameRegistry.registerItem(ingot_weaponsteel, ingot_weaponsteel.getUnlocalizedName()); GameRegistry.registerItem(ingot_saturnite, ingot_saturnite.getUnlocalizedName()); GameRegistry.registerItem(ingot_euphemium, ingot_euphemium.getUnlocalizedName()); GameRegistry.registerItem(ingot_dineutronium, ingot_dineutronium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/NEIRegistry.java b/src/main/java/com/hbm/main/NEIRegistry.java index 8db11642a..3899820c8 100644 --- a/src/main/java/com/hbm/main/NEIRegistry.java +++ b/src/main/java/com/hbm/main/NEIRegistry.java @@ -66,6 +66,7 @@ public class NEIRegistry { handlers.add(new ExposureChamberHandler()); handlers.add(new ArcFurnaceSolidHandler()); handlers.add(new ArcFurnaceFluidHandler()); + handlers.add(new RotaryFurnaceHandler()); //this shit comes last handlers.add(new FluidRecipeHandler()); diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java index 85e8fb5db..2ae2a54e2 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRotaryFurnace.java @@ -314,16 +314,15 @@ public class TileEntityMachineRotaryFurnace extends TileEntityMachinePolluting i ForgeDirection dir = ForgeDirection.getOrientation(this.getBlockMetadata() - 10); ForgeDirection rot = dir.getRotation(ForgeDirection.UP); BlockPos core = new BlockPos(xCoord, yCoord, zCoord); - core.offset(dir, -1); //Red - if(pos.equals(core.clone().offset(rot, -2))) return new int[] {0}; + if(side == dir.getOpposite().ordinal() && pos.equals(core.clone().offset(dir, -1).offset(rot, -2))) return new int[] {0}; //Yellow - if(pos.equals(core.clone().offset(rot, -1))) return new int[] {1}; + if(side == dir.getOpposite().ordinal() && pos.equals(core.clone().offset(dir, -1).offset(rot, -1))) return new int[] {1}; //Green - if(pos.equals(core)) return new int[] {2}; + if(side == dir.getOpposite().ordinal() && pos.equals(core.clone().offset(dir, -1))) return new int[] {2}; //Fuel - if(pos.equals(new BlockPos(xCoord, yCoord, zCoord).offset(dir).offset(rot, -1))) return new int[] {4}; + if(side == dir.ordinal() && pos.equals(core.clone().offset(dir, 1).offset(rot, -1))) return new int[] {4}; return new int[] { }; } diff --git a/src/main/resources/assets/hbm/textures/items/ammo.png b/src/main/resources/assets/hbm/textures/items/ammo.png index 9f9dba6934eb7d7e4b8a2296aa033d9ba5223102..f386e052cf5e2e01ce960224cf8cbee71f96f6bf 100644 GIT binary patch literal 11221 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�hlf^^{$&J%E(ty{lqV# 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 G`u_k27g8Mn diff --git a/src/main/resources/assets/hbm/textures/items/chem_icon_SATURN.png b/src/main/resources/assets/hbm/textures/items/chem_icon_SATURN.png index 06149dfa927852891da5d3d1017ec7565f9be7b6..af0895d3093966ce6ebedeaf467f9a2e89bdc3f7 100644 GIT binary patch delta 323 zcmV-J0lfb40`3BkG=C*YL_t(Ijg^zJZi6rohJPfMu+}4qtMDE$)lZRRq|M0FWY30;@B4lJ&j2?@oEL4J7wvF8n1U#ecmk^xtXBAW zdv#nm1^FNVuv7p*OCsSAVySS&Lzo18kuc7ScCp#Ql+pp$;D6|``*;EXZ3qDNq`)!( zQ_4|zvDvySno_#GMjtO8m{Nje0`_#?WSMYKz2E)mEaFLDz-k3kN<6PuIMfO1{ciLc z1ox&u1y(B@>aR)oyLtxz%=q#mFl8V?jXvTbed>F_QUOzSQ|LUP0)l3IdEEo*#A@YE zo3CH)^S~e3Ej%7HpC3U0oL?dp(4+d#0|F^`35i5JfvIHAgCXQcZ;}29zr``gk6)FE V1x;k5GPD2y002ovPDHLkV1mYHl!X8Q delta 326 zcmV-M0lEI}0`UTnG=C^bL_t(IjkS_7io!q?hQFXy+z?5VB5b!1`|oFW{ka z0S_Qp1{P~CkXBX*NXVi|J6lXsw4)sCkBfJ#rdqkV}Fw9)O$%7hI+k?A}C7? zY)=pb%$G~zIIblDOeT{$1W=aXy0F{P2O!VcMiKM%nmCT1L#j+uFQve;BqVo*6)_(un#-9mH6NW>`^Ow-`@@E1*s;681 Y0llD&YgPgHlmGw#07*qoM6N<$f+$#-!#1^ zrk}=>B}n|N(1g|zTF3j-W8~5$Xb1wRO$E@4NIHeori#T=SbqeEB57VX{c5|zTN8ob z;B5W%3JuVw0O8_LWreq97G7<4aYS!T%-!1a_YS-@sInqlK9j1fBGeuBKRU|_Jr)S9 z!&}3{{T;_n(;fD+V+cIDf)s?-aqQj};p^!cfZOX!lE@XLKo&ZM1rkvF=!i&GX#B~< oCCx!Y8wKS*3>#aVgZ`F%0E_dsh7sE)d;kCd07*qoM6N<$f<1AGDgXcg delta 363 zcmV-x0hIo|0)_*SB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000iZ z000iZ0XPLyBme*b8%ab#R5(wilh10xKoG{i^{ADGTs*YBdXzwW6Ku)diwD6M@S%JS z!DA?R?GuQ%f*?o`f?lUPlbNu#X%PLvWM=<--y~$$5fSd8rGNQmt~PMdGjZs!qVW?h z1fx-zcRSG6rz;0F26dvBeqZwUW+OQ?5rh9kd7evc#BnTHjMT*8@rgQ<2~LNDEV7U{ zSl7@bO;fFaB!2{RLP=Bz2nYy#2xN!=008YtL_t(Ijn$Gdj)FiGhCh;NoRUz3 z2@Qp3&<;9Iu+SO~v4x4HiKV^Xz;5k!&#=Wd7_cUmP|g+#8N!HLt}mHp-hAK7pEvLl zWk<2Hqga`G)-w>mnTOP6PF?0)KaM>{jDc>Fbzmz3lr9k_(0`eSNYC%V(({p?Kag0a ziH~6Yu8kw?C|1GyhPufA1iNVlz-7Oq31&(FRG%lDMcA25aNED^cilSxanEwgz6hzl zPCZyoZ$}54@(e)p^KA(LUE-!0b&(^d{$QdG4z{36mdP92^=cF}uCbLI?zzXn(Xyjh hO@f*6>;Av`1r!JIrmBo1tl|Iw002ovPDHLkV1jsEgsuPp delta 348 zcmV-i0i*u50`~%tB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000iZ z000iZ0XPLyBme*b3`s;mR5(wilf4RpP!z}iw%o`ekf0%YfFQ&%aC7eg+QV1#0fOeB zr6q6(dVnSu7fFbQy65B(ui2+Rko$rE-#Pb+mQo6B=oI7Me19dlbO$$jilxEZBa|WE z=K)Cqb=X;t#e>EU%8C@!&v-K7ecN?$na+$(j1H<5?corP;~-5_-lF;Gcx2gWvne}a zLA_O}C}BcmXMGH&IF5z>=r&$1*)CNHdRgX#tUb@;^(u;h^%^Xo%JannaU2^hS0zR; z%YZxw_WR-pbX76E9_C@l5<)~l5b#(J5=vdI@)GNkR}~2g@At