Enhanced Clay Crafting Board

src/main/java/com/nao7016/ClayiumAdditions/block/EnhancedClayCraftingTable.java

@@ -0,0 +1,39 @@
+package com.nao7016.ClayiumAdditions.block;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import mods.clayium.block.ClayContainerTiered;
+import mods.clayium.block.tile.TileClayCraftingTable;
+
+public class EnhancedClayCraftingTable extends ClayContainerTiered {
+
+    public EnhancedClayCraftingTable(int tier) {
+        super(Material.clay, TileClayCraftingTable.class, 0, tier);
+        setStepSound(Block.soundTypeGravel);
+        setHardness(1.0F);
+        setResistance(4.0F);
+        setHarvestLevel("shovel", 0);
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void registerBlockIcons(IIconRegister iconRegister) {
+        this.UpOverlayIcon = iconRegister.registerIcon("clayium:claycraftingtable");
+        super.registerBlockIcons(iconRegister);
+    }
+
+    public boolean isOpaqueCube() {
+        return false;
+    }
+
+    public boolean renderAsNormalBlock() {
+        return false;
+    }
+
+    public void setInitialBlockBounds() {
+        this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 0.25F, 1.0F);
+    }
+}

src/main/java/com/nao7016/ClayiumAdditions/client/ClientProxy.java

@@ -1,12 +1,15 @@
 package com.nao7016.ClayiumAdditions.client;
 
 import net.minecraftforge.client.MinecraftForgeClient;
+import net.minecraftforge.common.MinecraftForge;
 
 import com.nao7016.ClayiumAdditions.common.CAItems;
 import com.nao7016.ClayiumAdditions.common.CommonProxy;
+import com.nao7016.ClayiumAdditions.event.IDChecker;
 import com.nao7016.ClayiumAdditions.item.storagebox.StorageKey;
 import com.nao7016.ClayiumAdditions.item.storagebox.StorageRenderer;
 
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 
 public class ClientProxy extends CommonProxy {
@@ -19,5 +22,7 @@ public void init(FMLInitializationEvent event) {
         MinecraftForgeClient.registerItemRenderer(CAItems.storageBox, new StorageRenderer());
         MinecraftForgeClient.registerItemRenderer(CAItems.clayStorageBox, new StorageRenderer());
         StorageKey.set();
+
+        if (!(Loader.isModLoaded("inventorytweaks"))) MinecraftForge.EVENT_BUS.register(new IDChecker());
     }
 }

src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java

@@ -4,11 +4,11 @@
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
 
+import com.nao7016.ClayiumAdditions.item.hammer.itemClayHammer;
+import com.nao7016.ClayiumAdditions.item.hammer.itemClayMiningHammer;
 import com.nao7016.ClayiumAdditions.item.itemClayBowl;
 import com.nao7016.ClayiumAdditions.item.itemClayBowlEmpty;
 import com.nao7016.ClayiumAdditions.item.itemClayEnergy;
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
-import com.nao7016.ClayiumAdditions.item.itemClayMiningHammer;
 import com.nao7016.ClayiumAdditions.item.itemRawClayOre;
 import com.nao7016.ClayiumAdditions.item.storagebox.itemClayStorageBox;
 import com.nao7016.ClayiumAdditions.item.storagebox.itemStorageBox;

src/main/java/com/nao7016/ClayiumAdditions/common/CommonProxy.java

@@ -5,14 +5,14 @@
 
 import com.nao7016.ClayiumAdditions.CAModMain;
 import com.nao7016.ClayiumAdditions.Tags;
+import com.nao7016.ClayiumAdditions.item.hammer.HammerEvent;
+import com.nao7016.ClayiumAdditions.item.hammer.MiningHammerEvent;
 import com.nao7016.ClayiumAdditions.item.storagebox.AutoCollect;
 import com.nao7016.ClayiumAdditions.network.CANetwork;
 import com.nao7016.ClayiumAdditions.plugin.EtOreIntegration;
 import com.nao7016.ClayiumAdditions.plugin.InventoryBogoSorter;
 import com.nao7016.ClayiumAdditions.plugin.nei.NEIPluginClayiumAdditions;
 import com.nao7016.ClayiumAdditions.recipe.CARecipes;
-import com.nao7016.ClayiumAdditions.util.HammerEvent;
-import com.nao7016.ClayiumAdditions.util.MiningHammerEvent;
 import com.nao7016.ClayiumAdditions.util.UtilAddTier;
 
 import cpw.mods.fml.common.Loader;

src/main/java/com/nao7016/ClayiumAdditions/event/IDChecker.java

@@ -0,0 +1,23 @@
+package com.nao7016.ClayiumAdditions.event;
+
+import net.minecraft.item.Item;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraftforge.event.entity.player.ItemTooltipEvent;
+
+import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+
+/**
+ * From Inventory Tweaks ID checker function
+ */
+
+public class IDChecker {
+
+    @SubscribeEvent
+    public void IDCheckerOnTooltip(ItemTooltipEvent event) {
+        if (event.showAdvancedItemTooltips) {
+            event.toolTip
+                .add(1, EnumChatFormatting.GRAY + Item.itemRegistry.getNameForObject(event.itemStack.getItem()));
+        }
+    }
+
+}

src/main/java/com/nao7016/ClayiumAdditions/util/HammerEvent.java → src/main/java/com/nao7016/ClayiumAdditions/item/hammer/HammerEvent.java

@@ -1,10 +1,9 @@
-package com.nao7016.ClayiumAdditions.util;
+package com.nao7016.ClayiumAdditions.item.hammer;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.world.BlockEvent;
 
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
 import com.nao7016.ClayiumAdditions.recipe.CrushRecipes;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;

src/main/java/com/nao7016/ClayiumAdditions/util/MiningHammerEvent.java → src/main/java/com/nao7016/ClayiumAdditions/item/hammer/MiningHammerEvent.java

@@ -1,11 +1,10 @@
-package com.nao7016.ClayiumAdditions.util;
+package com.nao7016.ClayiumAdditions.item.hammer;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.event.world.BlockEvent;
 
 import com.nao7016.ClayiumAdditions.common.CABlocks;
-import com.nao7016.ClayiumAdditions.item.itemClayMiningHammer;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import mods.clayium.block.CBlocks;

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayHammer.java → src/main/java/com/nao7016/ClayiumAdditions/item/hammer/itemClayHammer.java

@@ -1,4 +1,4 @@
-package com.nao7016.ClayiumAdditions.item;
+package com.nao7016.ClayiumAdditions.item.hammer;
 
 import java.util.List;
 import java.util.Objects;

src/main/java/com/nao7016/ClayiumAdditions/item/itemClayMiningHammer.java → src/main/java/com/nao7016/ClayiumAdditions/item/hammer/itemClayMiningHammer.java

@@ -1,4 +1,4 @@
-package com.nao7016.ClayiumAdditions.item;
+package com.nao7016.ClayiumAdditions.item.hammer;
 
 import java.util.List;
 import java.util.Objects;

src/main/java/com/nao7016/ClayiumAdditions/item/storagebox/StorageRenderer.java

@@ -12,7 +12,7 @@
 import org.lwjgl.opengl.GL11;
 
 import com.nao7016.ClayiumAdditions.common.Config;
-import com.nao7016.ClayiumAdditions.util.StorageBoxUtil;
+import com.nao7016.ClayiumAdditions.util.UtilStorageBox;
 
 public class StorageRenderer extends RenderItem implements IItemRenderer {
 
@@ -38,7 +38,7 @@ public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
         if (type != ItemRenderType.INVENTORY || !(item.getItem() instanceof itemStorageBox)) return;
 
         ItemStack stored = itemStorageBox.getStoredItemStackAll(item);
-        String count = Config.cfgSBSIPrefix ? StorageBoxUtil.calcNumberPrefix(itemStorageBox.getStoredCount(item))
+        String count = Config.cfgSBSIPrefix ? UtilStorageBox.calcNumberPrefix(itemStorageBox.getStoredCount(item))
             : String.valueOf(itemStorageBox.getStoredCount(item));
         if (stored != null) {
             GL11.glPushMatrix();

src/main/java/com/nao7016/ClayiumAdditions/item/storagebox/itemStorageBox.java

@@ -1,7 +1,7 @@
 package com.nao7016.ClayiumAdditions.item.storagebox;
 
-import static com.nao7016.ClayiumAdditions.util.StorageBoxUtil.findPrivateValue;
-import static com.nao7016.ClayiumAdditions.util.StorageBoxUtil.setItemNBTData;
+import static com.nao7016.ClayiumAdditions.util.UtilStorageBox.findPrivateValue;
+import static com.nao7016.ClayiumAdditions.util.UtilStorageBox.setItemNBTData;
 
 import java.util.List;
 import java.util.Objects;
@@ -28,7 +28,7 @@
 
 import com.nao7016.ClayiumAdditions.CAModMain;
 import com.nao7016.ClayiumAdditions.common.CATabs;
-import com.nao7016.ClayiumAdditions.util.StorageBoxUtil;
+import com.nao7016.ClayiumAdditions.util.UtilStorageBox;
 
 import cpw.mods.fml.common.registry.GameData;
 import cpw.mods.fml.relauncher.Side;
@@ -254,7 +254,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool
         if (sItem == null) return;
         String storageItemName = "Name: " + sItem.getItemStackDisplayName(sItemStack);
         list.add(storageItemName);
-        StringBuilder builder = StorageBoxUtil.calcItemNumByUnit(stack, false);
+        StringBuilder builder = UtilStorageBox.calcItemNumByUnit(stack, false);
         builder.insert(0, "Unit: ");
         list.add(builder.toString());
         list.add("Items: " + getStoredCount(stack));

src/main/java/com/nao7016/ClayiumAdditions/plugin/InventoryBogoSorter.java

@@ -6,7 +6,7 @@
 
 import com.cleanroommc.bogosorter.BogoSortAPI;
 import com.cleanroommc.bogosorter.api.IPosSetter;
-import com.nao7016.ClayiumAdditions.util.StorageBoxUtil;
+import com.nao7016.ClayiumAdditions.util.UtilStorageBox;
 
 import mods.clayium.block.tile.InventoryMultiPage;
 import mods.clayium.block.tile.InventoryOffsetted;
@@ -20,10 +20,10 @@ public static void init() {
         BogoSortAPI.INSTANCE.addCompat(ContainerNormalInventory.class, ((container, builder) -> {
 
             // ContainerNormalInventory -> ContainerTemp.tileを取得
-            List<Object> l = StorageBoxUtil.findPrivateValue(ContainerTemp.class, container, IInventory.class);
+            List<Object> l = UtilStorageBox.findPrivateValue(ContainerTemp.class, container, IInventory.class);
             if (l.size() != 1 || !(l.get(0) instanceof InventoryMultiPage multiPage)) return;
             // InventoryOffsetted.inventoryを取得
-            List<Object> l2 = StorageBoxUtil.findPrivateValue(InventoryOffsetted.class, multiPage, IInventory.class);
+            List<Object> l2 = UtilStorageBox.findPrivateValue(InventoryOffsetted.class, multiPage, IInventory.class);
             if (l2.size() != 1 || !(l2.get(0) instanceof TileMetalChest)) return;
 
             if (container.drawInventoryName()) {

src/main/java/com/nao7016/ClayiumAdditions/plugin/nei/NEICrushHandler.java

@@ -4,7 +4,7 @@
 
 import net.minecraft.item.ItemStack;
 
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
+import com.nao7016.ClayiumAdditions.item.hammer.itemClayHammer;
 import com.nao7016.ClayiumAdditions.recipe.CrushRecipes;
 import com.nao7016.ClayiumAdditions.util.CrushList;
 

src/main/java/com/nao7016/ClayiumAdditions/recipe/CrushRecipesCraft.java

@@ -5,7 +5,7 @@
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.world.World;
 
-import com.nao7016.ClayiumAdditions.item.itemClayHammer;
+import com.nao7016.ClayiumAdditions.item.hammer.itemClayHammer;
 
 public class CrushRecipesCraft implements IRecipe {