From bf74920482dc2ffbbc4c5fa3a2650d65f6167c07 Mon Sep 17 00:00:00 2001 From: malte0811 Date: Mon, 14 Aug 2017 18:25:12 +0200 Subject: [PATCH] Update changelog and contributing guidelines --- CONTRIBUTING.md | 2 +- changelog.md | 5 +++++ .../crafting/factories/IC2ItemFactory.java | 11 ++--------- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index beb3ab0..aee9c0f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -18,7 +18,7 @@ Some mods are not officially supported by IndustrialWires. They will probably wo - **Fastcraft**: same as Optifine. -- **(K)Cauldron** and similar server software: While the source code of some of these is available on GitHub or similar platforms, it would require a lot of extra work to test everything with every server software. +- **Sponge(Forge)** and similar server software: While the source code of some of these is available on GitHub or similar platforms, it would require a lot of extra work to test everything with every server software. - **Any version of IndustrialCraft2 that is not made by the official IC2 team** (more specifically, any IC2 version not available for download [here](http://jenkins.ic2.player.to/) or [here](https://minecraft.curseforge.com/projects/industrial-craft)) diff --git a/changelog.md b/changelog.md index 6c309c7..6b27df4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,8 @@ +#####Version 1.5-20 (UNRELEASED) + - Fixed GUI background and item tooltips + - Fixed some components resetting when the chunk is unloaded + - Chunks with control panels properly unload now + #####Version 1.5-15 - Components can be placed in the world now to use the as conventional levers/etc. - Added documentation on the key ring. It also shows all attached keys on the tooltip now diff --git a/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java b/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java index 503a7ca..7e82fb5 100644 --- a/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java +++ b/src/main/java/malte0811/industrialWires/crafting/factories/IC2ItemFactory.java @@ -1,11 +1,10 @@ package malte0811.industrialWires.crafting.factories; +import blusunrize.immersiveengineering.common.crafting.IngredientFactoryStackableNBT; import com.google.gson.JsonObject; import ic2.api.item.IC2Items; -import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; import net.minecraftforge.common.crafting.IIngredientFactory; -import net.minecraftforge.common.crafting.IngredientNBT; import net.minecraftforge.common.crafting.JsonContext; import javax.annotation.Nonnull; @@ -16,12 +15,6 @@ public class IC2ItemFactory implements IIngredientFactory { public Ingredient parse(JsonContext context, JsonObject json) { String name = json.get("name").getAsString(); String variant = json.get("variant").getAsString(); - return new MyNBTIngredient(IC2Items.getItem(name, variant)); - } - private class MyNBTIngredient extends IngredientNBT { - - public MyNBTIngredient(ItemStack stack) { - super(stack); - } + return new IngredientFactoryStackableNBT.IngredientStackableNBT(IC2Items.getItem(name, variant)); } }