maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update CraftTweaker support

Browse source
This commit is contained in:
modmuss50 2017-03-14 12:59:17 +00:00
parent 3e6fc499df
commit da6925195b
No known key found for this signature in database
GPG key ID: 203A5ED4D3E48BEA
19 changed files with 98 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -81,7 +81,7 @@ if (ENV.BUILD_NUMBER) {
}
minecraft {
version = "1.11.2-13.20.0.2201"
version = "1.11.2-13.20.0.2255"
mappings = "snapshot_20161118"
replace "@MODVERSION@", project.version
// makeObfSourceJar = false
@ -114,7 +114,7 @@ dependencies {
deobfCompile ('RebornCore:RebornCore-1.11.2:+:universal'){
transitive = false
}
deobfCompile "mezz.jei:jei_1.11:+"
deobfCompile "mezz.jei:jei_1.11.2:+"
compile "mcp.mobius.waila:Hwyla:+"
compile "net.darkhax.tesla:Tesla:1.11-1.3.0.51:deobf"

BIN
libs/CraftTweaker-Dev-1.10.2-3.0.10.jar
View file

Binary file not shown.

4
src/main/java/techreborn/compat/CompatManager.java
View file

@ -29,7 +29,7 @@ import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.relauncher.Side;
import techreborn.client.render.parts.ClientPartLoader;
import techreborn.compat.ic2.RecipesIC2;
import techreborn.compat.minetweaker.MinetweakerCompat;
import techreborn.compat.crafttweaker.CraftTweakerCompat;
import techreborn.compat.theoneprobe.CompactTheOneProbe;
import techreborn.compat.tinkers.CompatModuleTinkers;
import techreborn.compat.waila.CompatModuleWaila;
@ -50,7 +50,7 @@ public class CompatManager {
public CompatManager() {
isIC2Loaded = Loader.isModLoaded("IC2");
isQuantumStorageLoaded = Loader.isModLoaded("quantumstorage");
register(MinetweakerCompat.class, "MineTweaker3");
register(CraftTweakerCompat.class, "crafttweaker");
registerCompact(TechRebornParts.class, false, "reborncore-mcmultipart");
registerCompact(ClientPartLoader.class, false, "reborncore-mcmultipart", "@client");
registerCompact(StandalonePartCompact.class, false, "!reborncore-mcmultipart");

12
src/main/java/techreborn/compat/minetweaker/MTAlloySmelter.java → src/main/java/techreborn/compat/crafttweaker/CTAlloySmelter.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -38,14 +38,14 @@ import techreborn.api.recipe.machines.AlloySmelterRecipe;
*/
@ZenClass("mods.techreborn.alloySmelter")
public class MTAlloySmelter extends MTGeneric {
public class CTAlloySmelter extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
AlloySmelterRecipe r = new AlloySmelterRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output), ticktime, euTick);
AlloySmelterRecipe r = new AlloySmelterRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output), ticktime, euTick);
addRecipe(r);
}
@ -57,7 +57,7 @@ public class MTAlloySmelter extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

12
src/main/java/techreborn/compat/minetweaker/MTAssemblingMachine.java → src/main/java/techreborn/compat/crafttweaker/CTAssemblingMachine.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,14 +34,14 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.AssemblingMachineRecipe;
@ZenClass("mods.techreborn.assemblingMachine")
public class MTAssemblingMachine extends MTGeneric {
public class CTAssemblingMachine extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
AssemblingMachineRecipe r = new AssemblingMachineRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output), ticktime, euTick);
AssemblingMachineRecipe r = new AssemblingMachineRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output), ticktime, euTick);
addRecipe(r);
}
@ -53,7 +53,7 @@ public class MTAssemblingMachine extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

12
src/main/java/techreborn/compat/minetweaker/MTBlastFurnace.java → src/main/java/techreborn/compat/crafttweaker/CTBlastFurnace.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,14 +34,14 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.BlastFurnaceRecipe;
@ZenClass("mods.techreborn.blastFurnace")
public class MTBlastFurnace extends MTGeneric {
public class CTBlastFurnace extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient input1, IIngredient input2, int ticktime, int euTick, int neededHeat) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
BlastFurnaceRecipe r = new BlastFurnaceRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output1), MinetweakerCompat.toStack(output2), ticktime, euTick, neededHeat);
BlastFurnaceRecipe r = new BlastFurnaceRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), ticktime, euTick, neededHeat);
addRecipe(r);
}
@ -53,7 +53,7 @@ public class MTBlastFurnace extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

12
src/main/java/techreborn/compat/minetweaker/MTCentrifuge.java → src/main/java/techreborn/compat/crafttweaker/CTCentrifuge.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,14 +34,14 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.CentrifugeRecipe;
@ZenClass("mods.techreborn.centrifuge")
public class MTCentrifuge extends MTGeneric {
public class CTCentrifuge extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
CentrifugeRecipe r = new CentrifugeRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output1), MinetweakerCompat.toStack(output2), MinetweakerCompat.toStack(output3), MinetweakerCompat.toStack(output4), ticktime, euTick);
CentrifugeRecipe r = new CentrifugeRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick);
addRecipe(r);
}
@ -53,7 +53,7 @@ public class MTCentrifuge extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

12
src/main/java/techreborn/compat/minetweaker/MTChemicalReactor.java → src/main/java/techreborn/compat/crafttweaker/CTChemicalReactor.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,14 +34,14 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.ChemicalReactorRecipe;
@ZenClass("mods.techreborn.chemicalReactorRecipe")
public class MTChemicalReactor extends MTGeneric {
public class CTChemicalReactor extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
ChemicalReactorRecipe r = new ChemicalReactorRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output1), ticktime, euTick);
ChemicalReactorRecipe r = new ChemicalReactorRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), ticktime, euTick);
addRecipe(r);
}
@ -53,7 +53,7 @@ public class MTChemicalReactor extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

10
src/main/java/techreborn/compat/minetweaker/MTCompressor.java → src/main/java/techreborn/compat/crafttweaker/CTCompressor.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -38,14 +38,14 @@ import techreborn.api.recipe.machines.CompressorRecipe;
*/
@ZenClass("mods.techreborn.compressor")
public class MTCompressor extends MTGeneric {
public class CTCompressor extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IIngredient input1, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
//public CompressorRecipe(ItemStack input1, ItemStack output1, int tickTime, int euPerTick) {
CompressorRecipe r = new CompressorRecipe(oInput1, MinetweakerCompat.toStack(output1), ticktime, euTick);
CompressorRecipe r = new CompressorRecipe(oInput1, CraftTweakerCompat.toStack(output1), ticktime, euTick);
addRecipe(r);
}
@ -57,7 +57,7 @@ public class MTCompressor extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

8
src/main/java/techreborn/compat/minetweaker/MTFusionReactor.java → src/main/java/techreborn/compat/crafttweaker/CTFusionReactor.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@ -40,11 +40,11 @@ import java.util.ArrayList;
import java.util.List;
@ZenClass("mods.techreborn.fusionReactor")
public class MTFusionReactor {
public class CTFusionReactor {
@ZenMethod
public static void addRecipe(IIngredient topInput, IIngredient bottomInput, IItemStack output, int startEU, int euTick, int tickTime) {
FusionReactorRecipe reactorRecipe = new FusionReactorRecipe((ItemStack) MinetweakerCompat.toObject(topInput), (ItemStack) MinetweakerCompat.toObject(bottomInput), MinetweakerCompat.toStack(output), startEU, euTick, tickTime);
FusionReactorRecipe reactorRecipe = new FusionReactorRecipe((ItemStack) CraftTweakerCompat.toObject(topInput), (ItemStack) CraftTweakerCompat.toObject(bottomInput), CraftTweakerCompat.toStack(output), startEU, euTick, tickTime);
MineTweakerAPI.apply(new Add(reactorRecipe));
}
@ -98,7 +98,7 @@ public class MTFusionReactor {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output)));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output)));
}
private static class Remove implements IUndoableAction {

6
src/main/java/techreborn/compat/minetweaker/MTGenerator.java → src/main/java/techreborn/compat/crafttweaker/CTGenerator.java
View file

@ -22,16 +22,16 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.api.liquid.ILiquidStack;
import reborncore.api.fuel.FluidPowerManager;
import stanhebben.zenscript.annotations.ZenClass;
@ZenClass("mods.techreborn.generator")
public class MTGenerator {
public class CTGenerator {
public static void addFluidPower(ILiquidStack fluid, double value) {
FluidPowerManager.fluidPowerValues.put(MinetweakerCompat.toFluidStack(fluid).getFluid(), value);
FluidPowerManager.fluidPowerValues.put(CraftTweakerCompat.toFluidStack(fluid).getFluid(), value);
}
}

4
src/main/java/techreborn/compat/minetweaker/MTGeneric.java → src/main/java/techreborn/compat/crafttweaker/CTGeneric.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@ -37,7 +37,7 @@ import techreborn.api.recipe.BaseRecipe;
import java.util.ArrayList;
import java.util.List;
public class MTGeneric {
public class CTGeneric {
public static String getMachineName() {
return null;
}

12
src/main/java/techreborn/compat/minetweaker/MTImplosionCompressor.java → src/main/java/techreborn/compat/crafttweaker/CTImplosionCompressor.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,14 +34,14 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.ImplosionCompressorRecipe;
@ZenClass("mods.techreborn.implosionCompressor")
public class MTImplosionCompressor extends MTGeneric {
public class CTImplosionCompressor extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
ImplosionCompressorRecipe r = new ImplosionCompressorRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output1), MinetweakerCompat.toStack(output2), ticktime, euTick);
ImplosionCompressorRecipe r = new ImplosionCompressorRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), ticktime, euTick);
addRecipe(r);
}
@ -53,7 +53,7 @@ public class MTImplosionCompressor extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

12
src/main/java/techreborn/compat/minetweaker/MTIndustrialElectrolyzer.java → src/main/java/techreborn/compat/crafttweaker/CTIndustrialElectrolyzer.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,14 +34,14 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.IndustrialElectrolyzerRecipe;
@ZenClass("mods.techreborn.industrialElectrolyzer")
public class MTIndustrialElectrolyzer extends MTGeneric {
public class CTIndustrialElectrolyzer extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient cells, IIngredient input2, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(cells);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(cells);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
IndustrialElectrolyzerRecipe r = new IndustrialElectrolyzerRecipe(oInput1, oInput2, MinetweakerCompat.toStack(output1), MinetweakerCompat.toStack(output2), MinetweakerCompat.toStack(output3), MinetweakerCompat.toStack(output4), ticktime, euTick);
IndustrialElectrolyzerRecipe r = new IndustrialElectrolyzerRecipe(oInput1, oInput2, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick);
addRecipe(r);
}
@ -53,7 +53,7 @@ public class MTIndustrialElectrolyzer extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

14
src/main/java/techreborn/compat/minetweaker/MTIndustrialGrinder.java → src/main/java/techreborn/compat/crafttweaker/CTIndustrialGrinder.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -36,7 +36,7 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.IndustrialGrinderRecipe;
@ZenClass("mods.techreborn.grinder")
public class MTIndustrialGrinder extends MTGeneric {
public class CTIndustrialGrinder extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, int ticktime, int euTick) {
@ -45,16 +45,16 @@ public class MTIndustrialGrinder extends MTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IItemStack output4, IIngredient input1, IIngredient input2, ILiquidStack fluid, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
FluidStack fluidStack = null;
if (fluid != null) {
fluidStack = MinetweakerCompat.toFluidStack(fluid);
fluidStack = CraftTweakerCompat.toFluidStack(fluid);
}
IndustrialGrinderRecipe r = new IndustrialGrinderRecipe(oInput1, fluidStack, MinetweakerCompat.toStack(output1),MinetweakerCompat.toStack(output2), MinetweakerCompat.toStack(output3), MinetweakerCompat.toStack(output4), ticktime, euTick);
IndustrialGrinderRecipe r = new IndustrialGrinderRecipe(oInput1, fluidStack, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), CraftTweakerCompat.toStack(output4), ticktime, euTick);
addRecipe(r);
}
@ -65,7 +65,7 @@ public class MTIndustrialGrinder extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

14
src/main/java/techreborn/compat/minetweaker/MTIndustrialSawmill.java → src/main/java/techreborn/compat/crafttweaker/CTIndustrialSawmill.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -36,7 +36,7 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.IndustrialSawmillRecipe;
@ZenClass("mods.techreborn.industrialSawmill")
public class MTIndustrialSawmill extends MTGeneric {
public class CTIndustrialSawmill extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IIngredient input1, IIngredient input2, ILiquidStack fluid, int ticktime, int euTick) {
@ -55,16 +55,16 @@ public class MTIndustrialSawmill extends MTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output1, IItemStack output2, IItemStack output3, IIngredient input1, IIngredient input2, ILiquidStack fluid, int ticktime, int euTick, boolean useOreDic) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input1);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input1);
ItemStack oInput2 = (ItemStack) MinetweakerCompat.toObject(input2);
ItemStack oInput2 = (ItemStack) CraftTweakerCompat.toObject(input2);
FluidStack fluidStack = null;
if (fluid != null) {
fluidStack = MinetweakerCompat.toFluidStack(fluid);
fluidStack = CraftTweakerCompat.toFluidStack(fluid);
}
IndustrialSawmillRecipe r = new IndustrialSawmillRecipe(oInput1, oInput2, fluidStack, MinetweakerCompat.toStack(output1), MinetweakerCompat.toStack(output2), MinetweakerCompat.toStack(output3), ticktime, euTick, useOreDic);
IndustrialSawmillRecipe r = new IndustrialSawmillRecipe(oInput1, oInput2, fluidStack, CraftTweakerCompat.toStack(output1), CraftTweakerCompat.toStack(output2), CraftTweakerCompat.toStack(output3), ticktime, euTick, useOreDic);
addRecipe(r);
}
@ -76,7 +76,7 @@ public class MTIndustrialSawmill extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

6
src/main/java/techreborn/compat/minetweaker/MTRollingMachine.java → src/main/java/techreborn/compat/crafttweaker/CTRollingMachine.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -40,7 +40,7 @@ import java.util.ArrayList;
import java.util.List;
@ZenClass("mods.techreborn.rollingMachine")
public class MTRollingMachine {
public class CTRollingMachine {
@ZenMethod
public static void addShaped(IItemStack output, IIngredient[][] ingredients) {
@ -56,7 +56,7 @@ public class MTRollingMachine {
public static void removeRecipe(IItemStack output) {
List<IRecipe> toRemove = new ArrayList<>();
for (IRecipe recipe : RollingMachineRecipe.instance.getRecipeList()) {
if (ItemUtils.isItemEqual(recipe.getRecipeOutput(), MinetweakerCompat.toStack(output), true, false)) {
if (ItemUtils.isItemEqual(recipe.getRecipeOutput(), CraftTweakerCompat.toStack(output), true, false)) {
toRemove.add(recipe);
}
}

10
src/main/java/techreborn/compat/minetweaker/MTVacuumFreezer.java → src/main/java/techreborn/compat/crafttweaker/CTVacuumFreezer.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -34,13 +34,13 @@ import techreborn.api.Reference;
import techreborn.api.recipe.machines.VacuumFreezerRecipe;
@ZenClass("mods.techreborn.vacuumFreezer")
public class MTVacuumFreezer extends MTGeneric {
public class CTVacuumFreezer extends CTGeneric {
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient input, int ticktime, int euTick) {
ItemStack oInput1 = (ItemStack) MinetweakerCompat.toObject(input);
ItemStack oInput1 = (ItemStack) CraftTweakerCompat.toObject(input);
VacuumFreezerRecipe r = new VacuumFreezerRecipe(oInput1, MinetweakerCompat.toStack(output), ticktime, euTick);
VacuumFreezerRecipe r = new VacuumFreezerRecipe(oInput1, CraftTweakerCompat.toStack(output), ticktime, euTick);
addRecipe(r);
}
@ -51,7 +51,7 @@ public class MTVacuumFreezer extends MTGeneric {
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(MinetweakerCompat.toStack(output), getMachineName()));
MineTweakerAPI.apply(new Remove(CraftTweakerCompat.toStack(output), getMachineName()));
}
public static String getMachineName() {

32
src/main/java/techreborn/compat/minetweaker/MinetweakerCompat.java → src/main/java/techreborn/compat/crafttweaker/CraftTweakerCompat.java
View file

@ -22,7 +22,7 @@
* SOFTWARE.
*/
package techreborn.compat.minetweaker;
package techreborn.compat.crafttweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
@ -42,7 +42,7 @@ import techreborn.compat.ICompatModule;
import static minetweaker.api.minecraft.MineTweakerMC.getItemStack;
import static minetweaker.api.minecraft.MineTweakerMC.getLiquidStack;
public class MinetweakerCompat implements ICompatModule {
public class CraftTweakerCompat implements ICompatModule {
public static ItemStack toStack(IItemStack iStack) {
return getItemStack(iStack);
}
@ -79,20 +79,20 @@ public class MinetweakerCompat implements ICompatModule {
@Override
public void postInit(FMLPostInitializationEvent event) {
MineTweakerAPI.registerClass(MTAlloySmelter.class);
MineTweakerAPI.registerClass(MTAssemblingMachine.class);
MineTweakerAPI.registerClass(MTBlastFurnace.class);
MineTweakerAPI.registerClass(MTCentrifuge.class);
MineTweakerAPI.registerClass(MTChemicalReactor.class);
MineTweakerAPI.registerClass(MTCompressor.class);
MineTweakerAPI.registerClass(MTIndustrialGrinder.class);
MineTweakerAPI.registerClass(MTImplosionCompressor.class);
MineTweakerAPI.registerClass(MTIndustrialElectrolyzer.class);
MineTweakerAPI.registerClass(MTIndustrialSawmill.class);
MineTweakerAPI.registerClass(MTFusionReactor.class);
MineTweakerAPI.registerClass(MTVacuumFreezer.class);
MineTweakerAPI.registerClass(MTGenerator.class);
MineTweakerAPI.registerClass(MTRollingMachine.class);
MineTweakerAPI.registerClass(CTAlloySmelter.class);
MineTweakerAPI.registerClass(CTAssemblingMachine.class);
MineTweakerAPI.registerClass(CTBlastFurnace.class);
MineTweakerAPI.registerClass(CTCentrifuge.class);
MineTweakerAPI.registerClass(CTChemicalReactor.class);
MineTweakerAPI.registerClass(CTCompressor.class);
MineTweakerAPI.registerClass(CTIndustrialGrinder.class);
MineTweakerAPI.registerClass(CTImplosionCompressor.class);
MineTweakerAPI.registerClass(CTIndustrialElectrolyzer.class);
MineTweakerAPI.registerClass(CTIndustrialSawmill.class);
MineTweakerAPI.registerClass(CTFusionReactor.class);
MineTweakerAPI.registerClass(CTVacuumFreezer.class);
MineTweakerAPI.registerClass(CTGenerator.class);
MineTweakerAPI.registerClass(CTRollingMachine.class);
}
@Override