From bc94be6316a33c671e4596c92dfbc1be8469e44e Mon Sep 17 00:00:00 2001 From: Timo Ley Date: Fri, 6 Jan 2023 11:56:09 +0100 Subject: [PATCH] feat: remove unnecessary things --- .../com/pahimar/ee3/EquivalentExchange3.java | 3 - .../com/pahimar/ee3/handler/FuelHandler.java | 49 ------------ .../java/com/pahimar/ee3/init/ModBlocks.java | 7 -- .../java/com/pahimar/ee3/init/ModItems.java | 6 -- .../java/com/pahimar/ee3/init/Recipes.java | 78 ------------------- .../ee3/init/RecipesTransmutationStone.java | 4 +- .../ee3/item/ItemBlockAlchemicalFuel.java | 16 ---- .../com/pahimar/ee3/test/EETestSuite.java | 10 --- 8 files changed, 1 insertion(+), 172 deletions(-) delete mode 100644 src/main/java/com/pahimar/ee3/handler/FuelHandler.java delete mode 100644 src/main/java/com/pahimar/ee3/item/ItemBlockAlchemicalFuel.java diff --git a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java index ff4f4f0f..1e9f66a9 100644 --- a/src/main/java/com/pahimar/ee3/EquivalentExchange3.java +++ b/src/main/java/com/pahimar/ee3/EquivalentExchange3.java @@ -122,9 +122,6 @@ public class EquivalentExchange3 { Recipes.init(); RecipesTransmutationStone.init(); - // Register our fuels - GameRegistry.registerFuelHandler(new FuelHandler()); - // Register the Waila data provider FMLInterModComms.sendMessage( "Waila", diff --git a/src/main/java/com/pahimar/ee3/handler/FuelHandler.java b/src/main/java/com/pahimar/ee3/handler/FuelHandler.java deleted file mode 100644 index eef882bb..00000000 --- a/src/main/java/com/pahimar/ee3/handler/FuelHandler.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.pahimar.ee3.handler; - -import com.pahimar.ee3.init.ModBlocks; -import com.pahimar.ee3.init.ModItems; -import com.pahimar.ee3.item.ItemAlchemicalFuel; -import com.pahimar.ee3.item.ItemBlockAlchemicalFuel; -import cpw.mods.fml.common.IFuelHandler; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityFurnace; - -public class FuelHandler implements IFuelHandler { - private static final ItemStack ALCHEMICAL_COAL - = new ItemStack(ModItems.alchemicalFuel, 1, 0); - private static final ItemStack MOBIUS_FUEL - = new ItemStack(ModItems.alchemicalFuel, 1, 1); - private static final ItemStack AETERNALIS_FUEL - = new ItemStack(ModItems.alchemicalFuel, 1, 2); - - private static final ItemStack ALCHEMICAL_COAL_BLOCK - = new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 0); - private static final ItemStack MOBIUS_FUEL_BLOCK - = new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 1); - private static final ItemStack AETERNALIS_FUEL_BLOCK - = new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 2); - - @Override - public int getBurnTime(ItemStack fuel) { - if (fuel.getItem() instanceof ItemAlchemicalFuel) { - if (fuel.getItemDamage() == ALCHEMICAL_COAL.getItemDamage()) { - return 8 * TileEntityFurnace.getItemBurnTime(new ItemStack(Items.coal)); - } else if (fuel.getItemDamage() == MOBIUS_FUEL.getItemDamage()) { - return 8 * getBurnTime(ALCHEMICAL_COAL); - } else if (fuel.getItemDamage() == AETERNALIS_FUEL.getItemDamage()) { - return 8 * getBurnTime(MOBIUS_FUEL); - } - } else if (fuel.getItem() instanceof ItemBlockAlchemicalFuel) { - if (fuel.getItemDamage() == ALCHEMICAL_COAL_BLOCK.getItemDamage()) { - return 9 * getBurnTime(ALCHEMICAL_COAL); - } else if (fuel.getItemDamage() == MOBIUS_FUEL_BLOCK.getItemDamage()) { - return 9 * getBurnTime(MOBIUS_FUEL); - } else if (fuel.getItemDamage() == AETERNALIS_FUEL_BLOCK.getItemDamage()) { - return 9 * getBurnTime(AETERNALIS_FUEL); - } - } - - return 0; - } -} diff --git a/src/main/java/com/pahimar/ee3/init/ModBlocks.java b/src/main/java/com/pahimar/ee3/init/ModBlocks.java index 2ab9b8f6..8a07a53c 100644 --- a/src/main/java/com/pahimar/ee3/init/ModBlocks.java +++ b/src/main/java/com/pahimar/ee3/init/ModBlocks.java @@ -2,7 +2,6 @@ package com.pahimar.ee3.init; import com.pahimar.ee3.block.*; import com.pahimar.ee3.item.ItemBlockAlchemicalChest; -import com.pahimar.ee3.item.ItemBlockAlchemicalFuel; import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Reference; import cpw.mods.fml.common.registry.GameRegistry; @@ -11,7 +10,6 @@ import net.minecraft.block.Block; @GameRegistry.ObjectHolder(Reference.MOD_ID) public class ModBlocks { public static final BlockEE chalkBlock = new BlockChalk(); - public static final BlockEE alchemicalFuelBlock = new BlockAlchemicalFuel(); public static final BlockTileEntityEE alchemicalChest = new BlockAlchemicalChest(); public static final BlockTileEntityEE aludel = new BlockAludel(); public static final BlockTileEntityEE calcinator = new BlockCalcinator(); @@ -33,11 +31,6 @@ public class ModBlocks { alchemicalChest, ItemBlockAlchemicalChest.class, Names.Blocks.ALCHEMICAL_CHEST ); GameRegistry.registerBlock(chalkBlock, Names.Blocks.CHALK); - GameRegistry.registerBlock( - alchemicalFuelBlock, - ItemBlockAlchemicalFuel.class, - Names.Blocks.ALCHEMICAL_FUEL - ); GameRegistry.registerBlock(ashInfusedStone, Names.Blocks.ASH_INFUSED_STONE); GameRegistry.registerBlock(alchemyArray, Names.Blocks.ALCHEMY_ARRAY); GameRegistry.registerBlock(dummyArray, Names.Blocks.DUMMY_ARRAY); diff --git a/src/main/java/com/pahimar/ee3/init/ModItems.java b/src/main/java/com/pahimar/ee3/init/ModItems.java index 30aa8840..77ddbc8c 100644 --- a/src/main/java/com/pahimar/ee3/init/ModItems.java +++ b/src/main/java/com/pahimar/ee3/init/ModItems.java @@ -9,25 +9,19 @@ import cpw.mods.fml.common.registry.GameRegistry; public class ModItems { public static final ItemEE alchemicalBag = new ItemAlchemicalBag(); public static final ItemEE alchemicalDust = new ItemAlchemicalDust(); - public static final ItemEE alchemicalFuel = new ItemAlchemicalFuel(); public static final ItemEE stoneInert = new ItemInertStone(); public static final ItemEE shardMinium = new ItemMiniumShard(); public static final ItemEE stoneMinium = new ItemMiniumStone(); - public static final ItemEE stonePhilosophers = new ItemPhilosophersStone(); - public static final ItemEE alchemicalUpgrade = new ItemAlchemicalInventoryUpgrade(); public static final ItemEE chalk = new ItemChalk(); public static final ItemEE alchenomicon = new ItemAlchenomicon(); public static void init() { GameRegistry.registerItem(alchemicalBag, Names.Items.ALCHEMICAL_BAG); GameRegistry.registerItem(alchemicalDust, Names.Items.ALCHEMICAL_DUST); - GameRegistry.registerItem(alchemicalFuel, Names.Items.ALCHEMICAL_FUEL); GameRegistry.registerItem(stoneInert, Names.Items.INERT_STONE); GameRegistry.registerItem(shardMinium, Names.Items.MINIUM_SHARD); GameRegistry.registerItem(stoneMinium, Names.Items.MINIUM_STONE); - GameRegistry.registerItem(stonePhilosophers, Names.Items.PHILOSOPHERS_STONE); GameRegistry.registerItem(chalk, Names.Items.CHALK); - GameRegistry.registerItem(alchemicalUpgrade, Names.Items.ALCHEMICAL_UPGRADE); GameRegistry.registerItem( alchenomicon, Names.Items.ALCHENOMICON, Names.Items.ALCHEMICAL_TOME ); diff --git a/src/main/java/com/pahimar/ee3/init/Recipes.java b/src/main/java/com/pahimar/ee3/init/Recipes.java index 7a58df88..e66865dd 100644 --- a/src/main/java/com/pahimar/ee3/init/Recipes.java +++ b/src/main/java/com/pahimar/ee3/init/Recipes.java @@ -15,43 +15,6 @@ public class Recipes { } private static void initModRecipes() { - GameRegistry.addShapedRecipe( - new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 0), - "fff", - "fff", - "fff", - 'f', - new ItemStack(ModItems.alchemicalFuel, 1, 0) - ); - GameRegistry.addShapedRecipe( - new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 1), - "fff", - "fff", - "fff", - 'f', - new ItemStack(ModItems.alchemicalFuel, 1, 1) - ); - GameRegistry.addShapedRecipe( - new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 2), - "fff", - "fff", - "fff", - 'f', - new ItemStack(ModItems.alchemicalFuel, 1, 2) - ); - - GameRegistry.addShapelessRecipe( - new ItemStack(ModItems.alchemicalFuel, 9, 0), - new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 0) - ); - GameRegistry.addShapelessRecipe( - new ItemStack(ModItems.alchemicalFuel, 9, 1), - new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 1) - ); - GameRegistry.addShapelessRecipe( - new ItemStack(ModItems.alchemicalFuel, 9, 2), - new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 2) - ); GameRegistry.addShapedRecipe( new ItemStack(ModBlocks.ashInfusedStoneSlab, 6), @@ -141,47 +104,6 @@ public class Recipes { new ItemStack(ModItems.alchemicalDust, 4, 2) ); - // Alchemical Coal - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(ModItems.alchemicalDust, 32, 1) - ); - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 1, 0), - new ItemStack(Items.coal, 1, 0), - new ItemStack(ModItems.alchemicalDust, 1, 2) - ); - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 4, 0), - new ItemStack(Items.coal, 4, 0), - new ItemStack(ModItems.alchemicalDust, 1, 3) - ); - - // Mobius Fuel - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 1, 1), - new ItemStack(ModItems.alchemicalFuel, 1, 0), - new ItemStack(ModItems.alchemicalDust, 7, 2) - ); - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 1, 1), - new ItemStack(ModItems.alchemicalFuel, 1, 0), - new ItemStack(ModItems.alchemicalDust, 2, 3) - ); - - // Aeternalis Fuel - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 1, 2), - new ItemStack(ModItems.alchemicalFuel, 1, 1), - new ItemStack(ModItems.alchemicalDust, 56, 2) - ); - AludelRecipeManager.getInstance().addRecipe( - new ItemStack(ModItems.alchemicalFuel, 1, 2), - new ItemStack(ModItems.alchemicalFuel, 1, 1), - new ItemStack(ModItems.alchemicalDust, 14, 3) - ); - // Alchemical Chest AludelRecipeManager.getInstance().addRecipe( new ItemStack(ModBlocks.alchemicalChest, 1, 0), diff --git a/src/main/java/com/pahimar/ee3/init/RecipesTransmutationStone.java b/src/main/java/com/pahimar/ee3/init/RecipesTransmutationStone.java index b28b1818..1b7ef7ea 100644 --- a/src/main/java/com/pahimar/ee3/init/RecipesTransmutationStone.java +++ b/src/main/java/com/pahimar/ee3/init/RecipesTransmutationStone.java @@ -298,12 +298,10 @@ public class RecipesTransmutationStone { } static { - RecipesTransmutationStone.philStone - = new ItemStack(ModItems.stonePhilosophers, 1, 32767); RecipesTransmutationStone.miniumStone = new ItemStack(ModItems.stoneMinium, 1, 32767); RecipesTransmutationStone.transmutationStones = Arrays.asList( - RecipesTransmutationStone.miniumStone, RecipesTransmutationStone.philStone + RecipesTransmutationStone.miniumStone ); RecipesTransmutationStone.anyCoal = new ItemStack(Items.coal, 1, 32767); RecipesTransmutationStone.anyWood = new ItemStack(Blocks.log, 1, 32767); diff --git a/src/main/java/com/pahimar/ee3/item/ItemBlockAlchemicalFuel.java b/src/main/java/com/pahimar/ee3/item/ItemBlockAlchemicalFuel.java deleted file mode 100644 index 268cdc1a..00000000 --- a/src/main/java/com/pahimar/ee3/item/ItemBlockAlchemicalFuel.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.pahimar.ee3.item; - -import com.pahimar.ee3.init.ModBlocks; -import com.pahimar.ee3.reference.Names; -import net.minecraft.block.Block; -import net.minecraft.item.ItemMultiTexture; - -public class ItemBlockAlchemicalFuel extends ItemMultiTexture { - public ItemBlockAlchemicalFuel(Block block) { - super( - ModBlocks.alchemicalFuelBlock, - ModBlocks.alchemicalFuelBlock, - Names.Items.ALCHEMICAL_FUEL_SUBTYPES - ); - } -} diff --git a/src/main/java/com/pahimar/ee3/test/EETestSuite.java b/src/main/java/com/pahimar/ee3/test/EETestSuite.java index 2f66d2cf..75fab309 100644 --- a/src/main/java/com/pahimar/ee3/test/EETestSuite.java +++ b/src/main/java/com/pahimar/ee3/test/EETestSuite.java @@ -21,9 +21,6 @@ public class EETestSuite extends EnergyValueTestSuite { add(new ItemStack(ModBlocks.alchemicalChest, 1, 1), 16448); add(new ItemStack(ModBlocks.alchemicalChest, 1, 2), 65600); add(ModBlocks.chalkBlock, 320); - add(new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 0), 18720); - add(new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 1), 147744); - add(new ItemStack(ModBlocks.alchemicalFuelBlock, 1, 2), 1179936); add(ModBlocks.ashInfusedStone, 2); add(ModBlocks.ashInfusedStoneSlab, 1); add(new ItemStack(ModItems.alchemicalBag, 1, 0), 560); @@ -33,17 +30,10 @@ public class EETestSuite extends EnergyValueTestSuite { add(new ItemStack(ModItems.alchemicalDust, 1, 1), 64); add(new ItemStack(ModItems.alchemicalDust, 1, 2), 2048); add(new ItemStack(ModItems.alchemicalDust, 1, 3), 8192); - add(new ItemStack(ModItems.alchemicalFuel, 1, 0), 2080); - add(new ItemStack(ModItems.alchemicalFuel, 1, 1), 16416); - add(new ItemStack(ModItems.alchemicalFuel, 1, 2), 131104); add(ModItems.stoneInert, 3076); add(ModItems.shardMinium, 8192); add(ModItems.stoneMinium, 68612); - add(ModItems.stonePhilosophers, null); add(ModItems.chalk, 80); - add(new ItemStack(ModItems.alchemicalUpgrade, 1, 0), null); - add(new ItemStack(ModItems.alchemicalUpgrade, 1, 1), null); - add(new ItemStack(ModItems.alchemicalUpgrade, 1, 2), null); add(ModItems.alchenomicon, 8352); return this;