From 8926a92fa3175a497d623a788b0b36f12d1369b4 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 24 Apr 2016 03:22:02 +1000 Subject: Refactor no. 3 I think that's enough until 1.1.x --- src/Java/miscutil/MiscUtils.java | 10 +- src/Java/miscutil/core/block/BasicBlock.java | 2 +- src/Java/miscutil/core/block/ModBlocks.java | 2 +- .../miscutil/core/block/antigrief/TowerDevice.java | 2 +- .../miscutil/core/block/fluids/BlocktestFluid.java | 2 +- .../miscutil/core/creative/AddToCreativeTab.java | 23 ++ .../core/creative/MiscUtilCreativeTabBlock.java | 18 ++ .../core/creative/MiscUtilCreativeTabMachines.java | 18 ++ .../core/creative/MiscUtilCreativeTabMisc.java | 18 ++ .../core/creative/MiscUtilCreativeTabTools.java | 18 ++ .../core/creativetabs/AddToCreativeTab.java | 23 -- .../creativetabs/MiscUtilCreativeTabBlock.java | 18 -- .../creativetabs/MiscUtilCreativeTabMachines.java | 18 -- .../core/creativetabs/MiscUtilCreativeTabMisc.java | 18 -- .../creativetabs/MiscUtilCreativeTabTools.java | 18 -- src/Java/miscutil/core/gui/GUI_Bat_Buf.java | 247 ------------------- src/Java/miscutil/core/gui/GUI_Battery_Buffer.java | 51 ---- src/Java/miscutil/core/gui/GUI_Tool_Builder.java | 5 - .../miscutil/core/gui/Gui_No_Inventory_Base.java | 51 ---- .../miscutil/core/handler/CraftingManager.java | 6 +- .../miscutil/core/handler/DebugRenderManager.java | 46 ---- src/Java/miscutil/core/handler/GuiHandler.java | 10 +- .../miscutil/core/handler/ResourceHandler.java | 83 ------- .../core/handler/UnbreakableBlockManager.java | 138 ----------- src/Java/miscutil/core/handler/XEventHandler.java | 65 ----- .../events/PickaxeBlockBreakEventHandler.java | 65 +++++ .../handler/events/UnbreakableBlockManager.java | 138 +++++++++++ src/Java/miscutil/core/item/ModItems.java | 4 +- src/Java/miscutil/core/lib/CORE.java | 2 +- .../core/util/debug/DEBUG_ScreenOverlay.java | 46 ++++ src/Java/miscutil/deprecated/ResourceHandler.java | 83 +++++++ .../gregtech/api/enums/AddExtraOreDict.java | 13 - .../gregtech/api/enums/ExtraOreDictNames.java | 18 -- .../gregtech/api/enums/GregtechOreDictNames.java | 13 + .../api/init/machines/GregtechEnergyBuffer.java | 26 +- .../implementations/GregtechMetaCasingBlocks.java | 82 ------- .../GregtechMetaCreativeEnergyBuffer.java | 261 -------------------- .../implementations/GregtechMetaEnergyBuffer.java | 1 - .../base/GregtechMetaSafeBlockBase.java | 2 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 268 +++++++++++++++++++++ .../common/blocks/GregtechMetaCasingBlocks.java | 82 +++++++ 41 files changed, 821 insertions(+), 1193 deletions(-) create mode 100644 src/Java/miscutil/core/creative/AddToCreativeTab.java create mode 100644 src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java create mode 100644 src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java create mode 100644 src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java create mode 100644 src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java delete mode 100644 src/Java/miscutil/core/creativetabs/AddToCreativeTab.java delete mode 100644 src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabBlock.java delete mode 100644 src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java delete mode 100644 src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMisc.java delete mode 100644 src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabTools.java delete mode 100644 src/Java/miscutil/core/gui/GUI_Bat_Buf.java delete mode 100644 src/Java/miscutil/core/gui/GUI_Battery_Buffer.java delete mode 100644 src/Java/miscutil/core/gui/GUI_Tool_Builder.java delete mode 100644 src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java delete mode 100644 src/Java/miscutil/core/handler/DebugRenderManager.java delete mode 100644 src/Java/miscutil/core/handler/ResourceHandler.java delete mode 100644 src/Java/miscutil/core/handler/UnbreakableBlockManager.java delete mode 100644 src/Java/miscutil/core/handler/XEventHandler.java create mode 100644 src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java create mode 100644 src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java create mode 100644 src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java create mode 100644 src/Java/miscutil/deprecated/ResourceHandler.java delete mode 100644 src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java delete mode 100644 src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java create mode 100644 src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java delete mode 100644 src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCasingBlocks.java delete mode 100644 src/Java/miscutil/gregtech/api/metatileentity/implementations/GregtechMetaCreativeEnergyBuffer.java create mode 100644 src/Java/miscutil/gregtech/api/metatileentity/implementations/creative/GregtechMetaCreativeEnergyBuffer.java create mode 100644 src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java (limited to 'src/Java') diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java index 42c2a75282..3ee9f1f2fd 100644 --- a/src/Java/miscutil/MiscUtils.java +++ b/src/Java/miscutil/MiscUtils.java @@ -5,13 +5,13 @@ import java.awt.event.ActionListener; import miscutil.core.commands.CommandMath; import miscutil.core.common.CommonProxy; -import miscutil.core.creativetabs.AddToCreativeTab; -import miscutil.core.handler.DebugRenderManager; -import miscutil.core.handler.XEventHandler; +import miscutil.core.creative.AddToCreativeTab; +import miscutil.core.handler.events.PickaxeBlockBreakEventHandler; import miscutil.core.lib.CORE; import miscutil.core.lib.LoadedMods; import miscutil.core.util.PlayerCache; import miscutil.core.util.Utils; +import miscutil.core.util.debug.DEBUG_ScreenOverlay; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -55,9 +55,9 @@ implements ActionListener proxy.init(event); proxy.registerOreDict(); MinecraftForge.EVENT_BUS.register(this); - MinecraftForge.EVENT_BUS.register(new XEventHandler()); + MinecraftForge.EVENT_BUS.register(new PickaxeBlockBreakEventHandler()); if (CORE.DEBUG){ - MinecraftForge.EVENT_BUS.register(new DebugRenderManager()); + MinecraftForge.EVENT_BUS.register(new DEBUG_ScreenOverlay()); } FMLCommonHandler.instance().bus().register(this); proxy.registerNetworkStuff(); diff --git a/src/Java/miscutil/core/block/BasicBlock.java b/src/Java/miscutil/core/block/BasicBlock.java index 31a92d47a5..061e66d9c5 100644 --- a/src/Java/miscutil/core/block/BasicBlock.java +++ b/src/Java/miscutil/core/block/BasicBlock.java @@ -1,6 +1,6 @@ package miscutil.core.block; -import miscutil.core.creativetabs.AddToCreativeTab; +import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java index 90cfbdca7d..7ddc3d07af 100644 --- a/src/Java/miscutil/core/block/ModBlocks.java +++ b/src/Java/miscutil/core/block/ModBlocks.java @@ -3,7 +3,7 @@ package miscutil.core.block; import miscutil.core.block.fluids.BlocktestFluid; import miscutil.core.lib.CORE; import miscutil.core.util.Utils; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCasingBlocks; +import miscutil.gregtech.common.blocks.GregtechMetaCasingBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraftforge.fluids.Fluid; diff --git a/src/Java/miscutil/core/block/antigrief/TowerDevice.java b/src/Java/miscutil/core/block/antigrief/TowerDevice.java index 7e9a3d78a9..c3b0ab69a8 100644 --- a/src/Java/miscutil/core/block/antigrief/TowerDevice.java +++ b/src/Java/miscutil/core/block/antigrief/TowerDevice.java @@ -5,7 +5,7 @@ import static miscutil.core.block.ModBlocks.blockGriefSaver; import java.util.List; import java.util.Random; -import miscutil.core.creativetabs.AddToCreativeTab; +import miscutil.core.creative.AddToCreativeTab; import miscutil.core.lib.CORE; import miscutil.core.tileentities.TileEntityReverter; import miscutil.core.util.Utils; diff --git a/src/Java/miscutil/core/block/fluids/BlocktestFluid.java b/src/Java/miscutil/core/block/fluids/BlocktestFluid.java index 07addf45a8..8676f21d81 100644 --- a/src/Java/miscutil/core/block/fluids/BlocktestFluid.java +++ b/src/Java/miscutil/core/block/fluids/BlocktestFluid.java @@ -1,6 +1,6 @@ package miscutil.core.block.fluids; -import miscutil.core.creativetabs.AddToCreativeTab; +import miscutil.core.creative.AddToCreativeTab; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; diff --git a/src/Java/miscutil/core/creative/AddToCreativeTab.java b/src/Java/miscutil/core/creative/AddToCreativeTab.java new file mode 100644 index 0000000000..5f73ca75c7 --- /dev/null +++ b/src/Java/miscutil/core/creative/AddToCreativeTab.java @@ -0,0 +1,23 @@ +package miscutil.core.creative; + +import miscutil.core.lib.CORE; +import net.minecraft.creativetab.CreativeTabs; + +public class AddToCreativeTab { + + public static CreativeTabs tabBlock; + public static CreativeTabs tabMisc; + public static CreativeTabs tabCombat; + public static CreativeTabs tabTools; + public static CreativeTabs tabMachines; + + public static void initialiseTabs(){ + tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); + tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); + //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); + tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); + if (CORE.DEBUG){ + tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); + } + } +} diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java new file mode 100644 index 0000000000..b1b330f93c --- /dev/null +++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabBlock.java @@ -0,0 +1,18 @@ +package miscutil.core.creative; + +import miscutil.core.block.ModBlocks; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class MiscUtilCreativeTabBlock extends CreativeTabs { + + public MiscUtilCreativeTabBlock(String lable) { + super(lable); + } + + @Override + public Item getTabIconItem() { + return Item.getItemFromBlock(ModBlocks.blockBloodSteel); + } + +} diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java new file mode 100644 index 0000000000..53d0e92a89 --- /dev/null +++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMachines.java @@ -0,0 +1,18 @@ +package miscutil.core.creative; + +import miscutil.core.block.ModBlocks; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class MiscUtilCreativeTabMachines extends CreativeTabs { + + public MiscUtilCreativeTabMachines(String lable) { + super(lable); + } + + @Override + public Item getTabIconItem() { + return Item.getItemFromBlock(ModBlocks.blockGriefSaver); + } + +} diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java new file mode 100644 index 0000000000..16de793be8 --- /dev/null +++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabMisc.java @@ -0,0 +1,18 @@ +package miscutil.core.creative; + +import miscutil.core.item.ModItems; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class MiscUtilCreativeTabMisc extends CreativeTabs { + + public MiscUtilCreativeTabMisc(String lable) { + super(lable); + } + + @Override + public Item getTabIconItem() { + return ModItems.itemIngotBloodSteel; + } + +} diff --git a/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java b/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java new file mode 100644 index 0000000000..eb0bf320cc --- /dev/null +++ b/src/Java/miscutil/core/creative/MiscUtilCreativeTabTools.java @@ -0,0 +1,18 @@ +package miscutil.core.creative; + +import miscutil.core.item.ModItems; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; + +public class MiscUtilCreativeTabTools extends CreativeTabs { + + public MiscUtilCreativeTabTools(String lable) { + super(lable); + } + + @Override + public Item getTabIconItem() { + return ModItems.itemStaballoyPickaxe; + } + +} diff --git a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java b/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java deleted file mode 100644 index 57ab17168d..0000000000 --- a/src/Java/miscutil/core/creativetabs/AddToCreativeTab.java +++ /dev/null @@ -1,23 +0,0 @@ -package miscutil.core.creativetabs; - -import miscutil.core.lib.CORE; -import net.minecraft.creativetab.CreativeTabs; - -public class AddToCreativeTab { - - public static CreativeTabs tabBlock; - public static CreativeTabs tabMisc; - public static CreativeTabs tabCombat; - public static CreativeTabs tabTools; - public static CreativeTabs tabMachines; - - public static void initialiseTabs(){ - tabBlock = new MiscUtilCreativeTabBlock("MiscUtilBlockTab"); - tabMisc = new MiscUtilCreativeTabMisc("MiscUtilMiscTab"); - //tabCombat = new MiscUtilCreativeTabCombat("MiscUtilCombatTab"); - tabTools = new MiscUtilCreativeTabTools("MiscUtilToolsTab"); - if (CORE.DEBUG){ - tabMachines = new MiscUtilCreativeTabMachines("MiscUtilMachineTab"); - } - } -} diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabBlock.java b/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabBlock.java deleted file mode 100644 index 2db845e04c..0000000000 --- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabBlock.java +++ /dev/null @@ -1,18 +0,0 @@ -package miscutil.core.creativetabs; - -import miscutil.core.block.ModBlocks; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabBlock extends CreativeTabs { - - public MiscUtilCreativeTabBlock(String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.blockBloodSteel); - } - -} diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java b/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java deleted file mode 100644 index 02a0069a38..0000000000 --- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMachines.java +++ /dev/null @@ -1,18 +0,0 @@ -package miscutil.core.creativetabs; - -import miscutil.core.block.ModBlocks; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabMachines extends CreativeTabs { - - public MiscUtilCreativeTabMachines(String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return Item.getItemFromBlock(ModBlocks.blockGriefSaver); - } - -} diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMisc.java b/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMisc.java deleted file mode 100644 index 2893146f93..0000000000 --- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabMisc.java +++ /dev/null @@ -1,18 +0,0 @@ -package miscutil.core.creativetabs; - -import miscutil.core.item.ModItems; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabMisc extends CreativeTabs { - - public MiscUtilCreativeTabMisc(String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return ModItems.itemIngotBloodSteel; - } - -} diff --git a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabTools.java b/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabTools.java deleted file mode 100644 index aa7cf227aa..0000000000 --- a/src/Java/miscutil/core/creativetabs/MiscUtilCreativeTabTools.java +++ /dev/null @@ -1,18 +0,0 @@ -package miscutil.core.creativetabs; - -import miscutil.core.item.ModItems; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; - -public class MiscUtilCreativeTabTools extends CreativeTabs { - - public MiscUtilCreativeTabTools(String lable) { - super(lable); - } - - @Override - public Item getTabIconItem() { - return ModItems.itemStaballoyPickaxe; - } - -} diff --git a/src/Java/miscutil/core/gui/GUI_Bat_Buf.java b/src/Java/miscutil/core/gui/GUI_Bat_Buf.java deleted file mode 100644 index db37520885..0000000000 --- a/src/Java/miscutil/core/gui/GUI_Bat_Buf.java +++ /dev/null @@ -1,247 +0,0 @@ -package miscutil.core.gui; - -import miscutil.core.lib.CORE; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.resources.I18n; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.input.Keyboard; -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - - - -public class GUI_Bat_Buf extends GuiScreen -{ - private final int bookImageHeight = 192; - private final int bookImageWidth = 192; - private int currPage = 0; - private static final int bookTotalPages = 4; - private static ResourceLocation[] bookPageTextures = - - new ResourceLocation[bookTotalPages]; - private static String[] stringPageText = new String[bookTotalPages]; - private GuiButton buttonDone; - private NextPageButton buttonNextPage; - private NextPageButton buttonPreviousPage; - - public GUI_Bat_Buf() - { - - bookPageTextures[0] = new ResourceLocation( - - CORE.MODID+":textures/gui/book_cover.png"); - - bookPageTextures[1] = new ResourceLocation( - - CORE.MODID+":textures/gui/book.png"); - - bookPageTextures[2] = new ResourceLocation( - - CORE.MODID+":textures/gui/book.png"); - - stringPageText[0] = ""; - - stringPageText[1] = "The Mysterious Stranger admired your family cow and asked if it was for sale.\n\nWhen you nodded, he offered to trade some Magic Beans, that (if planted in tilled dirt) would lead to more wealth than you could imagine."; - - stringPageText[2]="So you handed him your cow, and grabbed the Magic Beans.\n\nPleased with yourself, you hurried away, looking for tilled dirt in which to plant the Magic Beans.\n\nYou couldn't wait to see how proud your mother would be for"; - stringPageText[3]="being so shrewd! Untold wealth in return for an old, milkless cow; what a good deal you made!\n\nSo off you went, looking for a place to plant the Magic Beans with room to grow..."; - } - - /** - * Adds the buttons (and other controls) to the screen in question. - */ - @Override - public void initGui() - { - // DEBUG - System.out.println("GuiMysteriousStranger initGUI()"); - buttonList.clear(); - Keyboard.enableRepeatEvents(true); - - buttonDone = new GuiButton(0, width / 2 + 2, 4 + bookImageHeight, - - 98, 20, I18n.format("gui.done", new Object[0])); - - buttonList.add(buttonDone); - int offsetFromScreenLeft = (width - bookImageWidth) / 2; - buttonList.add(buttonNextPage = new NextPageButton(1, - - offsetFromScreenLeft + 120, 156, true)); - buttonList.add(buttonPreviousPage = new NextPageButton(2, - - offsetFromScreenLeft + 38, 156, false)); - } - - /** - * Called from the main game loop to update the screen. - */ - @Override - public void updateScreen() - { - buttonDone.visible = (currPage == bookTotalPages - 1); - buttonNextPage.visible = (currPage < bookTotalPages - 1); - buttonPreviousPage.visible = currPage > 0; - } - - /** - * Draws the screen and all the components in it. - */ - @Override - public void drawScreen(int parWidth, int parHeight, float p_73863_3_) - { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - if (currPage == 0) - { - mc.getTextureManager().bindTexture(bookPageTextures[0]); - } - else - { - mc.getTextureManager().bindTexture(bookPageTextures[1]); - } - int offsetFromScreenLeft = (width - bookImageWidth ) / 2; - drawTexturedModalRect(offsetFromScreenLeft, 2, 0, 0, bookImageWidth, - - bookImageHeight); - int widthOfString; - String stringPageIndicator = I18n.format("book.pageIndicator", - - new Object[] {Integer.valueOf(currPage + 1), bookTotalPages}); - - widthOfString = fontRendererObj.getStringWidth(stringPageIndicator); - fontRendererObj.drawString(stringPageIndicator, - - offsetFromScreenLeft - widthOfString + bookImageWidth - 44, - - 18, 0); - - fontRendererObj.drawSplitString(stringPageText[currPage], - - offsetFromScreenLeft + 36, 34, 116, 0); - - super.drawScreen(parWidth, parHeight, p_73863_3_); - - } - - /** - * Called when a mouse button is pressed and the mouse is moved around. - - * Parameters are : mouseX, mouseY, lastButtonClicked & - - * timeSinceMouseClick. - */ - @Override - protected void mouseClickMove(int parMouseX, int parMouseY, - - int parLastButtonClicked, long parTimeSinceMouseClick) - - { - - } - - @Override - protected void actionPerformed(GuiButton parButton) - { - if (parButton == buttonDone) - { - // You can send a packet to server here if you need server to do - - // something - mc.displayGuiScreen((GuiScreen)null); - } - else if (parButton == buttonNextPage) - { - if (currPage < bookTotalPages - 1) - { - ++currPage; - } - } - else if (parButton == buttonPreviousPage) - { - if (currPage > 0) - { - --currPage; - } - } - } - - /** - * Called when the screen is unloaded. Used to disable keyboard repeat - - * events - */ - @Override - public void onGuiClosed() - { - - } - - /** - * Returns true if this GUI should pause the game when it is displayed in - - * single-player - */ - @Override - public boolean doesGuiPauseGame() - { - return true; - } - - @SideOnly(Side.CLIENT) - static class NextPageButton extends GuiButton - { - private final boolean isNextButton; - - public NextPageButton(int parButtonId, int parPosX, int parPosY, - - boolean parIsNextButton) - { - super(parButtonId, parPosX, parPosY, 23, 13, ""); - isNextButton = parIsNextButton; - } - - /** - * Draws this button to the screen. - */ - @Override - public void drawButton(Minecraft mc, int parX, int parY) - { - if (visible) - { - boolean isButtonPressed = (parX >= xPosition - - && parY >= yPosition - - && parX < xPosition + width - - && parY < yPosition + height); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.getTextureManager().bindTexture(bookPageTextures[1]); - int textureX = 0; - int textureY = 192; - - if (isButtonPressed) - { - textureX += 23; - } - - if (!isNextButton) - { - textureY += 13; - } - - drawTexturedModalRect(xPosition, yPosition, - - textureX, textureY, - - 23, 13); - } - } - } -} - diff --git a/src/Java/miscutil/core/gui/GUI_Battery_Buffer.java b/src/Java/miscutil/core/gui/GUI_Battery_Buffer.java deleted file mode 100644 index c4bdf3666b..0000000000 --- a/src/Java/miscutil/core/gui/GUI_Battery_Buffer.java +++ /dev/null @@ -1,51 +0,0 @@ -package miscutil.core.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; - -public class GUI_Battery_Buffer extends GuiScreen { - - private GuiButton a; - private GuiButton b; - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } - - /* - @SuppressWarnings("unchecked") - public void initGui() { - this.buttonList.add(this.a = new GuiButton(0, this.width / 2 - 100, this.height / 2 - 24, "This is button a")); - this.buttonList.add(this.b = new GuiButton(1, this.width / 2 - 100, this.height / 2 + 4, "This is button b")); - }*/ - - /* @Override - protected void actionPerformed(GuiButton button) { - if (button == this.a) { - //Main.packetHandler.sendToServer(...); - this.mc.displayGuiScreen(null); - if (this.mc.currentScreen == null) - this.mc.setIngameFocus(); - } - if (button == this.b){ - //Main.packetHandler.sendToServer(...); - this.mc.displayGuiScreen(null); - if (this.mc.currentScreen == null) - this.mc.setIngameFocus(); - } - }*/ - /** - * if (worldIn.isRemote) { - playerIn.openGui(Main.instance, 0, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ); - } - */ - - -} \ No newline at end of file diff --git a/src/Java/miscutil/core/gui/GUI_Tool_Builder.java b/src/Java/miscutil/core/gui/GUI_Tool_Builder.java deleted file mode 100644 index e6a81a7d80..0000000000 --- a/src/Java/miscutil/core/gui/GUI_Tool_Builder.java +++ /dev/null @@ -1,5 +0,0 @@ -package miscutil.core.gui; - -public class GUI_Tool_Builder { - -} diff --git a/src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java b/src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java deleted file mode 100644 index 7a8f7d3e97..0000000000 --- a/src/Java/miscutil/core/gui/Gui_No_Inventory_Base.java +++ /dev/null @@ -1,51 +0,0 @@ -package miscutil.core.gui; - -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.gui.GuiScreen; - -public class Gui_No_Inventory_Base extends GuiScreen { - - private GuiButton a; - private GuiButton b; - - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); - } - - @Override - public boolean doesGuiPauseGame() { - return false; - } - - /* - @SuppressWarnings("unchecked") - public void initGui() { - this.buttonList.add(this.a = new GuiButton(0, this.width / 2 - 100, this.height / 2 - 24, "This is button a")); - this.buttonList.add(this.b = new GuiButton(1, this.width / 2 - 100, this.height / 2 + 4, "This is button b")); - }*/ - - /* @Override - protected void actionPerformed(GuiButton button) { - if (button == this.a) { - //Main.packetHandler.sendToServer(...); - this.mc.displayGuiScreen(null); - if (this.mc.currentScreen == null) - this.mc.setIngameFocus(); - } - if (button == this.b){ - //Main.packetHandler.sendToServer(...); - this.mc.displayGuiScreen(null); - if (this.mc.currentScreen == null) - this.mc.setIngameFocus(); - } - }*/ - /** - * if (worldIn.isRemote) { - playerIn.openGui(Main.instance, 0, worldIn, (int) playerIn.posX, (int) playerIn.posY, (int) playerIn.posZ); - } - */ - - -} \ No newline at end of file diff --git a/src/Java/miscutil/core/handler/CraftingManager.java b/src/Java/miscutil/core/handler/CraftingManager.java index 42b602440d..144b5a0726 100644 --- a/src/Java/miscutil/core/handler/CraftingManager.java +++ b/src/Java/miscutil/core/handler/CraftingManager.java @@ -8,14 +8,10 @@ public class CraftingManager { } public static void addCraftingRecipies() { - // Shaped Recipie - //GameRegistry.addRecipe(new ItemStack(ModItems.tutPickaxe, 1), new Object[] { "###", " S ", " S ", '#', ModItems.tutItem, 'S', Items.stick }); - //Shapeless Recipie - //GameRegistry.addShapelessRecipe(new ItemStack(ModItems.tutItem, 10), new Object[]{Blocks.dirt , Blocks.cobblestone}); } public static void addSmeltingRecipies() { - //GameRegistry.addSmelting(ModItems.tutItem, new ItemStack(Blocks.diamond_block, 5), 20.0F); + } } diff --git a/src/Java/miscutil/core/handler/DebugRenderManager.java b/src/Java/miscutil/core/handler/DebugRenderManager.java deleted file mode 100644 index 451d465e5e..0000000000 --- a/src/Java/miscutil/core/handler/DebugRenderManager.java +++ /dev/null @@ -1,46 +0,0 @@ -package miscutil.core.handler; - -import miscutil.core.item.tool.staballoy.StaballoyPickaxe; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.item.Item; -import net.minecraftforge.client.event.RenderGameOverlayEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class DebugRenderManager extends Gui { - - int width, height; - Minecraft mc = Minecraft.getMinecraft(); - - @SubscribeEvent - public void eventHandler(RenderGameOverlayEvent.Text event) - { - - //if (mc.thePlayer.getHeldItem().equals(ModItems.itemStaballoyPickaxe)){ - ScaledResolution res = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight); - FontRenderer fontRender = mc.fontRenderer; - this.width = res.getScaledWidth(); - this.height = res.getScaledHeight(); - Minecraft.getMinecraft().entityRenderer.setupOverlayRendering(); - String str = "Words"; - Item heldItem = null; - - try{heldItem = mc.thePlayer.getHeldItem().getItem(); - - if (heldItem != null){ - if (heldItem instanceof StaballoyPickaxe){ - - int dmg =((StaballoyPickaxe) heldItem).getDamage(((StaballoyPickaxe) heldItem).thisPickaxe); - - ((StaballoyPickaxe) heldItem).checkFacing(((StaballoyPickaxe) heldItem).localWorld); - str = "DAMAGE: "+ dmg +" | FACING: "+((StaballoyPickaxe) heldItem).FACING+" | FACING_HORIZONTAL: "+((StaballoyPickaxe) heldItem).FACING_HORIZONTAL+" | LOOKING DIRECTION: "+((StaballoyPickaxe) heldItem).lookingDirection; - - drawString(fontRender, str, (this.width - fontRender.getStringWidth(str)) / 2, this.height / 10, 0xFFAA00); - } - } - }catch(NullPointerException e){} - - } -} \ No newline at end of file diff --git a/src/Java/miscutil/core/handler/GuiHandler.java b/src/Java/miscutil/core/handler/GuiHandler.java index 9412ed8983..951b697aab 100644 --- a/src/Java/miscutil/core/handler/GuiHandler.java +++ b/src/Java/miscutil/core/handler/GuiHandler.java @@ -1,7 +1,5 @@ package miscutil.core.handler; -import miscutil.core.gui.GUI_Bat_Buf; -import miscutil.core.gui.GUI_Battery_Buffer; import miscutil.core.util.Utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; @@ -16,8 +14,8 @@ public class GuiHandler implements IGuiHandler { @Override //ContainerModTileEntity public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - if (ID == GUI1) - return new GUI_Battery_Buffer(); + if (ID == GUI1){} + //return new GUI_Battery_Buffer(); return null; } @@ -27,11 +25,11 @@ public class GuiHandler implements IGuiHandler { Utils.LOG_WARNING("getClientGuiElement Called by: "+player+", in world: "+player.dimension+" at x:"+x+", y:"+y+", z:"+z+"."); if (ID == GUI1){ Utils.LOG_WARNING("Opening Gui with Id: "+ID); - return new GUI_Battery_Buffer(); + //return new GUI_Battery_Buffer(); } else if (ID == GUI2){ Utils.LOG_WARNING("Opening Gui with Id: "+ID+" Energy Buffer"); - return new GUI_Bat_Buf(); + //return new GUI_Bat_Buf(); } return null; } diff --git a/src/Java/miscutil/core/handler/ResourceHandler.java b/src/Java/miscutil/core/handler/ResourceHandler.java deleted file mode 100644 index e8f81f4d02..0000000000 --- a/src/Java/miscutil/core/handler/ResourceHandler.java +++ /dev/null @@ -1,83 +0,0 @@ -package miscutil.core.handler; - -import org.apache.commons.lang3.Validate; - -public class ResourceHandler -{ - private final String resourceDomain; - private final String resourcePath; - private static final String __OBFID = "CL_00001082"; - - public ResourceHandler(String p_i1292_1_, String p_i1292_2_) - { - Validate.notNull(p_i1292_2_); - - if (p_i1292_1_ != null && p_i1292_1_.length() != 0) - { - this.resourceDomain = p_i1292_1_; - } - else - { - this.resourceDomain = "minecraft"; - } - - this.resourcePath = p_i1292_2_; - } - - public ResourceHandler(String p_i1293_1_) - { - String s1 = "miscUtils"; - String s2 = p_i1293_1_; - int i = p_i1293_1_.indexOf(58); - - if (i >= 0) - { - s2 = p_i1293_1_.substring(i + 1, p_i1293_1_.length()); - - if (i > 1) - { - s1 = p_i1293_1_.substring(0, i); - } - } - - this.resourceDomain = s1.toLowerCase(); - this.resourcePath = s2; - } - - public String getResourcePath() - { - return this.resourcePath; - } - - public String getResourceDomain() - { - return this.resourceDomain; - } - - public String toString() - { - return this.resourceDomain + ":" + this.resourcePath; - } - - public boolean equals(Object p_equals_1_) - { - if (this == p_equals_1_) - { - return true; - } - else if (!(p_equals_1_ instanceof ResourceHandler)) - { - return false; - } - else - { - ResourceHandler resourcelocation = (ResourceHandler)p_equals_1_; - return this.resourceDomain.equals(resourcelocation.resourceDomain) && this.resourcePath.equals(resourcelocation.resourcePath); - } - } - - public int hashCode() - { - return 31 * this.resourceDomain.hashCode() + this.resourcePath.hashCode(); - } -} \ No newline at end of file diff --git a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/UnbreakableBlockManager.java deleted file mode 100644 index b15f5bb561..0000000000 --- a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java +++ /dev/null @@ -1,138 +0,0 @@ -package miscutil.core.handler; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.BaseTileEntity; -import miscutil.core.util.Utils; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -public class UnbreakableBlockManager{ - - private static boolean hasRun = false; - - public final BaseMetaTileEntity getmTileEntity() { - return mTileEntity; - } - - - public final void setmTileEntity(BaseMetaTileEntity mTileEntity/*, EntityPlayer aPlayer*/) { - UnbreakableBlockManager.mTileEntity = mTileEntity; - if (!hasRun){ - hasRun = true; - makeIndestructible(/*aPlayer*/); - } - else { - Utils.LOG_WARNING("Why do you run twice?"); - } - } - - - //BaseMetaTileEntity - //GregtechMetaSafeBlock - private static BaseMetaTileEntity mTileEntity = null; - - - private void makeIndestructible(/*EntityPlayer aPlayer*/){ - - - Utils.LOG_WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible."); - int X = ((BaseMetaTileEntity)mTileEntity).xCoord; //(GregtechMetaSafeBlock) this.mTileEntity.getXCoord(); - int Y = ((BaseMetaTileEntity)mTileEntity).yCoord; - int Z = ((BaseMetaTileEntity)mTileEntity).zCoord; - Utils.LOG_WARNING("Grabbing TileEntity @ [x,y,z] |"+X+"|"+Y+"|"+Z+"|"); - - - - try{ - GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()); - TileEntity BaseMetaTileEntity = ((BaseMetaTileEntity)mTileEntity).getTileEntity(X, Y, Z); - //MetaSafeBlockBase. - World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld(); - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - TileEntity entity = BaseMetaTileEntity; - innerInvincible(MetaSafeBlock, entity, TE_WORLD, /*aPlayer,*/ X, Y, Z); - } - catch (NullPointerException e) { - System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "); - e.printStackTrace(); - } - } - - - private static void innerInvincible(GregtechMetaSafeBlock MetaSafeBlock, TileEntity entity, World TE_WORLD, /*EntityPlayer aPlayer,*/ int X, int Y, int Z){ - if (entity != null && !entity.equals(null)){ - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - Utils.LOG_WARNING("Grabbed TE: "+entity.toString()); - - - - - if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){ - IMetaTileEntity I = ((BaseMetaTileEntity)entity).getMetaTileEntity(); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - Utils.LOG_WARNING("I Details: "+I.getMetaName()+" | "+I.getTileEntityBaseType()+" | "+I.toString()); - - - - - - if (I instanceof GregtechMetaSafeBlock){ - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - - Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z); - Utils.LOG_WARNING("Block Details: "+ThisBlock.toString()); - - - if (((GregtechMetaSafeBlock)I).bUnbreakable){ - ThisBlock.setHardness(Integer.MAX_VALUE); - //ThisBlock.setResistance(18000000.0F); - ThisBlock.setResistance(-1); - ThisBlock.setBlockUnbreakable(); - Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=true"); - MetaSafeBlock.bUnbreakable = true; - //entity.markDirty(); - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - Utils.LOG_ERROR("New Indestructible Flag enabled."); - //GT_Utility.sendChatToPlayer(aPlayer, "Block is now unbreakable."); - } - - - - - else { - ThisBlock.setHardness(1); - ThisBlock.setResistance(1.0F); - Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=false"); - MetaSafeBlock.bUnbreakable = false; - //entity.markDirty(); - Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - Utils.LOG_ERROR("New Indestructible Flag disabled."); - //GT_Utility.sendChatToPlayer(aPlayer, "Block is now breakable."); - } - - //entity.markDirty(); - - Utils.LOG_WARNING("Block Hardness: "+ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z)); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - hasRun = false; - - } - else { - Utils.LOG_WARNING("I is not an instanceof MetaSafeBlockBase"); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - } - } else { - Utils.LOG_WARNING("TE is not an instanceof BaseTileEntity or may be a pipe."); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - } - }else { - Utils.LOG_WARNING("Did not grab a TE instance to make a block instance from."); - Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); - } - } - -} diff --git a/src/Java/miscutil/core/handler/XEventHandler.java b/src/Java/miscutil/core/handler/XEventHandler.java deleted file mode 100644 index 4aa3154cee..0000000000 --- a/src/Java/miscutil/core/handler/XEventHandler.java +++ /dev/null @@ -1,65 +0,0 @@ -package miscutil.core.handler; - -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.metatileentity.BaseMetaPipeEntity; -import gregtech.api.metatileentity.BaseMetaTileEntity; -import gregtech.api.metatileentity.BaseTileEntity; -import miscutil.core.util.Utils; -import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.world.BlockEvent.BreakEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class XEventHandler { - @SubscribeEvent - public void onBreakBlock(BreakEvent event) { - try{ - TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z); - if (entity != null && !entity.equals(null)){ - EntityPlayer playerInternal = event.getPlayer(); - Utils.LOG_WARNING(entity.getClass().getSimpleName()); - if (entity.getClass().getSimpleName().equals("")){ - - } - if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){ - IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity(); - Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z); - if (X instanceof GregtechMetaSafeBlockBase){ - - String ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID; - String accessorUUID = playerInternal.getUniqueID().toString(); - Utils.LOG_WARNING("Owner UUID: "+ownerUUID); - Utils.LOG_WARNING("Accessor UUID: "+accessorUUID); - - if (((GregtechMetaSafeBlockBase)X).bUnbreakable){ - if (accessorUUID.equals(ownerUUID)){ - Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed."); - event.setCanceled(false); - } - else { - event.setCanceled(true); - Utils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed."); - } - // - } - } - } - } - - } - catch (NullPointerException e) { - System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "+e.getCause()); - } - } - - - @SubscribeEvent - public void onPlayerInteraction(PlayerInteractEvent aEvent) { - if (aEvent.entityPlayer != null && aEvent.entityPlayer.worldObj != null && aEvent.action != null && aEvent.world.provider != null && !aEvent.entityPlayer.worldObj.isRemote && aEvent.action != null && aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { - Utils.LOG_ERROR("Test"); - } - } -} diff --git a/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java new file mode 100644 index 0000000000..9169249136 --- /dev/null +++ b/src/Java/miscutil/core/handler/events/PickaxeBlockBreakEventHandler.java @@ -0,0 +1,65 @@ +package miscutil.core.handler.events; + +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.metatileentity.BaseMetaPipeEntity; +import gregtech.api.metatileentity.BaseMetaTileEntity; +import gregtech.api.metatileentity.BaseTileEntity; +import miscutil.core.util.Utils; +import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import net.minecraftforge.event.world.BlockEvent.BreakEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class PickaxeBlockBreakEventHandler { + @SubscribeEvent + public void onBreakBlock(BreakEvent event) { + try{ + TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z); + if (entity != null && !entity.equals(null)){ + EntityPlayer playerInternal = event.getPlayer(); + Utils.LOG_WARNING(entity.getClass().getSimpleName()); + if (entity.getClass().getSimpleName().equals("")){ + + } + if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){ + IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity(); + Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z); + if (X instanceof GregtechMetaSafeBlockBase){ + + String ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID; + String accessorUUID = playerInternal.getUniqueID().toString(); + Utils.LOG_WARNING("Owner UUID: "+ownerUUID); + Utils.LOG_WARNING("Accessor UUID: "+accessorUUID); + + if (((GregtechMetaSafeBlockBase)X).bUnbreakable){ + if (accessorUUID.equals(ownerUUID)){ + Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed."); + event.setCanceled(false); + } + else { + event.setCanceled(true); + Utils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed."); + } + // + } + } + } + } + + } + catch (NullPointerException e) { + System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "+e.getCause()); + } + } + + + @SubscribeEvent + public void onPlayerInteraction(PlayerInteractEvent aEvent) { + if (aEvent.entityPlayer != null && aEvent.entityPlayer.worldObj != null && aEvent.action != null && aEvent.world.provider != null && !aEvent.entityPlayer.worldObj.isRemote && aEvent.action != null && aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) { + Utils.LOG_ERROR("Test"); + } + } +} diff --git a/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java new file mode 100644 index 0000000000..9ce59cb2c2 --- /dev/null +++ b/src/Java/miscutil/core/handler/events/UnbreakableBlockManager.java @@ -0,0 +1,138 @@ +package miscutil.core.handler.events; + +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.metatileentity.BaseMetaPipeEntity; +import gregtech.api.metatileentity.BaseMetaTileEntity; +import gregtech.api.metatileentity.BaseTileEntity; +import miscutil.core.util.Utils; +import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock; +import net.minecraft.block.Block; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class UnbreakableBlockManager{ + + private static boolean hasRun = false; + + public final BaseMetaTileEntity getmTileEntity() { + return mTileEntity; + } + + + public final void setmTileEntity(BaseMetaTileEntity mTileEntity/*, EntityPlayer aPlayer*/) { + UnbreakableBlockManager.mTileEntity = mTileEntity; + if (!hasRun){ + hasRun = true; + makeIndestructible(/*aPlayer*/); + } + else { + Utils.LOG_WARNING("Why do you run twice?"); + } + } + + + //BaseMetaTileEntity + //GregtechMetaSafeBlock + private static BaseMetaTileEntity mTileEntity = null; + + + private void makeIndestructible(/*EntityPlayer aPlayer*/){ + + + Utils.LOG_WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible."); + int X = ((BaseMetaTileEntity)mTileEntity).xCoord; //(GregtechMetaSafeBlock) this.mTileEntity.getXCoord(); + int Y = ((BaseMetaTileEntity)mTileEntity).yCoord; + int Z = ((BaseMetaTileEntity)mTileEntity).zCoord; + Utils.LOG_WARNING("Grabbing TileEntity @ [x,y,z] |"+X+"|"+Y+"|"+Z+"|"); + + + + try{ + GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()); + TileEntity BaseMetaTileEntity = ((BaseMetaTileEntity)mTileEntity).getTileEntity(X, Y, Z); + //MetaSafeBlockBase. + World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld(); + Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + TileEntity entity = BaseMetaTileEntity; + innerInvincible(MetaSafeBlock, entity, TE_WORLD, /*aPlayer,*/ X, Y, Z); + } + catch (NullPointerException e) { + System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "); + e.printStackTrace(); + } + } + + + private static void innerInvincible(GregtechMetaSafeBlock MetaSafeBlock, TileEntity entity, World TE_WORLD, /*EntityPlayer aPlayer,*/ int X, int Y, int Z){ + if (entity != null && !entity.equals(null)){ + Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING("Grabbed TE: "+entity.toString()); + + + + + if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){ + IMetaTileEntity I = ((BaseMetaTileEntity)entity).getMetaTileEntity(); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_WARNING("I Details: "+I.getMetaName()+" | "+I.getTileEntityBaseType()+" | "+I.toString()); + + + + + + if (I instanceof GregtechMetaSafeBlock){ + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + + Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z); + Utils.LOG_WARNING("Block Details: "+ThisBlock.toString()); + + + if (((GregtechMetaSafeBlock)I).bUnbreakable){ + ThisBlock.setHardness(Integer.MAX_VALUE); + //ThisBlock.setResistance(18000000.0F); + ThisBlock.setResistance(-1); + ThisBlock.setBlockUnbreakable(); + Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=true"); + MetaSafeBlock.bUnbreakable = true; + //entity.markDirty(); + Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_ERROR("New Indestructible Flag enabled."); + //GT_Utility.sendChatToPlayer(aPlayer, "Block is now unbreakable."); + } + + + + + else { + ThisBlock.setHardness(1); + ThisBlock.setResistance(1.0F); + Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=false"); + MetaSafeBlock.bUnbreakable = false; + //entity.markDirty(); + Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + Utils.LOG_ERROR("New Indestructible Flag disabled."); + //GT_Utility.sendChatToPlayer(aPlayer, "Block is now breakable."); + } + + //entity.markDirty(); + + Utils.LOG_WARNING("Block Hardness: "+ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z)); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + hasRun = false; + + } + else { + Utils.LOG_WARNING("I is not an instanceof MetaSafeBlockBase"); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + } + } else { + Utils.LOG_WARNING("TE is not an instanceof BaseTileEntity or may be a pipe."); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + } + }else { + Utils.LOG_WARNING("Did not grab a TE instance to make a block instance from."); + Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable); + } + } + +} diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java index 140ec76b95..d71c60f1e3 100644 --- a/src/Java/miscutil/core/item/ModItems.java +++ b/src/Java/miscutil/core/item/ModItems.java @@ -1,8 +1,8 @@ package miscutil.core.item; -import static miscutil.core.creativetabs.AddToCreativeTab.tabMisc; +import static miscutil.core.creative.AddToCreativeTab.tabMisc; import static miscutil.core.lib.CORE.LOAD_ALL_CONTENT; -import miscutil.core.creativetabs.AddToCreativeTab; +import miscutil.core.creative.AddToCreativeTab; import miscutil.core.item.effects.RarityUncommon; import miscutil.core.item.general.BufferCore; import miscutil.core.item.tool.misc.SandstoneHammer; diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index 2302337ef9..fcb6d245f9 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -2,7 +2,7 @@ package miscutil.core.lib; import java.util.Map; -import miscutil.core.creativetabs.AddToCreativeTab; +import miscutil.core.creative.AddToCreativeTab; public class CORE { diff --git a/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java b/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java new file mode 100644 index 0000000000..9752127d73 --- /dev/null +++ b/src/Java/miscutil/core/util/debug/DEBUG_ScreenOverlay.java @@ -0,0 +1,46 @@ +package miscutil.core.util.debug; + +import miscutil.core.item.tool.staballoy.StaballoyPickaxe; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.item.Item; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; + +public class DEBUG_ScreenOverlay extends Gui { + + int width, height; + Minecraft mc = Minecraft.getMinecraft(); + + @SubscribeEvent + public void eventHandler(RenderGameOverlayEvent.Text event) + { + + //if (mc.thePlayer.getHeldItem().equals(ModItems.itemStaballoyPickaxe)){ + ScaledResolution res = new ScaledResolution(this.mc, this.mc.displayWidth, this.mc.displayHeight); + FontRenderer fontRender = mc.fontRenderer; + this.width = res.getScaledWidth(); + this.height = res.getScaledHeight(); + Minecraft.getMinecraft().entityRenderer.setupOverlayRendering(); + String str = "Words"; + Item heldItem = null; + + try{heldItem = mc.thePlayer.getHeldItem().getItem(); + + if (heldItem != null){ + if (heldItem instanceof StaballoyPickaxe){ + + int dmg =((StaballoyPickaxe) heldItem).getDamage(((StaballoyPickaxe) heldItem).thisPickaxe); + + ((StaballoyPickaxe) heldItem).checkFacing(((StaballoyPickaxe) heldItem).localWorld); + str = "DAMAGE: "+ dmg +" | FACING: "+((StaballoyPickaxe) heldItem).FACING+" | FACING_HORIZONTAL: "+((StaballoyPickaxe) heldItem).FACING_HORIZONTAL+" | LOOKING DIRECTION: "+((StaballoyPickaxe) heldItem).lookingDirection; + + drawString(fontRender, str, (this.width - fontRender.getStringWidth(str)) / 2, this.height / 10, 0xFFAA00); + } + } + }catch(NullPointerException e){} + + } +} \ No newline at end of file diff --git a/src/Java/miscutil/deprecated/ResourceHandler.java b/src/Java/miscutil/deprecated/ResourceHandler.java new file mode 100644 index 0000000000..c9604bf923 --- /dev/null +++ b/src/Java/miscutil/deprecated/ResourceHandler.java @@ -0,0 +1,83 @@ +package miscutil.deprecated; + +import org.apache.commons.lang3.Validate; + +public class ResourceHandler +{ + private final String resourceDomain; + private final String resourcePath; + private static final String __OBFID = "CL_00001082"; + + public ResourceHandler(String p_i1292_1_, String p_i1292_2_) + { + Validate.notNull(p_i1292_2_); + + if (p_i1292_1_ != null && p_i1292_1_.length() != 0) + { + this.resourceDomain = p_i1292_1_; + } + else + { + this.resourceDomain = "minecraft"; + } + + this.resourcePath = p_i1292_2_; + } + + public ResourceHandler(String p_i1293_1_) + { + String s1 = "miscUtils"; + String s2 = p_i1293_1_; + int i = p_i1293_1_.indexOf(58); + + if (i >= 0) + { + s2 = p_i1293_1_.substring(i + 1, p_i1293_1_.length()); + + if (i > 1) + { + s1 = p_i1293_1_.substring(0, i); + } + } + + this.resourceDomain = s1.toLowerCase(); + this.resourcePath = s2; + } + + public String getResourcePath() + { + return this.resourcePath; + } + + public String getResourceDomain() + { + return this.resourceDomain; + } + + public String toString() + { + return this.resourceDomain + ":" + this.resourcePath; + } + + public boolean equals(Object p_equals_1_) + { + if (this == p_equals_1_) + { + return true; + } + else if (!(p_equals_1_ instanceof ResourceHandler)) + { + return false; + } + else + { + ResourceHandler resourcelocation = (ResourceHandler)p_equals_1_; + return this.resourceDomain.equals(resourcelocation.resourceDomain) && this.resourcePath.equals(resourcelocation.resourcePath); + } + } + + public int hashCode() + { + return 31 * this.resourceDomain.hashCode() + this.resourcePath.hashCode(); + } +} \ No newline at end of file diff --git a/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java b/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java deleted file mode 100644 index dff0483470..0000000000 --- a/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java +++ /dev/null @@ -1,13 +0,0 @@ -package miscutil.gregtech.api.enums; - -import gregtech.loaders.preload.GT_Loader_OreDictionary; - -public class AddExtraOreDict extends GT_Loader_OreDictionary { - - @Override - public void run() - { - //GT_OreDictUnificator.registerOre(ExtraOreDictNames.buffer_core, new ItemStack(GregtechEnergyBuffer.itemBufferCore)); - } - -} diff --git a/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java b/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java deleted file mode 100644 index 8ca492c9dd..0000000000 --- a/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java +++ /dev/null @@ -1,18 +0,0 @@ -package miscutil.gregtech.api.enums; - -/** - * - * - * @author Jordan - *Adds in extra names for items (No idea yet why anyone does this in such a fashion..) - */ -public enum ExtraOreDictNames { - buffer_core, itemGregConduit; - -public String unlocalisedName; - -private void ModObject() { - unlocalisedName = name(); -} - -} \ No newline at end of file diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java b/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java new file mode 100644 index 0000000000..56079d38c1 --- /dev/null +++ b/src/Java/miscutil/gregtech/api/enums/GregtechOreDictNames.java @@ -0,0 +1,13 @@ +package miscutil.gregtech.api.enums; + + +public enum GregtechOreDictNames { + buffer_core, itemGregConduit; + + public String unlocalisedName; + + private void ModObject() { + unlocalisedName = name(); + } + +} \ No newline at end of file diff --git a/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java index c54e9f9d76..46b7fd8a53 100644 --- a/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java +++ b/src/Java/miscutil/gregtech/api/init/machines/GregtechEnergyBuffer.java @@ -5,10 +5,10 @@ import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import miscutil.core.util.Utils; -import miscutil.gregtech.api.enums.ExtraOreDictNames; +import miscutil.gregtech.api.enums.GregtechOreDictNames; import miscutil.gregtech.api.enums.GregtechItemList; -import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCreativeEnergyBuffer; import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaEnergyBuffer; +import miscutil.gregtech.api.metatileentity.implementations.creative.GregtechMetaCreativeEnergyBuffer; public class GregtechEnergyBuffer { @@ -55,16 +55,16 @@ public class GregtechEnergyBuffer "512V Creative Energy Buffer", 3, "", 0) .getStackForm(1L)); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ULV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Lead), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tin), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.AnyCopper), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_HV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_HV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Gold), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_EV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_EV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Aluminium), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_IV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_IV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Tungsten), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_LuV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_LuV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ZPM.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_ZPM, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_UV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_UV, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Osmium), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); - GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_MAX.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFERED, new Object[] { "WTW", "WMW", Character.valueOf('M'), ItemList.Hull_MAX, Character.valueOf('W'), OrePrefixes.wireGt08.get(Materials.Superconductor), Character.valueOf('T'), ExtraOreDictNames.buffer_core }); + GT_ModHandler.addCraftingRecipe(GregtechItemList.Energy_Buffer_1by1_ULV.get(1L, new Object[0]), GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE | GT_ModHandler.RecipeBits.BUFFER