diff --git a/src/main/java/org/altadoon/gt6x/Gt6xMod.java b/src/main/java/org/altadoon/gt6x/Gt6xMod.java index 3700bad4..17cd58c9 100644 --- a/src/main/java/org/altadoon/gt6x/Gt6xMod.java +++ b/src/main/java/org/altadoon/gt6x/Gt6xMod.java @@ -1,8 +1,10 @@ package org.altadoon.gt6x; +import cpw.mods.fml.common.FMLCommonHandler; import gregapi.data.CS; import gregapi.data.MD; import org.altadoon.gt6x.common.*; +import org.altadoon.gt6x.common.items.ItemMaterialDisplay; import org.altadoon.gt6x.common.items.MultiItemBottlesX; import org.altadoon.gt6x.common.items.MultiItemsX; import org.altadoon.gt6x.common.items.Tools; @@ -121,6 +123,10 @@ public void onModInit2(cpw.mods.fml.common.event.FMLInitializationEvent event) { for (GT6XFeature feature : enabledFeatures) { feature.init(); } + + if (FMLCommonHandler.instance().getSide().isClient()) { + ItemMaterialDisplay.initClientNEI(); + } } @Override diff --git a/src/main/java/org/altadoon/gt6x/common/items/ItemMaterialDisplay.java b/src/main/java/org/altadoon/gt6x/common/items/ItemMaterialDisplay.java index 3e11049b..7d696e59 100644 --- a/src/main/java/org/altadoon/gt6x/common/items/ItemMaterialDisplay.java +++ b/src/main/java/org/altadoon/gt6x/common/items/ItemMaterialDisplay.java @@ -6,17 +6,18 @@ import codechicken.nei.guihook.IContainerInputHandler; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregapi.data.*; -import gregapi.gui.ContainerClient; import gregapi.item.IItemGT; import gregapi.oredict.OreDictMaterial; import gregapi.oredict.OreDictMaterialStack; import gregapi.util.OM; import gregapi.util.ST; import gregapi.util.UT; +import gregapi.gui.ContainerClient; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -94,7 +95,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool list.add(LH.Chat.BLINKING_RED + "CLIENTSIDE MATERIAL IS NULL!!!"); } - list.add(LH.Chat.BLUE + String.format("Content: %.3f Units of %s", (double)mat.mAmount / U, mat.mMaterial.getLocal())); + list.add(LH.Chat.BLUE + String.format("Content: %.3f Units of %s", (double) mat.mAmount / U, mat.mMaterial.getLocal())); if (mat.mMaterial.mTooltipChemical != null) { list.add(LH.Chat.YELLOW + mat.mMaterial.mTooltipChemical); @@ -105,7 +106,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool list.add(LH.Chat.WHITE + "State: " + ( temperature < mat.mMaterial.mMeltingPoint ? "solid" : temperature < mat.mMaterial.mBoilingPoint ? "liquid" : - temperature < mat.mMaterial.mPlasmaPoint ? "gas" : + temperature < mat.mMaterial.mPlasmaPoint ? "gas" : "plasma" )); } @@ -177,20 +178,26 @@ public String getItemStackDisplayName(ItemStack stack) { return mat.mMaterial.getLocal(); } - @Override public final Item setUnlocalizedName(String aName) {return this;} - @Override public final String getUnlocalizedName() {return name;} - @Override public ItemStack getContainerItem(ItemStack aStack) { - return null; - } - @Override public final boolean hasContainerItem(ItemStack aStack) { - return false; - } + @Override + public final Item setUnlocalizedName(String aName) {return this;} + + @Override + public final String getUnlocalizedName() {return name;} + + @Override + public ItemStack getContainerItem(ItemStack aStack){return null;} - static { + @Override + public final boolean hasContainerItem(ItemStack aStack) {return false;} + + @SideOnly(Side.CLIENT) + public static void initClientNEI() { + if (!Loader.isModLoaded("NotEnoughItems")) return; GuiContainerManager.addInputHandler(new ItemMaterialDisplayNeiHandler()); } - public static class ItemMaterialDisplayNeiHandler implements IContainerInputHandler { + @SideOnly(Side.CLIENT) + static class ItemMaterialDisplayNeiHandler implements IContainerInputHandler { protected boolean canHandle(GuiContainer gui) { return gui instanceof ContainerClient; } @@ -199,7 +206,6 @@ protected boolean showUsages(ItemStack stackover) { OreDictMaterial mat = ItemMaterialDisplay.UnDisplay(stackover).mMaterial; if (mat != MT.NULL) return GuiUsageRecipe.openRecipeGui("item", OP.dust.mat(mat, 1)); - return false; } @@ -207,18 +213,20 @@ protected boolean showRecipes(ItemStack stackover) { OreDictMaterial mat = ItemMaterialDisplay.UnDisplay(stackover).mMaterial; if (mat != MT.NULL) return GuiCraftingRecipe.openRecipeGui("item", OP.ingot.mat(mat, 1)); - return false; } @Override public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { ItemStack stackover = GuiContainerManager.getStackMouseOver(gui); - if (stackover == null) - return false; - if(keyCode == NEIClientConfig.getKeyBinding("gui.usage") || (keyCode == NEIClientConfig.getKeyBinding("gui.recipe") && NEIClientUtils.shiftKey())) + if (stackover == null) return false; + + if (keyCode == NEIClientConfig.getKeyBinding("gui.usage") + || (keyCode == NEIClientConfig.getKeyBinding("gui.recipe") + && NEIClientUtils.shiftKey())) return showRecipes(stackover); - if(keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) + + if (keyCode == NEIClientConfig.getKeyBinding("gui.recipe")) return showUsages(stackover); return false; @@ -226,26 +234,37 @@ public boolean keyTyped(GuiContainer gui, char keyChar, int keyCode) { @Override public boolean mouseClicked(GuiContainer gui, int mousex, int mousey, int button) { - if (!canHandle(gui)) - return false; + if (!canHandle(gui)) return false; + ItemStack stackover = GuiContainerManager.getStackMouseOver(gui); - if (stackover == null) - return false; - if (button == 0) - return showRecipes(stackover); - if (button == 1) - return showUsages(stackover); + if (stackover == null) return false; + + if (button == 0) return showRecipes(stackover); + if (button == 1) return showUsages(stackover); return false; } + @Override + public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) { + } + + @Override + public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) {return false;} - @Override public void onKeyTyped(GuiContainer gui, char keyChar, int keyID) {} - @Override public boolean lastKeyTyped(GuiContainer gui, char keyChar, int keyID) { return false; } - @Override public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {} - @Override public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {} - @Override public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) { return false; } - @Override public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {} - @Override public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {} + @Override + public void onMouseClicked(GuiContainer gui, int mousex, int mousey, int button) {} + + @Override + public void onMouseUp(GuiContainer gui, int mousex, int mousey, int button) {} + + @Override + public boolean mouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {return false;} + + @Override + public void onMouseScrolled(GuiContainer gui, int mousex, int mousey, int scrolled) {} + + @Override + public void onMouseDragged(GuiContainer gui, int mousex, int mousey, int button, long heldTime) {} } } diff --git a/src/main/java/org/altadoon/gt6x/features/ceramics/Ceramics.java b/src/main/java/org/altadoon/gt6x/features/ceramics/Ceramics.java index 51b841f9..fca8d6a6 100644 --- a/src/main/java/org/altadoon/gt6x/features/ceramics/Ceramics.java +++ b/src/main/java/org/altadoon/gt6x/features/ceramics/Ceramics.java @@ -126,11 +126,11 @@ private void addMTEs() { private void addRecipes() { // Fire clay RM.Mixer.addRecipe2(true, 16, 192, dust.mat(MT.Kaolinite, 2), dust.mat(MT.Graphite, 1), dust.mat(MTx.Fireclay, 3)); - for (FluidStack water : FL.waters(125, 100)) { - RM.Mixer.addRecipe2(true, 16, 192, IL.Clay_Ball_White.get(2), dust.mat(MT.Graphite, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(3)); - RM.Mixer.addRecipe1(true, 16, 64, dust.mat(MTx.RefractoryCeramic, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(1)); - RM.Bath.addRecipe1(true, 0, 64, dust.mat(MTx.Fireclay, 1), water, NF, ILx.Fireclay_Ball.get(1)); - } + for (FluidStack water : FL.waters(125, 100)) { + RM.Mixer.addRecipe2(true, 16, 192, IL.Clay_Ball_White.get(2), dust.mat(MT.Graphite, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(3)); + RM.Mixer.addRecipe1(true, 16, 64, dust.mat(MTx.RefractoryCeramic, 1), FL.mul(water, 5), NF, ILx.Fireclay_Ball.get(1)); + RM.Bath.addRecipe1(true, 0, 64, dust.mat(MTx.Fireclay, 1), water, NF, ILx.Fireclay_Ball.get(1));} + RM.Furnace.addRecipe1(true, 16, 64, dust.mat(MTx.Fireclay, 1), ingot.mat(MTx.Firebrick, 1)); // Magnesia-Carbon