From 86a3568e9e0a162d1a06fb789f900f2c170deb6a Mon Sep 17 00:00:00 2001 From: Stan Hebben Date: Mon, 1 Sep 2014 09:56:40 +0200 Subject: [PATCH] Fixed an issue with the overriding Fuel handler in 1.7.X for the combination of certain mods with NEI. --- .../mc1710/furnace/FuelTweaker.java | 36 ++++++++-------- .../mc172/furnace/FuelTweaker.java | 28 ++++++------ MineTweaker3-Web/downloads.html | 43 +++++++++++++++++-- MineTweaker3-Web/index.html | 6 +-- configuration.gradle | 2 +- 5 files changed, 79 insertions(+), 36 deletions(-) diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java index ad7b191..afbb5dd 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java @@ -6,24 +6,23 @@ package minetweaker.mc1710.furnace; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.registry.GameRegistry; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; - -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.common.IFuelHandler; -import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import minetweaker.mc1710.item.MCItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class FuelTweaker { public static final FuelTweaker INSTANCE = new FuelTweaker(); private List original; - private final HashMap> quickList = new HashMap>(); + private final HashMap> quickList = new HashMap>(); private FuelTweaker() {} @@ -52,29 +51,32 @@ public class FuelTweaker { } for (IItemStack item : pattern.getPattern().getItems()) { - if (!quickList.containsKey(item.getName())) { - quickList.put(item.getName(), new ArrayList()); + ItemStack itemStack = MineTweakerMC.getItemStack(item); + Item mcItem = itemStack.getItem(); + if (!quickList.containsKey(mcItem)) { + quickList.put(mcItem, new ArrayList()); } - quickList.get(item.getName()).add(pattern); + quickList.get(mcItem).add(pattern); } } public void removeFuelPattern(SetFuelPattern pattern) { for (IItemStack item : pattern.getPattern().getItems()) { - if (!quickList.containsKey(item.getName())) { - quickList.put(item.getName(), new ArrayList()); + ItemStack itemStack = MineTweakerMC.getItemStack(item); + Item mcItem = itemStack.getItem(); + if (quickList.containsKey(mcItem)) { + quickList.get(mcItem).remove(pattern); } - quickList.get(item.getName()).add(pattern); } } private class OverridingFuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { - IItemStack stack = new MCItemStack(fuel); - String name = fuel.getUnlocalizedName(); - if (quickList.containsKey(name)) { - for (SetFuelPattern override : quickList.get(name)) { + if (quickList.containsKey(fuel.getItem())) { + IItemStack stack = MineTweakerMC.getIItemStack(fuel); + + for (SetFuelPattern override : quickList.get(fuel.getItem())) { if (override.getPattern().matches(stack)) { return override.getValue(); } diff --git a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java index 455ea3f..89f6838 100644 --- a/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java +++ b/MineTweaker3-MC172-Main/src/main/java/minetweaker/mc172/furnace/FuelTweaker.java @@ -17,13 +17,14 @@ import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import static minetweaker.api.minecraft.MineTweakerMC.getIItemStack; +import minetweaker.api.minecraft.MineTweakerMC; +import net.minecraft.item.Item; public class FuelTweaker { public static final FuelTweaker INSTANCE = new FuelTweaker(); private List original; - private final HashMap> quickList = new HashMap>(); + private final HashMap> quickList = new HashMap>(); private FuelTweaker() {} @@ -52,29 +53,32 @@ public class FuelTweaker { } for (IItemStack item : pattern.getPattern().getItems()) { - if (!quickList.containsKey(item.getName())) { - quickList.put(item.getName(), new ArrayList()); + ItemStack itemStack = MineTweakerMC.getItemStack(item); + Item mcItem = itemStack.getItem(); + if (!quickList.containsKey(mcItem)) { + quickList.put(mcItem, new ArrayList()); } - quickList.get(item.getName()).add(pattern); + quickList.get(mcItem).add(pattern); } } public void removeFuelPattern(SetFuelPattern pattern) { for (IItemStack item : pattern.getPattern().getItems()) { - if (!quickList.containsKey(item.getName())) { - quickList.put(item.getName(), new ArrayList()); + ItemStack itemStack = MineTweakerMC.getItemStack(item); + Item mcItem = itemStack.getItem(); + if (quickList.containsKey(mcItem)) { + quickList.get(mcItem).remove(pattern); } - quickList.get(item.getName()).add(pattern); } } private class OverridingFuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { - IItemStack stack = getIItemStack(fuel); - String name = fuel.getUnlocalizedName(); - if (quickList.containsKey(name)) { - for (SetFuelPattern override : quickList.get(name)) { + if (quickList.containsKey(fuel.getItem())) { + IItemStack stack = MineTweakerMC.getIItemStack(fuel); + + for (SetFuelPattern override : quickList.get(fuel.getItem())) { if (override.getPattern().matches(stack)) { return override.getValue(); } diff --git a/MineTweaker3-Web/downloads.html b/MineTweaker3-Web/downloads.html index 2b3904b..1678c83 100644 --- a/MineTweaker3-Web/downloads.html +++ b/MineTweaker3-Web/downloads.html @@ -82,15 +82,52 @@

Latest version

+ +

Development versions

+

Basic version (without mod support)

+

This version is recommended for development, as it won't need you to provide the libraries for every mod in it.

+ + +

Full version (with mod support)

+

This version includes all mod support. You may need the development versions of the supported mods as well.

+

What's changed? Changelog

Archived versions

+

Version 3.0.8

+ + +

Version 3.0.7

+ +

Version 3.0.6