diff --git a/src/main/java/modtweaker2/ModTweaker2.java b/src/main/java/modtweaker2/ModTweaker2.java index 710c7f7..522ed48 100644 --- a/src/main/java/modtweaker2/ModTweaker2.java +++ b/src/main/java/modtweaker2/ModTweaker2.java @@ -16,7 +16,6 @@ import modtweaker2.mods.extendedworkbench.ExtendedWorkbench; import modtweaker2.mods.extraUtils.ExtraUtils; import modtweaker2.mods.factorization.Factorization; import modtweaker2.mods.forestry.Forestry; -import modtweaker2.mods.fsp.Steamcraft; import modtweaker2.mods.ic2c.IC2C; import modtweaker2.mods.mariculture.Mariculture; import modtweaker2.mods.mekanism.Mekanism; @@ -75,7 +74,6 @@ public class ModTweaker2 { TweakerPlugin.register("Metallurgy", Metallurgy.class); TweakerPlugin.register("PneumaticCraft", PneumaticCraft.class); TweakerPlugin.register("Railcraft", Railcraft.class); - TweakerPlugin.register("Steamcraft", Steamcraft.class); TweakerPlugin.register("TConstruct", TConstruct.class); TweakerPlugin.register("Thaumcraft", Thaumcraft.class); TweakerPlugin.register("ThermalExpansion", ThermalExpansion.class); diff --git a/src/main/java/modtweaker2/mods/fsp/FSPHelper.java b/src/main/java/modtweaker2/mods/fsp/FSPHelper.java deleted file mode 100644 index 2182866..0000000 --- a/src/main/java/modtweaker2/mods/fsp/FSPHelper.java +++ /dev/null @@ -1,16 +0,0 @@ -package modtweaker2.mods.fsp; - -import flaxbeard.steamcraft.api.CrucibleLiquid; -import flaxbeard.steamcraft.api.SteamcraftRegistry; - -public class FSPHelper { - public static CrucibleLiquid getLiquid(String name) { - for (CrucibleLiquid l : SteamcraftRegistry.liquids) { - if (l.name.equals(name)) { - return l; - } - } - - return null; - } -} diff --git a/src/main/java/modtweaker2/mods/fsp/Steamcraft.java b/src/main/java/modtweaker2/mods/fsp/Steamcraft.java deleted file mode 100644 index 26d8ac0..0000000 --- a/src/main/java/modtweaker2/mods/fsp/Steamcraft.java +++ /dev/null @@ -1,12 +0,0 @@ -package modtweaker2.mods.fsp; - -import minetweaker.MineTweakerAPI; -import modtweaker2.mods.fsp.handlers.Crucible; -import modtweaker2.mods.fsp.handlers.Furnace; - -public class Steamcraft { - public Steamcraft() { - MineTweakerAPI.registerClass(Crucible.class); - MineTweakerAPI.registerClass(Furnace.class); - } -} diff --git a/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java b/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java deleted file mode 100644 index 3686437..0000000 --- a/src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java +++ /dev/null @@ -1,160 +0,0 @@ -package modtweaker2.mods.fsp.handlers; - -import static modtweaker2.helpers.InputHelper.toIItemStack; -import static modtweaker2.helpers.InputHelper.toStack; -import static modtweaker2.helpers.StackHelper.matches; -import static modtweaker2.mods.fsp.FSPHelper.getLiquid; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseListAddition; -import modtweaker2.utils.BaseMapAddition; -import modtweaker2.utils.BaseMapRemoval; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import org.apache.commons.lang3.tuple.MutablePair; - -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; -import flaxbeard.steamcraft.api.CrucibleFormula; -import flaxbeard.steamcraft.api.CrucibleLiquid; -import flaxbeard.steamcraft.api.SteamcraftRegistry; -import flaxbeard.steamcraft.api.Tuple3; - -@ZenClass("mods.fsp.Crucible") -public class Crucible { - - public static final String nameLiquid = "FSP Crucible (Liquid)"; - public static final String nameMelting = "FSP Crucible (Liquid)"; - public static final String nameDunking = "FSP Crucible (Dunking)"; - - @ZenMethod - public static void addLiquid(String name, IItemStack ingot, IItemStack plate, IItemStack nugget, int r, int g, int b) { - MineTweakerAPI.apply(new AddLiquid(new CrucibleLiquid(name, toStack(ingot), toStack(plate), toStack(nugget), null, r, g, b))); - } - - @ZenMethod - public static void addLiquid(String name, IItemStack ingot, IItemStack plate, IItemStack nugget, int r, int g, int b, String l1, int n1, String l2, int n2, int n3) { - MineTweakerAPI.apply(new AddLiquid(new CrucibleLiquid(name, toStack(ingot), toStack(plate), toStack(nugget), new CrucibleFormula(getLiquid(l1), n1, getLiquid(l2), n2, n3), r, g, b))); - } - - private static class AddLiquid extends BaseListAddition { - public AddLiquid(CrucibleLiquid recipe) { - super(nameLiquid, SteamcraftRegistry.liquids); - recipes.add(recipe); - } - - @Override - public String getRecipeInfo(CrucibleLiquid recipe) { - return recipe.name; - } - } - - @ZenMethod - public static void addMelting(IItemStack input, String liquid, int volume) { - ItemStack stack = toStack(input); - CrucibleLiquid fluid = getLiquid(liquid); - if (fluid != null) { - MineTweakerAPI.apply(new AddMelting(stack, MutablePair.of(stack.getItem(), stack.getItemDamage()), MutablePair.of(fluid, volume))); - } - } - - private static class AddMelting extends BaseMapAddition, MutablePair> { - public AddMelting(ItemStack stack, MutablePair key, MutablePair recipe) { - super(nameMelting, SteamcraftRegistry.smeltThings); - map.put(key, recipe); - } - - @Override - protected String getRecipeInfo(Entry, MutablePair> recipe) { - return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); - } - } - - @ZenMethod - public static void removeMelting(IIngredient input) { - Map, MutablePair> recipes = new HashMap, MutablePair>(); - - for(Entry, MutablePair> entry : SteamcraftRegistry.smeltThings.entrySet()) { - if(matches(input, toIItemStack(new ItemStack(entry.getKey().left, 1, entry.getKey().right)))) { - recipes.put(entry.getKey(), entry.getValue()); - } - } - - if(!recipes.isEmpty()) { - MineTweakerAPI.apply(new RemoveMelting(recipes)); - } else { - LogHelper.logWarning(String.format("No %s Recipes found for %s", Crucible.nameMelting, input)); - } - } - - private static class RemoveMelting extends BaseMapRemoval, MutablePair> { - public RemoveMelting(Map, MutablePair> recipes) { - super(nameMelting, SteamcraftRegistry.smeltThings, recipes); - } - - @Override - protected String getRecipeInfo(Entry, MutablePair> recipe) { - return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); - } - } - - @ZenMethod - public static void addDunking(IItemStack input, String liquid, int volume, IItemStack output) { - ItemStack stack = toStack(input); - CrucibleLiquid fluid = getLiquid(liquid); - if (fluid != null) { - MineTweakerAPI.apply(new AddDunking(new Tuple3(stack.getItem(), stack.getItemDamage(), fluid), MutablePair.of(volume, toStack(output)))); - } - } - - private static class AddDunking extends BaseMapAddition> { - public AddDunking(Tuple3 key, MutablePair recipe) { - super(Crucible.nameDunking, SteamcraftRegistry.dunkThings); - recipes.put(key, recipe); - } - - @Override - public String getRecipeInfo(Entry> recipe) { - return LogHelper.getStackDescription(recipe.getValue().right); - } - } - - @ZenMethod - public static void removeDunking(IIngredient input, String liquid) { - Map> recipes = new HashMap>(); - - for(Entry> recipe : SteamcraftRegistry.dunkThings.entrySet()) { - if(recipe.getValue() != null && recipe.getValue().right != null && matches(input, toIItemStack(recipe.getValue().right))) { - if(((CrucibleLiquid)recipe.getKey().third).equals(getLiquid(liquid))) { - recipes.put(recipe.getKey(), recipe.getValue()); - } - } - - } - - if(!recipes.isEmpty()) { - MineTweakerAPI.apply(new RemoveDunking(recipes)); - } else { - LogHelper.logWarning(String.format("No %s recipe found for %s and %s. Command ignored!", Crucible.nameDunking, input.toString(), liquid)); - } - } - - private static class RemoveDunking extends BaseMapRemoval> { - public RemoveDunking(Map> recipes) { - super(Crucible.nameDunking, SteamcraftRegistry.dunkThings, recipes); - } - - @Override - public String getRecipeInfo(Entry> recipe) { - return LogHelper.getStackDescription(recipe.getValue().right); - } - } -} diff --git a/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java b/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java deleted file mode 100644 index f93b7f6..0000000 --- a/src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java +++ /dev/null @@ -1,75 +0,0 @@ -package modtweaker2.mods.fsp.handlers; - -import static modtweaker2.helpers.InputHelper.toIItemStack; -import static modtweaker2.helpers.InputHelper.toStack; -import static modtweaker2.helpers.StackHelper.matches; - -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; - -import minetweaker.MineTweakerAPI; -import minetweaker.api.item.IIngredient; -import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseMapAddition; -import modtweaker2.utils.BaseMapRemoval; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import org.apache.commons.lang3.tuple.MutablePair; - -import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; -import flaxbeard.steamcraft.api.SteamcraftRegistry; - -@ZenClass("mods.fsp.Furnace") -public class Furnace { - - public static final String name = "FSP Furnace (Steamed Foods)"; - - @ZenMethod - public static void addSteamFood(IItemStack input, IItemStack output) { - MineTweakerAPI.apply(new AddSteamFood(toStack(input), MutablePair.of(toStack(input).getItem(), toStack(input).getItemDamage()), MutablePair.of(toStack(output).getItem(), toStack(output).getItemDamage()))); - } - - private static class AddSteamFood extends BaseMapAddition, MutablePair> { - public AddSteamFood(ItemStack stack, MutablePair key, MutablePair recipe) { - super(Furnace.name, SteamcraftRegistry.steamedFoods); - recipes.put(key, recipe); - } - - @Override - public String getRecipeInfo(Entry, MutablePair> recipe) { - return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); - } - } - - @ZenMethod - public static void removeSteamFood(IIngredient input) { - Map, MutablePair> recipes = new HashMap, MutablePair>(); - - for(Entry, MutablePair> recipe : SteamcraftRegistry.steamedFoods.entrySet()) { - if(matches(input, toIItemStack(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)))) { - recipes.put(recipe.getKey(), recipe.getValue()); - } - } - - if(!recipes.isEmpty()) { - MineTweakerAPI.apply(new RemoveSteamFood(recipes)); - } else { - LogHelper.logWarning(String.format("No %s Recipe found for %s. Command ignored!", Furnace.name, input.toString())); - } - } - - private static class RemoveSteamFood extends BaseMapRemoval, MutablePair> { - public RemoveSteamFood(Map, MutablePair> recipes) { - super(Furnace.name, SteamcraftRegistry.steamedFoods, recipes); - } - - @Override - public String getRecipeInfo(Entry, MutablePair> recipe) { - return LogHelper.getStackDescription(new ItemStack(recipe.getKey().left, 1, recipe.getKey().right)); - } - } -}