Anvilcraft/ModTweaker
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated MTLib

Browse source
This commit is contained in:
Jared 2018-02-15 00:22:34 +02:00
parent 9afeef25b4
commit 66c4560414
28 changed files with 85 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -62,7 +62,7 @@ repositories {
dependencies {
deobfCompile "CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.1.0.+"
deobfCompile "mezz.jei:jei_1.12.2:4.8.5.+"
deobfCompile "com.blamejared:MTLib:3.0.+"
deobfCompile "com.blamejared:MTLib:3.0.2.4"
deobfCompile "com.azanor.baubles:Baubles:1.12-1.5.2"
deobfCompile "vazkii.botania:Botania:r1.10-353"

10
src/main/java/com/blamejared/compat/betterwithmods/Anvil.java
View file

@ -7,7 +7,7 @@ import betterwithmods.common.registry.anvil.ShapelessAnvilRecipe;
import betterwithmods.module.gameplay.AnvilRecipes;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -47,7 +47,7 @@ public class Anvil {
ModTweaker.LATE_REMOVALS.add(new RemoveShapeless(output, ingredients));
}
public static class AddShaped extends BaseUndoable {
public static class AddShaped extends BaseAction {
private final IItemStack output;
private final IIngredient[][] ingredients;
@ -69,7 +69,7 @@ public class Anvil {
}
}
public static class AddShapeless extends BaseUndoable {
public static class AddShapeless extends BaseAction {
private final IItemStack output;
private final IIngredient[] ingredients;
@ -118,7 +118,7 @@ public class Anvil {
}
}
public static class RemoveShaped extends BaseUndoable {
public static class RemoveShaped extends BaseAction {
private final IItemStack output;
private final IIngredient[][] ingredients;
@ -155,7 +155,7 @@ public class Anvil {
}
}
public static class RemoveShapeless extends BaseUndoable {
public static class RemoveShapeless extends BaseAction {
private final IItemStack output;
private final IIngredient[] ingredients;

4
src/main/java/com/blamejared/compat/betterwithmods/Kiln.java
View file

@ -8,7 +8,7 @@ import com.blamejared.ModTweaker;
import com.blamejared.compat.betterwithmods.util.BMAdd;
import com.blamejared.compat.betterwithmods.util.BMRemove;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import com.google.common.collect.Lists;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
@ -60,7 +60,7 @@ public class Kiln {
}
public static class KilnBlock extends BaseUndoable {
public static class KilnBlock extends BaseAction {
private IBlockState state;

4
src/main/java/com/blamejared/compat/betterwithmods/Movement.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.betterwithmods;
import betterwithmods.module.hardcore.needs.HCMovement;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -30,7 +30,7 @@ public class Movement {
}
}
public static class Set extends BaseUndoable {
public static class Set extends BaseAction {
private IBlockState state;
private float speed;

4
src/main/java/com/blamejared/compat/betterwithmods/util/BMRemove.java
View file

@ -3,13 +3,13 @@ package com.blamejared.compat.betterwithmods.util;
import betterwithmods.common.registry.blockmeta.managers.BlockMetaManager;
import betterwithmods.common.registry.blockmeta.recipe.BlockMetaRecipe;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.api.minecraft.CraftTweakerMC;
import net.minecraft.item.ItemStack;
import java.util.*;
public class BMRemove extends BaseUndoable {
public class BMRemove extends BaseAction {
private final BlockMetaManager recipes;
private final ItemStack input;

4
src/main/java/com/blamejared/compat/betterwithmods/util/BulkRemove.java
View file

@ -4,11 +4,11 @@ package com.blamejared.compat.betterwithmods.util;
import betterwithmods.common.registry.bulk.manager.CraftingManagerBulk;
import betterwithmods.common.registry.bulk.recipes.BulkRecipe;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import net.minecraft.item.ItemStack;
public class BulkRemove<T extends BulkRecipe> extends BaseUndoable {
public class BulkRemove<T extends BulkRecipe> extends BaseAction {
private CraftingManagerBulk<T> manager;
private final ItemStack output;

6
src/main/java/com/blamejared/compat/extrautils2/Crusher.java
View file

@ -4,7 +4,7 @@ import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.helpers.StackHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import com.rwtema.extrautils2.api.machine.IMachineRecipe;
import com.rwtema.extrautils2.api.machine.MachineSlotFluid;
import com.rwtema.extrautils2.api.machine.MachineSlotItem;
@ -38,7 +38,7 @@ public class Crusher {
ModTweaker.LATE_REMOVALS.add(new Remove(input));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input, secondaryOutput;
private float secondaryChance;
@ -65,7 +65,7 @@ public class Crusher {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private IItemStack input;

6
src/main/java/com/blamejared/compat/extrautils2/Resonator.java
View file

@ -4,7 +4,7 @@ import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.InputHelper;
import com.blamejared.mtlib.helpers.LogHelper;
import com.blamejared.mtlib.helpers.StackHelper;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import com.rwtema.extrautils2.tile.TileResonator;
import crafttweaker.annotations.ModOnly;
import crafttweaker.annotations.ZenRegister;
@ -37,7 +37,7 @@ public class Resonator {
ModTweaker.LATE_REMOVALS.add(new Remove(output));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input;
private int energy;
@ -62,7 +62,7 @@ public class Resonator {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private IItemStack output;

6
src/main/java/com/blamejared/compat/tcomplement/Blacklist.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.tcomplement;
import com.blamejared.ModTweaker;
import com.blamejared.compat.tconstruct.recipes.MeltingRecipeTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -47,7 +47,7 @@ public class Blacklist {
CraftTweakerAPI.apply(new Blacklist.Remove(input));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output;
private ItemStack input;
@ -69,7 +69,7 @@ public class Blacklist {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private IItemStack input;

6
src/main/java/com/blamejared/compat/tcomplement/Overrides.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.tcomplement;
import com.blamejared.ModTweaker;
import com.blamejared.compat.tconstruct.recipes.MeltingRecipeTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -49,7 +49,7 @@ public class Overrides {
CraftTweakerAPI.apply(new Overrides.Remove(output, input));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output;
private ItemStack input;
@ -76,7 +76,7 @@ public class Overrides {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ILiquidStack output;
private IItemStack input;

6
src/main/java/com/blamejared/compat/tconstruct/Alloy.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.tconstruct;
import com.blamejared.ModTweaker;
import com.blamejared.compat.tconstruct.recipes.AlloyRecipeTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.liquid.ILiquidStack;
@ -51,7 +51,7 @@ public class Alloy {
CraftTweakerAPI.apply(new Alloy.Remove(output, in));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output;
private FluidStack[] input;
@ -73,7 +73,7 @@ public class Alloy {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ILiquidStack output;
private List<ILiquidStack> inputs;

6
src/main/java/com/blamejared/compat/tconstruct/Casting.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.tconstruct;
import com.blamejared.ModTweaker;
import com.blamejared.compat.tconstruct.recipes.CastingRecipeTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -62,7 +62,7 @@ public class Casting {
CraftTweakerAPI.apply(new Remove(output, input, false));
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private IItemStack output;
private ILiquidStack input;
@ -138,7 +138,7 @@ public class Casting {
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, cast;
private FluidStack fluid;

6
src/main/java/com/blamejared/compat/tconstruct/Drying.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.tconstruct;
import com.blamejared.ModTweaker;
import com.blamejared.compat.tconstruct.recipes.DryingRecipeTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -46,7 +46,7 @@ public class Drying {
CraftTweakerAPI.apply(new Remove(output, input));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input;
private int time;
@ -69,7 +69,7 @@ public class Drying {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private IItemStack output;
private IItemStack input;

4
src/main/java/com/blamejared/compat/tconstruct/Fuel.java
View file

@ -2,7 +2,7 @@ package com.blamejared.compat.tconstruct;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.annotations.*;
import crafttweaker.api.liquid.ILiquidStack;
import net.minecraftforge.fluids.FluidStack;
@ -20,7 +20,7 @@ public class Fuel {
ModTweaker.LATE_ADDITIONS.add(new Fuel.Add(InputHelper.toFluid(fluid), duration));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack fuel;
private int duration;

10
src/main/java/com/blamejared/compat/tconstruct/Melting.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.tconstruct;
import com.blamejared.ModTweaker;
import com.blamejared.compat.tconstruct.recipes.MeltingRecipeTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import com.google.common.collect.*;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
@ -66,7 +66,7 @@ public class Melting {
CraftTweakerAPI.apply(new RemoveEntityMelting((EntityEntry) entity.getInternal()));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output;
private ItemStack input;
@ -93,7 +93,7 @@ public class Melting {
}
}
private static class AddEntityMelting extends BaseUndoable {
private static class AddEntityMelting extends BaseAction {
private EntityEntry entity;
private FluidStack output;
@ -116,7 +116,7 @@ public class Melting {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ILiquidStack output;
private IItemStack input;
@ -138,7 +138,7 @@ public class Melting {
}
}
private static class RemoveEntityMelting extends BaseUndoable {
private static class RemoveEntityMelting extends BaseAction {
private EntityEntry entity;

6
src/main/java/com/blamejared/compat/thermalexpansion/Centrifuge.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.CentrifugeManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.*;
@ -37,7 +37,7 @@ public class Centrifuge {
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack[] outputs;
private Integer[] chances;
@ -65,7 +65,7 @@ public class Centrifuge {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;

6
src/main/java/com/blamejared/compat/thermalexpansion/Compactor.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.CompactorManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -54,7 +54,7 @@ public class Compactor {
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input;
private int energy;
@ -79,7 +79,7 @@ public class Compactor {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;
private CompactorManager.Mode mode;

6
src/main/java/com/blamejared/compat/thermalexpansion/Crucible.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.CrucibleManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -27,7 +27,7 @@ public class Crucible {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(input)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output;
private ItemStack input;
@ -51,7 +51,7 @@ public class Crucible {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;

6
src/main/java/com/blamejared/compat/thermalexpansion/Enchanter.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.EnchanterManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -25,7 +25,7 @@ public class Enchanter {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(input), InputHelper.toStack(secondInput)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input, inputSecondary;
private int energy, experience;
@ -52,7 +52,7 @@ public class Enchanter {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input, inputSecondary;

6
src/main/java/com/blamejared/compat/thermalexpansion/Imbuer.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.BrewerManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -27,7 +27,7 @@ public class Imbuer {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(input), InputHelper.toFluid(secondInput)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output;
private ItemStack input;
@ -53,7 +53,7 @@ public class Imbuer {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;
private FluidStack fluid;

6
src/main/java/com/blamejared/compat/thermalexpansion/InductionSmelter.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.SmelterManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -25,7 +25,7 @@ public class InductionSmelter {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(primaryInput), InputHelper.toStack(secondaryInput)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack primaryOutput, primaryInput, secondaryInput, secondaryOutput;
private int energy, secondaryChance;
@ -54,7 +54,7 @@ public class InductionSmelter {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack primaryInput, secondaryInput;

6
src/main/java/com/blamejared/compat/thermalexpansion/Infuser.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.ChargerManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -26,7 +26,7 @@ public class Infuser {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(input)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output;
private ItemStack input;
@ -50,7 +50,7 @@ public class Infuser {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;

6
src/main/java/com/blamejared/compat/thermalexpansion/Insolator.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.InsolatorManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -25,7 +25,7 @@ public class Insolator {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(primaryInput), InputHelper.toStack(secondaryInput)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack primaryOutput, primaryInput, secondaryInput, secondaryOutput;
private int energy, secondaryChance;
@ -54,7 +54,7 @@ public class Insolator {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack primaryInput, secondaryInput;

6
src/main/java/com/blamejared/compat/thermalexpansion/Pulverizer.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.PulverizerManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -25,7 +25,7 @@ public class Pulverizer {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(input)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input, secondaryOutput;
private int energy, secondaryChance;
@ -53,7 +53,7 @@ public class Pulverizer {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;

10
src/main/java/com/blamejared/compat/thermalexpansion/RedstoneFurnace.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.FurnaceManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -35,7 +35,7 @@ public class RedstoneFurnace {
ModTweaker.LATE_REMOVALS.add(new RemovePyrolysis(InputHelper.toStack(input)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input;
private int energy;
@ -58,7 +58,7 @@ public class RedstoneFurnace {
}
}
private static class AddPyrolysis extends BaseUndoable {
private static class AddPyrolysis extends BaseAction {
private ItemStack output, input;
private int energy;
@ -83,7 +83,7 @@ public class RedstoneFurnace {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;
@ -107,7 +107,7 @@ public class RedstoneFurnace {
}
}
private static class RemovePyrolysis extends BaseUndoable {
private static class RemovePyrolysis extends BaseAction {
private ItemStack input;

6
src/main/java/com/blamejared/compat/thermalexpansion/Refinery.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.RefineryManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.WeightedItemStack;
@ -26,7 +26,7 @@ public class Refinery {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toFluid(input)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private FluidStack output, input;
private WeightedItemStack outputItem;
@ -55,7 +55,7 @@ public class Refinery {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private FluidStack input;

6
src/main/java/com/blamejared/compat/thermalexpansion/SawMill.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.SawmillManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.IItemStack;
@ -25,7 +25,7 @@ public class SawMill {
ModTweaker.LATE_REMOVALS.add(new Remove(InputHelper.toStack(input)));
}
private static class Add extends BaseUndoable {
private static class Add extends BaseAction {
private ItemStack output, input, secondaryOutput;
private int energy, secondaryChance;
@ -53,7 +53,7 @@ public class SawMill {
}
}
private static class Remove extends BaseUndoable {
private static class Remove extends BaseAction {
private ItemStack input;

10
src/main/java/com/blamejared/compat/thermalexpansion/Transposer.java
View file

@ -3,7 +3,7 @@ package com.blamejared.compat.thermalexpansion;
import cofh.thermalexpansion.util.managers.machine.TransposerManager;
import com.blamejared.ModTweaker;
import com.blamejared.mtlib.helpers.*;
import com.blamejared.mtlib.utils.BaseUndoable;
import com.blamejared.mtlib.utils.BaseAction;
import crafttweaker.CraftTweakerAPI;
import crafttweaker.annotations.*;
import crafttweaker.api.item.*;
@ -44,7 +44,7 @@ public class Transposer {
ModTweaker.LATE_REMOVALS.add(new RemoveFill(InputHelper.toStack(input), InputHelper.toFluid(fluid)));
}
private static class AddExtract extends BaseUndoable {
private static class AddExtract extends BaseAction {
private FluidStack output;
private ItemStack input;
@ -73,7 +73,7 @@ public class Transposer {
}
}
private static class RemoveExtract extends BaseUndoable {
private static class RemoveExtract extends BaseAction {
private ItemStack input;
@ -97,7 +97,7 @@ public class Transposer {
}
}
private static class AddFill extends BaseUndoable {
private static class AddFill extends BaseAction {
private FluidStack fluid;
private ItemStack input;
@ -124,7 +124,7 @@ public class Transposer {
}
}
private static class RemoveFill extends BaseUndoable {
private static class RemoveFill extends BaseAction {
private ItemStack input;
private FluidStack fluid;