From fd8609b7cc92b862382ff02a352843d6725ad9c7 Mon Sep 17 00:00:00 2001 From: kekzdealer Date: Sun, 17 May 2020 20:01:38 +0200 Subject: Disabling Item Proxy tech again --- src/main/java/common/Blocks.java | 2 +- .../common/blocks/Block_ItemProxyEndpoint.java | 4 -- src/main/java/items/Item_Configurator.java | 43 ---------------------- src/main/java/kekztech/KekzCore.java | 6 +-- 4 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 src/main/java/items/Item_Configurator.java (limited to 'src/main') diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java index cab14a6ca8..f6939ffd90 100644 --- a/src/main/java/common/Blocks.java +++ b/src/main/java/common/Blocks.java @@ -61,7 +61,7 @@ public class Blocks { registerBlocks_TFFT(); registerBlocks_Nuclear(); //registerBlocks_ItemServer(); - registerBlocks_ItemProxy(); + //registerBlocks_ItemProxy(); registerBlocks_Jars(); registerBlocks_LSC(); diff --git a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java index ec1bc6b827..00e0426250 100644 --- a/src/main/java/common/blocks/Block_ItemProxyEndpoint.java +++ b/src/main/java/common/blocks/Block_ItemProxyEndpoint.java @@ -1,18 +1,14 @@ package common.blocks; -import java.util.UUID; - import common.itemBlocks.IB_ItemProxyEndpoint; import common.tileentities.TE_ItemProxyEndpoint; import cpw.mods.fml.common.registry.GameRegistry; -import items.Item_Configurator; import kekztech.GuiHandler; import kekztech.KekzCore; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; diff --git a/src/main/java/items/Item_Configurator.java b/src/main/java/items/Item_Configurator.java deleted file mode 100644 index ed319eb37e..0000000000 --- a/src/main/java/items/Item_Configurator.java +++ /dev/null @@ -1,43 +0,0 @@ -package items; - -import java.util.List; - -import cpw.mods.fml.common.registry.GameRegistry; -import kekztech.KekzCore; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class Item_Configurator extends Item { - - private static final Item_Configurator instance = new Item_Configurator(); - - private Item_Configurator() { - // I am a singleton - } - - public static Item_Configurator getInstance() { - return instance; - } - - public void registerItem() { - super.setHasSubtypes(false); - final String unlocalizedName = "kekztech_configurator"; - super.setUnlocalizedName(unlocalizedName); - super.setCreativeTab(CreativeTabs.tabMisc); - super.setMaxStackSize(1); - super.setTextureName(KekzCore.MODID + ":" + "DiamondHeatPipe"); - GameRegistry.registerItem(getInstance(), unlocalizedName); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean b) { - list.add("Used to configure Item Proxy Networks"); - if(stack.hasTagCompound() && stack.getTagCompound().hasKey("config")) { - list.add("Channel: " + stack.getTagCompound().getString("config")); - } - } - -} diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java index 2a068a7eb4..d6956736ed 100644 --- a/src/main/java/kekztech/KekzCore.java +++ b/src/main/java/kekztech/KekzCore.java @@ -4,7 +4,6 @@ import common.Blocks; import common.Recipes; import common.Researches; import common.tileentities.*; -import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -12,12 +11,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import items.ErrorItem; -import items.Item_Configurator; import items.MetaItem_CraftingComponent; import items.MetaItem_ReactorComponent; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import render.ConduitRenderer; /** * My GT-Meta-IDs are: 13101 - 13500 @@ -59,7 +56,6 @@ public class KekzCore { ErrorItem.getInstance().registerItem(); MetaItem_ReactorComponent.getInstance().registerItem(); MetaItem_CraftingComponent.getInstance().registerItem(); - Item_Configurator.getInstance().registerItem(); Items.registerOreDictNames(); Blocks.preInit(); @@ -90,7 +86,7 @@ public class KekzCore { //is = new GTMTE_ItemServer(13105, "multimachine.itemserver", "Item Server"); lsc = new GTMTE_LapotronicSuperCapacitor(13106, "multimachine.supercapacitor", "Lapotronic Supercapacitor"); // Register renderer - RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance()); + //RenderingRegistry.registerBlockHandler(ConduitRenderer.getInstance()); } @Mod.EventHandler -- cgit