Cabinet

dependencies.gradle

@@ -38,23 +38,19 @@ dependencies {
     // TODO: remove MUI1 dep when the implicit dependency
     // TODO: in IItemHandlerModifiable is removed
     api("com.github.GTNewHorizons:ModularUI:1.3.1:dev")
-    api("com.github.GTNewHorizons:ModularUI2:2.3.23-1.7.10:dev")
+    api("com.github.GTNewHorizons:ModularUI2:2.3.24-1.7.10:dev")
     api("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev")
     api('curse.maven:cofh-lib-220333:2388748')
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('com.github.GTNewHorizons:Angelica:1.0.0-beta68a:dev')
     compileOnly("com.github.GTNewHorizons:FindIt:1.4.0:dev")
     compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.14-GTNH:dev')
 
-
-    devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.4-GTNH:dev")
+    devOnlyNonPublishable("com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev")
     devOnlyNonPublishable("io.github.legacymoddingmc:unimixins:0.1.23:dev")
 
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.40-GTNH:dev")
-
-    // For testing NBT data (/nbtedit)
-    // runtimeOnlyNonPublishable("com.github.GTNewHorizons:ServerUtilities:2.2.6:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.48-GTNH:dev" )
     // For testing glove
-    // runtimeOnlyNonPublishable("com.github.GTNewHorizons:Translocators:1.4.0:dev")
+    // runtimeOnlyNonPublishable("com.github.GTNewHorizons:Translocators:1.4.3:dev")
     // runtimeOnlyNonPublishable("com.github.GTNewHorizons:Backhand:1.8.2:dev")
 }

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

@@ -17,6 +17,7 @@
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockDrum;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEnderLotus;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockEtherealGlass;
+import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockFilingCabinet;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockFloating;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockInverted;
 import com.fouristhenumber.utilitiesinexcess.common.blocks.BlockLapisAetherius;
@@ -53,6 +54,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.FilingCabinetsConfig;
 import com.fouristhenumber.utilitiesinexcess.config.blocks.GeneratorConfig;
 import com.fouristhenumber.utilitiesinexcess.config.dimensions.EndOfTimeConfig;
 import com.fouristhenumber.utilitiesinexcess.config.dimensions.UnderWorldConfig;
@@ -151,6 +153,7 @@ public enum ModBlocks {
     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"),
+    FILING_CABINET(FilingCabinetsConfig.enableFilingCabinets,new BlockFilingCabinet() , BlockFilingCabinet.ItemBlockFilingCabinet.class,"filing_cabinet"),
     TRADING_POST(BlockConfig.enableTradingPost, new BlockTradingPost(), "trading_post"),
     DECORATIVE_BLOCKS(BlockConfig.enableDecorativeBlocks, new BlockDecorative(), BlockDecorative.ItemBlockDecorative.class, "decorative_block"),
     ; // leave trailing semicolon

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

@@ -14,6 +14,7 @@
 import com.fouristhenumber.utilitiesinexcess.common.recipe.RecipeLoader;
 import com.fouristhenumber.utilitiesinexcess.common.renderers.BlackoutCurtainsRenderer;
 import com.fouristhenumber.utilitiesinexcess.common.renderers.LapisAetheriusRenderer;
+import com.fouristhenumber.utilitiesinexcess.common.renderers.RotatableBlockRenderer;
 import com.fouristhenumber.utilitiesinexcess.common.renderers.SpikeRenderer;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityBlockUpdateDetector;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.TileEntityConveyor;
@@ -33,6 +34,9 @@
 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.cabinet.TileFilingCabinetAdvanced;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.cabinet.TileFilingCabinetBasic;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.cabinet.TileFilingCabinetElite;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityEnderGenerator;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityFoodGenerator;
 import com.fouristhenumber.utilitiesinexcess.common.tileentities.generators.TileEntityFurnaceGenerator;
@@ -83,6 +87,7 @@ public class UtilitiesInExcess {
     public static int lapisAetheriusRenderID;
     public static int blackoutCurtainsRenderID;
     public static int spikeRenderID;
+    public static int rotatableblockRenderID;
 
     @SidedProxy(
         clientSide = "com.fouristhenumber.utilitiesinexcess.ClientProxy",
@@ -143,6 +148,9 @@ public void init(FMLInitializationEvent event) {
         GameRegistry.registerTileEntity(TileEntityPinkGenerator.class, "TileEntityPinkGeneratorUIE");
         GameRegistry.registerTileEntity(TileEntityNetherStarGenerator.class, "TileEntityNetherStarGeneratorUIE");
         GameRegistry.registerTileEntity(TileEntityPacifistsBench.class, "TileEntityPacifistsBenchUIE");
+        GameRegistry.registerTileEntity(TileFilingCabinetBasic.class, "TileFilingCabinetBasicUIE");
+        GameRegistry.registerTileEntity(TileFilingCabinetAdvanced.class, "TileFilingCabinetAdvancedUIE");
+        GameRegistry.registerTileEntity(TileFilingCabinetElite.class, "TileFilingCabinetEliteUIE");
         GameRegistry.registerTileEntity(TileEntityTradingPost.class, "TileEntityTradingPostUIE");
 
         lapisAetheriusRenderID = RenderingRegistry.getNextAvailableRenderId();
@@ -151,6 +159,8 @@ public void init(FMLInitializationEvent event) {
         RenderingRegistry.registerBlockHandler(new BlackoutCurtainsRenderer());
         spikeRenderID = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(new SpikeRenderer());
+        rotatableblockRenderID = RenderingRegistry.getNextAvailableRenderId();
+        RenderingRegistry.registerBlockHandler(new RotatableBlockRenderer());
 
         GameRegistry.registerWorldGenerator(new WorldGenEnderLotus(), 10);
 

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

@@ -0,0 +1,223 @@
+package com.fouristhenumber.utilitiesinexcess.common.blocks;
+
+import static com.fouristhenumber.utilitiesinexcess.render.FacingRotation.calculateFacingRotation;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Supplier;
+
+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.client.resources.I18n;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import com.cleanroommc.modularui.factory.GuiFactories;
+import com.fouristhenumber.utilitiesinexcess.UtilitiesInExcess;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.cabinet.TileFilingCabinetAdvanced;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.cabinet.TileFilingCabinetBasic;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.cabinet.TileFilingCabinetElite;
+import com.fouristhenumber.utilitiesinexcess.common.tileentities.cabinet.base.TileFilingCabinetBase;
+import com.fouristhenumber.utilitiesinexcess.config.blocks.FilingCabinetsConfig;
+import com.fouristhenumber.utilitiesinexcess.render.FacingRotation;
+import com.mojang.realmsclient.gui.ChatFormatting;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+// Adapted from Filing Cabinets by phantamanta44 (MIT License)
+// Source: https://github.com/phantamanta44/filing-cabinets
+
+public class BlockFilingCabinet extends BlockContainer {
+
+    public enum Type {
+
+        BASIC(TileFilingCabinetBasic::new, FilingCabinetsConfig.cabinetBasic.enable),
+        ADVANCED(TileFilingCabinetAdvanced::new, FilingCabinetsConfig.cabinetAdvanced.enable),
+        ELITE(TileFilingCabinetElite::new, FilingCabinetsConfig.cabinetElite.enable);
+
+        private static final Type[] VALUES = values();
+
+        public static Type getForItemMeta(int meta) {
+            return VALUES[meta];
+        }
+
+        private final Supplier<TileEntity> tileFactory;
+        private final boolean isEnabled;
+
+        Type(Supplier<TileEntity> tileFactory, boolean isEnabled) {
+            this.tileFactory = tileFactory;
+            this.isEnabled = isEnabled;
+        }
+
+        TileEntity createTileEntity() {
+            return tileFactory.get();
+        }
+
+        public String getName() {
+            return name().toLowerCase();
+        }
+
+        public int getItemMeta() {
+            return ordinal();
+        }
+
+    }
+
+    public BlockFilingCabinet() {
+        super(Material.iron);
+        this.setHardness(2F);
+        this.setBlockName("filing_cabinet");
+    }
+
+    @Override
+    public void getSubBlocks(Item itemIn, CreativeTabs tab, List<ItemStack> items) {
+        for (Type type : Type.VALUES) {
+            if (type.isEnabled) {
+                items.add(new ItemStack(this, 1, type.getItemMeta()));
+            }
+        }
+    }
+
+    @Override
+    public int damageDropped(int meta) {
+        return meta;
+    }
+
+    @Override
+    public int getRenderType() {
+        return UtilitiesInExcess.rotatableblockRenderID;
+    }
+
+    @Override
+    public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack stack) {
+        FacingRotation fr = calculateFacingRotation(placer);
+        TileEntity te = world.getTileEntity(x, y, z);
+        if (te instanceof TileFilingCabinetBase cabinet) {
+            cabinet.setFacing(fr.facing);
+            cabinet.setYaw(fr.yaw);
+        }
+        super.onBlockPlacedBy(world, x, y, z, placer, stack);
+
+    }
+
+    @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) return true;
+
+        TileEntity te = worldIn.getTileEntity(x, y, z);
+        if (!(te instanceof TileFilingCabinetBase cabinet)) {
+            return false;
+        }
+
+        ItemStack held = player.getCurrentEquippedItem();
+
+        if (held != null && cabinet.installCapacityUpgrade(worldIn, player, held)) {
+            return true;
+        }
+
+        GuiFactories.tileEntity()
+            .open(player, x, y, z);
+        return true;
+    }
+
+    @Override
+    public void breakBlock(World world, int x, int y, int z, Block block, int meta) {
+        dropInventory(world, x, y, z);
+        super.breakBlock(world, x, y, z, block, meta);
+    }
+
+    public static void dropInventory(World world, int x, int y, int z) {
+        if (world.isRemote) return;
+
+        TileEntity te = world.getTileEntity(x, y, z);
+        if (te == null) return;
+
+        if (te instanceof TileFilingCabinetBase inv) {
+            inv.dropInventory(world, x, y, z);
+        }
+    }
+
+    @Override
+    public TileEntity createNewTileEntity(World worldIn, int meta) {
+        return Type.getForItemMeta(meta)
+            .createTileEntity();
+    }
+
+    @SideOnly(Side.CLIENT)
+    private Map<Type, IIcon[]> icons;
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister reg) {
+        icons = new HashMap<>();
+        for (Type type : Type.VALUES) {
+            String basePath = String.format("%s:filing_cabinet/%s/", UtilitiesInExcess.MODID, type.getName());
+            IIcon side = reg.registerIcon(basePath + "side");
+            IIcon front = reg.registerIcon(basePath + "front");
+            icons.put(type, new IIcon[] { side, front });
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int side, int meta) {
+        return side == 3 ? getFrontIcon(meta) : getSideIcon(meta);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public IIcon getSideIcon(int meta) {
+        Type type = Type.getForItemMeta(meta);
+        return icons.get(type)[0]; // side
+    }
+
+    @SideOnly(Side.CLIENT)
+    public IIcon getFrontIcon(int meta) {
+        Type type = Type.getForItemMeta(meta);
+        return icons.get(type)[1];
+    }
+
+    public static class ItemBlockFilingCabinet extends ItemBlock {
+
+        public ItemBlockFilingCabinet(Block block) {
+            super(block);
+            setHasSubtypes(true);
+        }
+
+        @Override
+        public int getMetadata(int damage) {
+            return damage;
+        }
+
+        @Override
+        public String getUnlocalizedName(final ItemStack stack) {
+            return this.getUnlocalizedName() + "."
+                + Type.getForItemMeta(stack.getItemDamage())
+                    .getName();
+        }
+
+        @Override
+        public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean flags) {
+            switch (Type.getForItemMeta(stack.getItemDamage())) {
+                case BASIC:
+                    tooltip.add(ChatFormatting.GRAY + I18n.format("tile.filing_cabinet.basic.desc"));
+                    break;
+                case ADVANCED:
+                    tooltip.add(ChatFormatting.GRAY + I18n.format("tile.filing_cabinet.advanced.desc"));
+                    break;
+            }
+        }
+    }
+}