diff --git a/.gitignore b/.gitignore index a260e86..3fcd5f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +/commit +/lib/* + # ForgeGradle /.gradle /build @@ -18,4 +21,4 @@ # Mac Stuff .DS_Store -*.command \ No newline at end of file +*.command diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 138e952..3ccd49a --- a/build.gradle +++ b/build.gradle @@ -1,49 +1,65 @@ +Properties ver = new Properties() +File versionFile = new File('version.txt') + +// build is to distinguish bugfix releases, as the fourth number in the mod version. Resets when any of the others increase. +ver.build = 0 + +// revision is used by liteloader, and is required to increase (by an arbitrary amount) with each public release +ver.revision = 0 + +ver.load(versionFile.newDataInputStream()) + buildscript { repositories { mavenCentral() maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" + name = 'forge' + url = 'http://files.minecraftforge.net/maven' } maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" + name = 'sonatype' + url = 'https://oss.sonatype.org/content/repositories/snapshots/' } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' } } -apply plugin: 'forge' +apply plugin: 'net.minecraftforge.gradle.forge' // apply plugin: 'liteloader' -apply plugin: 'curseforge' -version = "1.6.9.0" -group = "uristqwerty" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "CraftGuide" +version = '1.6.9.' + ver.build +group = 'uristqwerty' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'CraftGuide' -ext.llrevision = "03" +ext.llrevision = '03' minecraft { - version = "1.8-11.14.3.1449" - runDir = "run" + version = "1.8.9-11.15.1.1808" + mappings = "stable_20" + runDir = 'run' + + replaceIn 'CraftGuide_FML.java' + replaceIn 'LiteMod_CraftGuide.java' + replace '@MOD_VERSION@', project.version +} - replaceIn "CraftGuide_FML.java" - replaceIn "LiteMod_CraftGuide.java" - replace "@MOD_VERSION@", project.version +configurations { + compile.extendsFrom exportedCompile } repositories { maven { - name = "Player's Repo" - url = "http://maven.ic2.player.to/" + name = 'Player\'s Repo' + url = 'http://maven.ic2.player.to/' } } dependencies { - compile 'com.mod-buildcraft:buildcraft:6.0.17:dev' - compile 'net.industrial-craft:industrialcraft-2:2.2.760-experimental:dev' +// compile 'com.mod-buildcraft:buildcraft:7.2.5:dev' + compile 'net.industrial-craft:industrialcraft-2:2.3.262-ex18:dev' + compile fileTree(dir: 'lib', include: '*.jar') } task themeZip(type: Zip) { @@ -55,18 +71,19 @@ task themeZip(type: Zip) { processResources { // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version + inputs.property 'version', project.version + inputs.property 'mcversion', project.minecraft.version + inputs.property 'revision', ver.revision // replace stuff in mcmod.info, nothing else from(sourceSets.main.resources.srcDirs) { include 'mcmod.info' include 'litemod.json' - + // replace version and mcversion - expand 'version':project.version, 'mcversion':project.minecraft.version, 'llrevision':project.llrevision + expand 'version':project.version, 'mcversion':project.minecraft.version, 'llrevision':project.llrevision, 'revision':ver.revision } - + // copy everything else, thats not the mcmod.info from(sourceSets.main.resources.srcDirs) { exclude 'mcmod.info' @@ -106,32 +123,14 @@ task sourcesJar(type: Jar) { classifier = 'sources' } -curse { - projectId = '75557' - apiKey = project.curseForgeApiKey - releaseType = 'release' - - addGameVersion '1.7.10' - additionalArtifact deobfJar, apiJar, sourcesJar - - changelog '''\ -API changes - - Added interface allowing item filters to be combined - -Additions: - - If shift or control is held when clicking an item, instead of outright setting the current filter, will try adding to or removing from it. Shift adds, control removes. - -Other changes: - - Updated tooltip EU display to work with more recent IC2 versions - - A few bugfixes -''' - -} - -curse.dependsOn build - artifacts { archives deobfJar archives apiJar archives sourcesJar -} \ No newline at end of file +} + +build.doLast { + ver.build++ + ver.revision++ + ver.store(versionFile.newWriter(), null) +} diff --git a/disabled-features b/disabled-features new file mode 100644 index 0000000..ff6ade6 --- /dev/null +++ b/disabled-features @@ -0,0 +1,7 @@ +buildcraft recipes (causing build errors. But I don't have BC installed on my server anyway, so didn't fix that) + +IC2 exp recycler recipes (it only produces scrap... and cause gameplay errors) + +some liquid icons? (class Fluid doesn't have a getStillIcon() method... causing build errors. +didn't know why and coudn't find a replacement so I just disabled it (by setting the icon directly to 'null')) +(but i didn't find what's influenced in the gameplay) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b761216..e8c6bf7 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 678d9d8..ea7cafb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jul 02 15:54:47 CDT 2014 +#Tue Feb 16 20:36:24 CET 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip diff --git a/src/main/java/uristqwerty/CraftGuide/api/ChanceSlot.java b/src/main/java/uristqwerty/CraftGuide/api/ChanceSlot.java index 19bf803..3aaaf6e 100644 --- a/src/main/java/uristqwerty/CraftGuide/api/ChanceSlot.java +++ b/src/main/java/uristqwerty/CraftGuide/api/ChanceSlot.java @@ -45,12 +45,38 @@ public List getTooltip(int x, int y, Object[] data, int dataIndex) } List tooltip = implementation.getTooltip(this, stack(data, dataIndex)); - double probability = ((Integer)((Object[])data[dataIndex])[1]) * 100 / (double)ratio; + double val = unboxToDouble(((Object[])data[dataIndex])[1]) * 100 / ratio; - tooltip.set(0, tooltip.get(0) + String.format(formatString, probability)); + tooltip.set(0, tooltip.get(0) + String.format(formatString, val)); return tooltip; } + private static double unboxToDouble(Object obj) + { + if(obj instanceof Double) + return (Double)obj; + + else if(obj instanceof Float) + return (Float)obj; + + else if(obj instanceof Long) + return (Long)obj; + + else if(obj instanceof Integer) + return (Integer)obj; + + else if(obj instanceof Short) + return (Short)obj; + + else if(obj instanceof Character) + return (Character)obj; + + else if(obj instanceof Byte) + return (Byte)obj; + + return (Double)obj; // As instanceof Double was already checked, this will throw with a meaningful error message. + } + @Override public boolean matches(ItemFilter search, Object[] data, int dataIndex, SlotType type) { diff --git a/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java b/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java old mode 100644 new mode 100755 index 58a33f2..d2b0b70 --- a/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java +++ b/src/main/java/uristqwerty/CraftGuide/api/LiquidFilter.java @@ -77,8 +77,9 @@ public void draw(Renderer renderer, int x, int y) TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); Fluid fluid = liquid.getFluid(); - TextureAtlasSprite icon = fluid.getStillIcon(); - + //TextureAtlasSprite icon = fluid.getStillIcon(); + TextureAtlasSprite icon = null; + if(icon != null) { textureManager.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java b/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java old mode 100644 new mode 100755 index 77cf6f5..ef9aec3 --- a/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java +++ b/src/main/java/uristqwerty/CraftGuide/api/LiquidSlot.java @@ -49,8 +49,9 @@ public void draw(Renderer renderer, int recipeX, int recipeY, Object[] data, int TextureManager textureManager = Minecraft.getMinecraft().getTextureManager(); Fluid fluid = liquid.getFluid(); - TextureAtlasSprite icon = fluid.getStillIcon(); - + //TextureAtlasSprite icon = fluid.getStillIcon(); + TextureAtlasSprite icon = null; + if(icon != null) { textureManager.bindTexture(TextureMap.locationBlocksTexture); diff --git a/src/main/java/uristqwerty/CraftGuide/client/ui/GuiRenderer.java b/src/main/java/uristqwerty/CraftGuide/client/ui/GuiRenderer.java old mode 100644 new mode 100755 index dc1cfcf..c66b6aa --- a/src/main/java/uristqwerty/CraftGuide/client/ui/GuiRenderer.java +++ b/src/main/java/uristqwerty/CraftGuide/client/ui/GuiRenderer.java @@ -67,7 +67,8 @@ public void setTextureID(int textureID) { if(textureID != -1) { - GlStateManager.func_179144_i(textureID); + GlStateManager.bindTexture(textureID); + //GL11.glBindTexture(GL11.GL_TEXTURE_2D, textureID); } } @@ -95,7 +96,8 @@ public void drawText(String text, int x, int y) @Override public void drawTextWithShadow(String text, int x, int y) { - Minecraft.getMinecraft().fontRendererObj.func_175063_a(text, x, y, currentColor()); + //Minecraft.getMinecraft().fontRendererObj.func_175063_a(text, x, y, currentColor()); + Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow(text, x, y, currentColor()); } private int currentColor() @@ -254,12 +256,12 @@ private ItemStack renderItem(ItemStack itemStack, boolean renderOverlay) } RenderItem itemRenderer = Minecraft.getMinecraft().getRenderItem(); - itemRenderer.func_180450_b(itemStack, 0, 0); + itemRenderer.renderItemAndEffectIntoGUI(itemStack, 0, 0); if(renderOverlay) { String count = null; // TODO: arbitrary-text-for-stacksize looks interesting. Expose? - itemRenderer.func_180453_a(Minecraft.getMinecraft().fontRendererObj, itemStack, 0, 0, count); + itemRenderer.renderItemOverlayIntoGUI(Minecraft.getMinecraft().fontRendererObj, itemStack, 0, 0, count); } return itemStack; diff --git a/src/main/java/uristqwerty/CraftGuide/itemtype/ItemType.java b/src/main/java/uristqwerty/CraftGuide/itemtype/ItemType.java old mode 100644 new mode 100755 index 45efcdc..e8403b4 --- a/src/main/java/uristqwerty/CraftGuide/itemtype/ItemType.java +++ b/src/main/java/uristqwerty/CraftGuide/itemtype/ItemType.java @@ -76,7 +76,7 @@ public int compareTo(ItemTypeKey other) private static Map simpleItemStacks = new HashMap(); private static Map> nbtItemStacks = new HashMap>(); private static Map oreDictionaryEntries = new HashMap(); - private static Map generalArrayLists = new IdentityHashMap(); + private static Map, ItemType> generalArrayLists = new IdentityHashMap, ItemType>(); private final ItemTypeKey key; private final Item item; @@ -132,9 +132,15 @@ public static ItemType getInstance(Object stack) { return getInstance((ItemStack)stack); } - else if(stack instanceof ArrayList && ((ArrayList)stack).size() > 0) + else if(stack instanceof ArrayList && ((ArrayList)stack).size() > 0) { - return getInstance((ArrayList)stack); + for(Object o: (ArrayList)stack) + { + if(o != null && !(o instanceof ItemStack)) + return errType_unknownType; + } + + return getInstance((ArrayList)stack); } else { @@ -142,12 +148,16 @@ else if(stack instanceof ArrayList && ((ArrayList)stack).size() > 0) } } - private static ItemType getInstance(ArrayList stack) + private static ItemType getInstance(ArrayList stack) { ItemType type = generalArrayLists.get(stack); if(type == null) { + if(stack.get(0) == null) + { + return errType_unknownType; + } type = new ItemType(stack); generalArrayLists.put(stack, type); } @@ -195,12 +205,13 @@ private static ItemType getInstance(ItemStack stack) return type; } - private static ItemType findMatchingNBT(List items, NBTTagCompound nbt) { + private static ItemType findMatchingNBT(List items, NBTTagCompound nbt) + { for(ItemType type: items) { ItemStack stack = (ItemStack)type.stack; - if(stack.getTagCompound().equals(nbt)) + if(nbt.equals(stack.getTagCompound())) { return type; } @@ -353,11 +364,11 @@ public ItemStack getDisplayStack() } else if(stack instanceof ArrayList) { - return (ItemStack)((ArrayList)stack).get(0); + return ((ArrayList)stack).get(0); } else { return null; } } -} \ No newline at end of file +} diff --git a/src/main/java/uristqwerty/CraftGuide/recipes/BuildCraftRecipes.java b/src/main/java/uristqwerty/CraftGuide/recipes/BuildCraftRecipes.java.disabled similarity index 91% rename from src/main/java/uristqwerty/CraftGuide/recipes/BuildCraftRecipes.java rename to src/main/java/uristqwerty/CraftGuide/recipes/BuildCraftRecipes.java.disabled index d701282..c0b4be5 100644 --- a/src/main/java/uristqwerty/CraftGuide/recipes/BuildCraftRecipes.java +++ b/src/main/java/uristqwerty/CraftGuide/recipes/BuildCraftRecipes.java.disabled @@ -21,10 +21,10 @@ import uristqwerty.CraftGuide.api.RecipeTemplate; import uristqwerty.CraftGuide.api.Slot; import uristqwerty.CraftGuide.api.SlotType; -import buildcraft.api.recipes.BuildcraftRecipes; -import buildcraft.api.recipes.IAssemblyRecipeManager.IAssemblyRecipe; -import buildcraft.api.recipes.IIntegrationRecipeManager.IIntegrationRecipe; -import buildcraft.api.recipes.IRefineryRecipeManager.IRefineryRecipe; +import buildcraft.api.recipes.BuildcraftRecipeRegistry; +import buildcraft.api.recipes.IAssemblyRecipeManager; +import buildcraft.api.recipes.IIntegrationRecipeManager; +import buildcraft.api.recipes.IRefineryRecipeManager; public class BuildCraftRecipes extends CraftGuideAPIObject implements RecipeProvider { @@ -72,7 +72,7 @@ private void addAssemblyRecipes(RecipeGenerator generator, ItemStack table, Item { int maxInput = 1; - for(IAssemblyRecipe recipe: BuildcraftRecipes.assemblyTable.getRecipes()) + for(IAssemblyRecipeManager recipe: BuildcraftRecipeRegistry.assemblyTable.getRecipes()) { maxInput = Math.max(maxInput, recipe.getInputs().length); } @@ -98,7 +98,7 @@ private void addAssemblyRecipes(RecipeGenerator generator, ItemStack table, Item RecipeTemplate template = generator.createRecipeTemplate(recipeSlots, table); template.setSize(79, rows > 3? 58 + (rows - 3) * 18 : 58); - for(IAssemblyRecipe recipe: BuildcraftRecipes.assemblyTable.getRecipes()) + for(IAssemblyRecipeManager recipe: BuildcraftRecipeRegistry.assemblyTable.getRecipes()) { Object[] recipeContents = new Object[rows * 3 + 3]; Object[] input = recipe.getInputs(); @@ -119,7 +119,7 @@ private void addIntegrationRecipes(RecipeGenerator generator, ItemStack table, I { try { - IIntegrationRecipe.class.getMethod("getComponents"); + IIntegrationRecipeManager.class.getMethod("getComponents"); addIntegrationRecipes_bc6(generator, table, laser); } catch(NoSuchMethodException e) @@ -146,12 +146,12 @@ private void addIntegrationRecipes(RecipeGenerator generator, ItemStack table, I private void addIntegrationRecipes_bc6(RecipeGenerator generator, ItemStack table, ItemStack laser) throws SecurityException, NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { - Method getComponents = IIntegrationRecipe.class.getMethod("getComponents"); - Method getOutput = IIntegrationRecipe.class.getMethod("getOutputForInputs", ItemStack.class, ItemStack.class, ItemStack[].class); + Method getComponents = IIntegrationRecipeManager.class.getMethod("getComponents"); + Method getOutput = IIntegrationRecipeManager.class.getMethod("getOutputForInputs", ItemStack.class, ItemStack.class, ItemStack[].class); int maxComponents = 0; - for(IIntegrationRecipe recipe: BuildcraftRecipes.integrationTable.getRecipes()) + for(IIntegrationRecipeManager recipe: BuildcraftRecipeRegistry.integrationTable.getRecipes()) { ItemStack[] components = (ItemStack[])getComponents.invoke(recipe); maxComponents = Math.max(maxComponents, components.length); @@ -166,7 +166,7 @@ private void addIntegrationRecipes_bc6(RecipeGenerator generator, ItemStack tabl template.setSize(79, 58 + (slotRows(maxComponents + 2) - 3) * 18); } - for(IIntegrationRecipe recipe: BuildcraftRecipes.integrationTable.getRecipes()) + for(IIntegrationRecipeManager recipe: BuildcraftRecipeRegistry.integrationTable.getRecipes()) { ItemStack a[] = recipe.getExampleInputsA(); ArrayList inputA = new ArrayList(a.length); @@ -368,7 +368,7 @@ private void addRefineryRecipes(RecipeGenerator generator, ItemStack refinery) RecipeTemplate templateOneInput = generator.createRecipeTemplate(recipeSlotsOneInput, refinery); RecipeTemplate templateTwoInputs = generator.createRecipeTemplate(recipeSlotsTwoInputs, refinery); - for(IRefineryRecipe recipe: BuildcraftRecipes.refinery.getRecipes()) + for(IRefineryRecipeManager recipe: BuildcraftRecipeRegistry.refinery.getRecipes()) { boolean twoInputs = recipe.getIngredient2() != null; Object[] recipeContents = new Object[twoInputs? 4 : 3]; diff --git a/src/main/java/uristqwerty/CraftGuide/recipes/IC2ExperimentalRecipes.java b/src/main/java/uristqwerty/CraftGuide/recipes/IC2ExperimentalRecipes.java old mode 100644 new mode 100755 index bff364d..c18b1bb --- a/src/main/java/uristqwerty/CraftGuide/recipes/IC2ExperimentalRecipes.java +++ b/src/main/java/uristqwerty/CraftGuide/recipes/IC2ExperimentalRecipes.java @@ -2,6 +2,7 @@ import ic2.api.item.IC2Items; import ic2.api.recipe.IMachineRecipeManager; +import ic2.api.recipe.IMachineRecipeManager.RecipeIoContainer; import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.IScrapboxManager; import ic2.api.recipe.RecipeOutput; @@ -67,8 +68,8 @@ public void generateRecipes(RecipeGenerator generator) addMachineRecipes(generator, IC2Items.getItem("compressor"), getCompressor(), Recipes.compressor); addMachineRecipes(generator, IC2Items.getItem("centrifuge"), Recipes.centrifuge); addMachineRecipes(generator, IC2Items.getItem("blockcutter"), Recipes.blockcutter); - addMachineRecipes(generator, IC2Items.getItem("blastfurance"), Recipes.blastfurance); - addMachineRecipes(generator, IC2Items.getItem("recycler"), Recipes.recycler); + addMachineRecipes(generator, IC2Items.getItem("blastfurnace"), Recipes.blastfurnace); + //addMachineRecipes(generator, IC2Items.getItem("recycler"), Recipes.recycler); addMachineRecipes(generator, IC2Items.getItem("metalformer"), Recipes.metalformerExtruding); addMachineRecipes(generator, IC2Items.getItem("metalformer"), Recipes.metalformerCutting); addMachineRecipes(generator, IC2Items.getItem("metalformer"), Recipes.metalformerRolling); @@ -186,8 +187,10 @@ private void addMachineRecipes(RecipeGenerator generator, ItemStack type, Object int maxOutput = 1; - for(RecipeOutput output: recipeManager.getRecipes().values()) + //for(RecipeOutput output: recipeManager.getRecipes().values()) + for(RecipeIoContainer recipeIoContainer: recipeManager.getRecipes()) { + RecipeOutput output = recipeIoContainer.output; maxOutput = Math.max(maxOutput, output.items.size()); } @@ -212,13 +215,15 @@ private void addMachineRecipes(RecipeGenerator generator, ItemStack type, Object RecipeTemplate template = generator.createRecipeTemplate(recipeSlots, type); - for(Entry recipe: recipeManager.getRecipes().entrySet()) + //for(Entry recipe: recipeManager.getRecipes()) + for(RecipeIoContainer recipeIoContainer: recipeManager.getRecipes()) { + Object[] recipeContents = new Object[maxOutput + 3]; - recipeContents[0] = recipe.getKey().getInputs(); + recipeContents[0] = recipeIoContainer.input.getInputs(); recipeContents[1] = machine; recipeContents[2] = null; - List output = recipe.getValue().items; + List output = recipeIoContainer.output.items; for(int i = 0; i < Math.min(maxOutput, output.size()); i++) { @@ -254,7 +259,7 @@ private void addScrapboxOutput(RecipeGenerator generator, ItemStack scrapbox, IS private void addCraftingRecipes(RecipeGenerator generator) throws ClassNotFoundException, SecurityException, IllegalArgumentException, IllegalAccessException, NoSuchFieldException, InvocationTargetException, NoSuchMethodException { - Class advancedRecipe = Class.forName("ic2.core.AdvRecipe"); + Class advancedRecipe = Class.forName("ic2.core.recipe.AdvRecipe"); Field outputField = advancedRecipe.getField("output"); Field inputField = advancedRecipe.getField("input"); Field widthField = advancedRecipe.getField("inputWidth"); @@ -267,7 +272,7 @@ private void addCraftingRecipes(RecipeGenerator generator) throws ClassNotFoundE } catch(NoSuchFieldException e){} - Class shapelessRecipe = Class.forName("ic2.core.AdvShapelessRecipe"); + Class shapelessRecipe = Class.forName("ic2.core.recipe.AdvShapelessRecipe"); Field shapelessInput = shapelessRecipe.getField("input"); Field shapelessOutput = shapelessRecipe.getField("output"); Method shapelessCanShow = shapelessRecipe.getMethod("canShow"); diff --git a/src/main/java/uristqwerty/CraftGuide/recipes/IC2GeneratorFuel.java b/src/main/java/uristqwerty/CraftGuide/recipes/IC2GeneratorFuel.java old mode 100644 new mode 100755 index c3a130e..a0739a9 --- a/src/main/java/uristqwerty/CraftGuide/recipes/IC2GeneratorFuel.java +++ b/src/main/java/uristqwerty/CraftGuide/recipes/IC2GeneratorFuel.java @@ -32,7 +32,8 @@ public IC2GeneratorFuel() @Override public String getInfo(ItemStack itemStack) { - int fuel = Info.itemFuel.getFuelValue(itemStack, false); + //int fuel = Info.itemFuel.getFuelValue(itemStack, false); + int fuel = Info.itemInfo.getFuelValue(itemStack, false); if(fuel > 0) { diff --git a/src/main/java/uristqwerty/CraftGuide/recipes/IC2Power.java b/src/main/java/uristqwerty/CraftGuide/recipes/IC2Power.java old mode 100644 new mode 100755 index ecf3bed..fedcbdd --- a/src/main/java/uristqwerty/CraftGuide/recipes/IC2Power.java +++ b/src/main/java/uristqwerty/CraftGuide/recipes/IC2Power.java @@ -1,5 +1,6 @@ package uristqwerty.CraftGuide.recipes; +//import ic2.api.info.Info; import ic2.api.info.Info; import ic2.api.item.IElectricItem; import net.minecraft.item.ItemStack; @@ -16,7 +17,8 @@ public String getInfo(ItemStack itemStack) } else { - double power = Info.itemEnergy.getEnergyValue(itemStack); + //double power = Info.itemEnergy.getEnergyValue(itemStack); + double power = Info.itemInfo.getEnergyValue(itemStack); if(power > 0) { diff --git a/src/main/resources/litemod.json b/src/main/resources/litemod.json index 820cc98..c061c79 100644 --- a/src/main/resources/litemod.json +++ b/src/main/resources/litemod.json @@ -1,7 +1,7 @@ { "mcversion": "${mcversion}_${llrevision}", "name": "craftguide", - "revision": "0", + "revision": "${revision}", "author": "Uristqwerty", "version": "${version}", "description": "A recipe viewer, WITH A SCROLL BAR!", diff --git a/version.txt b/version.txt new file mode 100644 index 0000000..6a5e6f4 --- /dev/null +++ b/version.txt @@ -0,0 +1,3 @@ +#Fri Oct 16 18:08:17 EDT 2015 +revision=48 +build=0