cleanup

SuperSoupr · SuperSoupr · commit 5461fc80af98 · 2025-12-10T00:17:58.000+02:00
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockBaseGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockBaseGenerator.java
@@ -11,8 +11,6 @@
 
 public abstract class BlockBaseGenerator extends BlockContainer {
 
-    public String TILE_ENTITY_ID;
-
     public int multiplier;
 
     protected BlockBaseGenerator(String id, int mult) {
@@ -39,6 +37,4 @@ public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neig
         }
         super.onNeighborBlockChange(worldIn, x, y, z, neighbor);
     }
-
-    public abstract String getGeneratorTEID();
 }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockEnderGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockEnderGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockEnderGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityEnderGeneratorUIE";
-    }
-
     public BlockEnderGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockFoodGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockFoodGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockFoodGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityFoodGeneratorUIE";
-    }
-
     public BlockFoodGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockFurnaceGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockFurnaceGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockFurnaceGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityFurnaceGeneratorUIE";
-    }
-
     public BlockFurnaceGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockHighTemperatureFurnaceGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockHighTemperatureFurnaceGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockHighTemperatureFurnaceGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityHighTemperatureFurnaceGenerator";
-    }
-
     public BlockHighTemperatureFurnaceGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockLavaGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockLavaGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockLavaGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityLavaGeneratorUIE";
-    }
-
     public BlockLavaGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockLowTemperatureFurnaceGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockLowTemperatureFurnaceGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockLowTemperatureFurnaceGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityLowTemperatureFurnaceGeneratorUIE";
-    }
-
     public BlockLowTemperatureFurnaceGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockNetherStarGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockNetherStarGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockNetherStarGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityNetherStarGeneratorUIE";
-    }
-
     public BlockNetherStarGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockPinkGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockPinkGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockPinkGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityPinkGeneratorUIE";
-    }
-
     public BlockPinkGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockPotionGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockPotionGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockPotionGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityPotionGeneratorUIE";
-    }
-
     public BlockPotionGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockRedstoneGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockRedstoneGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockRedstoneGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntityRedstoneGeneratorUIE";
-    }
-
     public BlockRedstoneGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockSolarGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockSolarGenerator.java
@@ -7,11 +7,6 @@
 
 public class BlockSolarGenerator extends BlockBaseGenerator {
 
-    @Override
-    public String getGeneratorTEID() {
-        return "TileEntitySolarGeneratorUIE";
-    }
-
     public BlockSolarGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockTNTGenerator.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/generators/BlockTNTGenerator.java
@@ -7,10 +7,6 @@
 
 public class BlockTNTGenerator extends BlockBaseGenerator {
 
-    public String getGeneratorTEID() {
-        return "TileEntityTNTGeneratorUIE";
-    }
-
     public BlockTNTGenerator(String id, int mult) {
         super(id, mult);
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemEnderLotusSeed.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/common/items/ItemEnderLotusSeed.java
@@ -3,7 +3,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
@@ -15,13 +15,12 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-// This unfortunately has to be an ItemBlock for remapping EXU to work
-public class ItemEnderLotusSeed extends ItemBlock implements IPlantable {
+public class ItemEnderLotusSeed extends Item implements IPlantable {
 
     private final Block cropBlock;
 
     public ItemEnderLotusSeed(Block cropBlock) {
-        super(cropBlock);
+        super();
         this.cropBlock = cropBlock;
         this.setUnlocalizedName("ender_lotus_seed");
     }
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/Remappings.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/Remappings.java
@@ -1,6 +1,10 @@
 package com.fouristhenumber.utilitiesinexcess.compat.exu;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -12,10 +16,10 @@
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks.ConveyorTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks.DarkPortalTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks.DecoBlock1Transformation;
+import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks.EnderLilyTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks.SoundMufflerTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks.TrashCanTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.items.DivisionSigilTransformation;
-import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.items.EnderLilyTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.items.GoldenBagTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.items.GoldenLassoTransformation;
 import com.fouristhenumber.utilitiesinexcess.compat.exu.postea.items.UnstableIngotTransformation;
@@ -45,7 +49,7 @@ public enum Remappings {
     SPIKE_DIAMOND("ExtraUtilities:spike_base_diamond", ModBlocks.SPIKE_DIAMOND),
     TIMER("ExtraUtilities:timer", ModBlocks.REDSTONE_CLOCK),
     ETHEREAL_GLASS("ExtraUtilities:etherealglass", ModBlocks.ETHEREAL_GLASS),
-//    ENDER_PUMP("ExtraUtilities:enderThermicPump", ModBlocks.abc), // TODO: add here once merged
+    ENDER_PUMP("ExtraUtilities:enderThermicPump", ModBlocks.SMART_PUMP),
     COLORED_STONE_BRICK("ExtraUtilities:colorStoneBrick", ModBlocks.COLORED_STONE_BRICKS),
     COLORED_PLANKS("ExtraUtilities:colorWoodPlanks", ModBlocks.COLORED_WOOD_PLANKS),
     COLORED_GLOWSTONE("ExtraUtilities:color_lightgem", ModBlocks.COLORED_GLOWSTONE),
@@ -75,12 +79,14 @@ public enum Remappings {
     XRAY_GLASSES("ExtraUtilities:sonar_goggles", ModItems.XRAY_GLASSES),
     BEDROCKUIM_INGOT("ExtraUtilities:bedrockiumIngot", ModItems.BEDROCKIUM_INGOT),
     SCANNER("ExtraUtilities:scanner", ModItems.BLOCK_ANALYZER),
+
     // Item Transformations
     GOLDEN_BAG(new GoldenBagTransformation()),
     WATERING_CAN(new WateringCanTransformation()),
     INVERSION_SIGIL(new DivisionSigilTransformation()),
     MOB_JAR(new GoldenLassoTransformation()),
     INVERTED_INGOT(new UnstableIngotTransformation()),
+
     // Block Transformations
     SOUND_MUFFLER(new SoundMufflerTransformation()),
     DECO_BLOCK_1(new DecoBlock1Transformation()),
@@ -89,11 +95,14 @@ public enum Remappings {
     TRASH_CANS(new TrashCanTransformation()),
     ENDER_LOTUS(new EnderLilyTransformation()),
     CONVEYOR(new ConveyorTransformation()),
+
     // Tile Entity Transformation
     GENERATORS(new GeneratorTransformation()),
     FULL_CHEST(new FullChestTransformation()),
     MINI_CHEST(new MiniChestTransformation()),
     SPIKES(new SpikeTransformation()),
+//    ENDER_PUMP(new EnderPumpTransformation()),
+
     // Skipped mappings
     PAINT_BRUSH("ExtraUtilities:paintbrush"),
     DATABLOCK("ExtraUtilities:datablock"),
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/blocks/EnderLilyTransformation.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/blocks/EnderLilyTransformation.java
@@ -0,0 +1,38 @@
+package com.fouristhenumber.utilitiesinexcess.compat.exu.postea.blocks;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+import com.fouristhenumber.utilitiesinexcess.ModBlocks;
+import com.fouristhenumber.utilitiesinexcess.ModItems;
+import com.gtnewhorizons.postea.api.IDExtenderCompat;
+import com.gtnewhorizons.postea.utility.BlockConversionInfo;
+
+public class EnderLilyTransformation extends AbstractBlockTransformation {
+
+    public EnderLilyTransformation() {
+        super();
+        setDummyName("dummy_ender_lotus");
+        setOldName("ExtraUtilities:plant/ender_lilly");
+    }
+
+    // This is NOT a direct mapping!!
+    // EXU's ender lily item is the block's ItemBlock, which is incompatible with our version which is a seed
+    // that plants the block,
+    public NBTTagCompound doItemTransformation(NBTTagCompound tag) {
+        IDExtenderCompat.setItemStackID(tag, Item.getIdFromItem(ModItems.ENDER_LOTUS_SEED.get()));
+        tag.setInteger("Damage", 0);
+        return tag;
+    }
+
+    public BlockConversionInfo doBlockTransformation(BlockConversionInfo blockConversionInfo, World world) {
+        BlockConversionInfo blockConversionInfoNew = new BlockConversionInfo();
+
+        blockConversionInfoNew.blockID = Block.getIdFromBlock(ModBlocks.ENDER_LOTUS.get());
+        blockConversionInfoNew.metadata = 0;
+
+        return blockConversionInfoNew;
+    }
+}
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/items/EnderLilyTransformation.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/items/EnderLilyTransformation.java
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/AbstractTileEntityTransformation.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/AbstractTileEntityTransformation.java
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/FullChestTransformation.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/FullChestTransformation.java
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/GeneratorTransformation.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/GeneratorTransformation.java
diff --git a/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/MiniChestTransformation.java b/src/main/java/com/fouristhenumber/utilitiesinexcess/compat/exu/postea/tileentities/MiniChestTransformation.java

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`public abstract class BlockBaseGenerator extends BlockContainer {`
`13`	`13`
`14`		`- public String TILE_ENTITY_ID;`
`15`		`-`
`16`	`14`	`public int multiplier;`
`17`	`15`
`18`	`16`	`protected BlockBaseGenerator(String id, int mult) {`
`@@ -39,6 +37,4 @@ public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neig`
`39`	`37`	`}`
`40`	`38`	`super.onNeighborBlockChange(worldIn, x, y, z, neighbor);`
`41`	`39`	`}`
`42`		`-`
`43`		`- public abstract String getGeneratorTEID();`
`44`	`40`	`}`