diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 2c770e0..0000000 --- a/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -# eclipse -bin -*.launch -.settings -.metadata -.classpath -.project - -# idea -out -*.ipr -*.iws -*.iml -.idea - -# gradle -build -.gradle - -# other -eclipse -run diff --git a/build.gradle b/build.gradle index 86df391..9b1f161 100644 --- a/build.gradle +++ b/build.gradle @@ -1,28 +1,44 @@ - -// For those who want the bleeding edge buildscript { repositories { - jcenter() + mavenCentral() maven { name = "forge" url = "http://files.minecraftforge.net/maven" } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' } } -apply plugin: 'net.minecraftforge.gradle.forge' -/* -// for people who want stable - not yet functional for MC 1.8.8 - we require the forgegradle 2.1 snapshot -plugins { - id "net.minecraftforge.gradle.forge" version "2.0.2" -} -*/ -version = "1.1.0" -group= "pers.towdium.justEnoughCalulation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +apply plugin: 'forge' + +version = "1.7.10-0.1.0" +group= "pers.towdium.justEnoughCalculation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "je_calculation" + +minecraft { + version = "1.7.10-10.13.4.1558-1.7.10" + runDir = "eclipse" +} + +jar { + manifest { + attributes 'FMLAT': 'accessTransformer.cfg' + } +} + +repositories { + maven { + name 'CB Repo' + url "http://chickenbones.net/maven/" + } +} + sourceCompatibility = 1.7 targetCompatibility = 1.7 @@ -30,26 +46,6 @@ tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } -repositories { - maven { - url "http://dvs1.progwml6.com/files/maven" - } -} - -minecraft { - version = "1.8.9-11.15.1.1722" - runDir = "run" - useDepAts = true - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not allways work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "stable_20" - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. -} - dependencies { // you may put jars on which you depend on in ./libs // or you may define them like so.. @@ -60,19 +56,14 @@ dependencies { //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - // for more info... // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html // http://www.gradle.org/docs/current/userguide/dependency_management.html + compile "codechicken:NotEnoughItems:1.7.10-1.0.3.74:dev" + compile "codechicken:CodeChickenLib:1.7.10-1.1.1.99:dev" + compile "codechicken:CodeChickenCore:1.7.10-1.0.4.29:dev" + - deobfCompile "mezz.jei:jei_1.8.9:2.28.2.166" } processResources diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..b761216 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9397848..678d9d8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 14 12:28:28 PDT 2015 +#Wed Jul 02 15:54:47 CDT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java index a2c6bf7..2197b7d 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java @@ -1,24 +1,27 @@ package pers.towdium.justEnoughCalculation; -import net.minecraft.client.Minecraft; -import net.minecraft.client.resources.model.ModelResourceLocation; +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; +import codechicken.nei.recipe.DefaultOverlayHandler; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import net.minecraft.client.gui.Gui; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.SidedProxy; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -import net.minecraftforge.fml.common.registry.GameRegistry; -import net.minecraftforge.fml.relauncher.Side; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import pers.towdium.justEnoughCalculation.gui.commom.recipe.GuiRecipe; +import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; import pers.towdium.justEnoughCalculation.item.ItemCalculator; import pers.towdium.justEnoughCalculation.network.IProxy; import pers.towdium.justEnoughCalculation.network.packets.PacketCalculatorUpdate; @@ -31,10 +34,9 @@ import java.io.File; * @author Towdium */ -@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION, - dependencies = "required-after:JEI@[1.8.9-2.28.2.166,)") -public class JustEnoughCalculation { - public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator"); +@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION) +public class JustEnoughCalculation{ + public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator").setTextureName(Reference.MODID + ":" + "itemCalculator"); public static SimpleNetworkWrapper networkWrapper; public static Logger log = LogManager.getLogger(Reference.MODID); @@ -47,7 +49,7 @@ public class JustEnoughCalculation { public static class Reference { public static final String MODID = "je_calculation"; public static final String MODNAME = "Just Enough Calculation"; - public static final String VERSION = "1.1.0"; + public static final String VERSION = "0.1.0"; } @Mod.EventHandler @@ -63,15 +65,18 @@ public class JustEnoughCalculation { @Mod.EventHandler public static void init(FMLInitializationEvent event){ - if(event.getSide().isClient()){ + /*if(event.getSide().isClient()){ Minecraft.getMinecraft().getRenderItem().getItemModelMesher(). register(itemCalculator, 0, new ModelResourceLocation(Reference.MODID + ":" + itemCalculator.getUnlocalizedName().substring(5), "inventory")); - } - GameRegistry.addRecipe(new ItemStack(itemCalculator), "SIS", "SRS", "SRS", 'S', new ItemStack(Blocks.stone, 1, 0), 'I', new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeDamage()), 'R', Items.redstone); + }*/ + GameRegistry.addRecipe(new ItemStack(itemCalculator), "SIS", "SRS", "SRS", 'S', new ItemStack(Blocks.stone, 1, 0), 'I', new ItemStack(Items.dye, 1, 0), 'R', Items.redstone); proxy.init(); + + //DefaultOverlayHandler } public static class JECConfig{ + public static boolean initialized = false; public static Configuration config; public enum EnumItems { EnableInventoryCheck, @@ -134,7 +139,7 @@ public class JustEnoughCalculation { case ListRecipeBlackList: return new String[0]; case ListRecipeCategory: - return new String[]{ "minecraft.crafting", "minecraft.smelting"}; + return new String[]{"crafting", "smelting"}; } return JECConfig.empty; } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java index fbdc3df..c7999fa 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/Calculator.java @@ -17,11 +17,15 @@ public class Calculator { List costRecords; public Calculator(ItemStack itemStack, long amount){ + int count = 0; costRecords = new ArrayList<>(); costRecords.add(new CostRecord(new ItemRecord(itemStack, amount, false))); List cancellableItems = costRecords.get(0).getCancellableItems(); LOOP2: while(cancellableItems.size() != 0){ + if (count > 100) { + return; + } // all the items possible tp cancel for(ItemRecord itemRecord : cancellableItems){ // all the recipes for one item @@ -33,6 +37,7 @@ public class Calculator { continue LOOP1; } costRecords.add(record); + count++; cancellableItems = record.getCancellableItems(); continue LOOP2; } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java index 601b593..b18e1e0 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/CostRecord.java @@ -173,33 +173,57 @@ public class CostRecord{ @Override public boolean equals(Object obj) { if (obj instanceof CostRecord) { + LOOP: for (ItemRecord itemRecordIn : output) { for (ItemRecord itemRecordExt : ((CostRecord) obj).output) { - if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { - return false; + if(itemRecordExt.isSameType(itemRecordIn)){ + if(itemRecordExt.amount != itemRecordIn.amount){ + return false; + }else { + continue LOOP; + } } } + return false; } + LOOP: for (ItemRecord itemRecordIn : input) { for (ItemRecord itemRecordExt : ((CostRecord) obj).input) { - if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { - return false; + if(itemRecordExt.isSameType(itemRecordIn)){ + if(itemRecordExt.amount != itemRecordIn.amount){ + return false; + }else { + continue LOOP; + } } } + return false; } + LOOP: for (ItemRecord itemRecordIn : ((CostRecord) obj).output) { for (ItemRecord itemRecordExt : output) { - if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { - return false; + if(itemRecordExt.isSameType(itemRecordIn)){ + if(itemRecordExt.amount != itemRecordIn.amount){ + return false; + }else { + continue LOOP; + } } } + return false; } + LOOP: for (ItemRecord itemRecordIn : ((CostRecord) obj).input) { for (ItemRecord itemRecordExt : input) { - if (itemRecordExt.isSameType(itemRecordIn) && itemRecordExt.amount != itemRecordIn.amount) { - return false; + if(itemRecordExt.isSameType(itemRecordIn)){ + if(itemRecordExt.amount != itemRecordIn.amount){ + return false; + }else { + continue LOOP; + } } } + return false; } return true; } else { diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java index 40462a0..2995906 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemRecord.java @@ -19,7 +19,7 @@ public class ItemRecord{ */ public ItemRecord(ItemStack itemStack, long multiplier){ item = itemStack.getItem(); - meta = itemStack.getMetadata(); + meta = itemStack.getItemDamage(); amount = ItemStackWrapper.getUnifiedAmount(itemStack) * multiplier; approx = itemStack.hasTagCompound() && itemStack.getTagCompound().getBoolean("percentage"); } @@ -33,7 +33,7 @@ public class ItemRecord{ */ public ItemRecord(ItemStack itemStack, long amount, boolean approx){ item = itemStack.getItem(); - meta = itemStack.getMetadata(); + meta = itemStack.getItemDamage(); this.amount = amount; this.approx = approx; } @@ -52,7 +52,7 @@ public class ItemRecord{ protected int getOutputAmount(Recipe recipe){ for(int i = 0; i<4; i++){ - if(recipe.output[i].getItem() == item && recipe.output[i].getMetadata() == meta){ + if(recipe.output[i].getItem() == item && recipe.output[i].getItemDamage() == meta){ return ItemStackWrapper.getUnifiedAmount(recipe.output[i]); } } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java index 19bf078..0d24578 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/ItemStackWrapper.java @@ -2,6 +2,7 @@ package pers.towdium.justEnoughCalculation.core; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; /** * @author Towdium @@ -9,7 +10,7 @@ import net.minecraft.nbt.NBTTagCompound; public class ItemStackWrapper { public static boolean isTypeEqual(ItemStack one, ItemStack two){ - return one != null && two != null && one.getItem() == two.getItem() && one.getMetadata() == two.getMetadata(); + return one != null && two != null && one.getItem() == two.getItem() && one.getItemDamage() == two.getItemDamage(); } public static boolean isStackEqual(ItemStack one, ItemStack two){ @@ -17,7 +18,7 @@ public class ItemStackWrapper { } public static int getUnifiedAmount(ItemStack itemStack){ - if(itemStack.hasTagCompound()){ + if(itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey("percentage")){ return itemStack.getTagCompound().getInteger("percentage"); }else { return itemStack.stackSize*100; @@ -30,7 +31,7 @@ public class ItemStackWrapper { if(itemStack.getTagCompound().getBoolean("mark")){ return ""; } - long l = itemStack.getTagCompound().getLong("amount"); + long l = itemStack.getTagCompound().hasKey("amount") ? itemStack.getTagCompound().getLong("amount") : -1; if(l == 0 && itemStack.stackSize == 0){ return ""; } @@ -38,6 +39,9 @@ public class ItemStackWrapper { if(i != 0){ return i + "%"; }else{ + if(l==-1){ + return String.valueOf(itemStack.stackSize); + } return getSimplifiedString((l+99)/100, itemStack.getTagCompound().getBoolean("approx")); } }else { @@ -62,6 +66,7 @@ public class ItemStackWrapper { itemStack.stackSize = 1; } itemStack.setTagCompound(null); + ItemStackWrapper.NBT.setBool(itemStack, JustEnoughCalculation.Reference.MODID, true); return itemStack; } @@ -188,6 +193,16 @@ public class ItemStackWrapper { dest.getTagCompound().setInteger(key, value); } + public static void setBool(ItemStack dest, String key, boolean value){ + initNBT(dest); + dest.getTagCompound().setBoolean(key, value); + } + + public static void setLong(ItemStack dest, String key, long value){ + initNBT(dest); + dest.getTagCompound().setLong(key, value); + } + public static String getString(ItemStack dest, String key){ if(dest.getTagCompound() != null){ return dest.getTagCompound().getString(key); @@ -195,6 +210,10 @@ public class ItemStackWrapper { else return ""; } + public static boolean getBool(ItemStack dest, String key) { + return dest.getTagCompound() != null && dest.getTagCompound().getBoolean(key); + } + public static int getInt(ItemStack dest, String key){ if(dest.getTagCompound() != null){ return dest.getTagCompound().getInteger(key); @@ -216,7 +235,7 @@ public class ItemStackWrapper { return false; }else { if(doChange){ - if(itemStack.hasTagCompound()){ + if(itemStack.hasTagCompound() && itemStack.getTagCompound().hasKey("percentage")){ itemStack.getTagCompound().setInteger("percentage", itemStack.getTagCompound().getInteger("percentage")+1); }else { itemStack.stackSize += 1; @@ -231,7 +250,7 @@ public class ItemStackWrapper { return false; }else { if(doChange){ - if(itemStack.hasTagCompound()){ + if(itemStack.hasTagCompound()&& itemStack.getTagCompound().hasKey("percentage")){ int i = itemStack.getTagCompound().getInteger("percentage"); itemStack.getTagCompound().setInteger("percentage", i == 1 ? 10 : i+10); }else { @@ -253,7 +272,7 @@ public class ItemStackWrapper { return false; }else { if(doChange){ - if(itemStack.hasTagCompound()){ + if(itemStack.hasTagCompound()&& itemStack.getTagCompound().hasKey("percentage")){ int i = itemStack.getTagCompound().getInteger("percentage"); if(i == 1 || i == 0){ itemStack.stackSize = 0; @@ -273,7 +292,7 @@ public class ItemStackWrapper { return false; }else { if(doChange){ - if(itemStack.hasTagCompound()){ + if(itemStack.hasTagCompound()&& itemStack.getTagCompound().hasKey("percentage")){ int i = itemStack.getTagCompound().getInteger("percentage"); if(i == 0 || i == 1){ itemStack.stackSize = 0; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java b/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java index ceff79c..ea21aa7 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/core/Recipe.java @@ -1,10 +1,10 @@ package pers.towdium.justEnoughCalculation.core; import com.google.common.collect.ImmutableList; +import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.ByteBufUtils; /** * @author Towdium @@ -62,6 +62,11 @@ public class Recipe { public int getOutputIndex(ItemStack itemStack){ for(int i = 0; i<4; i++){ if(ItemStackWrapper.isTypeEqual(output[i], itemStack)){ + for(ItemStack buffer : input){ + if(ItemStackWrapper.isTypeEqual(buffer, output[i]) && ItemStackWrapper.getUnifiedAmount(output[i]) idents = new ArrayList<>(); + LOOP: + for(ICraftingHandler handler : GuiCraftingRecipe.craftinghandlers){ + if(handler instanceof TemplateRecipeHandler){ + if(((TemplateRecipeHandler) handler).getOverlayIdentifier() == null){ + continue; + } + for (String id : idents){ + if(((TemplateRecipeHandler) handler).getOverlayIdentifier().equals(id) ){ + continue LOOP; + } + } + idents.add(((TemplateRecipeHandler) handler).getOverlayIdentifier()); + } + } + String[] strings = new String[idents.size()]; + for(int i=0; i= button.xPosition + button.getButtonWidth() - 10 && mouseX <= button.xPosition + button.getButtonWidth() && mouseY >= button.yPosition && mouseY <= button.yPosition + 10; @@ -147,14 +159,16 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation /** * Render anything special onto all buttons that have tooltips assigned to them. */ - protected void RenderTooltipButtonEffect() + private void RenderTooltipButtonEffect() { - for (GuiButton button : buttonList) { + for (Object buttonObj : buttonList) { + GuiButton button = ((GuiButton) buttonObj); if (GetButtonTooltip(button.id) != null) { - boolean flag = mc.fontRendererObj.getUnicodeFlag(); - mc.fontRendererObj.setUnicodeFlag(true); - mc.fontRendererObj.drawStringWithShadow("?", button.xPosition + button.getButtonWidth() - 7, button.yPosition + 1, 14737632); - mc.fontRendererObj.setUnicodeFlag(flag); + + boolean flag = mc.fontRenderer.getUnicodeFlag(); + mc.fontRenderer.setUnicodeFlag(true); + mc.fontRenderer.drawStringWithShadow("?", button.xPosition + button.getButtonWidth() - 7, button.yPosition + 1, 14737632); + mc.fontRenderer.setUnicodeFlag(flag); } } } @@ -162,18 +176,18 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation /** * Render anything special onto buttons that have tooltips assigned to them when they are mousevered. */ - protected void RenderTooltipButtonMouseoverEffect(GuiButton button) + private void RenderTooltipButtonMouseoverEffect(GuiButton button) { - boolean flag = mc.fontRendererObj.getUnicodeFlag(); - mc.fontRendererObj.setUnicodeFlag(true); - mc.fontRendererObj.drawStringWithShadow(FontCodes.AQUA + "?", button.xPosition+button.getButtonWidth()-7, button.yPosition+1, 14737632); - mc.fontRendererObj.setUnicodeFlag(flag); + boolean flag = mc.fontRenderer.getUnicodeFlag(); + mc.fontRenderer.setUnicodeFlag(true); + mc.fontRenderer.drawStringWithShadow(FontCodes.AQUA + "?", button.xPosition+button.getButtonWidth()-7, button.yPosition+1, 14737632); + mc.fontRenderer.setUnicodeFlag(flag); } /** * Renders a tooltip at (x,y). */ - protected void RenderTooltip(int x, int y, String tooltip) + private void RenderTooltip(int x, int y, String tooltip) { String[] tooltipArray = ParseTooltipArrayFromString(tooltip); this.drawHoveringText(ImmutableList.copyOf(tooltipArray), x, y, fontRendererObj); @@ -184,11 +198,11 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation * @param s Ex: "Hello,_nI am your _ltooltip_r and you love me." * @return An array of Strings such that each String width does not exceed tooltipMaxWidth */ - protected String[] ParseTooltipArrayFromString(String s) + private String[] ParseTooltipArrayFromString(String s) { s = DecodeStringCodes(s); String[] tooltipSections = s.split(tooltipNewlineDelimeter); - ArrayList tooltipArrayList = new ArrayList<>(); + ArrayList tooltipArrayList = new ArrayList(); for(String section : tooltipSections) { @@ -196,7 +210,7 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation String[] tooltipWords = section.split(" "); for (String tooltipWord : tooltipWords) { - int lineWidthWithNextWord = mc.fontRendererObj.getStringWidth(tooltip + tooltipWord); + int lineWidthWithNextWord = mc.fontRenderer.getStringWidth(tooltip + tooltipWord); if (lineWidthWithNextWord > tooltipMaxWidth) { tooltipArrayList.add(tooltip.trim()); tooltip = tooltipWord + " "; @@ -253,7 +267,7 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation int longestWidth = 0; for(String s : tooltipArray) { - int width = mc.fontRendererObj.getStringWidth(s); + int width = mc.fontRenderer.getStringWidth(s); if(width > longestWidth) longestWidth = width; } @@ -265,7 +279,7 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation */ private int GetTooltipHeight(String[] tooltipArray) { - int tooltipHeight = mc.fontRendererObj.FONT_HEIGHT - 2; + int tooltipHeight = mc.fontRenderer.FONT_HEIGHT - 2; if (tooltipArray.length > 1) { tooltipHeight += (tooltipArray.length - 1) * LINE_HEIGHT; @@ -273,6 +287,32 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation return tooltipHeight; } + @Override + public VisiblityData modifyVisiblity(GuiContainer guiContainer, VisiblityData visiblityData) { + return null; + } + + @Override + public Iterable getItemSpawnSlots(GuiContainer guiContainer, ItemStack itemStack) { + return null; + } + + @Override + public List getInventoryAreas(GuiContainer guiContainer) { + return null; + } + + @Override + public boolean handleDragNDrop(GuiContainer guiContainer, int i, int i1, ItemStack itemStack, int i2) { + itemStack.stackSize=0; + return false; + } + + @Override + public boolean hideItemPanelSlot(GuiContainer guiContainer, int i, int i1, int i2, int i3) { + return false; + } + public class FontCodes { @@ -303,4 +343,6 @@ public abstract class GuiTooltipScreen extends GuiJustEnoughCalculation public static final String RESET = "\247r"; } + + } \ No newline at end of file diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java index a0bd2e5..50ec4bc 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/ContainerRecipe.java @@ -4,6 +4,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.ItemRecord; import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; import pers.towdium.justEnoughCalculation.core.Recipe; @@ -13,10 +15,8 @@ import pers.towdium.justEnoughCalculation.core.Recipe; */ public class ContainerRecipe extends Container { - InventoryRecipe inventoryRecipe; - public ContainerRecipe(){ - inventoryRecipe = new InventoryRecipe(); + InventoryRecipe inventoryRecipe = new InventoryRecipe(); int i, left, top; i = 0; left = 9; top = 9; for(int a = 0; a < 2; a++){ @@ -70,14 +70,28 @@ public class ContainerRecipe extends Container { ItemStack[] output = new ItemStack[4]; boolean flag1 = false, flag2 = false; for(int i=0; i<4; i++){ - output[i] = getSlot(i).getStack(); + ItemStack buffer = getSlot(i).getStack(); + if(buffer != null && buffer.hasTagCompound()){ + buffer.getTagCompound().removeTag(JustEnoughCalculation.Reference.MODID); + if(buffer.getTagCompound().hasNoTags()){ + buffer.setTagCompound(null); + } + } + output[i] = buffer; if(output[i] != null){ flag1 = true; } } ItemStack[] input = new ItemStack[12]; for(int i=4; i<16; i++){ - input[i-4] = getSlot(i).getStack(); + ItemStack buffer = getSlot(i).getStack(); + if(buffer != null && buffer.hasTagCompound()){ + buffer.getTagCompound().removeTag(JustEnoughCalculation.Reference.MODID); + if(buffer.getTagCompound().hasNoTags()){ + buffer.setTagCompound(null); + } + } + input[i-4] = buffer; if(input[i-4] != null){ flag2 = true; } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java index 560af1e..1cbca6d 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java @@ -1,8 +1,11 @@ package pers.towdium.justEnoughCalculation.gui.commom.recipe; +import codechicken.nei.VisiblityData; +import codechicken.nei.api.INEIGuiHandler; +import codechicken.nei.api.TaggedInventoryArea; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -16,13 +19,14 @@ import pers.towdium.justEnoughCalculation.gui.commom.GuiTooltipScreen; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.io.IOException; +import java.lang.reflect.Field; import java.util.List; /** * @author Towdium */ -public class GuiRecipe extends GuiTooltipScreen{ - protected int activeSlot = -1; +public class GuiRecipe extends GuiTooltipScreen { + private int activeSlot = -1; public GuiRecipe(@Nonnull Container inventorySlotsIn, @Nullable GuiScreen parent) { super(inventorySlotsIn, parent); @@ -48,7 +52,6 @@ public class GuiRecipe extends GuiTooltipScreen{ @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(new ResourceLocation(JustEnoughCalculation.Reference.MODID,"textures/gui/guiRecipe.png")); this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); if(activeSlot != -1){ @@ -58,7 +61,7 @@ public class GuiRecipe extends GuiTooltipScreen{ } @Override - protected void actionPerformed(GuiButton button) throws IOException { + protected void actionPerformed(GuiButton button){ int buttonId = button.id; if(buttonId <= 15){ Slot slot = inventorySlots.getSlot(buttonId); @@ -72,18 +75,26 @@ public class GuiRecipe extends GuiTooltipScreen{ } } - @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + /*@Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton){ super.mouseClicked(mouseX, mouseY, mouseButton); - Slot slot = getSlotUnderMouse(); + Slot slot = null; + try { + Field slotField = this.getClass().getDeclaredField("field_146998_K"); + slotField.setAccessible(true); + slot = (Slot) slotField.get(this); + } + catch (NoSuchFieldException ignored) {} + catch (IllegalAccessException ignored) {} + if(slot != null && mouseButton == 0 && slot.getStack() == null){ setActiveSlot(slot.getSlotIndex()); mc.thePlayer.playSound("random.click", 1f, 1f ); } - } + }*/ @Override - protected void keyTyped(char typedChar, int keyCode) throws IOException { + protected void keyTyped(char typedChar, int keyCode) { if (keyCode == 1) { if(activeSlot != -1){ setActiveSlot(-1); @@ -101,7 +112,7 @@ public class GuiRecipe extends GuiTooltipScreen{ } super.handleMouseClick(slotIn, slotId, clickedButton, clickType); if(slotIn != null && b && !slotIn.getHasStack()){ - buttonList.get(slotIn.getSlotIndex()).displayString = "#"; + ((GuiButton) buttonList.get(slotIn.getSlotIndex())).displayString = "#"; } } @@ -120,8 +131,9 @@ public class GuiRecipe extends GuiTooltipScreen{ if(i=0 && buttonId<=15){ @@ -65,10 +65,10 @@ public class GuiRecipePicker extends GuiRecipe{ } } - @Override - protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException { + /*@Override + protected void mouseClicked(int mouseX, int mouseY, int mouseButton){ super.mouseClicked(mouseX, mouseY, mouseButton); - Slot slot = getSlotUnderMouse(); + Slot slot = getSlotUnderMouse(mouseX, mouseY); if(slot != null){ GuiRecipeEditor recipeEditor = new GuiRecipeEditor(new ContainerRecipeEditor(), parent, recipes.get(index)); mc.displayGuiScreen(recipeEditor); @@ -78,7 +78,7 @@ public class GuiRecipePicker extends GuiRecipe{ recipeEditor.setActiveSlot(slot.getSlotIndex()); } } - } + }*/ public void updateLayout(){ displayRecipe(JustEnoughCalculation.proxy.getPlayerHandler().getRecipe(recipes.get(index), null)); diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java index 1959476..d0a7695 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/guis/recipeViewer/GuiRecipeViewer.java @@ -1,13 +1,13 @@ package pers.towdium.justEnoughCalculation.gui.guis.recipeViewer; +import cpw.mods.fml.client.config.GuiButtonExt; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import net.minecraftforge.fml.client.config.GuiButtonExt; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; import pers.towdium.justEnoughCalculation.core.Recipe; import pers.towdium.justEnoughCalculation.gui.commom.GuiJustEnoughCalculation; import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeEditor; @@ -49,7 +49,7 @@ public class GuiRecipeViewer extends GuiJustEnoughCalculation { @Override protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + //GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); mc.getTextureManager().bindTexture(new ResourceLocation(JustEnoughCalculation.Reference.MODID,"textures/gui/guiRecipeViewer.png")); drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); } @@ -66,13 +66,16 @@ public class GuiRecipeViewer extends GuiJustEnoughCalculation { if(page>total){ page = total; } + if(page==0){ + page=1; + } displayRecipes(); buttonLeft.enabled = page != 1; buttonRight.enabled = page < total; } @Override - protected void actionPerformed(GuiButton button) throws IOException { + protected void actionPerformed(GuiButton button){ int i = button.id; switch (i){ case 0: @@ -103,7 +106,9 @@ public class GuiRecipeViewer extends GuiJustEnoughCalculation { List items = recipe.getOutput(); for(int i=0; i<4; i++){ if(i recipes = new ArrayList<>(); + public List recipes = new ArrayList(); @Override public void addRecipe(Recipe recipe, UUID uuid) { @@ -44,7 +44,7 @@ public class PlayerHandlerClient implements IPlayerHandler { @Override public ImmutableList getAllRecipeIndex(UUID uuid) { int a = recipes.size(); - ImmutableList.Builder builder = new ImmutableList.Builder<>(); + ImmutableList.Builder builder = new ImmutableList.Builder(); for (int i = 0; i getAllRecipeOf(ItemStack itemStack, UUID uuid) { - ImmutableList.Builder recipeBuilder = new ImmutableList.Builder<>(); + ImmutableList.Builder recipeBuilder = new ImmutableList.Builder(); for(Integer index : getAllRecipeIndexOf(itemStack, null)){ recipeBuilder.add(recipes.get(index)); } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java index c4a980d..ce58ab6 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerServer.java @@ -12,7 +12,7 @@ import java.util.UUID; * @author Towdium */ public class PlayerHandlerServer implements IPlayerHandler { - HashMap players = new HashMap<>(); + private HashMap players = new HashMap<>(); @Override public boolean getHasRecipeOf(ItemStack itemStack, UUID uuid) { diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java b/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java index 0b4e814..a1eb619 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/ProxyClient.java @@ -1,7 +1,7 @@ package pers.towdium.justEnoughCalculation.network; +import cpw.mods.fml.common.network.NetworkRegistry; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fml.common.network.NetworkRegistry; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.event.GuiEventHandler; import pers.towdium.justEnoughCalculation.event.PlayerEventHandler; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java index 984b192..8454216 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketCalculatorUpdate.java @@ -1,11 +1,12 @@ package pers.towdium.justEnoughCalculation.network.packets; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; + import pers.towdium.justEnoughCalculation.item.ItemCalculator; /** diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java index a081642..3dabd8c 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketRecipeUpdate.java @@ -1,9 +1,9 @@ package pers.towdium.justEnoughCalculation.network.packets; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.core.Recipe; import pers.towdium.justEnoughCalculation.network.IPlayerHandler; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java index ae57793..dee6683 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/packets/PacketSyncRecord.java @@ -1,12 +1,11 @@ package pers.towdium.justEnoughCalculation.network.packets; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.common.network.ByteBufUtils; -import net.minecraftforge.fml.common.network.simpleimpl.IMessage; -import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; -import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.Side; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.network.PlayerHandlerClient; import pers.towdium.justEnoughCalculation.network.PlayerHandlerServer; diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java deleted file mode 100644 index ec00c2f..0000000 --- a/src/main/java/pers/towdium/justEnoughCalculation/plugin/JEIPlugin.java +++ /dev/null @@ -1,66 +0,0 @@ -package pers.towdium.justEnoughCalculation.plugin; - -import com.google.common.collect.ImmutableList; -import mezz.jei.api.*; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.VanillaRecipeCategoryUid; -import pers.towdium.justEnoughCalculation.JustEnoughCalculation; - -import javax.annotation.Nonnull; -import javax.annotation.concurrent.Immutable; -import java.util.HashSet; -import java.util.Set; - -/** - * @author Towdium - */ -@mezz.jei.api.JEIPlugin -public class JEIPlugin implements IModPlugin{ - public static IJeiRuntime runtime; - public static IRecipeRegistry recipeRegistry; - - - @Override - public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { - } - - @Override - public void onItemRegistryAvailable(IItemRegistry itemRegistry) { - } - - @Override - public void register(@Nonnull IModRegistry registry) { - String[] blackList = JustEnoughCalculation.JECConfig.EnumItems.ListRecipeBlackList.getProperty().getStringList(); - LOOP: - for(String s : JustEnoughCalculation.JECConfig.EnumItems.ListRecipeCategory.getProperty().getStringList()){ - for(String black : blackList){ - if(black.equals(s)){ - continue LOOP; - } - } - registry.getRecipeTransferRegistry().addRecipeTransferHandler(new NormalRecipeTransferHandler(s)); - } - } - - @Override - public void onRecipeRegistryAvailable(@Nonnull IRecipeRegistry recipeRegistry) { - JEIPlugin.recipeRegistry = recipeRegistry; - } - - @Override - public void onRuntimeAvailable(@Nonnull IJeiRuntime jeiRuntime) { - Set identifiers = new HashSet<>(); - runtime = jeiRuntime; - identifiers.addAll(ImmutableList.copyOf(JustEnoughCalculation.JECConfig.EnumItems.ListRecipeCategory.getProperty().getStringList())); - for(IRecipeCategory category : recipeRegistry.getRecipeCategories()){ - identifiers.add(category.getUid()); - } - int size = identifiers.size(); - String[] buffer = new String[size]; - for (String s : identifiers){ - buffer[--size] = s; - } - JustEnoughCalculation.JECConfig.EnumItems.ListRecipeCategory.getProperty().set(buffer); - JustEnoughCalculation.JECConfig.save(); - } -} diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/MyOverlayHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/MyOverlayHandler.java new file mode 100644 index 0000000..f2a2703 --- /dev/null +++ b/src/main/java/pers/towdium/justEnoughCalculation/plugin/MyOverlayHandler.java @@ -0,0 +1,41 @@ +package pers.towdium.justEnoughCalculation.plugin; + +import codechicken.nei.PositionedStack; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.api.IStackPositioner; +import codechicken.nei.recipe.IRecipeHandler; +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.ItemStack; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; + +import java.util.ArrayList; +import java.util.List; + +/** + * Created by Towdium on 2016/3/21. + */ +public class MyOverlayHandler implements IOverlayHandler { + @Override + public void overlayRecipe(GuiContainer guiContainer, IRecipeHandler iRecipeHandler, int i, boolean b) { + ItemStack buffer = iRecipeHandler.getResultStack(i).item.copy(); + ItemStackWrapper.NBT.setBool(buffer, JustEnoughCalculation.Reference.MODID, true); + guiContainer.inventorySlots.getSlot(0).putStack(buffer); + List itemStacks = new ArrayList<>(); + LOOP: + for(PositionedStack item : iRecipeHandler.getIngredientStacks(i)){ + for(ItemStack current : itemStacks){ + if(ItemStackWrapper.isTypeEqual(current, item.item)){ + current.stackSize++; + continue LOOP; + } + } + itemStacks.add(item.item.copy()); + } + int index=4; + for(ItemStack itemStack : itemStacks){ + ItemStackWrapper.NBT.setBool(itemStack, JustEnoughCalculation.Reference.MODID, true); + guiContainer.inventorySlots.getSlot(index++).putStack(itemStack); + } + } +} diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/NEICalculatorConfig.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/NEICalculatorConfig.java new file mode 100644 index 0000000..fe8c2a0 --- /dev/null +++ b/src/main/java/pers/towdium/justEnoughCalculation/plugin/NEICalculatorConfig.java @@ -0,0 +1,36 @@ +package pers.towdium.justEnoughCalculation.plugin; + +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; +import codechicken.nei.recipe.DefaultOverlayHandler; +import pers.towdium.justEnoughCalculation.JustEnoughCalculation; +import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.GuiRecipeEditor; + + +public class NEICalculatorConfig implements IConfigureNEI { + @Override + public void loadConfig() { + LOOP: + for(String s : JustEnoughCalculation.JECConfig.EnumItems.ListRecipeCategory.getProperty().getStringList()){ + for(String b : JustEnoughCalculation.JECConfig.EnumItems.ListRecipeBlackList.getProperty().getStringList()){ + if(s.equals(b)){ + continue LOOP; + } + } + API.registerGuiOverlay(GuiRecipeEditor.class, s); + API.registerGuiOverlayHandler(GuiRecipeEditor.class, new MyOverlayHandler(), s); + } + //API.registerGuiOverlay(GuiRecipeEditor.class, "crafting"); + //API.registerGuiOverlayHandler(GuiRecipeEditor.class, new MyOverlayHandler(), "crafting"); + } + + @Override + public String getName() { + return JustEnoughCalculation.Reference.MODNAME; + } + + @Override + public String getVersion() { + return JustEnoughCalculation.Reference.VERSION; + } +} diff --git a/src/main/java/pers/towdium/justEnoughCalculation/plugin/NormalRecipeTransferHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/plugin/NormalRecipeTransferHandler.java deleted file mode 100644 index 38ccb77..0000000 --- a/src/main/java/pers/towdium/justEnoughCalculation/plugin/NormalRecipeTransferHandler.java +++ /dev/null @@ -1,78 +0,0 @@ -package pers.towdium.justEnoughCalculation.plugin; - -import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.transfer.IRecipeTransferError; -import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; -import mezz.jei.gui.ingredients.IGuiIngredient; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; -import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; -import pers.towdium.justEnoughCalculation.gui.guis.recipeEditor.ContainerRecipeEditor; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.List; - -/** - * @author Towdium - */ -public class NormalRecipeTransferHandler implements IRecipeTransferHandler { - String recipeUID; - - public NormalRecipeTransferHandler(String recipeUID ) { - this.recipeUID = recipeUID; - } - - @Override - public Class getContainerClass() { - return ContainerRecipeEditor.class; - } - - @Override - public String getRecipeCategoryUid() { - return recipeUID; - } - - @Nullable - @Override - public IRecipeTransferError transferRecipe(@Nonnull Container container, @Nonnull IRecipeLayout iRecipeLayout, @Nonnull EntityPlayer entityPlayer, boolean maxTransfer, boolean doTransfer) { - if(doTransfer){ - List outputStacks = new ArrayList<>(); - List inputStacks = new ArrayList<>(); - LOOP: - for(IGuiIngredient ingredient : iRecipeLayout.getItemStacks().getGuiIngredients().values()){ - if(ingredient.getAllIngredients().size()==0){ - continue; - } - if(ingredient.isInput()){ - ItemStack itemStack = ingredient.getAllIngredients().get(0); - for (ItemStack exist : inputStacks){ - if(ItemStackWrapper.isTypeEqual(exist, itemStack)){ - exist.stackSize += itemStack.stackSize; - continue LOOP; - } - } - inputStacks.add(itemStack.copy()); - }else { - ItemStack itemStack = ingredient.getAllIngredients().get(0); - for (ItemStack exist : outputStacks){ - if(ItemStackWrapper.isTypeEqual(exist, itemStack)){ - exist.stackSize += itemStack.stackSize; - continue LOOP; - } - } - outputStacks.add(itemStack.copy()); - } - } - for(int i=0; i<=outputStacks.size()-1 && i<=3; i++){ - container.getSlot(i).putStack(outputStacks.get(i)); - } - for(int i=4; i<=4+inputStacks.size()-1 && i<=15; i++){ - container.getSlot(i).putStack(inputStacks.get(i-4)); - } - } - return null; - } -}