Ender Locus

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

@@ -20,6 +20,7 @@
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.render.item.ItemUEMultiPartRenderer;
 import com.fouristhenumber.utilitiesinexcess.compat.Mods;
 import com.fouristhenumber.utilitiesinexcess.compat.findit.FindItHelper;
+import com.fouristhenumber.utilitiesinexcess.compat.nei.NEIConfig;
 import com.fouristhenumber.utilitiesinexcess.render.CollectorRangeBox;
 import com.fouristhenumber.utilitiesinexcess.render.ISBRHUnderworldPortal;
 import com.fouristhenumber.utilitiesinexcess.render.TESRUnderworldPortal;
@@ -84,6 +85,9 @@ public void init(FMLInitializationEvent event) {
             FindItHelper.INSTANCE = new FindItHelper();
             MinecraftForge.EVENT_BUS.register(FindItHelper.INSTANCE);
         }
+        if (Mods.NEI.isLoaded()) {
+            MinecraftForge.EVENT_BUS.register(new NEIConfig());
+        }
     }
 
     @SubscribeEvent

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

@@ -13,11 +13,13 @@
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockCollector;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockColored;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockCompressed;
+import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockConvergenceCrystal;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockConveyor;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockCursedEarth;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockDecorative;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockDecorativeGlass;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockDrum;
+import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEnderLocus;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEnderLotus;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEndspark;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEtherealGlass;
@@ -156,6 +158,8 @@ public enum ModBlocks {
     SPIKE_DIAMOND(BlockConfig.spikes.enableDiamondSpike, new BlockSpike(BlockSpike.SpikeType.DIAMOND, "diamond_spike"), BlockSpike.ItemSpike.class, "diamond_spike"),
     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_LOCUS(BlockConfig.enableEnderLocus, new BlockEnderLocus(), "ender_locus"),
+    CONVERGENCE_CRYSTAL(BlockConfig.enableEnderLocus, new BlockConvergenceCrystal(), "convergence_crystal"),
     DECORATIVE_GLASS(BlockConfig.enableDecorativeGlass, new BlockDecorativeGlass(), BlockDecorativeGlass.ItemBlockDecorativeGlass.class, "decorative_glass"),
     PACIFISTS_BENCH(BlockConfig.enablePacifistsBench, new BlockPacifistsBench(), "pacifists_bench"),
     SMART_PUMP(BlockConfig.enableSmartPump, new BlockSmartPump(), "smart_pump"),

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

@@ -20,6 +20,7 @@
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityCollector;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityConveyor;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityDrum;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityEnderLocus;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityGigaTorch;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityMarginallyMaximisedChest;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityPacifistsBench;
@@ -52,7 +53,7 @@
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.FMPRecipeLoader;
 import com.fouristhenumber.utilitiesinexcess.compat.ForgeMultipart.multipart.Content;
 import com.fouristhenumber.utilitiesinexcess.compat.Mods;
-import com.fouristhenumber.utilitiesinexcess.compat.crafttweaker.QEDCraftTweakerSupport;
+import com.fouristhenumber.utilitiesinexcess.compat.crafttweaker.EnderLocusCraftTweakerSupport;
 import com.fouristhenumber.utilitiesinexcess.compat.tinkers.TinkersCompat;
 import com.fouristhenumber.utilitiesinexcess.config.OtherConfig;
 import com.fouristhenumber.utilitiesinexcess.utils.FMLEventHandler;
@@ -80,6 +81,7 @@
 public class UtilitiesInExcess {
 
     public static final String MODID = "utilitiesinexcess";
+    public static final String MODNAME = "Utilities in Excess";
     public static final Logger LOG = LogManager.getLogger(MODID);
 
     @Mod.Instance(MODID)
@@ -137,6 +139,7 @@ public void init(FMLInitializationEvent event) {
         GameRegistry.registerTileEntity(TileEntityPortalUnderWorld.class, "TileEntityPortalUnderWorldUIE");
         GameRegistry.registerTileEntity(TileEntitySmartPump.class, "TileEntitySmartPumpUIE");
         GameRegistry.registerTileEntity(TileEntityCollector.class, "TileEntityCollectorUIE");
+        GameRegistry.registerTileEntity(TileEntityEnderLocus.class, "TileEntityEnderLocusUIE");
         GameRegistry.registerTileEntity(
             TileEntityLowTemperatureFurnaceGenerator.class,
             "TileEntityLowTemperatureFurnaceGeneratorUIE");
@@ -195,7 +198,7 @@ public void init(FMLInitializationEvent event) {
         }
 
         if (Mods.CraftTweaker.isLoaded()) {
-            MineTweakerAPI.registerClass(QEDCraftTweakerSupport.class);
+            MineTweakerAPI.registerClass(EnderLocusCraftTweakerSupport.class);
         }
     }
 

src/main/java/com/fouristhenumber/utilitiesinexcess/api/QEDRecipe.java → src/main/java/com/fouristhenumber/utilitiesinexcess/api/EnderLocusRecipe.java

@@ -4,12 +4,12 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
-public class QEDRecipe {
+public class EnderLocusRecipe {
 
     private final Object[] inputs;
     private final ItemStack output;
 
-    public QEDRecipe(Object[] inputs, ItemStack output) {
+    public EnderLocusRecipe(Object[] inputs, ItemStack output) {
         this.inputs = inputs;
         this.output = output;
     }
@@ -36,8 +36,9 @@ public boolean matches(InventoryCrafting inv) {
                         return false;
                     }
 
-                    if (recipeInput.getItemDamage() != providedInput.getItemDamage()) {
-                        return recipeInput.getItemDamage() == OreDictionary.WILDCARD_VALUE;
+                    if (recipeInput.getItemDamage() != providedInput.getItemDamage()
+                        && recipeInput.getItemDamage() != OreDictionary.WILDCARD_VALUE) {
+                        return false;
                     }
                 } else if (rawRecipeInput instanceof ItemStack[]ores) {
                     boolean matched = false;

src/main/java/com/fouristhenumber/utilitiesinexcess/api/QEDRegistry.java → src/main/java/com/fouristhenumber/utilitiesinexcess/api/EnderLocusRegistry.java

@@ -18,15 +18,15 @@
 import it.unimi.dsi.fastutil.objects.ObjectList;
 import it.unimi.dsi.fastutil.objects.ObjectLists;
 
-public final class QEDRegistry {
+public final class EnderLocusRegistry {
 
-    private static final QEDRegistry REGISTRY = new QEDRegistry();
+    private static final EnderLocusRegistry REGISTRY = new EnderLocusRegistry();
 
-    private final ObjectList<QEDRecipe> recipes = new ObjectArrayList<>();
+    private final ObjectList<EnderLocusRecipe> recipes = new ObjectArrayList<>();
 
-    private QEDRegistry() {}
+    private EnderLocusRegistry() {}
 
-    public static QEDRegistry instance() {
+    public static EnderLocusRegistry instance() {
         return REGISTRY;
     }
 
@@ -73,11 +73,11 @@ public void addRecipe(ItemStack output, String[] pattern, Object... inputs) {
             }
         }
 
-        QEDRecipe qedRecipe = new QEDRecipe(inputArray, output);
-        this.recipes.add(qedRecipe);
+        EnderLocusRecipe enderLocusRecipe = new EnderLocusRecipe(inputArray, output);
+        this.recipes.add(enderLocusRecipe);
     }
 
-    public void addRecipe(QEDRecipe recipe) {
+    public void addRecipe(EnderLocusRecipe recipe) {
         this.recipes.add(recipe);
     }
 
@@ -86,7 +86,7 @@ private void verifyPattern(String[] pattern) {
             || pattern[0].length() != 3
             || pattern[1].length() != 3
             || pattern[2].length() != 3) {
-            throw new IllegalArgumentException("QED recipe pattern must be 3 strings each with 3 characters");
+            throw new IllegalArgumentException("Ender Locus recipe pattern must be 3 strings each with 3 characters");
         }
     }
 
@@ -95,7 +95,7 @@ public void removeRecipe(ItemStack output) {
     }
 
     public ItemStack findRecipe(InventoryCrafting inv, boolean consume) {
-        for (QEDRecipe recipe : this.recipes) {
+        for (EnderLocusRecipe recipe : this.recipes) {
             if (recipe.matches(inv)) {
                 if (consume) {
                     for (int i = 0; i < 9; i++) {
@@ -108,7 +108,7 @@ public ItemStack findRecipe(InventoryCrafting inv, boolean consume) {
         return null;
     }
 
-    public List<QEDRecipe> getAllRecipes() {
+    public List<EnderLocusRecipe> getAllRecipes() {
         return ObjectLists.unmodifiable(this.recipes);
     }
 }

src/main/java/com/fouristhenumber/utilitiesinexcess/client/IMCForNEI.java

@@ -78,6 +78,10 @@ public static void IMCSender() {
 
         sendInfoPage("<utilitiesinexcess:drum>", "nei.infopage.uie.drum.1");
 
+        sendInfoPage(
+            "<utilitiesinexcess:ender_locus>,<utilitiesinexcess:convergence_crystal>",
+            "nei.infopage.uie.ender_locus.1");
+
         sendInfoPage("<utilitiesinexcess:block_update_detector>", "nei.infopage.uie.block_update_detector.1");
         sendInfoPage(
             "<utilitiesinexcess:advanced_block_update_detector>",

src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockConvergenceCrystal.java

@@ -0,0 +1,71 @@
+package com.fouristhenumber.utilitiesinexcess.common.blocks;
+
+import static com.fouristhenumber.utilitiesinexcess.utils.UIEUtils.scanForBlock;
+
+import java.util.Set;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.world.World;
+
+import com.fouristhenumber.utilitiesinexcess.ModBlocks;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityEnderLocus;
+import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
+import com.gtnewhorizon.gtnhlib.client.model.ModelISBRH;
+
+public class BlockConvergenceCrystal extends Block {
+
+    public BlockConvergenceCrystal() {
+        super(Material.iron);
+        setBlockName("convergence_crystal");
+        setBlockTextureName("utilitiesinexcess:convergence_crystal");
+        setHardness(5.0F);
+    }
+
+    @Override
+    public int getMobilityFlag() {
+        return 2;
+    }
+
+    @Override
+    public boolean isOpaqueCube() {
+        return false;
+    }
+
+    @Override
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
+
+    @Override
+    public int getRenderType() {
+        return ModelISBRH.JSON_ISBRH_ID;
+    }
+
+    @Override
+    public int onBlockPlaced(World worldIn, int x, int y, int z, int side, float subX, float subY, float subZ,
+        int meta) {
+        if (!worldIn.isRemote) {
+            Set<BlockPos> positions = scanForBlock(worldIn, x, y, z, 9, ModBlocks.ENDER_LOCUS.get());
+            for (BlockPos pos : positions) {
+                TileEntityEnderLocus enderLocus = (TileEntityEnderLocus) worldIn.getTileEntity(pos.x, pos.y, pos.z);
+                enderLocus.addCrystal();
+            }
+        }
+
+        return super.onBlockPlaced(worldIn, x, y, z, side, subX, subY, subZ, meta);
+    }
+
+    @Override
+    public void onBlockPreDestroy(World worldIn, int x, int y, int z, int meta) {
+        if (!worldIn.isRemote) {
+            Set<BlockPos> positions = scanForBlock(worldIn, x, y, z, 9, ModBlocks.ENDER_LOCUS.get());
+            for (BlockPos pos : positions) {
+                TileEntityEnderLocus enderLocus = (TileEntityEnderLocus) worldIn.getTileEntity(pos.x, pos.y, pos.z);
+                enderLocus.removeCrystal();
+            }
+        }
+
+        super.onBlockPreDestroy(worldIn, x, y, z, meta);
+    }
+}

src/main/java/com/fouristhenumber/utilitiesinexcess/common/blocks/BlockEnderLocus.java

@@ -0,0 +1,85 @@
+package com.fouristhenumber.utilitiesinexcess.common.blocks;
+
+import static com.fouristhenumber.utilitiesinexcess.utils.UIEUtils.dropItemsFromIInventory;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockContainer;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.World;
+
+import com.cleanroommc.modularui.factory.GuiFactories;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityEnderLocus;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class BlockEnderLocus extends BlockContainer {
+
+    public BlockEnderLocus() {
+        super(Material.iron);
+        setBlockName("ender_locus");
+        setBlockTextureName("utilitiesinexcess:ender_locus");
+        setHardness(5.0F);
+    }
+
+    @Override
+    public TileEntity createNewTileEntity(World worldIn, int meta) {
+        return new TileEntityEnderLocus();
+    }
+
+    @Override
+    public void onBlockAdded(World worldIn, int x, int y, int z) {
+        if (!worldIn.isRemote) {
+            TileEntityEnderLocus locus = (TileEntityEnderLocus) worldIn.getTileEntity(x, y, z);
+            locus.scan();
+        }
+        super.onBlockAdded(worldIn, x, y, z);
+    }
+
+    @Override
+    public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer player, int side, float subX,
+        float subY, float subZ) {
+        if (!worldIn.isRemote) {
+            GuiFactories.tileEntity()
+                .open(player, x, y, z);
+        }
+        return true;
+    }
+
+    public IIcon sideTexture;
+    public IIcon bottomTexture;
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public void registerBlockIcons(IIconRegister reg) {
+        this.blockIcon = reg.registerIcon(this.getTextureName() + "_top");
+        this.sideTexture = reg.registerIcon(this.getTextureName() + "_side");
+        this.bottomTexture = reg.registerIcon(this.getTextureName() + "_bottom");
+    }
+
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int side, int meta) {
+        return side == 1 ? this.blockIcon : (side == 0 ? bottomTexture : this.sideTexture);
+    }
+
+    @SideOnly(Side.CLIENT)
+    @Override
+    public IIcon getIcon(IBlockAccess worldIn, int x, int y, int z, int side) {
+        return getIcon(side, 0);
+    }
+
+    @Override
+    public void breakBlock(World worldIn, int x, int y, int z, Block blockBroken, int meta) {
+        TileEntity te = worldIn.getTileEntity(x, y, z);
+        if (te instanceof IInventory inv) {
+            dropItemsFromIInventory(0, inv, worldIn, te.xCoord, te.yCoord, te.zCoord);
+        }
+        super.breakBlock(worldIn, x, y, z, blockBroken, meta);
+    }
+}