upstream/ModTweaker
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ModTweaker.git synced 2026-11-11 07:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

This closes #17 and closes #58, I tested and it worked using the script given

Browse Source 
Also changes like all packages
inb4 "jared changes a package name in ModTweaker2 breaking compatability
with everything" drama tweet.
This commit is contained in:
jaredlll08 committed 2015-02-20 23:57:32 +02:00
1 parent 4fd2551072
commit ec562b62ea
187 files changed
+977 -991
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+1 -1
View File
@@ -1,3 +1,3 @@
mc_version=1.7.10
forge_version=10.13.2.1284
forge_version=10.13.2.1286
mod_version=0.3.0
libs/Ex-Nihilo-1.37-dev.jar.d → libs/Ex-Nihilo-1.37-dev.jar
BIN
View File
Binary file not shown.
libs/ForgeMultipart-1.7.10-1.1.1.320-src.jar
BIN
View File
Binary file not shown.
libs/ForgeMultipart-1.7.10-1.1.1.322-dev.jar
BIN
View File
Binary file not shown.
libs/MekanismAll-1.7.10-7.1.2.homebaked-dev.jar
BIN
View File
Binary file not shown.
libs/forestry_1.7.10-3.3.0.452-unstable-dev.jar → libs/forestry_1.7.10-3.5.0.471-unstable-dev.jar
BIN
View File
Binary file not shown.
src/api/java/thaumcraft/api/aspects/IEssentiaContainerItem.java
-1
View File
@@ -1,7 +1,6 @@
package thaumcraft.api.aspects;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
/**
*
src/api/java/thaumcraft/api/package-info.java
+1
View File
@@ -2,3 +2,4 @@
package thaumcraft.api;
import cpw.mods.fml.common.API;
src/main/java/modtweaker/ClientEvents.java
-35
View File
@@ -1,35 +0,0 @@
package modtweaker;
import static modtweaker.helpers.LogHelper.print;
import minetweaker.api.item.IItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.player.IPlayer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class ClientEvents {
public static int cooldown;
public static boolean active;
@SubscribeEvent
public void onDrawTooltip(ItemTooltipEvent event) {
if (active) {
IPlayer player = MineTweakerMC.getIPlayer(event.entityPlayer);
if (player != null) {
IItemStack hand = MineTweakerMC.getIItemStack(event.itemStack);
if (hand != null) {
String print = hand.toString();
event.toolTip.add(print);
if (GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindSprint)) {
if (cooldown <= 0) {
cooldown = 30;
print(print + " -- " + hand.getDisplayName());
} else cooldown--;
} else cooldown--;
}
}
}
}
}
src/main/java/modtweaker/Commands.java
-61
View File
@@ -1,61 +0,0 @@
package modtweaker;
import minetweaker.MineTweakerAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker.commands.EntityMappingLogger;
import modtweaker.mods.botania.commands.BotaniaBrewLogger;
import modtweaker.mods.botania.commands.BotaniaOrechidLogger;
import modtweaker.mods.botania.lexicon.commands.LexiconCategoryLogger;
import modtweaker.mods.botania.lexicon.commands.LexiconEntryLogger;
import modtweaker.mods.botania.lexicon.commands.LexiconKnowledgeTypesLogger;
import modtweaker.mods.botania.lexicon.commands.LexiconPageLogger;
import modtweaker.mods.chisel.commands.ChiselGroupLogger;
import modtweaker.mods.chisel.commands.ChiselVariationLogger;
import modtweaker.mods.mekanism.gas.GasLogger;
import modtweaker.mods.tconstruct.MaterialLogger;
import modtweaker.mods.thaumcraft.commands.AspectLogger;
import modtweaker.mods.thaumcraft.research.commands.ResearchLogger;
import modtweaker.util.TweakerPlugin;
public class Commands {
public static void registerCommands() {
MineTweakerAPI.server.addMineTweakerCommand("tooltips", new String[] { "/minetweaker tooltips", " Adds tooltips to all items ingame with their mt script name, press ctrl on an item to print to the log" }, new ICommandFunction() {
@Override
public void execute(String[] arguments, IPlayer player) {
ClientEvents.active = !ClientEvents.active;
}
});
MineTweakerAPI.server.addMineTweakerCommand("entities", new String[] { "/minetweaker entities", " Outputs a list of entities class mapping keys and the entity IDs" }, new EntityMappingLogger());
if (TweakerPlugin.isLoaded("Mekanism")) {
MineTweakerAPI.server.addMineTweakerCommand("gases", new String[] { "/minetweaker gases", " Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger());
}
if (TweakerPlugin.isLoaded("Thaumcraft")) {
MineTweakerAPI.server.addMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", " Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger());
MineTweakerAPI.server.addMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", " Outputs a list of all aspects registered to entities and items"}, new AspectLogger());
}
if (TweakerPlugin.isLoaded("TConstruct")) {
MineTweakerAPI.server.addMineTweakerCommand("materials", new String[] { "/minetweaker materials", " Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger());
}
if (TweakerPlugin.isLoaded("Botania")) {
MineTweakerAPI.server.addMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", " Outputs a list of lexicon categories" }, new LexiconCategoryLogger());
MineTweakerAPI.server.addMineTweakerCommand("lexiconEntries", new String[] { "/minetweaker lexiconEntries", "/minetweaker lexiconEntries [CATEGORY]", " Outputs a list of lexicon entries" }, new LexiconEntryLogger());
MineTweakerAPI.server.addMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", " Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger());
MineTweakerAPI.server.addMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", " Outputs a list of keys for botania brews" }, new BotaniaBrewLogger());
MineTweakerAPI.server.addMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", " Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger());
MineTweakerAPI.server.addMineTweakerCommand("botaniaOrchid", new String[] { "/minetweaker botaniaOrechid", " Outputs a list of keys for botania orechid weights" }, new BotaniaOrechidLogger());
}
if (TweakerPlugin.isLoaded("chisel")) {
MineTweakerAPI.server.addMineTweakerCommand("chiselGroups", new String[] { "/minetweaker chiselGroups", " Outputs a list of chisel groups" }, new ChiselGroupLogger());
MineTweakerAPI.server.addMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", " Outputs a list of chisel variations" }, new ChiselVariationLogger());
}
}
}
src/main/java/modtweaker/mods/tconstruct/MaterialLogger.java
-36
View File
@@ -1,36 +0,0 @@
package modtweaker.mods.tconstruct;
import static modtweaker.helpers.LogHelper.logPrinted;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Map;
import minetweaker.MineTweakerAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.tools.ToolMaterial;
public class MaterialLogger implements ICommandFunction {
private static ArrayList<String> materials = new ArrayList();
static {
materials = new ArrayList();
for (Map.Entry<String, ToolMaterial> entry : TConstructRegistry.toolMaterialStrings.entrySet()) {
materials.add(entry.getKey());
}
Collections.sort(materials);
}
@Override
public void execute(String[] arguments, IPlayer player) {
System.out.println("Materials: " + materials.size());
for (String s : materials) {
System.out.println("Material " + s);
MineTweakerAPI.logCommand("<" + s + "> -- ");
}
logPrinted(player);
}
}
src/main/java/modtweaker/mods/thermalexpansion/ThermalExpansion.java
-20
View File
@@ -1,20 +0,0 @@
package modtweaker.mods.thermalexpansion;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.thermalexpansion.handlers.Crucible;
import modtweaker.mods.thermalexpansion.handlers.Furnace;
import modtweaker.mods.thermalexpansion.handlers.Pulverizer;
import modtweaker.mods.thermalexpansion.handlers.Sawmill;
import modtweaker.mods.thermalexpansion.handlers.Smelter;
import modtweaker.mods.thermalexpansion.handlers.Transposer;
public class ThermalExpansion {
public ThermalExpansion() {
MineTweakerAPI.registerClass(Crucible.class);
MineTweakerAPI.registerClass(Furnace.class);
MineTweakerAPI.registerClass(Pulverizer.class);
MineTweakerAPI.registerClass(Sawmill.class);
MineTweakerAPI.registerClass(Smelter.class);
MineTweakerAPI.registerClass(Transposer.class);
}
}
src/main/java/modtweaker/util/ArrayUtils.java
-17
View File
@@ -1,17 +0,0 @@
package modtweaker.util;
import java.util.ArrayList;
import net.minecraft.item.ItemStack;
public class ArrayUtils {
public static ArrayList<ItemStack> toArrayList(ItemStack[] array){
ArrayList<ItemStack> stacks = new ArrayList<ItemStack>();
for(ItemStack stack : array){
stacks.add(stack);
}
return stacks;
}
}
src/main/java/modtweaker2/ClientEvents.java
+43
View File
@@ -0,0 +1,43 @@
package modtweaker2;
import minetweaker.api.item.IItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.player.IPlayer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import static modtweaker2.helpers.LogHelper.*;
public class ClientEvents {
public static int cooldown;
public static boolean active;
@SubscribeEvent
public void onDrawTooltip(ItemTooltipEvent event) {
IPlayer player = MineTweakerMC.getIPlayer(event.entityPlayer);
if (player != null) {
IItemStack hand = MineTweakerMC.getIItemStack(event.itemStack);
if (hand != null) {
if (active) {
String print = hand.toString();
event.toolTip.add(print);
if (GameSettings.isKeyDown(Minecraft.getMinecraft().gameSettings.keyBindSprint)) {
if (cooldown <= 0) {
cooldown = 30;
print(print + " -- " + hand.getDisplayName());
} else
cooldown--;
} else
cooldown--;
}
}
}
}
}
src/main/java/modtweaker2/Commands.java
+66
View File
@@ -0,0 +1,66 @@
package modtweaker2;
import minetweaker.MineTweakerAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker2.commands.EntityMappingLogger;
import modtweaker2.mods.botania.commands.BotaniaBrewLogger;
import modtweaker2.mods.botania.commands.BotaniaOrechidLogger;
import modtweaker2.mods.botania.lexicon.commands.LexiconCategoryLogger;
import modtweaker2.mods.botania.lexicon.commands.LexiconEntryLogger;
import modtweaker2.mods.botania.lexicon.commands.LexiconKnowledgeTypesLogger;
import modtweaker2.mods.botania.lexicon.commands.LexiconPageLogger;
import modtweaker2.mods.chisel.commands.ChiselGroupLogger;
import modtweaker2.mods.chisel.commands.ChiselVariationLogger;
import modtweaker2.mods.mekanism.gas.GasLogger;
import modtweaker2.mods.tconstruct.MaterialLogger;
import modtweaker2.mods.thaumcraft.commands.AspectLogger;
import modtweaker2.mods.thaumcraft.research.commands.ResearchLogger;
import modtweaker2.util.TweakerPlugin;
public class Commands {
public static void registerCommands() {
registerMineTweakerCommand("tooltips", new String[] { "/minetweaker tooltips", " Adds tooltips to all items ingame with their mt script name, press ctrl on an item to print to the log" }, new ICommandFunction() {
@Override
public void execute(String[] arguments, IPlayer player) {
ClientEvents.active = !ClientEvents.active;
}
});
registerMineTweakerCommand("entities", new String[] { "/minetweaker entities", " Outputs a list of entities class mapping keys and the entity IDs" }, new EntityMappingLogger());
if (TweakerPlugin.isLoaded("Mekanism")) {
registerMineTweakerCommand("gases", new String[] { "/minetweaker gases", " Outputs a list of all gas names in the game to the minetweaker log" }, new GasLogger());
}
if (TweakerPlugin.isLoaded("Thaumcraft")) {
registerMineTweakerCommand("research", new String[] { "/minetweaker research", "/minetweaker research [CATEGORY]", " Outputs a list of all category names in the game to the minetweaker log," + " or outputs a list of all research keys in a category to the log." }, new ResearchLogger());
registerMineTweakerCommand("aspectList", new String[] { "/minetweaker aspectList", " Outputs a list of all aspects registered to entities and items" }, new AspectLogger());
}
if (TweakerPlugin.isLoaded("TConstruct")) {
registerMineTweakerCommand("materials", new String[] { "/minetweaker materials", " Outputs a list of all Tinker's Construct material names in the game to the minetweaker log" }, new MaterialLogger());
}
if (TweakerPlugin.isLoaded("Botania")) {
registerMineTweakerCommand("lexiconCategories", new String[] { "/minetweaker lexiconCategories", " Outputs a list of lexicon categories" }, new LexiconCategoryLogger());
registerMineTweakerCommand("lexiconEntries", new String[] { "/minetweaker lexiconEntries", "/minetweaker lexiconEntries [CATEGORY]", " Outputs a list of lexicon entries" }, new LexiconEntryLogger());
registerMineTweakerCommand("lexiconPages", new String[] { "/minetweaker lexiconPages", "/minetweaker lexiconPages [ENTRY]", " Outputs a list of lexicon pages for the entry" }, new LexiconPageLogger());
registerMineTweakerCommand("botaniaBrews", new String[] { "/minetweaker botaniaBrews", " Outputs a list of keys for botania brews" }, new BotaniaBrewLogger());
registerMineTweakerCommand("lexiconKnowledgeTypes", new String[] { "/minetweaker lexiconKnowledgeTypes", " Outputs a list of keys for lexicon knowledge types" }, new LexiconKnowledgeTypesLogger());
registerMineTweakerCommand("botaniaOrchid", new String[] { "/minetweaker botaniaOrechid", " Outputs a list of keys for botania orechid weights" }, new BotaniaOrechidLogger());
}
if (TweakerPlugin.isLoaded("chisel")) {
registerMineTweakerCommand("chiselGroups", new String[] { "/minetweaker chiselGroups", " Outputs a list of chisel groups" }, new ChiselGroupLogger());
registerMineTweakerCommand("chiselVariations", new String[] { "/minetweaker chiselVariations", "/minetweaker chiselVariations [GROUP]", " Outputs a list of chisel variations" }, new ChiselVariationLogger());
}
}
private static void registerMineTweakerCommand(String commandName, String[] usages, ICommandFunction commandFunction) {
MineTweakerAPI.server.addMineTweakerCommand(commandName, usages, commandFunction);
ModTweaker2.logger.info("Registering command " + commandName + ".");
}
}
src/main/java/modtweaker/ModProps.java → src/main/java/modtweaker2/ModProps.java
+2 -2
View File
@@ -1,9 +1,9 @@
package modtweaker;
package modtweaker2;
public class ModProps {
public static final String NAME = "Mod Tweaker 2", name = NAME;
public static final String MODID = "modtweaker2", modid = MODID;
public static final String VERSION = "0.0.1", version = VERSION;
public static final String VERSION = "0.7", version = VERSION;
public static final String DEPENDENCIES = "required-after:MineTweaker3", dependencies = DEPENDENCIES;
}
src/main/java/modtweaker/ModTweaker.java → src/main/java/modtweaker2/ModTweaker2.java
+47 -25
View File
@@ -1,50 +1,65 @@
package modtweaker;
package modtweaker2;
import java.io.File;
import modtweaker.mods.appeng.AppliedEnergistics;
import modtweaker.mods.botania.Botania;
import modtweaker.mods.chisel.Chisel;
import modtweaker.mods.exnihilo.ExNihilo;
import modtweaker.mods.extendedworkbench.ExtendedWorkbench;
import modtweaker.mods.factorization.Factorization;
import modtweaker.mods.forestry.Forestry;
import modtweaker.mods.fsp.Steamcraft;
import modtweaker.mods.hee.HardcoreEnderExpansion;
import modtweaker.mods.imc.handler.Message;
import modtweaker.mods.mariculture.Mariculture;
import modtweaker.mods.mekanism.Mekanism;
import modtweaker.mods.metallurgy.Metallurgy;
import modtweaker.mods.pneumaticcraft.PneumaticCraft;
import modtweaker.mods.railcraft.Railcraft;
import modtweaker.mods.tconstruct.TConstruct;
import modtweaker.mods.thaumcraft.Thaumcraft;
import modtweaker.mods.thermalexpansion.ThermalExpansion;
import modtweaker.util.TweakerPlugin;
import minetweaker.MineTweakerAPI;
import modtweaker2.mods.appeng.AppliedEnergistics;
import modtweaker2.mods.botania.Botania;
import modtweaker2.mods.chisel.Chisel;
import modtweaker2.mods.exnihilo.ExNihilo;
import modtweaker2.mods.extendedworkbench.ExtendedWorkbench;
import modtweaker2.mods.factorization.Factorization;
import modtweaker2.mods.forestry.Forestry;
import modtweaker2.mods.fsp.Steamcraft;
import modtweaker2.mods.hee.HardcoreEnderExpansion;
import modtweaker2.mods.imc.handler.Message;
import modtweaker2.mods.mariculture.Mariculture;
import modtweaker2.mods.mekanism.Mekanism;
import modtweaker2.mods.metallurgy.Metallurgy;
import modtweaker2.mods.pneumaticcraft.PneumaticCraft;
import modtweaker2.mods.railcraft.Railcraft;
import modtweaker2.mods.tconstruct.TConstruct;
import modtweaker2.mods.thaumcraft.Thaumcraft;
import modtweaker2.mods.thermalexpansion.ThermalExpansion;
import modtweaker2.util.TweakerPlugin;
import net.minecraftforge.common.MinecraftForge;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.Mod.Instance;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.relauncher.Side;
@Mod(modid = ModProps.modid, name = ModProps.name, dependencies = ModProps.dependencies)
public class ModTweaker {
@Mod(modid = ModProps.modid, version = ModProps.version, dependencies = ModProps.dependencies)
public class ModTweaker2 {
public static Logger logger = LogManager.getLogger(ModProps.modid);
@Instance(ModProps.modid)
public ModTweaker2 instance;
@EventHandler
public void preInit(FMLPreInitializationEvent event) {
logger.info("Starting PreInitialization for " + ModProps.modid);
File file = new File("scripts");
if (!file.exists()) {
file.mkdir();
}
new Message(file.getPath());
}
@EventHandler
public void init(FMLInitializationEvent event) {
logger.info("Starting Initialization for " + ModProps.modid);
TweakerPlugin.register("Botania", Botania.class);
TweakerPlugin.register("exnihilo", ExNihilo.class);
TweakerPlugin.register("extendedWorkbench", ExtendedWorkbench.class);
@@ -62,15 +77,22 @@ public class ModTweaker {
TweakerPlugin.register("Forestry", Forestry.class);
TweakerPlugin.register("chisel", Chisel.class);
TweakerPlugin.register("appliedenergistics2-core", AppliedEnergistics.class);
MinecraftForge.EVENT_BUS.register(new TweakEventHandler());
if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
MinecraftForge.EVENT_BUS.register(new ClientEvents());
}
}
@EventHandler
public void onServerStart(FMLServerStartingEvent event) {
public void postInit(FMLPostInitializationEvent event) {
logger.info("Starting PostInitialization for " + ModProps.modid);
}
@EventHandler
public void serverStart(FMLServerStartingEvent event) {
logger.info("Starting ServerStart for " + ModProps.modid);
Commands.registerCommands();
}
}
src/main/java/modtweaker2/TweakEventHandler.java
+35
View File
@@ -0,0 +1,35 @@
package modtweaker2;
import java.util.ArrayList;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.living.LivingDropsEvent;
import org.apache.commons.lang3.tuple.MutablePair;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class TweakEventHandler {
public static ArrayList<MutablePair<EntityLivingBase, ArrayList<ItemStack>>> drops = new ArrayList<MutablePair<EntityLivingBase, ArrayList<ItemStack>>>();
public static ArrayList<EntityLiving> cancleDrops = new ArrayList<EntityLiving>();
@SubscribeEvent
public void handleDrops(LivingDropsEvent event) {
if (cancleDrops.contains(event.entityLiving)) {
event.setCanceled(true);
}
for (MutablePair<EntityLivingBase, ArrayList<ItemStack>> ent : drops) {
if (ent.left.isEntityEqual(event.entityLiving)) {
for (ItemStack stack : ent.right) {
event.drops.add(new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, stack));
}
}
}
}
}
src/main/java/modtweaker/commands/EntityMappingLogger.java → src/main/java/modtweaker2/commands/EntityMappingLogger.java
+3 -4
View File
@@ -1,13 +1,12 @@
package modtweaker.commands;
package modtweaker2.commands;
import java.util.Set;
import cpw.mods.fml.common.registry.EntityRegistry;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import net.minecraft.entity.Entity;
import modtweaker2.ModTweaker2;
import net.minecraft.entity.EntityList;
public class EntityMappingLogger implements ICommandFunction {
@@ -18,7 +17,7 @@ public class EntityMappingLogger implements ICommandFunction {
Set<Integer> keys = EntityList.stringToIDMapping.keySet();
System.out.println("Mob Keys: " + keys.size());
for (Integer key : keys) {
System.out.println("Mob Key " + EntityList.getStringFromID(key) + " : " + key);
ModTweaker2.logger.info("Mob Key " + EntityList.getStringFromID(key) + " : " + key);
MineTweakerAPI.logCommand("Mob Key " + EntityList.getStringFromID(key) + " : " + key);
}
src/main/java/modtweaker/helpers/ForgeHelper.java → src/main/java/modtweaker2/helpers/ForgeHelper.java
+3 -4
View File
@@ -1,12 +1,11 @@
package modtweaker.helpers;
import static modtweaker.helpers.ReflectionHelper.getFinalObject;
import static modtweaker.helpers.ReflectionHelper.getStaticObject;
package modtweaker2.helpers;
import java.lang.reflect.Constructor;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import static modtweaker2.helpers.ReflectionHelper.*;
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
src/main/java/modtweaker/helpers/InputHelper.java → src/main/java/modtweaker2/helpers/InputHelper.java
+8 -1
View File
@@ -1,12 +1,15 @@
package modtweaker.helpers;
package modtweaker2.helpers;
import java.util.ArrayList;
import minetweaker.MineTweakerAPI;
import minetweaker.api.entity.IEntity;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.IEntityLivingData;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
@@ -25,6 +28,10 @@ public class InputHelper {
public static boolean isABlock(ItemStack block) {
return block.getItem() instanceof ItemBlock;
}
public static Entity toEntity(){
return null;
}
public static ItemStack toStack(IItemStack iStack) {
if (iStack == null)
src/main/java/modtweaker/helpers/LogHelper.java → src/main/java/modtweaker2/helpers/LogHelper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.helpers;
package modtweaker2.helpers;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
src/main/java/modtweaker/helpers/ReflectionHelper.java → src/main/java/modtweaker2/helpers/ReflectionHelper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.helpers;
package modtweaker2.helpers;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
src/main/java/modtweaker/helpers/StackHelper.java → src/main/java/modtweaker2/helpers/StackHelper.java
+3 -3
View File
@@ -1,7 +1,7 @@
package modtweaker.helpers;
package modtweaker2.helpers;
import modtweaker.mods.botania.Botania;
import modtweaker.util.TweakerPlugin;
import modtweaker2.mods.botania.Botania;
import modtweaker2.util.TweakerPlugin;
import net.minecraft.item.ItemStack;
public class StackHelper {
src/main/java/modtweaker/mods/appeng/AppliedEnergistics.java → src/main/java/modtweaker2/mods/appeng/AppliedEnergistics.java
+4 -2
View File
@@ -1,10 +1,12 @@
package modtweaker.mods.appeng;
package modtweaker2.mods.appeng;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.appeng.handlers.Inscriber;
import modtweaker2.mods.appeng.handlers.Inscriber;
public class AppliedEnergistics {
public AppliedEnergistics() {
MineTweakerAPI.registerClass(Inscriber.class);
}
}
src/main/java/modtweaker/mods/appeng/handlers/Inscriber.java → src/main/java/modtweaker2/mods/appeng/handlers/Inscriber.java
+33 -5
View File
@@ -1,14 +1,17 @@
package modtweaker.mods.appeng.handlers;
package modtweaker2.mods.appeng.handlers;
import java.util.ArrayList;
import static modtweaker.helpers.InputHelper.*;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import stanhebben.zenscript.annotations.ZenMethodStatic;
import appeng.recipes.handlers.Inscribe;
import appeng.recipes.handlers.Inscribe.InscriberRecipe;
import static modtweaker2.helpers.InputHelper.*;
@ZenClass("mods.appeng.inscriber")
public class Inscriber {
@@ -22,7 +25,6 @@ public class Inscriber {
Inscribe.inputs.add(toStack(plateB));
Inscribe.plates.add(toStack(plateA));
Inscribe.plates.add(toStack(plateB));
}
public static class Add extends BaseListAddition {
@@ -38,4 +40,30 @@ public class Inscriber {
}
@ZenMethod
public static void removeRecipe(IItemStack output) {
MineTweakerAPI.apply(new Remove(toStack(output)));
}
public static class Remove extends BaseListRemoval {
public Remove(ItemStack stack) {
super(stack.getUnlocalizedName(), Inscribe.recipes, stack);
}
@Override
public void apply() {
ArrayList<InscriberRecipe> recipesToRemove = new ArrayList<Inscribe.InscriberRecipe>();
for (InscriberRecipe recipe : Inscribe.recipes) {
if (recipe.output.isItemEqual(stack)) {
recipesToRemove.add(recipe);
}
}
for (InscriberRecipe recipe : recipesToRemove) {
Inscribe.recipes.remove(recipe);
}
}
}
}
src/main/java/modtweaker/mods/botania/Botania.java → src/main/java/modtweaker2/mods/botania/Botania.java
+7 -8
View File
@@ -1,13 +1,12 @@
package modtweaker.mods.botania;
package modtweaker2.mods.botania;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.appeng.handlers.Inscriber;
import modtweaker.mods.botania.handlers.Apothecary;
import modtweaker.mods.botania.handlers.ElvenTrade;
import modtweaker.mods.botania.handlers.Lexicon;
import modtweaker.mods.botania.handlers.ManaInfusion;
import modtweaker.mods.botania.handlers.Orechid;
import modtweaker.mods.botania.handlers.RuneAltar;
import modtweaker2.mods.botania.handlers.Apothecary;
import modtweaker2.mods.botania.handlers.ElvenTrade;
import modtweaker2.mods.botania.handlers.Lexicon;
import modtweaker2.mods.botania.handlers.ManaInfusion;
import modtweaker2.mods.botania.handlers.Orechid;
import modtweaker2.mods.botania.handlers.RuneAltar;
import net.minecraft.item.ItemStack;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
src/main/java/modtweaker/mods/botania/BotaniaHelper.java → src/main/java/modtweaker2/mods/botania/BotaniaHelper.java
+1 -3
View File
@@ -1,9 +1,7 @@
package modtweaker.mods.botania;
package modtweaker2.mods.botania;
import java.util.ArrayList;
import java.util.List;
import minetweaker.api.item.IIngredient;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.KnowledgeType;
import vazkii.botania.api.lexicon.LexiconCategory;
src/main/java/modtweaker/mods/botania/commands/BotaniaBrewLogger.java → src/main/java/modtweaker2/mods/botania/commands/BotaniaBrewLogger.java
+2 -5
View File
@@ -1,15 +1,12 @@
package modtweaker.mods.botania.commands;
package modtweaker2.mods.botania.commands;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import vazkii.botania.api.BotaniaAPI;
public class BotaniaBrewLogger implements ICommandFunction{
src/main/java/modtweaker/mods/botania/commands/BotaniaOrechidLogger.java → src/main/java/modtweaker2/mods/botania/commands/BotaniaOrechidLogger.java
+2 -5
View File
@@ -1,15 +1,12 @@
package modtweaker.mods.botania.commands;
package modtweaker2.mods.botania.commands;
import java.util.Set;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.common.Botania;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker.mods.botania.BotaniaHelper;
import net.minecraft.entity.EntityList;
import vazkii.botania.api.BotaniaAPI;
public class BotaniaOrechidLogger implements ICommandFunction {
src/main/java/modtweaker/mods/botania/handlers/Apothecary.java → src/main/java/modtweaker2/mods/botania/handlers/Apothecary.java
+5 -6
View File
@@ -1,19 +1,18 @@
package modtweaker.mods.botania.handlers;
package modtweaker2.mods.botania.handlers;
import static modtweaker.helpers.InputHelper.toObjects;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.botania.Apothecary")
public class Apothecary {
src/main/java/modtweaker/mods/botania/handlers/ElvenTrade.java → src/main/java/modtweaker2/mods/botania/handlers/ElvenTrade.java
+5 -6
View File
@@ -1,18 +1,17 @@
package modtweaker.mods.botania.handlers;
package modtweaker2.mods.botania.handlers;
import static modtweaker.helpers.InputHelper.toObjects;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeElvenTrade;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.botania.ElvenTrade")
public class ElvenTrade {
src/main/java/modtweaker/mods/botania/handlers/Lexicon.java → src/main/java/modtweaker2/mods/botania/handlers/Lexicon.java
+17 -21
View File
@@ -1,35 +1,31 @@
package modtweaker.mods.botania.handlers;
package modtweaker2.mods.botania.handlers;
import static modtweaker2.helpers.InputHelper.toObject;
import static modtweaker2.helpers.InputHelper.toObjects;
import static modtweaker2.helpers.InputHelper.toStack;
import java.util.ArrayList;
import java.util.List;
import static modtweaker.helpers.InputHelper.toObject;
import static modtweaker.helpers.InputHelper.toObjects;
import static modtweaker.helpers.InputHelper.toShapedObjects;
import static modtweaker.helpers.InputHelper.toStack;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import minetweaker.api.recipes.ShapedRecipe;
import minetweaker.mc1710.recipes.RecipeConverter;
import modtweaker.mods.botania.BotaniaHelper;
import modtweaker.mods.botania.lexicon.AddCategory;
import modtweaker.mods.botania.lexicon.AddEntry;
import modtweaker.mods.botania.lexicon.AddPage;
import modtweaker.mods.botania.lexicon.AddRecipeMapping;
import modtweaker.mods.botania.lexicon.RemoveCategory;
import modtweaker.mods.botania.lexicon.RemoveEntry;
import modtweaker.mods.botania.lexicon.RemovePage;
import modtweaker.mods.botania.lexicon.RemoveRecipeMapping;
import modtweaker.mods.botania.lexicon.SetCategoryIcon;
import modtweaker.mods.botania.lexicon.SetCategoryPriority;
import modtweaker.mods.botania.lexicon.SetEntryKnowledgeType;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.mods.botania.BotaniaHelper;
import modtweaker2.mods.botania.lexicon.AddCategory;
import modtweaker2.mods.botania.lexicon.AddEntry;
import modtweaker2.mods.botania.lexicon.AddPage;
import modtweaker2.mods.botania.lexicon.AddRecipeMapping;
import modtweaker2.mods.botania.lexicon.RemoveCategory;
import modtweaker2.mods.botania.lexicon.RemoveEntry;
import modtweaker2.mods.botania.lexicon.RemovePage;
import modtweaker2.mods.botania.lexicon.RemoveRecipeMapping;
import modtweaker2.mods.botania.lexicon.SetCategoryIcon;
import modtweaker2.mods.botania.lexicon.SetCategoryPriority;
import modtweaker2.mods.botania.lexicon.SetEntryKnowledgeType;
import net.minecraft.entity.EntityList;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import vazkii.botania.api.BotaniaAPI;
src/main/java/modtweaker/mods/botania/handlers/ManaInfusion.java → src/main/java/modtweaker2/mods/botania/handlers/ManaInfusion.java
+7 -6
View File
@@ -1,18 +1,19 @@
package modtweaker.mods.botania.handlers;
package modtweaker2.mods.botania.handlers;
import static modtweaker.helpers.InputHelper.toObject;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.helpers.InputHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.botania.ManaInfusion")
public class ManaInfusion {
src/main/java/modtweaker/mods/botania/handlers/Orechid.java → src/main/java/modtweaker2/mods/botania/handlers/Orechid.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.botania.handlers;
package modtweaker2.mods.botania.handlers;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
src/main/java/modtweaker/mods/botania/handlers/RuneAltar.java → src/main/java/modtweaker2/mods/botania/handlers/RuneAltar.java
+6 -7
View File
@@ -1,20 +1,19 @@
package modtweaker.mods.botania.handlers;
package modtweaker2.mods.botania.handlers;
import static modtweaker.helpers.InputHelper.toObjects;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeRuneAltar;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.botania.RuneAltar")
@ZenClass("")
public class RuneAltar {
@ZenMethod
public static void addRecipe(IItemStack output, IIngredient[] input, int mana) {
src/main/java/modtweaker/mods/botania/lexicon/AddCategory.java → src/main/java/modtweaker2/mods/botania/lexicon/AddCategory.java
+2 -4
View File
@@ -1,10 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class AddCategory implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/AddEntry.java → src/main/java/modtweaker2/mods/botania/lexicon/AddEntry.java
+2 -3
View File
@@ -1,9 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class AddEntry implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/AddPage.java → src/main/java/modtweaker2/mods/botania/lexicon/AddPage.java
+2 -2
View File
@@ -1,8 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class AddPage implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/AddRecipeMapping.java → src/main/java/modtweaker2/mods/botania/lexicon/AddRecipeMapping.java
+4 -8
View File
@@ -1,13 +1,9 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData;
import minetweaker.IUndoableAction;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
public class AddRecipeMapping implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/RemoveCategory.java → src/main/java/modtweaker2/mods/botania/lexicon/RemoveCategory.java
+2 -4
View File
@@ -1,10 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class RemoveCategory implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/RemoveEntry.java → src/main/java/modtweaker2/mods/botania/lexicon/RemoveEntry.java
+2 -3
View File
@@ -1,9 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class RemoveEntry implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/RemovePage.java → src/main/java/modtweaker2/mods/botania/lexicon/RemovePage.java
+2 -2
View File
@@ -1,8 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class RemovePage implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/RemoveRecipeMapping.java → src/main/java/modtweaker2/mods/botania/lexicon/RemoveRecipeMapping.java
+2 -5
View File
@@ -1,13 +1,10 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import minetweaker.IUndoableAction;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.lexicon.LexiconRecipeMappings;
import vazkii.botania.api.lexicon.LexiconRecipeMappings.EntryData;
import minetweaker.IUndoableAction;
public class RemoveRecipeMapping implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/SetCategoryIcon.java → src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryIcon.java
+3 -6
View File
@@ -1,11 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.lexicon.LexiconCategory;
public class SetCategoryIcon implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/SetCategoryPriority.java → src/main/java/modtweaker2/mods/botania/lexicon/SetCategoryPriority.java
+2 -5
View File
@@ -1,10 +1,7 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
import vazkii.botania.api.lexicon.LexiconCategory;
public class SetCategoryPriority implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/SetEntryKnowledgeType.java → src/main/java/modtweaker2/mods/botania/lexicon/SetEntryKnowledgeType.java
+2 -4
View File
@@ -1,10 +1,8 @@
package modtweaker.mods.botania.lexicon;
package modtweaker2.mods.botania.lexicon;
import vazkii.botania.api.BotaniaAPI;
import minetweaker.IUndoableAction;
import vazkii.botania.api.lexicon.KnowledgeType;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.IUndoableAction;
public class SetEntryKnowledgeType implements IUndoableAction {
src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconCategoryLogger.java → src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconCategoryLogger.java
+3 -4
View File
@@ -1,14 +1,13 @@
package modtweaker.mods.botania.lexicon.commands;
package modtweaker2.mods.botania.lexicon.commands;
import java.util.Collections;
import java.util.List;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
public class LexiconCategoryLogger implements ICommandFunction{
src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconEntryLogger.java → src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconEntryLogger.java
+5 -6
View File
@@ -1,16 +1,15 @@
package modtweaker.mods.botania.lexicon.commands;
package modtweaker2.mods.botania.lexicon.commands;
import java.util.Collections;
import java.util.List;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker.mods.botania.BotaniaHelper;
import modtweaker2.mods.botania.BotaniaHelper;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
public class LexiconEntryLogger implements ICommandFunction{
src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java → src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconKnowledgeTypesLogger.java
+2 -5
View File
@@ -1,15 +1,12 @@
package modtweaker.mods.botania.lexicon.commands;
package modtweaker2.mods.botania.lexicon.commands;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import vazkii.botania.api.BotaniaAPI;
public class LexiconKnowledgeTypesLogger implements ICommandFunction{
src/main/java/modtweaker/mods/botania/lexicon/commands/LexiconPageLogger.java → src/main/java/modtweaker2/mods/botania/lexicon/commands/LexiconPageLogger.java
+5 -7
View File
@@ -1,18 +1,16 @@
package modtweaker.mods.botania.lexicon.commands;
package modtweaker2.mods.botania.lexicon.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconCategory;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker.mods.botania.BotaniaHelper;
import modtweaker2.mods.botania.BotaniaHelper;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.lexicon.LexiconPage;
public class LexiconPageLogger implements ICommandFunction{
src/main/java/modtweaker/mods/chisel/Chisel.java → src/main/java/modtweaker2/mods/chisel/Chisel.java
+2 -2
View File
@@ -1,7 +1,7 @@
package modtweaker.mods.chisel;
package modtweaker2.mods.chisel;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.chisel.handlers.Groups;
import modtweaker2.mods.chisel.handlers.Groups;
public class Chisel {
public Chisel() {
src/main/java/modtweaker/mods/chisel/ChiselHelper.java → src/main/java/modtweaker2/mods/chisel/ChiselHelper.java
+3 -5
View File
@@ -1,15 +1,13 @@
package modtweaker.mods.chisel;
package modtweaker2.mods.chisel;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker2.helpers.InputHelper.toStack;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import minetweaker.api.item.IItemStack;
import net.minecraft.block.Block;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import com.cricketcraft.chisel.api.carving.ICarvingGroup;
src/main/java/modtweaker/mods/chisel/commands/ChiselGroupLogger.java → src/main/java/modtweaker2/mods/chisel/commands/ChiselGroupLogger.java
+3 -6
View File
@@ -1,17 +1,14 @@
package modtweaker.mods.chisel.commands;
package modtweaker2.mods.chisel.commands;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import net.minecraft.entity.EntityList;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
public class ChiselGroupLogger implements ICommandFunction{
@Override
src/main/java/modtweaker/mods/chisel/commands/ChiselVariationLogger.java → src/main/java/modtweaker2/mods/chisel/commands/ChiselVariationLogger.java
+7 -11
View File
@@ -1,24 +1,20 @@
package modtweaker.mods.chisel.commands;
package modtweaker2.mods.chisel.commands;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import com.cricketcraft.chisel.api.carving.ICarvingGroup;
import com.cricketcraft.chisel.api.carving.ICarvingVariation;
import net.minecraft.entity.EntityList;
import net.minecraft.item.Item;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.player.IPlayer;
import minetweaker.api.server.ICommandFunction;
import modtweaker.mods.chisel.ChiselHelper;
import modtweaker2.mods.chisel.ChiselHelper;
import net.minecraft.item.Item;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import com.cricketcraft.chisel.api.carving.ICarvingGroup;
import com.cricketcraft.chisel.api.carving.ICarvingVariation;
public class ChiselVariationLogger implements ICommandFunction{
src/main/java/modtweaker/mods/chisel/handlers/Groups.java → src/main/java/modtweaker2/mods/chisel/handlers/Groups.java
+7 -15
View File
@@ -1,24 +1,16 @@
package modtweaker.mods.chisel.handlers;
package modtweaker2.mods.chisel.handlers;
import static modtweaker.helpers.InputHelper.toObjects;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker2.mods.chisel.ChiselHelper;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import com.cricketcraft.chisel.api.carving.CarvingUtils;
import com.cricketcraft.chisel.api.carving.ICarvingGroup;
import com.cricketcraft.chisel.api.carving.ICarvingVariation;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
import modtweaker.mods.chisel.ChiselHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@ZenClass("mods.chisel.Groups")
public class Groups {
@ZenMethod
src/main/java/modtweaker/mods/exnihilo/ExNihilo.java → src/main/java/modtweaker2/mods/exnihilo/ExNihilo.java
+5 -5
View File
@@ -1,10 +1,10 @@
package modtweaker.mods.exnihilo;
package modtweaker2.mods.exnihilo;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.exnihilo.handlers.Compost;
import modtweaker.mods.exnihilo.handlers.Crucible;
import modtweaker.mods.exnihilo.handlers.Hammer;
import modtweaker.mods.exnihilo.handlers.Sieve;
import modtweaker2.mods.exnihilo.handlers.Compost;
import modtweaker2.mods.exnihilo.handlers.Crucible;
import modtweaker2.mods.exnihilo.handlers.Hammer;
import modtweaker2.mods.exnihilo.handlers.Sieve;
public class ExNihilo {
public ExNihilo() {
src/main/java/modtweaker/mods/exnihilo/handlers/Compost.java → src/main/java/modtweaker2/mods/exnihilo/handlers/Compost.java
+4 -4
View File
@@ -1,10 +1,10 @@
package modtweaker.mods.exnihilo.handlers;
package modtweaker2.mods.exnihilo.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker2.helpers.InputHelper.toStack;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/exnihilo/handlers/Crucible.java → src/main/java/modtweaker2/mods/exnihilo/handlers/Crucible.java
+6 -6
View File
@@ -1,13 +1,13 @@
package modtweaker.mods.exnihilo.handlers;
package modtweaker2.mods.exnihilo.handlers;
import static modtweaker.helpers.InputHelper.isABlock;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker2.helpers.InputHelper.isABlock;
import static modtweaker2.helpers.InputHelper.toFluid;
import static modtweaker2.helpers.InputHelper.toStack;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/exnihilo/handlers/Hammer.java → src/main/java/modtweaker2/mods/exnihilo/handlers/Hammer.java
+5 -5
View File
@@ -1,14 +1,14 @@
package modtweaker.mods.exnihilo.handlers;
package modtweaker2.mods.exnihilo.handlers;
import static modtweaker.helpers.InputHelper.isABlock;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker2.helpers.InputHelper.isABlock;
import static modtweaker2.helpers.InputHelper.toStack;
import java.util.Iterator;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
src/main/java/modtweaker/mods/exnihilo/handlers/Sieve.java → src/main/java/modtweaker2/mods/exnihilo/handlers/Sieve.java
+7 -7
View File
@@ -1,13 +1,13 @@
package modtweaker.mods.exnihilo.handlers;
package modtweaker2.mods.exnihilo.handlers;
import static modtweaker.helpers.InputHelper.isABlock;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.isABlock;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseMultipleListRemoval;
import modtweaker.util.BaseMultipleListRemoval.Position;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseMultipleListRemoval;
import modtweaker2.util.BaseMultipleListRemoval.Position;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/extendedworkbench/ExtendedWorkbench.java → src/main/java/modtweaker2/mods/extendedworkbench/ExtendedWorkbench.java
+2 -2
View File
@@ -1,7 +1,7 @@
package modtweaker.mods.extendedworkbench;
package modtweaker2.mods.extendedworkbench;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.extendedworkbench.handlers.ExtendedCrafting;
import modtweaker2.mods.extendedworkbench.handlers.ExtendedCrafting;
public class ExtendedWorkbench {
public ExtendedWorkbench() {
src/main/java/modtweaker/mods/extendedworkbench/handlers/ExtendedCrafting.java → src/main/java/modtweaker2/mods/extendedworkbench/handlers/ExtendedCrafting.java
+5 -7
View File
@@ -1,15 +1,11 @@
package modtweaker.mods.extendedworkbench.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.InputHelper.toStacks;
import static modtweaker.helpers.StackHelper.areEqual;
package modtweaker2.mods.extendedworkbench.handlers;
import java.util.Arrays;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import naruto1310.extendedWorkbench.crafting.ExtendedCraftingManager;
import naruto1310.extendedWorkbench.crafting.ExtendedShapedRecipes;
import naruto1310.extendedWorkbench.crafting.ExtendedShapelessRecipes;
@@ -17,6 +13,8 @@ import naruto1310.extendedWorkbench.crafting.IExtendedRecipe;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.extendedworkbench")
public class ExtendedCrafting {
src/main/java/modtweaker/mods/factorization/Factorization.java → src/main/java/modtweaker2/mods/factorization/Factorization.java
+4 -4
View File
@@ -1,9 +1,9 @@
package modtweaker.mods.factorization;
package modtweaker2.mods.factorization;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.factorization.handlers.Crystallizer;
import modtweaker.mods.factorization.handlers.Lacerator;
import modtweaker.mods.factorization.handlers.SlagFurnace;
import modtweaker2.mods.factorization.handlers.Crystallizer;
import modtweaker2.mods.factorization.handlers.Lacerator;
import modtweaker2.mods.factorization.handlers.SlagFurnace;
public class Factorization {
public Factorization() {
src/main/java/modtweaker/mods/factorization/FactorizationHelper.java → src/main/java/modtweaker2/mods/factorization/FactorizationHelper.java
+2 -3
View File
@@ -1,11 +1,10 @@
package modtweaker.mods.factorization;
import static modtweaker.helpers.ReflectionHelper.getStaticObject;
package modtweaker2.mods.factorization;
import java.lang.reflect.Constructor;
import java.util.List;
import net.minecraft.item.ItemStack;
import static modtweaker2.helpers.ReflectionHelper.*;
public class FactorizationHelper {
public static List lacerator = null;
src/main/java/modtweaker/mods/factorization/handlers/Crystallizer.java → src/main/java/modtweaker2/mods/factorization/handlers/Crystallizer.java
+8 -7
View File
@@ -1,17 +1,18 @@
package modtweaker.mods.factorization.handlers;
package modtweaker2.mods.factorization.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.helpers.ReflectionHelper;
import modtweaker.mods.factorization.FactorizationHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
@ZenClass("mods.factorization.Crystallizer")
public class Crystallizer {
@ZenMethod
src/main/java/modtweaker/mods/factorization/handlers/Lacerator.java → src/main/java/modtweaker2/mods/factorization/handlers/Lacerator.java
+7 -7
View File
@@ -1,13 +1,13 @@
package modtweaker.mods.factorization.handlers;
package modtweaker2.mods.factorization.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.helpers.ReflectionHelper;
import modtweaker.mods.factorization.FactorizationHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
src/main/java/modtweaker/mods/factorization/handlers/SlagFurnace.java → src/main/java/modtweaker2/mods/factorization/handlers/SlagFurnace.java
+8 -8
View File
@@ -1,14 +1,14 @@
package modtweaker.mods.factorization.handlers;
package modtweaker2.mods.factorization.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.helpers.ReflectionHelper;
import modtweaker.mods.factorization.FactorizationHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseMultipleListRemoval;
import modtweaker.util.BaseMultipleListRemoval.Position;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.factorization.FactorizationHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseMultipleListRemoval;
import modtweaker2.util.BaseMultipleListRemoval.Position;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
src/main/java/modtweaker/mods/forestry/Forestry.java → src/main/java/modtweaker2/mods/forestry/Forestry.java
+8 -8
View File
@@ -1,13 +1,13 @@
package modtweaker.mods.forestry;
package modtweaker2.mods.forestry;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.forestry.handlers.Carpenter;
import modtweaker.mods.forestry.handlers.Centrifuge;
import modtweaker.mods.forestry.handlers.Fermenter;
import modtweaker.mods.forestry.handlers.Moistener;
import modtweaker.mods.forestry.handlers.Squeezer;
import modtweaker.mods.forestry.handlers.Still;
import modtweaker.mods.forestry.handlers.ThermionicFabricator;
import modtweaker2.mods.forestry.handlers.Carpenter;
import modtweaker2.mods.forestry.handlers.Centrifuge;
import modtweaker2.mods.forestry.handlers.Fermenter;
import modtweaker2.mods.forestry.handlers.Moistener;
import modtweaker2.mods.forestry.handlers.Squeezer;
import modtweaker2.mods.forestry.handlers.Still;
import modtweaker2.mods.forestry.handlers.ThermionicFabricator;
public class Forestry {
public Forestry() {
src/main/java/modtweaker/mods/forestry/ForestryHelper.java → src/main/java/modtweaker2/mods/forestry/ForestryHelper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.forestry;
package modtweaker2.mods.forestry;
import java.lang.reflect.Field;
import java.util.ArrayList;
src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java → src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java
+6 -14
View File
@@ -1,8 +1,4 @@
package modtweaker.mods.forestry.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStacks;
package modtweaker2.mods.forestry.handlers;
import java.util.ArrayList;
import java.util.List;
@@ -10,23 +6,19 @@ import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.recipes.ShapedRecipe;
import minetweaker.mc1710.recipes.RecipeConverter;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.mods.forestry.ForestryHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.Forestry;
import forestry.api.core.ForestryAPI;
import forestry.api.recipes.RecipeManagers;
import forestry.core.utils.RecipeUtil;
import forestry.core.utils.ShapedRecipeCustom;
import forestry.factory.gadgets.MachineCarpenter;
import forestry.factory.gadgets.MachineCarpenter.Recipe;
import forestry.factory.gadgets.MachineCarpenter.RecipeManager;
import modtweaker.mods.forestry.ForestryHelper;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.Carpenter")
public class Carpenter {
src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java → src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java
+9 -11
View File
@@ -1,21 +1,19 @@
package modtweaker.mods.forestry.handlers;
package modtweaker2.mods.forestry.handlers;
import java.util.List;
import java.util.HashMap;
import net.minecraft.item.ItemStack;
import java.util.List;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.InputHelper.toStacks;
import forestry.factory.gadgets.MachineCentrifuge;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.factory.gadgets.MachineCentrifuge.Recipe;
import forestry.factory.gadgets.MachineCentrifuge.RecipeManager;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.Centrifuge")
src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java → src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java
+5 -7
View File
@@ -1,8 +1,4 @@
package modtweaker.mods.forestry.handlers;
import static modtweaker.helpers.InputHelper.getFluid;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
package modtweaker2.mods.forestry.handlers;
import java.util.ArrayList;
import java.util.List;
@@ -10,14 +6,16 @@ import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.factory.gadgets.MachineFermenter;
import forestry.factory.gadgets.MachineFermenter.Recipe;
import forestry.factory.gadgets.MachineFermenter.RecipeManager;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.Fermenter")
public class Fermenter {
src/main/java/modtweaker/mods/forestry/handlers/Moistener.java → src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java
+5 -5
View File
@@ -1,19 +1,19 @@
package modtweaker.mods.forestry.handlers;
import static modtweaker.helpers.InputHelper.toStack;
package modtweaker2.mods.forestry.handlers;
import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.factory.gadgets.MachineMoistener;
import forestry.factory.gadgets.MachineMoistener.Recipe;
import forestry.factory.gadgets.MachineMoistener.RecipeManager;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.Moistener")
public class Moistener {
src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java → src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java
+5 -8
View File
@@ -1,23 +1,20 @@
package modtweaker.mods.forestry.handlers;
import static modtweaker.helpers.InputHelper.getFluid;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.InputHelper.toStacks;
package modtweaker2.mods.forestry.handlers;
import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.factory.gadgets.MachineSqueezer;
import forestry.factory.gadgets.MachineSqueezer.Recipe;
import forestry.factory.gadgets.MachineSqueezer.RecipeManager;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.Squeezer")
public class Squeezer {
src/main/java/modtweaker/mods/forestry/handlers/Still.java → src/main/java/modtweaker2/mods/forestry/handlers/Still.java
+5 -18
View File
@@ -1,32 +1,19 @@
package modtweaker.mods.forestry.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.getFluid;
package modtweaker2.mods.forestry.handlers;
import java.util.List;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
import cpw.mods.fml.common.registry.GameRegistry;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.helpers.InputHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import net.minecraftforge.fluids.Fluid;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.Forestry;
import forestry.api.core.ForestryAPI;
import forestry.core.utils.LiquidHelper;
import forestry.core.utils.RecipeUtil;
import forestry.factory.gadgets.MachineSqueezer;
import forestry.factory.gadgets.MachineStill;
import forestry.factory.gadgets.MachineStill.Recipe;
import forestry.factory.gadgets.MachineStill.RecipeManager;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.Still")
public class Still {
src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java → src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java
+10 -17
View File
@@ -1,28 +1,21 @@
package modtweaker.mods.forestry.handlers;
package modtweaker2.mods.forestry.handlers;
import java.util.List;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidRegistry;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.item.IIngredient;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.InputHelper.toObject;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import forestry.core.utils.ShapedRecipeCustom;
import forestry.factory.gadgets.MachineFabricator;
import forestry.factory.gadgets.MachineFabricator.RecipeManager;
import forestry.factory.gadgets.MachineFabricator.Recipe;
import forestry.factory.gadgets.MachineFabricator.RecipeManager;
import forestry.factory.gadgets.MachineFabricator.Smelting;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.forestry.ThermionicFabricator")
public class ThermionicFabricator {
src/main/java/modtweaker/mods/fsp/FSPHelper.java → src/main/java/modtweaker2/mods/fsp/FSPHelper.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.fsp;
package modtweaker2.mods.fsp;
import flaxbeard.steamcraft.api.CrucibleLiquid;
import flaxbeard.steamcraft.api.SteamcraftRegistry;
src/main/java/modtweaker/mods/fsp/Steamcraft.java → src/main/java/modtweaker2/mods/fsp/Steamcraft.java
+3 -3
View File
@@ -1,8 +1,8 @@
package modtweaker.mods.fsp;
package modtweaker2.mods.fsp;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.fsp.handlers.Crucible;
import modtweaker.mods.fsp.handlers.Furnace;
import modtweaker2.mods.fsp.handlers.Crucible;
import modtweaker2.mods.fsp.handlers.Furnace;
public class Steamcraft {
public Steamcraft() {
src/main/java/modtweaker/mods/fsp/handlers/Crucible.java → src/main/java/modtweaker2/mods/fsp/handlers/Crucible.java
+7 -6
View File
@@ -1,12 +1,11 @@
package modtweaker.mods.fsp.handlers;
package modtweaker2.mods.fsp.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.mods.fsp.FSPHelper.getLiquid;
import static modtweaker2.mods.fsp.FSPHelper.getLiquid;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.MutablePair;
@@ -17,6 +16,8 @@ import flaxbeard.steamcraft.api.CrucibleFormula;
import flaxbeard.steamcraft.api.CrucibleLiquid;
import flaxbeard.steamcraft.api.SteamcraftRegistry;
import flaxbeard.steamcraft.api.Tuple3;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.fsp.Crucible")
public class Crucible {
src/main/java/modtweaker/mods/fsp/handlers/Furnace.java → src/main/java/modtweaker2/mods/fsp/handlers/Furnace.java
+5 -4
View File
@@ -1,10 +1,9 @@
package modtweaker.mods.fsp.handlers;
package modtweaker2.mods.fsp.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.item.ItemStack;
import org.apache.commons.lang3.tuple.MutablePair;
@@ -12,6 +11,8 @@ import org.apache.commons.lang3.tuple.MutablePair;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import flaxbeard.steamcraft.api.SteamcraftRegistry;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.fsp.Furnace")
public class Furnace {
src/main/java/modtweaker/mods/hee/HardcoreEnderExpansion.java → src/main/java/modtweaker2/mods/hee/HardcoreEnderExpansion.java
+2 -2
View File
@@ -1,7 +1,7 @@
package modtweaker.mods.hee;
package modtweaker2.mods.hee;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.hee.handlers.EssenceAltar;
import modtweaker2.mods.hee.handlers.EssenceAltar;
public class HardcoreEnderExpansion {
public HardcoreEnderExpansion() {
src/main/java/modtweaker/mods/hee/handlers/EssenceAltar.java → src/main/java/modtweaker2/mods/hee/handlers/EssenceAltar.java
+6 -6
View File
@@ -1,15 +1,15 @@
package modtweaker.mods.hee.handlers;
package modtweaker2.mods.hee.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import java.util.List;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.helpers.ReflectionHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
src/main/java/modtweaker/mods/imc/IMC.java → src/main/java/modtweaker2/mods/imc/IMC.java
+1 -2
View File
@@ -1,7 +1,6 @@
package modtweaker.mods.imc;
package modtweaker2.mods.imc;
import java.util.ArrayList;
import java.util.List;
public class IMC {
src/main/java/modtweaker/mods/imc/handler/Message.java → src/main/java/modtweaker2/mods/imc/handler/Message.java
+1 -2
View File
@@ -1,9 +1,8 @@
package modtweaker.mods.imc.handler;
package modtweaker2.mods.imc.handler;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Scanner;
import cpw.mods.fml.common.event.FMLInterModComms;
src/main/java/modtweaker/mods/mariculture/Mariculture.java → src/main/java/modtweaker2/mods/mariculture/Mariculture.java
+6 -6
View File
@@ -1,11 +1,11 @@
package modtweaker.mods.mariculture;
package modtweaker2.mods.mariculture;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.mariculture.handlers.Anvil;
import modtweaker.mods.mariculture.handlers.Casting;
import modtweaker.mods.mariculture.handlers.Crucible;
import modtweaker.mods.mariculture.handlers.Fishing;
import modtweaker.mods.mariculture.handlers.Vat;
import modtweaker2.mods.mariculture.handlers.Anvil;
import modtweaker2.mods.mariculture.handlers.Casting;
import modtweaker2.mods.mariculture.handlers.Crucible;
import modtweaker2.mods.mariculture.handlers.Fishing;
import modtweaker2.mods.mariculture.handlers.Vat;
public class Mariculture {
public Mariculture() {
src/main/java/modtweaker/mods/mariculture/MaricultureHelper.java → src/main/java/modtweaker2/mods/mariculture/MaricultureHelper.java
+2 -2
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.mariculture;
package modtweaker2.mods.mariculture;
import java.util.ArrayList;
import java.util.HashMap;
@@ -8,7 +8,7 @@ import mariculture.api.core.MaricultureHandlers;
import mariculture.api.fishery.Fishing;
import mariculture.api.fishery.Loot;
import mariculture.api.fishery.Loot.Rarity;
import modtweaker.helpers.ReflectionHelper;
import modtweaker2.helpers.ReflectionHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
src/main/java/modtweaker/mods/mariculture/handlers/Anvil.java → src/main/java/modtweaker2/mods/mariculture/handlers/Anvil.java
+5 -5
View File
@@ -1,13 +1,13 @@
package modtweaker.mods.mariculture.handlers;
package modtweaker2.mods.mariculture.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker2.helpers.InputHelper.toStack;
import mariculture.api.core.IAnvilHandler.RecipeAnvil;
import mariculture.api.core.MaricultureHandlers;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.mods.mariculture.MaricultureHelper;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.mods.mariculture.MaricultureHelper;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
src/main/java/modtweaker/mods/mariculture/handlers/Casting.java → src/main/java/modtweaker2/mods/mariculture/handlers/Casting.java
+6 -6
View File
@@ -1,7 +1,7 @@
package modtweaker.mods.mariculture.handlers;
package modtweaker2.mods.mariculture.handlers;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker2.helpers.InputHelper.toFluid;
import static modtweaker2.helpers.InputHelper.toStack;
import java.util.HashMap;
@@ -11,9 +11,9 @@ import mariculture.api.core.RecipeCasting.RecipeNuggetCasting;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.mods.mariculture.MaricultureHelper;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.mods.mariculture.MaricultureHelper;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
src/main/java/modtweaker/mods/mariculture/handlers/Crucible.java → src/main/java/modtweaker2/mods/mariculture/handlers/Crucible.java
+9 -9
View File
@@ -1,19 +1,19 @@
package modtweaker.mods.mariculture.handlers;
package modtweaker2.mods.mariculture.handlers;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.toFluid;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import mariculture.api.core.FuelInfo;
import mariculture.api.core.MaricultureHandlers;
import mariculture.api.core.RecipeSmelter;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.mods.mariculture.MaricultureHelper;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker.util.BaseMapAddition;
import modtweaker.util.BaseMapRemoval;
import modtweaker2.mods.mariculture.MaricultureHelper;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import modtweaker2.util.BaseMapAddition;
import modtweaker2.util.BaseMapRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/mariculture/handlers/Fishing.java → src/main/java/modtweaker2/mods/mariculture/handlers/Fishing.java
+7 -7
View File
@@ -1,7 +1,7 @@
package modtweaker.mods.mariculture.handlers;
package modtweaker2.mods.mariculture.handlers;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import static modtweaker2.helpers.InputHelper.toStack;
import static modtweaker2.helpers.StackHelper.areEqual;
import java.util.ArrayList;
import java.util.HashMap;
@@ -12,10 +12,10 @@ import mariculture.api.fishery.Loot.Rarity;
import mariculture.api.fishery.RodType;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import modtweaker.helpers.ReflectionHelper;
import modtweaker.mods.mariculture.MaricultureHelper;
import modtweaker.util.BaseDescriptionAddition;
import modtweaker.util.BaseDescriptionRemoval;
import modtweaker2.helpers.ReflectionHelper;
import modtweaker2.mods.mariculture.MaricultureHelper;
import modtweaker2.util.BaseDescriptionAddition;
import modtweaker2.util.BaseDescriptionRemoval;
import net.minecraft.item.ItemStack;
import stanhebben.zenscript.annotations.Optional;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/mariculture/handlers/Vat.java → src/main/java/modtweaker2/mods/mariculture/handlers/Vat.java
+5 -6
View File
@@ -1,19 +1,18 @@
package modtweaker.mods.mariculture.handlers;
package modtweaker2.mods.mariculture.handlers;
import static modtweaker.helpers.InputHelper.toFluid;
import static modtweaker.helpers.InputHelper.toStack;
import static modtweaker.helpers.StackHelper.areEqual;
import mariculture.api.core.MaricultureHandlers;
import mariculture.api.core.RecipeVat;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
import minetweaker.api.liquid.ILiquidStack;
import modtweaker.util.BaseListAddition;
import modtweaker.util.BaseListRemoval;
import modtweaker2.util.BaseListAddition;
import modtweaker2.util.BaseListRemoval;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import stanhebben.zenscript.annotations.ZenClass;
import stanhebben.zenscript.annotations.ZenMethod;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
@ZenClass("mods.mariculture.Vat")
public class Vat {
src/main/java/modtweaker/mods/mekanism/Mekanism.java → src/main/java/modtweaker2/mods/mekanism/Mekanism.java
+18 -18
View File
@@ -1,23 +1,23 @@
package modtweaker.mods.mekanism;
package modtweaker2.mods.mekanism;
import minetweaker.MineTweakerAPI;
import modtweaker.mods.mekanism.gas.GasBracketHandler;
import modtweaker.mods.mekanism.handlers.ChemicalCrystallizer;
import modtweaker.mods.mekanism.handlers.ChemicalDissolution;
import modtweaker.mods.mekanism.handlers.ChemicalInfuser;
import modtweaker.mods.mekanism.handlers.ChemicalInjection;
import modtweaker.mods.mekanism.handlers.ChemicalOxidizer;
import modtweaker.mods.mekanism.handlers.ChemicalWasher;
import modtweaker.mods.mekanism.handlers.Combiner;
import modtweaker.mods.mekanism.handlers.Compressor;
import modtweaker.mods.mekanism.handlers.Crusher;
import modtweaker.mods.mekanism.handlers.Enrichment;
import modtweaker.mods.mekanism.handlers.Infuser;
import modtweaker.mods.mekanism.handlers.Purification;
import modtweaker.mods.mekanism.handlers.Reaction;
import modtweaker.mods.mekanism.handlers.Sawmill;
import modtweaker.mods.mekanism.handlers.Separator;
import modtweaker.util.TweakerPlugin;
import modtweaker2.mods.mekanism.gas.GasBracketHandler;
import modtweaker2.mods.mekanism.handlers.ChemicalCrystallizer;
import modtweaker2.mods.mekanism.handlers.ChemicalDissolution;
import modtweaker2.mods.mekanism.handlers.ChemicalInfuser;
import modtweaker2.mods.mekanism.handlers.ChemicalInjection;
import modtweaker2.mods.mekanism.handlers.ChemicalOxidizer;
import modtweaker2.mods.mekanism.handlers.ChemicalWasher;
import modtweaker2.mods.mekanism.handlers.Combiner;
import modtweaker2.mods.mekanism.handlers.Compressor;
import modtweaker2.mods.mekanism.handlers.Crusher;
import modtweaker2.mods.mekanism.handlers.Enrichment;
import modtweaker2.mods.mekanism.handlers.Infuser;
import modtweaker2.mods.mekanism.handlers.Purification;
import modtweaker2.mods.mekanism.handlers.Reaction;
import modtweaker2.mods.mekanism.handlers.Sawmill;
import modtweaker2.mods.mekanism.handlers.Separator;
import modtweaker2.util.TweakerPlugin;
public class Mekanism extends TweakerPlugin {
public Mekanism() {
src/main/java/modtweaker/mods/mekanism/MekanismHelper.java → src/main/java/modtweaker2/mods/mekanism/MekanismHelper.java
+2 -2
View File
@@ -1,9 +1,9 @@
package modtweaker.mods.mekanism;
package modtweaker2.mods.mekanism;
import mekanism.api.gas.GasRegistry;
import mekanism.api.gas.GasStack;
import minetweaker.api.item.IIngredient;
import modtweaker.mods.mekanism.gas.IGasStack;
import modtweaker2.mods.mekanism.gas.IGasStack;
public class MekanismHelper {
private MekanismHelper() {}
src/main/java/modtweaker/mods/mekanism/gas/GasBracketHandler.java → src/main/java/modtweaker2/mods/mekanism/gas/GasBracketHandler.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.mekanism.gas;
package modtweaker2.mods.mekanism.gas;
import java.util.List;
src/main/java/modtweaker/mods/mekanism/gas/GasLogger.java → src/main/java/modtweaker2/mods/mekanism/gas/GasLogger.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.mekanism.gas;
package modtweaker2.mods.mekanism.gas;
import java.util.Collections;
import java.util.Comparator;
src/main/java/modtweaker/mods/mekanism/gas/IGasDefinition.java → src/main/java/modtweaker2/mods/mekanism/gas/IGasDefinition.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.mekanism.gas;
package modtweaker2.mods.mekanism.gas;
import stanhebben.zenscript.annotations.OperatorType;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/mekanism/gas/IGasStack.java → src/main/java/modtweaker2/mods/mekanism/gas/IGasStack.java
+1 -1
View File
@@ -1,4 +1,4 @@
package modtweaker.mods.mekanism.gas;
package modtweaker2.mods.mekanism.gas;
import stanhebben.zenscript.annotations.OperatorType;
import stanhebben.zenscript.annotations.ZenClass;
src/main/java/modtweaker/mods/mekanism/gas/MCGasDefinition.java → src/main/java/modtweaker2/mods/mekanism/gas/MCGasDefinition.java
+2 -1
View File
@@ -1,8 +1,9 @@
package modtweaker.mods.mekanism.gas;
package modtweaker2.mods.mekanism.gas;
import mekanism.api.gas.Gas;
import mekanism.api.gas.GasStack;
public class MCGasDefinition implements IGasDefinition {
private final Gas gas;
src/main/java/modtweaker/mods/mekanism/gas/MCGasStack.java → src/main/java/modtweaker2/mods/mekanism/gas/MCGasStack.java
+4 -1
View File
@@ -1,6 +1,9 @@
package modtweaker.mods.mekanism.gas;
package modtweaker2.mods.mekanism.gas;
import mekanism.api.gas.GasStack;
import static modtweaker2.helpers.InputHelper.*;
import static modtweaker2.helpers.StackHelper.*;
public class MCGasStack implements IGasStack {
private final GasStack stack;
Loaded 100 of 187 files, more files were not shown because too many files have changed in this diff. Show more