Ender Quarry

.gitignore

@@ -36,3 +36,4 @@ addon.local.gradle.kts
 addon.late.local.gradle
 addon.late.local.gradle.kts
 layout.json
+libs/

dependencies.gradle

@@ -34,16 +34,35 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 dependencies {
-    implementation("com.github.GTNewHorizons:GTNHLib:0.7.7:dev")
+    compileOnly('org.jetbrains:annotations:26.0.1')
+
+    implementation("com.github.GTNewHorizons:GTNHLib:0.8.15:dev")
     // TODO: remove MUI1 dep when the implicit dependency
     // TODO: in IItemHandlerModifiable is removed
-    api("com.github.GTNewHorizons:ModularUI:1.2.20:dev")
-    api("com.github.GTNewHorizons:ModularUI2:2.2.16-1.7.10:dev")
-    api("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev")
-    api('curse.maven:cofh-lib-220333:2388748')
-    compileOnly("com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev")
-    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-    compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta62:dev')
+    api("com.github.GTNewHorizons:ModularUI:1.2.20:dev") { transitive = false }
+    api("com.github.GTNewHorizons:ModularUI2:2.2.16-1.7.10:dev") { transitive = false }
+    api("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") { transitive = false }
+    api('curse.maven:cofh-lib-220333:2388748') { transitive = false }
+
+    compileOnly("com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev") { transitive = false }
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.0:dev") { transitive = false }
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.2-GTNH:dev") { transitive = false }
+    compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta62:dev') { transitive = false }
+
+    api("com.github.GTNewHorizons:NotEnoughItems:2.8.31-GTNH:dev" ) { transitive = true }
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Angelica:1.0.0-beta71-pre:dev" ) { transitive = false }
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:Hodgepodge:2.7.17:dev" ) { transitive = false }
+
+    // For debugging chunkloading
+    runtimeOnlyNonPublishable('curse.maven:chicken-chunks-229316:2233250')
+    // Testing performance with ender quarry inserts
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Avaritiaddons:1.9.3-GTNH:dev') { transitive = true }
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Avaritia:1.81-pre:dev') { transitive = false }
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-789-GTNH:dev') { transitive = true }
+    runtimeOnlyNonPublishable rfg.deobf(files("libs/spark-1.10.pre-forge-1.7.10.jar"))
 
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.31-GTNH:dev" )
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev") { transitive = false }
+    api("com.github.GTNewHorizons:waila:1.9.15:dev") { transitive = false }
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:ServerUtilities:2.2.5:dev") { transitive = false }
 }

src/main/java/com/fouristhenumber/utilitiesinexcess/ClientProxy.java

@@ -4,12 +4,15 @@
 
 import com.fouristhenumber.utilitiesinexcess.common.renderers.InvertedIngotRenderer;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityPortalUnderWorld;
+import com.fouristhenumber.utilitiesinexcess.compat.Mods;
+import com.fouristhenumber.utilitiesinexcess.compat.waila.TTRenderUIETimeLeftBar;
 import com.fouristhenumber.utilitiesinexcess.render.ISBRHUnderworldPortal;
 import com.fouristhenumber.utilitiesinexcess.render.TESRUnderworldPortal;
 
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 
 public class ClientProxy extends CommonProxy {
 
@@ -24,4 +27,12 @@ public void init(FMLInitializationEvent event) {
             RenderingRegistry.registerBlockHandler(ISBRHUnderworldPortal.INSTANCE);
         }
     }
+
+    @Override
+    public void postInit(FMLPostInitializationEvent event) {
+        super.postInit(event);
+        if (Mods.Waila.isLoaded()) {
+            TTRenderUIETimeLeftBar.register();
+        }
+    }
 }

src/main/java/com/fouristhenumber/utilitiesinexcess/CommonProxy.java

@@ -8,6 +8,7 @@
 import com.fouristhenumber.utilitiesinexcess.utils.SoundVolumeChecks;
 
 import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartingEvent;
@@ -34,6 +35,13 @@ public void preInit(FMLPreInitializationEvent event) {
 
     public void init(FMLInitializationEvent event) {
         soundVolumeChecks = new SoundVolumeChecks();
+        ModTileEntities.init();
+        if (Mods.Waila.isLoaded()) {
+            FMLInterModComms.sendMessage(
+                "Waila",
+                "register",
+                "com.fouristhenumber.utilitiesinexcess.compat.waila.WailaHandler.callbackRegister");
+        }
     }
 
     public void postInit(FMLPostInitializationEvent event) {}

src/main/java/com/fouristhenumber/utilitiesinexcess/ModBlocks.java

@@ -32,6 +32,9 @@
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockTrashCanFluid;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockTrashCanItem;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockUpdateDetector;
+import com.fouristhenumber.utilitiesinexcess.common.blocks.ender_quarry.BlockEnderMarker;
+import com.fouristhenumber.utilitiesinexcess.common.blocks.ender_quarry.BlockEnderQuarry;
+import com.fouristhenumber.utilitiesinexcess.common.blocks.ender_quarry.BlockEnderQuarryUpgrade;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.generators.BlockEnderGenerator;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.generators.BlockFoodGenerator;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.generators.BlockFurnaceGenerator;
@@ -47,6 +50,7 @@
 import com.fouristhenumber.utilitiesinexcess.config.blocks.BlockConfig;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.CursedEarthConfig;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.EnderLotusConfig;
+import com.fouristhenumber.utilitiesinexcess.config.blocks.EnderQuarryConfig;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.GeneratorConfig;
 import com.fouristhenumber.utilitiesinexcess.config.dimensions.EndOfTimeConfig;
 import com.fouristhenumber.utilitiesinexcess.config.dimensions.UnderWorldConfig;
@@ -104,6 +108,9 @@ public enum ModBlocks {
     SPIKE_DIAMOND(BlockConfig.spikes.enableDiamondSpike, new BlockSpike(BlockSpike.SpikeType.DIAMOND, "diamondSpike"), BlockSpike.ItemSpike.class, "diamondSpike"),
     UNDERWORLD_PORTAL(BlockConfig.enableUnderWorldPortal && UnderWorldConfig.enableUnderWorld, new BlockPortalUnderWorld(), "underworld_portal"),
     END_OF_TIME_PORTAL(BlockConfig.enableEndOfTimePortal && EndOfTimeConfig.enableEndOfTime, new BlockPortalEndOfTime(), BlockPortalEndOfTime.ItemBlockPortalEndOfTime.class, "temporal_gate"),
+    ENDER_QUARRY(EnderQuarryConfig.enableEnderQuarry, new BlockEnderQuarry(), "ender_quarry"),
+    ENDER_MARKER(EnderQuarryConfig.enableEnderQuarry, new BlockEnderMarker(), "ender_marker"),
+    ENDER_QUARRY_UPGRADE(EnderQuarryConfig.enableEnderQuarry, new BlockEnderQuarryUpgrade(), BlockEnderQuarryUpgrade.ItemEnderQuarryUpgrade.class, "ender_quarry_upgrade"),
     ; // leave trailing semicolon
     // spotless:on
 

src/main/java/com/fouristhenumber/utilitiesinexcess/ModTileEntities.java

@@ -0,0 +1,98 @@
+package com.fouristhenumber.utilitiesinexcess;
+
+import net.minecraft.tileentity.TileEntity;
+
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityBlockUpdateDetector;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityConveyor;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityDrum;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityEnderMarker;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityEnderQuarry;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityMarginallyMaximisedChest;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityPortalUnderWorld;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityPureLove;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityRadicallyReducedChest;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityRainMuffler;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityRedstoneClock;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntitySignificantlyShrunkChest;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntitySoundMuffler;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityTrashCanEnergy;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityTrashCanFluid;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityTrashCanItem;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityEnderGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityFoodGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityFurnaceGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityHighTemperatureFurnaceGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityLavaGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityLowTemperatureFurnaceGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityNetherStarGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityPinkGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityPotionGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityRedstoneGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntitySolarGenerator;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityTNTGenerator;
+
+import cpw.mods.fml.common.registry.GameRegistry;
+
+public enum ModTileEntities {
+    // spotless:off
+
+    // make sure to leave a trailing comma
+    REDSTONE_CLOCK(TileEntityRedstoneClock .class                              , "RedstoneClock"),
+    TRASH_CAN_ITEM(TileEntityTrashCanItem.class                                , "TrashCanItem"),
+    TRASH_CAN_FLUID(TileEntityTrashCanFluid.class                              , "TrashCanFluid"),
+    TRASH_CAN_ENERGY(TileEntityTrashCanEnergy.class                            , "TrashCanEnergy"),
+    DRUM(TileEntityDrum.class                                                  , "Drum"),
+    PURE_LOVE(TileEntityPureLove.class                                         , "PureLove"),
+    CHEST_MAX(TileEntityMarginallyMaximisedChest.class                         , "MarginallyMaximisedChest"),
+    CHEST_SHRUNK(TileEntitySignificantlyShrunkChest.class                      , "SignificantlyShrunkChest"),
+    CHEST_SMALL(TileEntityRadicallyReducedChest.class                          , "RadicallyReducedChest"),
+    MUFFLER_SOUND(TileEntitySoundMuffler.class                                 , "SoundMuffler"),
+    MUFFLER_RAIN(TileEntityRainMuffler.class                                   , "RainMuffler"),
+    BLOCK_UPDATE_DETECTOR(TileEntityBlockUpdateDetector.class                  , "BlockUpdateDetector"),
+    CONVEYOR(TileEntityConveyor.class                                          , "Conveyor"),
+    PORTAL_UNDERWORLD(TileEntityPortalUnderWorld.class                         , "PortalUnderWorld"),
+    GENERATOR_LOW_TEMP_FURNACE(TileEntityLowTemperatureFurnaceGenerator.class  , "LowTemperatureFurnaceGenerator"),
+    GENERATOR_FURNACE(TileEntityFurnaceGenerator.class                         , "FurnaceGenerator"),
+    GENERATOR_HIGH_TEMP_FURNACE(TileEntityHighTemperatureFurnaceGenerator.class, "HighTemperatureFurnaceGenerator"),
+    GENERATOR_LAVA(TileEntityLavaGenerator.class                               , "LavaGenerator"),
+    GENERATOR_ENDER(TileEntityEnderGenerator.class                             , "EnderGenerator"),
+    GENERATOR_REDSTONE(TileEntityRedstoneGenerator.class                       , "RedstoneGenerator"),
+    GENERATOR_FOOD(TileEntityFoodGenerator.class                               , "FoodGenerator"),
+    GENERATOR_POTION(TileEntityPotionGenerator.class                           , "PotionGenerator"),
+    GENERATOR_SOLAR(TileEntitySolarGenerator.class                             , "SolarGenerator"),
+    GENERATOR_TNT(TileEntityTNTGenerator.class                                 , "TNTGenerator"),
+    GENERATOR_PINK(TileEntityPinkGenerator.class                               , "PinkGenerator"),
+    GENERATOR_NETHER_STAR(TileEntityNetherStarGenerator.class                  , "NetherStarGenerator"),
+    ENDER_QUARRY(TileEntityEnderQuarry.class                                   , "EnderQuarry"),
+    ENDER_MARKER(TileEntityEnderMarker.class                                   , "EnderMarker"),
+    ;
+    // spotless:on
+
+    public static final ModTileEntities[] VALUES = values();
+
+    public static void init() {
+        for (ModTileEntities te : VALUES) {
+            if (te.isEnabled()) {
+                GameRegistry.registerTileEntity(te.clazz, te.name);
+            }
+        }
+    }
+
+    private final boolean isEnabled;
+    private final Class<? extends TileEntity> clazz;
+    private final String name;
+
+    ModTileEntities(Class<? extends TileEntity> clazz, String name) {
+        this(true, clazz, name);
+    }
+
+    ModTileEntities(Boolean enabled, Class<? extends TileEntity> clazz, String name) {
+        this.isEnabled = enabled;
+        this.clazz = clazz;
+        this.name = "TileEntity" + name + "UIE";
+    }
+
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+}