ninja close #77

src/main/java/modtweaker2/EventHandler.java

@@ -1,13 +0,0 @@
-package modtweaker2;
-
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import minetweaker.MineTweakerImplementationAPI;
-import minetweaker.MineTweakerImplementationAPI.ReloadEvent;
-import minetweaker.util.IEventHandler;
-
-public class EventHandler {
-
-	public void reloadCommands(MineTweakerImplementationAPI.ReloadEvent event){
-		
-	}
-}

src/main/java/modtweaker2/ModTweaker2.java

@@ -83,11 +83,10 @@ public class ModTweaker2 {
 		TweakerPlugin.register("chisel", Chisel.class);
 		TweakerPlugin.register("aura", AuraCascade.class);
 		
-		MinecraftForge.EVENT_BUS.register(new modtweaker2.EventHandler());
 		if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
 			MinecraftForge.EVENT_BUS.register(new ClientEvents());
 		}
-
+		
 	}
 
 	@EventHandler

src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java

@@ -1,10 +1,13 @@
 package modtweaker2.mods.appeng.handlers;
 
+import static modtweaker2.helpers.InputHelper.toStack;
+import static modtweaker2.helpers.InputHelper.toStacks;
+
 import java.util.ArrayList;
+import java.util.List;
 
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.item.IItemStack;
-import modtweaker2.mods.auracascade.aura.IAuraStack;
 import modtweaker2.util.BaseListAddition;
 import modtweaker2.util.BaseListRemoval;
 import net.minecraft.item.ItemStack;
@@ -12,11 +15,9 @@ import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 import appeng.recipes.handlers.Inscribe;
 import appeng.recipes.handlers.Inscribe.InscriberRecipe;
-import static modtweaker2.helpers.InputHelper.*;
 
 @ZenClass("mods.appeng.Inscriber")
-public class Inscriber {
-
+public class Inscriber{
 	@ZenMethod
 	public static void addRecipe(IItemStack[] imprintable, IItemStack plateA, IItemStack plateB, IItemStack out, boolean usePlates) {
 		MineTweakerAPI.apply(new Add(new InscriberRecipe(toStacks(imprintable), toStack(plateA), toStack(plateB), toStack(out), usePlates)));
@@ -48,7 +49,9 @@ public class Inscriber {
 	public static class Remove extends BaseListRemoval {
 
 		public Remove(ItemStack stack) {
+			
 			super(stack.getUnlocalizedName(), Inscribe.recipes, stack);
+			listToRemove = list;
 		}
 
 		@Override
@@ -64,6 +67,8 @@ public class Inscriber {
 			}
 		}
 
+		
+
 	}
 
 }

src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java

@@ -89,7 +89,7 @@ public class Carpenter {
 
 		@Override
 		public String getRecipeInfo(){
-			return ((MachineCarpenter.Recipe) recipe).getCraftingResult().getDisplayName();
+			return "Removed recipe for: " + stack.getDisplayName();
 		}
 	}
 }

src/main/java/modtweaker2/mods/railcraft/handlers/RollingMachine.java

@@ -1,5 +1,7 @@
 package modtweaker2.mods.railcraft.handlers;
 
+import appeng.recipes.game.ShapedRecipe;
+import appeng.recipes.game.ShapelessRecipe;
 import minetweaker.MineTweakerAPI;
 import minetweaker.api.item.IIngredient;
 import minetweaker.api.item.IItemStack;
@@ -7,7 +9,10 @@ import mods.railcraft.api.crafting.RailcraftCraftingManager;
 import modtweaker2.mods.railcraft.RailcraftHelper;
 import modtweaker2.util.BaseCraftingAddition;
 import modtweaker2.util.BaseCraftingRemoval;
+import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.world.World;
 import stanhebben.zenscript.annotations.ZenClass;
 import stanhebben.zenscript.annotations.ZenMethod;
 import static modtweaker2.helpers.InputHelper.*;
@@ -32,12 +37,14 @@ public class RollingMachine {
 
         @Override
         public void applyShaped() {
-            RailcraftCraftingManager.rollingMachine.addRecipe(output, recipe);
+//            RailcraftCraftingManager.rollingMachine.addRecipe(output, recipe);
+            RailcraftHelper.rolling.add(new ShapedRecipe(output, recipe));
         }
 
         @Override
         public void applyShapeless() {
-            RailcraftCraftingManager.rollingMachine.addShapelessRecipe(output, recipe);
+//            RailcraftCraftingManager.rollingMachine.addShapelessRecipe(output, recipe);
+           RailcraftHelper.rolling.add(new ShapelessRecipe(output, recipe));
         }
     }
 

src/main/java/modtweaker2/mods/tconstruct/TConstruct.java

@@ -1,5 +1,10 @@
 package modtweaker2.mods.tconstruct;
 
+import net.minecraft.item.ItemStack;
+import tconstruct.library.crafting.PatternBuilder;
+import tconstruct.library.crafting.PatternBuilder.MaterialSet;
+import tconstruct.library.util.IPattern;
+import tconstruct.tools.logic.PartBuilderLogic;
 import minetweaker.MineTweakerAPI;
 import modtweaker2.mods.tconstruct.handlers.Casting;
 import modtweaker2.mods.tconstruct.handlers.Drying;

src/main/java/modtweaker2/util/BaseListRemoval.java

@@ -2,6 +2,7 @@ package modtweaker2.util;
 
 import java.util.List;
 
+import stanhebben.zenscript.annotations.ZenMethod;
 import minetweaker.IUndoableAction;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
@@ -9,15 +10,19 @@ import net.minecraftforge.fluids.FluidStack;
 public abstract class BaseListRemoval implements IUndoableAction {
     protected final String description;
     protected final List list;
-    protected final FluidStack fluid;
+
+	protected final FluidStack fluid;
     protected final ItemStack stack;
     protected Object recipe;
+    
+    public static List listToRemove;
 
     public BaseListRemoval(String description, List list, ItemStack stack, FluidStack fluid) {
         this.list = list;
         this.stack = stack;
         this.description = description;
         this.fluid = fluid;
+        listToRemove = list;
     }
 
     public BaseListRemoval(String description, List list, ItemStack stack) {
@@ -39,7 +44,7 @@ public abstract class BaseListRemoval implements IUndoableAction {
     public BaseListRemoval(String description, List list) {
         this(description, list, null, null);
     }
-
+    
 
 	@Override
     public boolean canUndo() {