Fixed an issue with the overriding Fuel handler in 1.7.X for the combination of certain mods with NEI.

This commit is contained in:
Stan Hebben committed 2014-09-01 09:56:40 +02:00
1 parent aa2da58446
commit 86a3568e9e
5 files changed
+79 -36

No files matched your search

@@ -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<IFuelHandler> original;
private final HashMap<String, List<SetFuelPattern>> quickList = new HashMap<String, List<SetFuelPattern>>();
private final HashMap<Item, List<SetFuelPattern>> quickList = new HashMap<Item, List<SetFuelPattern>>();
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<SetFuelPattern>());
ItemStack itemStack = MineTweakerMC.getItemStack(item);
Item mcItem = itemStack.getItem();
if (!quickList.containsKey(mcItem)) {
quickList.put(mcItem, new ArrayList<SetFuelPattern>());
}
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<SetFuelPattern>());
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();
}
@@ -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<IFuelHandler> original;
private final HashMap<String, List<SetFuelPattern>> quickList = new HashMap<String, List<SetFuelPattern>>();
private final HashMap<Item, List<SetFuelPattern>> quickList = new HashMap<Item, List<SetFuelPattern>>();
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<SetFuelPattern>());
ItemStack itemStack = MineTweakerMC.getItemStack(item);
Item mcItem = itemStack.getItem();
if (!quickList.containsKey(mcItem)) {
quickList.put(mcItem, new ArrayList<SetFuelPattern>());
}
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<SetFuelPattern>());
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();
}
+40 -3
View File
@@ -82,15 +82,52 @@
<h2>Latest version</h2>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.7.jar">MineTweaker 3.0.7 for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-1.7.2-3.0.7.jar">MineTweaker 3.0.7 for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.7.jar">MineTweaker 3.0.7 for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-1.6.4-3.0.8B.jar">MineTweaker 3.0.8B for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-1.7.2-3.0.8B.jar">MineTweaker 3.0.8B for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.8B.jar">MineTweaker 3.0.8B for Minecraft 1.7.10</a></li>
</ul>
<h3>Development versions</h3>
<h4>Basic version (without mod support)</h4>
<p>This version is recommended for development, as it won't need you to provide the libraries for every mod in it.</p>
<ul>
<li><a href="/download/MineTweaker3-Dev-1.6.4-3.0.8B.jar">MineTweaker 3.0.8B (Dev, core) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.2-3.0.8B.jar">MineTweaker 3.0.8B (Dev, core) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.10-3.0.8B.jar">MineTweaker 3.0.8B (Dev, core) for Minecraft 1.7.10</a></li>
</ul>
<h4>Full version (with mod support)</h4>
<p>This version includes all mod support. You may need the development versions of the supported mods as well.</p>
<ul>
<li><a href="/download/MineTweaker3-Dev-Full-1.6.4-3.0.8B.jar">MineTweaker 3.0.8B (Dev, full) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.2-3.0.8B.jar">MineTweaker 3.0.8B (Dev, full) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.10-3.0.8B.jar">MineTweaker 3.0.8B (Dev, full) for Minecraft 1.7.10</a></li>
</ul>
<p>What's changed? <a href="http://minetweaker3.powerofbytes.com/wiki/Changelog">Changelog</a></p>
<h2>Archived versions</h2>
<h3>Version 3.0.8</h3>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.8.jar">MineTweaker 3.0.8 for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-1.7.2-3.0.8.jar">MineTweaker 3.0.8 for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.8.jar">MineTweaker 3.0.8 for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-1.6.4-3.0.8.jar">MineTweaker 3.0.8 (Dev, core) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.2-3.0.8.jar">MineTweaker 3.0.8 (Dev, core) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-1.7.10-3.0.8.jar">MineTweaker 3.0.8 (Dev, core) for Minecraft 1.7.10</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.6.4-3.0.8.jar">MineTweaker 3.0.8 (Dev, full) for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.2-3.0.8.jar">MineTweaker 3.0.8 (Dev, full) for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-Dev-Full-1.7.10-3.0.8.jar">MineTweaker 3.0.8 (Dev, full) for Minecraft 1.7.10</a></li>
</ul>
<h3>Version 3.0.7</h3>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.7.jar">MineTweaker 3.0.7 for Minecraft 1.6.4</a></li>
<li><a href="/download/MineTweaker3-1.7.2-3.0.7.jar">MineTweaker 3.0.7 for Minecraft 1.7.2</a></li>
<li><a href="/download/MineTweaker3-1.7.10-3.0.7.jar">MineTweaker 3.0.7 for Minecraft 1.7.10</a></li>
</ul>
<h3>Version 3.0.6</h3>
<ul>
<li><a href="/download/MineTweaker3-1.6.4-3.0.6.jar">MineTweaker 3.0.6 for Minecraft 1.6.4</a></li>
+3 -3
View File
@@ -98,9 +98,9 @@
<div class="col-md-4">
<h2>Downloads</h2>
<p>Installation: it's a forge mod. Make sure you have Forge installed and put it in your mods folder. No configuration needed, just follow the wiki tutorials to start scripting!</p>
<p><a href="/download/MineTweaker3-1.6.4-3.0.7.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.7 for Minecraft 1.6.4</a></p>
<p><a href="/download/MineTweaker3-1.7.2-3.0.7.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.7 for Minecraft 1.7.2</a></p>
<p><a href="/download/MineTweaker3-1.7.10-3.0.7.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.7 for Minecraft 1.7.10</a></p>
<p><a href="/download/MineTweaker3-1.6.4-3.0.8B.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.8B for Minecraft 1.6.4</a></p>
<p><a href="/download/MineTweaker3-1.7.2-3.0.8B.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.8B for Minecraft 1.7.2</a></p>
<p><a href="/download/MineTweaker3-1.7.10-3.0.8B.jar"><i class="glyphicon glyphicon-download-alt"></i> 3.0.8B for Minecraft 1.7.10</a></p>
<p><a href="/downloads.html">Other downloads</a></p>
</div>
<div class="col-md-4">
+1 -1
View File
@@ -2,7 +2,7 @@
// ### Global settings ###
// #######################
ext.mineTweakerVersion = "3.0.8"
ext.mineTweakerVersion = "3.0.8B"
ext.mineTweakerDebug = "false"
ext.javaToolsJar = new File("C:/Program Files/Java/jdk1.8.0_05/lib/tools.jar")