diff --git a/src/main/java/modtweaker2/ClientEvents.java b/src/main/java/modtweaker/ClientEvents.java similarity index 93% rename from src/main/java/modtweaker2/ClientEvents.java rename to src/main/java/modtweaker/ClientEvents.java index 1268ce8..fb1ae66 100644 --- a/src/main/java/modtweaker2/ClientEvents.java +++ b/src/main/java/modtweaker/ClientEvents.java @@ -1,4 +1,4 @@ -package modtweaker2; +package modtweaker; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; @@ -8,7 +8,7 @@ import net.minecraft.client.settings.GameSettings; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import static modtweaker2.helpers.LogHelper.print; +import static modtweaker.helpers.LogHelper.print; public class ClientEvents { public static int cooldown; diff --git a/src/main/java/modtweaker2/Commands.java b/src/main/java/modtweaker/Commands.java similarity index 87% rename from src/main/java/modtweaker2/Commands.java rename to src/main/java/modtweaker/Commands.java index 7969737..4084bb4 100644 --- a/src/main/java/modtweaker2/Commands.java +++ b/src/main/java/modtweaker/Commands.java @@ -1,9 +1,9 @@ -package modtweaker2; +package modtweaker; import minetweaker.MineTweakerAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.commands.EntityMappingLogger; +import modtweaker.commands.EntityMappingLogger; public class Commands { @@ -26,6 +26,6 @@ public class Commands { public static void registerMineTweakerCommand(String commandName, String[] usages, ICommandFunction commandFunction) { MineTweakerAPI.server.addMineTweakerCommand(commandName, usages, commandFunction); - ModTweaker2.logger.info("\nRegistering command " + commandName + "."); + ModTweaker.logger.info("\nRegistering command " + commandName + "."); } } diff --git a/src/main/java/modtweaker2/ModProps.java b/src/main/java/modtweaker/ModProps.java similarity index 57% rename from src/main/java/modtweaker2/ModProps.java rename to src/main/java/modtweaker/ModProps.java index 36eabc4..b125c0b 100644 --- a/src/main/java/modtweaker2/ModProps.java +++ b/src/main/java/modtweaker/ModProps.java @@ -1,9 +1,9 @@ -package modtweaker2; +package modtweaker; 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 NAME = "Mod Tweaker", name = NAME; + public static final String MODID = "modtweaker", modid = MODID; public static final String VERSION = "@modVersion@", version = VERSION; public static final String DEPENDENCIES = "required-after:MineTweaker3;", dependencies = DEPENDENCIES; } diff --git a/src/main/java/modtweaker2/ModTweaker2.java b/src/main/java/modtweaker/ModTweaker.java similarity index 86% rename from src/main/java/modtweaker2/ModTweaker2.java rename to src/main/java/modtweaker/ModTweaker.java index 0aacdd3..24ccf74 100644 --- a/src/main/java/modtweaker2/ModTweaker2.java +++ b/src/main/java/modtweaker/ModTweaker.java @@ -1,14 +1,14 @@ -package modtweaker2; +package modtweaker; import minetweaker.MineTweakerImplementationAPI; import minetweaker.MineTweakerImplementationAPI.ReloadEvent; import minetweaker.runtime.providers.ScriptProviderDirectory; import minetweaker.util.IEventHandler; -import modtweaker2.mods.forestry.Forestry; -import modtweaker2.mods.randomthings.RandomThings; -import modtweaker2.mods.tconstruct.TConstruct; -import modtweaker2.proxy.CommonProxy; -import modtweaker2.utils.TweakerPlugin; +import modtweaker.mods.forestry.Forestry; +import modtweaker.mods.randomthings.RandomThings; +import modtweaker.mods.tconstruct.TConstruct; +import modtweaker.proxy.CommonProxy; +import modtweaker.utils.TweakerPlugin; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.*; import net.minecraftforge.fml.common.Mod.EventHandler; @@ -24,15 +24,15 @@ import org.apache.logging.log4j.Logger; import java.io.File; @Mod(modid = ModProps.modid, version = ModProps.version, dependencies = ModProps.dependencies) -public class ModTweaker2 { +public class ModTweaker { public static Logger logger = LogManager.getLogger(ModProps.modid); - @SidedProxy(clientSide = "modtweaker2.proxy.ClientProxy", serverSide = "modtweaker2.proxy.CommonProxy") + @SidedProxy(clientSide = "modtweaker.proxy.ClientProxy", serverSide = "modtweaker.proxy.CommonProxy") public static CommonProxy proxy; @Instance(ModProps.modid) - public ModTweaker2 instance; + public ModTweaker instance; @EventHandler public void preInit(FMLPreInitializationEvent event) { diff --git a/src/main/java/modtweaker2/brackets/MaterialBracketHandler.java b/src/main/java/modtweaker/brackets/MaterialBracketHandler.java similarity index 96% rename from src/main/java/modtweaker2/brackets/MaterialBracketHandler.java rename to src/main/java/modtweaker/brackets/MaterialBracketHandler.java index f419815..a2bf66e 100644 --- a/src/main/java/modtweaker2/brackets/MaterialBracketHandler.java +++ b/src/main/java/modtweaker/brackets/MaterialBracketHandler.java @@ -1,11 +1,11 @@ -package modtweaker2.brackets; +package modtweaker.brackets; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; import minetweaker.api.item.IngredientAny; -import modtweaker2.brackets.util.IMaterial; -import modtweaker2.brackets.util.MCMaterial; +import modtweaker.brackets.util.IMaterial; +import modtweaker.brackets.util.MCMaterial; import slimeknights.tconstruct.library.TinkerRegistry; import stanhebben.zenscript.compiler.IEnvironmentGlobal; import stanhebben.zenscript.expression.ExpressionCallStatic; diff --git a/src/main/java/modtweaker2/brackets/util/IMaterial.java b/src/main/java/modtweaker/brackets/util/IMaterial.java similarity index 97% rename from src/main/java/modtweaker2/brackets/util/IMaterial.java rename to src/main/java/modtweaker/brackets/util/IMaterial.java index 0a47191..846afb4 100644 --- a/src/main/java/modtweaker2/brackets/util/IMaterial.java +++ b/src/main/java/modtweaker/brackets/util/IMaterial.java @@ -1,4 +1,4 @@ -package modtweaker2.brackets.util; +package modtweaker.brackets.util; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenGetter; diff --git a/src/main/java/modtweaker2/brackets/util/IMaterialDefinition.java b/src/main/java/modtweaker/brackets/util/IMaterialDefinition.java similarity index 91% rename from src/main/java/modtweaker2/brackets/util/IMaterialDefinition.java rename to src/main/java/modtweaker/brackets/util/IMaterialDefinition.java index 52044e4..36e0674 100644 --- a/src/main/java/modtweaker2/brackets/util/IMaterialDefinition.java +++ b/src/main/java/modtweaker/brackets/util/IMaterialDefinition.java @@ -1,4 +1,4 @@ -package modtweaker2.brackets.util; +package modtweaker.brackets.util; import stanhebben.zenscript.annotations.*; diff --git a/src/main/java/modtweaker2/brackets/util/MCMaterial.java b/src/main/java/modtweaker/brackets/util/MCMaterial.java similarity index 97% rename from src/main/java/modtweaker2/brackets/util/MCMaterial.java rename to src/main/java/modtweaker/brackets/util/MCMaterial.java index c8a0231..557adc5 100644 --- a/src/main/java/modtweaker2/brackets/util/MCMaterial.java +++ b/src/main/java/modtweaker/brackets/util/MCMaterial.java @@ -1,7 +1,7 @@ -package modtweaker2.brackets.util; +package modtweaker.brackets.util; import minetweaker.MineTweakerAPI; -import modtweaker2.mods.tconstruct.actions.*; +import modtweaker.mods.tconstruct.actions.*; import slimeknights.tconstruct.library.materials.HandleMaterialStats; import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/modtweaker2/brackets/util/MCMaterialDefinition.java b/src/main/java/modtweaker/brackets/util/MCMaterialDefinition.java similarity index 94% rename from src/main/java/modtweaker2/brackets/util/MCMaterialDefinition.java rename to src/main/java/modtweaker/brackets/util/MCMaterialDefinition.java index 984fc79..ee38507 100644 --- a/src/main/java/modtweaker2/brackets/util/MCMaterialDefinition.java +++ b/src/main/java/modtweaker/brackets/util/MCMaterialDefinition.java @@ -1,4 +1,4 @@ -package modtweaker2.brackets.util; +package modtweaker.brackets.util; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/modtweaker2/commands/EntityMappingLogger.java b/src/main/java/modtweaker/commands/EntityMappingLogger.java similarity index 87% rename from src/main/java/modtweaker2/commands/EntityMappingLogger.java rename to src/main/java/modtweaker/commands/EntityMappingLogger.java index 1abe1d0..476d085 100644 --- a/src/main/java/modtweaker2/commands/EntityMappingLogger.java +++ b/src/main/java/modtweaker/commands/EntityMappingLogger.java @@ -1,10 +1,10 @@ -package modtweaker2.commands; +package modtweaker.commands; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.ModTweaker2; +import modtweaker.ModTweaker; import net.minecraft.entity.EntityList; import java.util.Set; @@ -20,7 +20,7 @@ public class EntityMappingLogger implements ICommandFunction { System.out.println("Mob Keys: " + keys.size()); for (String key : keys) { - ModTweaker2.logger.info("Mob Key " + key); + ModTweaker.logger.info("Mob Key " + key); MineTweakerAPI.logCommand("Mob Key " + key); } diff --git a/src/main/java/modtweaker2/helpers/ForgeHelper.java b/src/main/java/modtweaker/helpers/ForgeHelper.java similarity index 94% rename from src/main/java/modtweaker2/helpers/ForgeHelper.java rename to src/main/java/modtweaker/helpers/ForgeHelper.java index 242190e..22f50de 100644 --- a/src/main/java/modtweaker2/helpers/ForgeHelper.java +++ b/src/main/java/modtweaker/helpers/ForgeHelper.java @@ -1,4 +1,4 @@ -package modtweaker2.helpers; +package modtweaker.helpers; import net.minecraft.item.ItemStack; import net.minecraft.util.text.translation.I18n; @@ -10,7 +10,7 @@ import net.minecraftforge.fml.relauncher.Side; import java.util.List; import java.util.Map; -import static modtweaker2.helpers.ReflectionHelper.*; +import static modtweaker.helpers.ReflectionHelper.*; public class ForgeHelper { @SuppressWarnings("rawtypes") diff --git a/src/main/java/modtweaker2/helpers/InputHelper.java b/src/main/java/modtweaker/helpers/InputHelper.java similarity index 99% rename from src/main/java/modtweaker2/helpers/InputHelper.java rename to src/main/java/modtweaker/helpers/InputHelper.java index a64e3e3..3ffa79c 100644 --- a/src/main/java/modtweaker2/helpers/InputHelper.java +++ b/src/main/java/modtweaker/helpers/InputHelper.java @@ -1,4 +1,4 @@ -package modtweaker2.helpers; +package modtweaker.helpers; import minetweaker.api.entity.IEntity; import minetweaker.api.item.IIngredient; diff --git a/src/main/java/modtweaker2/helpers/LogHelper.java b/src/main/java/modtweaker/helpers/LogHelper.java similarity index 95% rename from src/main/java/modtweaker2/helpers/LogHelper.java rename to src/main/java/modtweaker/helpers/LogHelper.java index 0c23da2..ff87579 100644 --- a/src/main/java/modtweaker2/helpers/LogHelper.java +++ b/src/main/java/modtweaker/helpers/LogHelper.java @@ -1,4 +1,4 @@ -package modtweaker2.helpers; +package modtweaker.helpers; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -38,19 +38,19 @@ public class LogHelper { } public static void logError(String message) { - MineTweakerAPI.logError("[ModTweaker2] " + message); + MineTweakerAPI.logError("[ModTweaker] " + message); } public static void logError(String message, Throwable exception) { - MineTweakerAPI.logError("[ModTweaker2] " + message, exception); + MineTweakerAPI.logError("[ModTweaker] " + message, exception); } public static void logWarning(String message) { - MineTweakerAPI.logWarning("[ModTweaker2] " + message); + MineTweakerAPI.logWarning("[ModTweaker] " + message); } public static void logInfo(String message) { - MineTweakerAPI.logInfo("[ModTweaker2] " + message); + MineTweakerAPI.logInfo("[ModTweaker] " + message); } /** diff --git a/src/main/java/modtweaker2/helpers/ReflectionHelper.java b/src/main/java/modtweaker/helpers/ReflectionHelper.java similarity index 99% rename from src/main/java/modtweaker2/helpers/ReflectionHelper.java rename to src/main/java/modtweaker/helpers/ReflectionHelper.java index 1a367c0..53dbf84 100644 --- a/src/main/java/modtweaker2/helpers/ReflectionHelper.java +++ b/src/main/java/modtweaker/helpers/ReflectionHelper.java @@ -1,4 +1,4 @@ -package modtweaker2.helpers; +package modtweaker.helpers; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/src/main/java/modtweaker2/helpers/StackHelper.java b/src/main/java/modtweaker/helpers/StackHelper.java similarity index 94% rename from src/main/java/modtweaker2/helpers/StackHelper.java rename to src/main/java/modtweaker/helpers/StackHelper.java index f9003d9..ab585f2 100644 --- a/src/main/java/modtweaker2/helpers/StackHelper.java +++ b/src/main/java/modtweaker/helpers/StackHelper.java @@ -1,12 +1,8 @@ -package modtweaker2.helpers; - -import static modtweaker2.helpers.InputHelper.toStack; +package modtweaker.helpers; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import minetweaker.api.item.IngredientAny; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.utils.TweakerPlugin; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker2/helpers/StringHelper.java b/src/main/java/modtweaker/helpers/StringHelper.java similarity index 98% rename from src/main/java/modtweaker2/helpers/StringHelper.java rename to src/main/java/modtweaker/helpers/StringHelper.java index 0fe5a00..3eae116 100644 --- a/src/main/java/modtweaker2/helpers/StringHelper.java +++ b/src/main/java/modtweaker/helpers/StringHelper.java @@ -1,4 +1,4 @@ -package modtweaker2.helpers; +package modtweaker.helpers; import java.util.List; import java.util.ListIterator; diff --git a/src/main/java/modtweaker2/mods/forestry/Forestry.java b/src/main/java/modtweaker/mods/forestry/Forestry.java similarity index 51% rename from src/main/java/modtweaker2/mods/forestry/Forestry.java rename to src/main/java/modtweaker/mods/forestry/Forestry.java index 6ff297b..02ac25c 100644 --- a/src/main/java/modtweaker2/mods/forestry/Forestry.java +++ b/src/main/java/modtweaker/mods/forestry/Forestry.java @@ -1,13 +1,13 @@ -package modtweaker2.mods.forestry; +package modtweaker.mods.forestry; import minetweaker.MineTweakerAPI; -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; +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; public class Forestry { public Forestry() { diff --git a/src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java b/src/main/java/modtweaker/mods/forestry/ForestryListAddition.java similarity index 92% rename from src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java rename to src/main/java/modtweaker/mods/forestry/ForestryListAddition.java index 517b2e6..e1887a6 100644 --- a/src/main/java/modtweaker2/mods/forestry/ForestryListAddition.java +++ b/src/main/java/modtweaker/mods/forestry/ForestryListAddition.java @@ -1,9 +1,9 @@ -package modtweaker2.mods.forestry; +package modtweaker.mods.forestry; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.IForestryRecipe; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseListAddition; +import modtweaker.helpers.LogHelper; +import modtweaker.utils.BaseListAddition; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java b/src/main/java/modtweaker/mods/forestry/ForestryListRemoval.java similarity index 92% rename from src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java rename to src/main/java/modtweaker/mods/forestry/ForestryListRemoval.java index 897f6eb..8388482 100644 --- a/src/main/java/modtweaker2/mods/forestry/ForestryListRemoval.java +++ b/src/main/java/modtweaker/mods/forestry/ForestryListRemoval.java @@ -1,9 +1,9 @@ -package modtweaker2.mods.forestry; +package modtweaker.mods.forestry; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.IForestryRecipe; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseListRemoval; +import modtweaker.helpers.LogHelper; +import modtweaker.utils.BaseListRemoval; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java b/src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java similarity index 92% rename from src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java rename to src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java index 86074a8..73fe6e3 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Carpenter.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Carpenter.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.recipes.ICarpenterManager; import forestry.api.recipes.ICarpenterRecipe; @@ -8,11 +8,11 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.CarpenterRecipe; -import modtweaker2.mods.forestry.recipes.DescriptiveRecipe; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.CarpenterRecipe; +import modtweaker.mods.forestry.recipes.DescriptiveRecipe; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; @@ -21,8 +21,8 @@ import stanhebben.zenscript.annotations.ZenMethod; import java.util.LinkedList; import java.util.List; -import static modtweaker2.helpers.InputHelper.*; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.*; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.Carpenter") public class Carpenter { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java b/src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java similarity index 87% rename from src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java rename to src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java index c3d8a88..d761a1b 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Centrifuge.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Centrifuge.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.recipes.ICentrifugeManager; import forestry.api.recipes.ICentrifugeRecipe; @@ -7,10 +7,10 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.WeightedItemStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.CentrifugeRecipe; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.CentrifugeRecipe; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -20,9 +20,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import static modtweaker2.helpers.InputHelper.toIItemStack; -import static modtweaker2.helpers.InputHelper.toStack; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.toIItemStack; +import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.Centrifuge") diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java b/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java similarity index 93% rename from src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java rename to src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java index 6ffb357..209b61a 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Fermenter.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Fermenter.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.fuels.FermenterFuel; import forestry.api.fuels.FuelManager; @@ -9,12 +9,12 @@ import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.FermenterRecipe; -import modtweaker2.utils.BaseMapAddition; -import modtweaker2.utils.BaseMapRemoval; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.FermenterRecipe; +import modtweaker.utils.BaseMapAddition; +import modtweaker.utils.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -25,8 +25,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import static modtweaker2.helpers.InputHelper.*; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.*; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.Fermenter") public class Fermenter { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java b/src/main/java/modtweaker/mods/forestry/handlers/Moistener.java similarity index 91% rename from src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java rename to src/main/java/modtweaker/mods/forestry/handlers/Moistener.java index 25fab5b..720b6e8 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Moistener.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Moistener.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.fuels.FuelManager; import forestry.api.fuels.MoistenerFuel; @@ -8,12 +8,12 @@ import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.MoistenerRecipe; -import modtweaker2.utils.BaseMapAddition; -import modtweaker2.utils.BaseMapRemoval; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.MoistenerRecipe; +import modtweaker.utils.BaseMapAddition; +import modtweaker.utils.BaseMapRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -24,9 +24,9 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -import static modtweaker2.helpers.InputHelper.toIItemStack; -import static modtweaker2.helpers.InputHelper.toStack; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.toIItemStack; +import static modtweaker.helpers.InputHelper.toStack; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.Moistener") public class Moistener { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java b/src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java similarity index 90% rename from src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java rename to src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java index 867a988..4062bd4 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Squeezer.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Squeezer.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.recipes.ISqueezerManager; import forestry.api.recipes.ISqueezerRecipe; @@ -8,10 +8,10 @@ import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.WeightedItemStack; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.SqueezerRecipe; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.SqueezerRecipe; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -19,8 +19,8 @@ import stanhebben.zenscript.annotations.ZenMethod; import java.util.LinkedList; import java.util.List; -import static modtweaker2.helpers.InputHelper.*; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.*; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.Squeezer") public class Squeezer { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/Still.java b/src/main/java/modtweaker/mods/forestry/handlers/Still.java similarity index 87% rename from src/main/java/modtweaker2/mods/forestry/handlers/Still.java rename to src/main/java/modtweaker/mods/forestry/handlers/Still.java index bbe6bd9..4593674 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/Still.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/Still.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.recipes.IStillManager; import forestry.api.recipes.IStillRecipe; @@ -6,10 +6,10 @@ import forestry.api.recipes.RecipeManagers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.StillRecipe; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.StillRecipe; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; @@ -17,9 +17,9 @@ import stanhebben.zenscript.annotations.ZenMethod; import java.util.LinkedList; import java.util.List; -import static modtweaker2.helpers.InputHelper.toFluid; -import static modtweaker2.helpers.InputHelper.toILiquidStack; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.toFluid; +import static modtweaker.helpers.InputHelper.toILiquidStack; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.Still") public class Still { diff --git a/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java b/src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java similarity index 92% rename from src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java rename to src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java index f890bf8..8c43ec7 100644 --- a/src/main/java/modtweaker2/mods/forestry/handlers/ThermionicFabricator.java +++ b/src/main/java/modtweaker/mods/forestry/handlers/ThermionicFabricator.java @@ -1,16 +1,15 @@ -package modtweaker2.mods.forestry.handlers; +package modtweaker.mods.forestry.handlers; import forestry.api.recipes.*; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.forestry.ForestryListAddition; -import modtweaker2.mods.forestry.ForestryListRemoval; -import modtweaker2.mods.forestry.recipes.DescriptiveRecipe; -import modtweaker2.mods.forestry.recipes.FabricatorRecipe; -import modtweaker2.mods.forestry.recipes.FabricatorSmeltingRecipe; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.forestry.ForestryListAddition; +import modtweaker.mods.forestry.ForestryListRemoval; +import modtweaker.mods.forestry.recipes.DescriptiveRecipe; +import modtweaker.mods.forestry.recipes.FabricatorRecipe; +import modtweaker.mods.forestry.recipes.FabricatorSmeltingRecipe; import net.minecraftforge.fluids.FluidRegistry; import stanhebben.zenscript.annotations.Optional; import stanhebben.zenscript.annotations.ZenClass; @@ -19,8 +18,8 @@ import stanhebben.zenscript.annotations.ZenMethod; import java.util.LinkedList; import java.util.List; -import static modtweaker2.helpers.InputHelper.*; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.*; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.forestry.ThermionicFabricator") public class ThermionicFabricator { diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/CarpenterRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/CarpenterRecipe.java similarity index 95% rename from src/main/java/modtweaker2/mods/forestry/recipes/CarpenterRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/CarpenterRecipe.java index 6f8cf77..58bbfd5 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/CarpenterRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/CarpenterRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import forestry.api.recipes.ICarpenterRecipe; import forestry.api.recipes.IDescriptiveRecipe; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/CentrifugeRecipe.java similarity index 96% rename from src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/CentrifugeRecipe.java index f74370b..5da90d7 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/CentrifugeRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/CentrifugeRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import com.google.common.collect.ImmutableMap; import forestry.api.recipes.ICentrifugeRecipe; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/DescriptiveRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/DescriptiveRecipe.java similarity index 97% rename from src/main/java/modtweaker2/mods/forestry/recipes/DescriptiveRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/DescriptiveRecipe.java index b6dc9c0..68b77e8 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/DescriptiveRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/DescriptiveRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import forestry.api.recipes.IDescriptiveRecipe; import net.minecraft.inventory.InventoryCrafting; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/FabricatorRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/FabricatorRecipe.java similarity index 96% rename from src/main/java/modtweaker2/mods/forestry/recipes/FabricatorRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/FabricatorRecipe.java index b335617..210c78b 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/FabricatorRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/FabricatorRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import forestry.api.recipes.IDescriptiveRecipe; import forestry.api.recipes.IFabricatorRecipe; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/FabricatorSmeltingRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/FabricatorSmeltingRecipe.java similarity index 95% rename from src/main/java/modtweaker2/mods/forestry/recipes/FabricatorSmeltingRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/FabricatorSmeltingRecipe.java index 4d93a25..08675df 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/FabricatorSmeltingRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/FabricatorSmeltingRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import net.minecraft.item.ItemStack; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/FermenterRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/FermenterRecipe.java similarity index 97% rename from src/main/java/modtweaker2/mods/forestry/recipes/FermenterRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/FermenterRecipe.java index 15a3f7b..fb28530 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/FermenterRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/FermenterRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import net.minecraft.item.ItemStack; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/MoistenerRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/MoistenerRecipe.java similarity index 93% rename from src/main/java/modtweaker2/mods/forestry/recipes/MoistenerRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/MoistenerRecipe.java index 5cec8eb..7fedcf5 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/MoistenerRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/MoistenerRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import net.minecraft.item.ItemStack; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/SqueezerRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/SqueezerRecipe.java similarity index 96% rename from src/main/java/modtweaker2/mods/forestry/recipes/SqueezerRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/SqueezerRecipe.java index d1f6e82..4664e43 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/SqueezerRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/SqueezerRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import net.minecraft.item.ItemStack; diff --git a/src/main/java/modtweaker2/mods/forestry/recipes/StillRecipe.java b/src/main/java/modtweaker/mods/forestry/recipes/StillRecipe.java similarity index 95% rename from src/main/java/modtweaker2/mods/forestry/recipes/StillRecipe.java rename to src/main/java/modtweaker/mods/forestry/recipes/StillRecipe.java index 9049c6d..480a8ee 100644 --- a/src/main/java/modtweaker2/mods/forestry/recipes/StillRecipe.java +++ b/src/main/java/modtweaker/mods/forestry/recipes/StillRecipe.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.forestry.recipes; +package modtweaker.mods.forestry.recipes; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/modtweaker2/mods/randomthings/RandomThings.java b/src/main/java/modtweaker/mods/randomthings/RandomThings.java similarity index 66% rename from src/main/java/modtweaker2/mods/randomthings/RandomThings.java rename to src/main/java/modtweaker/mods/randomthings/RandomThings.java index a19dec0..a63e2eb 100644 --- a/src/main/java/modtweaker2/mods/randomthings/RandomThings.java +++ b/src/main/java/modtweaker/mods/randomthings/RandomThings.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.randomthings; +package modtweaker.mods.randomthings; import minetweaker.MineTweakerAPI; -import modtweaker2.mods.randomthings.handlers.ImbuingStation; +import modtweaker.mods.randomthings.handlers.ImbuingStation; /** * Created by Jared on 7/16/2016. diff --git a/src/main/java/modtweaker2/mods/randomthings/handlers/ImbuingStation.java b/src/main/java/modtweaker/mods/randomthings/handlers/ImbuingStation.java similarity index 94% rename from src/main/java/modtweaker2/mods/randomthings/handlers/ImbuingStation.java rename to src/main/java/modtweaker/mods/randomthings/handlers/ImbuingStation.java index c648a4c..19b10ad 100644 --- a/src/main/java/modtweaker2/mods/randomthings/handlers/ImbuingStation.java +++ b/src/main/java/modtweaker/mods/randomthings/handlers/ImbuingStation.java @@ -1,13 +1,13 @@ -package modtweaker2.mods.randomthings.handlers; +package modtweaker.mods.randomthings.handlers; import lumien.randomthings.recipes.imbuing.ImbuingRecipe; import lumien.randomthings.recipes.imbuing.ImbuingRecipeHandler; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.InputHelper; -import modtweaker2.helpers.LogHelper; -import modtweaker2.utils.BaseListAddition; -import modtweaker2.utils.BaseListRemoval; +import modtweaker.helpers.InputHelper; +import modtweaker.helpers.LogHelper; +import modtweaker.utils.BaseListAddition; +import modtweaker.utils.BaseListRemoval; import net.minecraft.item.ItemStack; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; diff --git a/src/main/java/modtweaker2/mods/tconstruct/TConstruct.java b/src/main/java/modtweaker/mods/tconstruct/TConstruct.java similarity index 85% rename from src/main/java/modtweaker2/mods/tconstruct/TConstruct.java rename to src/main/java/modtweaker/mods/tconstruct/TConstruct.java index 010e51f..272bb9e 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/TConstruct.java +++ b/src/main/java/modtweaker/mods/tconstruct/TConstruct.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.tconstruct; +package modtweaker.mods.tconstruct; import minetweaker.MineTweakerAPI; -import modtweaker2.brackets.MaterialBracketHandler; +import modtweaker.brackets.MaterialBracketHandler; public class TConstruct { public TConstruct() { diff --git a/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java b/src/main/java/modtweaker/mods/tconstruct/TConstructHelper.java similarity index 96% rename from src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java rename to src/main/java/modtweaker/mods/tconstruct/TConstructHelper.java index f8bb5bd..e255aeb 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/TConstructHelper.java +++ b/src/main/java/modtweaker/mods/tconstruct/TConstructHelper.java @@ -1,6 +1,6 @@ -package modtweaker2.mods.tconstruct; +package modtweaker.mods.tconstruct; -import modtweaker2.helpers.ReflectionHelper; +import modtweaker.helpers.ReflectionHelper; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import slimeknights.tconstruct.library.DryingRecipe; diff --git a/src/main/java/modtweaker2/mods/tconstruct/actions/SetAttackAction.java b/src/main/java/modtweaker/mods/tconstruct/actions/SetAttackAction.java similarity index 95% rename from src/main/java/modtweaker2/mods/tconstruct/actions/SetAttackAction.java rename to src/main/java/modtweaker/mods/tconstruct/actions/SetAttackAction.java index bce748d..e525fca 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/actions/SetAttackAction.java +++ b/src/main/java/modtweaker/mods/tconstruct/actions/SetAttackAction.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.tconstruct.actions; +package modtweaker.mods.tconstruct.actions; import minetweaker.IUndoableAction; -import modtweaker2.brackets.util.IMaterial; +import modtweaker.brackets.util.IMaterial; import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.materials.IMaterialStats; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/modtweaker2/mods/tconstruct/actions/SetDurabilityAction.java b/src/main/java/modtweaker/mods/tconstruct/actions/SetDurabilityAction.java similarity index 96% rename from src/main/java/modtweaker2/mods/tconstruct/actions/SetDurabilityAction.java rename to src/main/java/modtweaker/mods/tconstruct/actions/SetDurabilityAction.java index 97849d0..3f52515 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/actions/SetDurabilityAction.java +++ b/src/main/java/modtweaker/mods/tconstruct/actions/SetDurabilityAction.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.tconstruct.actions; +package modtweaker.mods.tconstruct.actions; import minetweaker.IUndoableAction; -import modtweaker2.brackets.util.IMaterial; +import modtweaker.brackets.util.IMaterial; import slimeknights.tconstruct.library.materials.*; /** diff --git a/src/main/java/modtweaker2/mods/tconstruct/actions/SetHarvestLevelAction.java b/src/main/java/modtweaker/mods/tconstruct/actions/SetHarvestLevelAction.java similarity index 95% rename from src/main/java/modtweaker2/mods/tconstruct/actions/SetHarvestLevelAction.java rename to src/main/java/modtweaker/mods/tconstruct/actions/SetHarvestLevelAction.java index c907700..ad418a0 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/actions/SetHarvestLevelAction.java +++ b/src/main/java/modtweaker/mods/tconstruct/actions/SetHarvestLevelAction.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.tconstruct.actions; +package modtweaker.mods.tconstruct.actions; import minetweaker.IUndoableAction; -import modtweaker2.brackets.util.IMaterial; +import modtweaker.brackets.util.IMaterial; import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.materials.IMaterialStats; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/modtweaker2/mods/tconstruct/actions/SetMiningSpeedAction.java b/src/main/java/modtweaker/mods/tconstruct/actions/SetMiningSpeedAction.java similarity index 95% rename from src/main/java/modtweaker2/mods/tconstruct/actions/SetMiningSpeedAction.java rename to src/main/java/modtweaker/mods/tconstruct/actions/SetMiningSpeedAction.java index 4f5ed3a..d7eaa7d 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/actions/SetMiningSpeedAction.java +++ b/src/main/java/modtweaker/mods/tconstruct/actions/SetMiningSpeedAction.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.tconstruct.actions; +package modtweaker.mods.tconstruct.actions; import minetweaker.IUndoableAction; -import modtweaker2.brackets.util.IMaterial; +import modtweaker.brackets.util.IMaterial; import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.materials.IMaterialStats; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/modtweaker2/mods/tconstruct/actions/SetModifierAction.java b/src/main/java/modtweaker/mods/tconstruct/actions/SetModifierAction.java similarity index 95% rename from src/main/java/modtweaker2/mods/tconstruct/actions/SetModifierAction.java rename to src/main/java/modtweaker/mods/tconstruct/actions/SetModifierAction.java index cb636bc..b0d4db3 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/actions/SetModifierAction.java +++ b/src/main/java/modtweaker/mods/tconstruct/actions/SetModifierAction.java @@ -1,7 +1,7 @@ -package modtweaker2.mods.tconstruct.actions; +package modtweaker.mods.tconstruct.actions; import minetweaker.IUndoableAction; -import modtweaker2.brackets.util.IMaterial; +import modtweaker.brackets.util.IMaterial; import slimeknights.tconstruct.library.materials.HandleMaterialStats; import slimeknights.tconstruct.library.materials.IMaterialStats; import slimeknights.tconstruct.library.materials.Material; diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/MaterialLogger.java b/src/main/java/modtweaker/mods/tconstruct/commands/MaterialLogger.java similarity index 86% rename from src/main/java/modtweaker2/mods/tconstruct/commands/MaterialLogger.java rename to src/main/java/modtweaker/mods/tconstruct/commands/MaterialLogger.java index bd013f1..a8cd240 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/commands/MaterialLogger.java +++ b/src/main/java/modtweaker/mods/tconstruct/commands/MaterialLogger.java @@ -1,4 +1,4 @@ -package modtweaker2.mods.tconstruct.commands; +package modtweaker.mods.tconstruct.commands; import minetweaker.MineTweakerAPI; import minetweaker.api.player.IPlayer; @@ -6,7 +6,7 @@ import minetweaker.api.server.ICommandFunction; import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.library.materials.Material; -import static modtweaker2.helpers.LogHelper.logPrinted; +import static modtweaker.helpers.LogHelper.logPrinted; public class MaterialLogger implements ICommandFunction { @Override diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/ModifierLogger.java b/src/main/java/modtweaker/mods/tconstruct/commands/ModifierLogger.java similarity index 79% rename from src/main/java/modtweaker2/mods/tconstruct/commands/ModifierLogger.java rename to src/main/java/modtweaker/mods/tconstruct/commands/ModifierLogger.java index e9f9320..791eb29 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/commands/ModifierLogger.java +++ b/src/main/java/modtweaker/mods/tconstruct/commands/ModifierLogger.java @@ -1,12 +1,12 @@ -package modtweaker2.mods.tconstruct.commands; +package modtweaker.mods.tconstruct.commands; import minetweaker.MineTweakerAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker.mods.tconstruct.TConstructHelper; import slimeknights.tconstruct.library.modifiers.IModifier; -import static modtweaker2.helpers.LogHelper.logPrinted; +import static modtweaker.helpers.LogHelper.logPrinted; public class ModifierLogger implements ICommandFunction{ @Override diff --git a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java b/src/main/java/modtweaker/mods/tconstruct/commands/TConstructLogger.java similarity index 96% rename from src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java rename to src/main/java/modtweaker/mods/tconstruct/commands/TConstructLogger.java index ea9f8b3..0ee01ca 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/commands/TConstructLogger.java +++ b/src/main/java/modtweaker/mods/tconstruct/commands/TConstructLogger.java @@ -1,12 +1,12 @@ -package modtweaker2.mods.tconstruct.commands; +package modtweaker.mods.tconstruct.commands; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.player.IPlayer; import minetweaker.api.server.ICommandFunction; -import modtweaker2.helpers.LogHelper; -import modtweaker2.helpers.StringHelper; -import modtweaker2.mods.tconstruct.TConstructHelper; +import modtweaker.helpers.LogHelper; +import modtweaker.helpers.StringHelper; +import modtweaker.mods.tconstruct.TConstructHelper; import slimeknights.tconstruct.library.DryingRecipe; import slimeknights.tconstruct.library.TinkerRegistry; import slimeknights.tconstruct.library.smeltery.AlloyRecipe; diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java similarity index 93% rename from src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java rename to src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java index b2528c6..d82f192 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Casting.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Casting.java @@ -1,14 +1,14 @@ -package modtweaker2.mods.tconstruct.handlers; +package modtweaker.mods.tconstruct.handlers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; import minetweaker.api.item.IngredientAny; import minetweaker.api.liquid.ILiquidStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.tconstruct.TConstructHelper; -import modtweaker2.utils.BaseListAddition; -import modtweaker2.utils.BaseListRemoval; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.tconstruct.TConstructHelper; +import modtweaker.utils.BaseListAddition; +import modtweaker.utils.BaseListRemoval; import slimeknights.mantle.util.RecipeMatch; import slimeknights.tconstruct.library.smeltery.CastingRecipe; import stanhebben.zenscript.annotations.Optional; @@ -19,8 +19,8 @@ import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import static modtweaker2.helpers.InputHelper.*; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.*; +import static modtweaker.helpers.StackHelper.matches; @ZenClass("mods.tconstruct.Casting") public class Casting { diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Drying.java similarity index 89% rename from src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java rename to src/main/java/modtweaker/mods/tconstruct/handlers/Drying.java index 5928ec0..7552261 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Drying.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Drying.java @@ -1,12 +1,12 @@ -package modtweaker2.mods.tconstruct.handlers; +package modtweaker.mods.tconstruct.handlers; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemStack; -import modtweaker2.helpers.LogHelper; -import modtweaker2.mods.tconstruct.TConstructHelper; -import modtweaker2.utils.BaseListAddition; -import modtweaker2.utils.BaseListRemoval; +import modtweaker.helpers.LogHelper; +import modtweaker.mods.tconstruct.TConstructHelper; +import modtweaker.utils.BaseListAddition; +import modtweaker.utils.BaseListRemoval; import slimeknights.tconstruct.library.DryingRecipe; import slimeknights.tconstruct.library.TinkerRegistry; import stanhebben.zenscript.annotations.ZenClass; @@ -15,8 +15,8 @@ import stanhebben.zenscript.annotations.ZenMethod; import java.util.LinkedList; import java.util.List; -import static modtweaker2.helpers.InputHelper.toIItemStack; -import static modtweaker2.helpers.InputHelper.toStack; +import static modtweaker.helpers.InputHelper.toIItemStack; +import static modtweaker.helpers.InputHelper.toStack; @ZenClass("mods.tconstruct.Drying") public class Drying { diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Modifiers.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Modifiers.java similarity index 91% rename from src/main/java/modtweaker2/mods/tconstruct/handlers/Modifiers.java rename to src/main/java/modtweaker/mods/tconstruct/handlers/Modifiers.java index 3c69aee..e741f7e 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Modifiers.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Modifiers.java @@ -4,9 +4,9 @@ //import java.util.List; // //import minetweaker.MineTweakerAPI; -//import modtweaker2.helpers.LogHelper; -//import modtweaker2.mods.tconstruct.TConstructHelper; -//import modtweaker2.utils.BaseListRemoval; +//import modtweaker.helpers.LogHelper; +//import modtweaker.mods.tconstruct.TConstructHelper; +//import modtweaker.utils.BaseListRemoval; //import stanhebben.zenscript.annotations.ZenClass; //import stanhebben.zenscript.annotations.ZenMethod; //import tconstruct.library.modifier.ItemModifier; diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java b/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java similarity index 93% rename from src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java rename to src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java index 1f892f5..43c2df3 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/Smeltery.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/Smeltery.java @@ -1,12 +1,12 @@ //package modtweaker2.mods.tconstruct.handlers; // -//import static modtweaker2.helpers.InputHelper.isABlock; -//import static modtweaker2.helpers.InputHelper.toFluid; -//import static modtweaker2.helpers.InputHelper.toFluids; -//import static modtweaker2.helpers.InputHelper.toIItemStack; -//import static modtweaker2.helpers.InputHelper.toILiquidStack; -//import static modtweaker2.helpers.InputHelper.toStack; -//import static modtweaker2.helpers.StackHelper.matches; +//import static modtweaker.helpers.InputHelper.isABlock; +//import static modtweaker.helpers.InputHelper.toFluid; +//import static modtweaker.helpers.InputHelper.toFluids; +//import static modtweaker.helpers.InputHelper.toIItemStack; +//import static modtweaker.helpers.InputHelper.toILiquidStack; +//import static modtweaker.helpers.InputHelper.toStack; +//import static modtweaker.helpers.StackHelper.matches; // //import java.util.ArrayList; //import java.util.Arrays; @@ -20,12 +20,12 @@ //import minetweaker.api.item.IIngredient; //import minetweaker.api.item.IItemStack; //import minetweaker.api.liquid.ILiquidStack; -//import modtweaker2.helpers.LogHelper; -//import modtweaker2.mods.tconstruct.TConstructHelper; -//import modtweaker2.utils.BaseListAddition; -//import modtweaker2.utils.BaseListRemoval; -//import modtweaker2.utils.BaseMapAddition; -//import modtweaker2.utils.BaseMapRemoval; +//import modtweaker.helpers.LogHelper; +//import modtweaker.mods.tconstruct.TConstructHelper; +//import modtweaker.utils.BaseListAddition; +//import modtweaker.utils.BaseListRemoval; +//import modtweaker.utils.BaseMapAddition; +//import modtweaker.utils.BaseMapRemoval; //import net.minecraft.block.Block; //import net.minecraft.item.ItemStack; //import net.minecraftforge.fluids.Fluid; diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java b/src/main/java/modtweaker/mods/tconstruct/handlers/TiCTweaks.java similarity index 93% rename from src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java rename to src/main/java/modtweaker/mods/tconstruct/handlers/TiCTweaks.java index e25dd89..6b0d100 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/TiCTweaks.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/TiCTweaks.java @@ -1,7 +1,7 @@ //package modtweaker2.mods.tconstruct.handlers; // -//import static modtweaker2.helpers.InputHelper.toIItemStack; -//import static modtweaker2.helpers.InputHelper.toStack; +//import static modtweaker.helpers.InputHelper.toIItemStack; +//import static modtweaker.helpers.InputHelper.toStack; // //import java.util.LinkedList; //import java.util.List; @@ -9,10 +9,10 @@ //import minetweaker.MineTweakerAPI; //import minetweaker.api.item.IIngredient; //import minetweaker.api.item.IItemStack; -//import modtweaker2.helpers.LogHelper; -//import modtweaker2.mods.tconstruct.TConstructHelper; -//import modtweaker2.utils.BaseListAddition; -//import modtweaker2.utils.BaseListRemoval; +//import modtweaker.helpers.LogHelper; +//import modtweaker.mods.tconstruct.TConstructHelper; +//import modtweaker.utils.BaseListAddition; +//import modtweaker.utils.BaseListRemoval; //import net.minecraft.item.ItemStack; //import stanhebben.zenscript.annotations.Optional; //import stanhebben.zenscript.annotations.ZenClass; diff --git a/src/main/java/modtweaker2/mods/tconstruct/handlers/ToolStats.java b/src/main/java/modtweaker/mods/tconstruct/handlers/ToolStats.java similarity index 99% rename from src/main/java/modtweaker2/mods/tconstruct/handlers/ToolStats.java rename to src/main/java/modtweaker/mods/tconstruct/handlers/ToolStats.java index ce755d0..4b49a09 100644 --- a/src/main/java/modtweaker2/mods/tconstruct/handlers/ToolStats.java +++ b/src/main/java/modtweaker/mods/tconstruct/handlers/ToolStats.java @@ -2,8 +2,8 @@ // //import minetweaker.IUndoableAction; //import minetweaker.MineTweakerAPI; -//import modtweaker2.helpers.ReflectionHelper; -//import modtweaker2.mods.tconstruct.TConstructHelper; +//import modtweaker.helpers.ReflectionHelper; +//import modtweaker.mods.tconstruct.TConstructHelper; //import slimeknights.tconstruct.library.TinkerRegistry; //import slimeknights.tconstruct.library.materials.Material; //import slimeknights.tconstruct.tools.TinkerMaterials; diff --git a/src/main/java/modtweaker2/proxy/ClientProxy.java b/src/main/java/modtweaker/proxy/ClientProxy.java similarity index 70% rename from src/main/java/modtweaker2/proxy/ClientProxy.java rename to src/main/java/modtweaker/proxy/ClientProxy.java index 03fc8f6..4f68807 100644 --- a/src/main/java/modtweaker2/proxy/ClientProxy.java +++ b/src/main/java/modtweaker/proxy/ClientProxy.java @@ -1,6 +1,6 @@ -package modtweaker2.proxy; +package modtweaker.proxy; -import modtweaker2.Commands; +import modtweaker.Commands; public class ClientProxy extends CommonProxy{ diff --git a/src/main/java/modtweaker2/proxy/CommonProxy.java b/src/main/java/modtweaker/proxy/CommonProxy.java similarity index 64% rename from src/main/java/modtweaker2/proxy/CommonProxy.java rename to src/main/java/modtweaker/proxy/CommonProxy.java index e25b202..030900b 100644 --- a/src/main/java/modtweaker2/proxy/CommonProxy.java +++ b/src/main/java/modtweaker/proxy/CommonProxy.java @@ -1,6 +1,6 @@ -package modtweaker2.proxy; +package modtweaker.proxy; -import modtweaker2.Commands; +import modtweaker.Commands; public class CommonProxy { diff --git a/src/main/java/modtweaker2/utils/ArrayUtils.java b/src/main/java/modtweaker/utils/ArrayUtils.java similarity index 89% rename from src/main/java/modtweaker2/utils/ArrayUtils.java rename to src/main/java/modtweaker/utils/ArrayUtils.java index 3297f67..e376fe0 100644 --- a/src/main/java/modtweaker2/utils/ArrayUtils.java +++ b/src/main/java/modtweaker/utils/ArrayUtils.java @@ -1,4 +1,4 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.ArrayList; diff --git a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java b/src/main/java/modtweaker/utils/BaseCraftingAddition.java similarity index 89% rename from src/main/java/modtweaker2/utils/BaseCraftingAddition.java rename to src/main/java/modtweaker/utils/BaseCraftingAddition.java index b33a1e1..a4326d0 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingAddition.java +++ b/src/main/java/modtweaker/utils/BaseCraftingAddition.java @@ -1,8 +1,8 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.List; -import modtweaker2.helpers.LogHelper; +import modtweaker.helpers.LogHelper; import net.minecraft.item.crafting.IRecipe; public abstract class BaseCraftingAddition extends BaseListAddition { diff --git a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java b/src/main/java/modtweaker/utils/BaseCraftingRemoval.java similarity index 84% rename from src/main/java/modtweaker2/utils/BaseCraftingRemoval.java rename to src/main/java/modtweaker/utils/BaseCraftingRemoval.java index 3cfa78e..36e1ef0 100644 --- a/src/main/java/modtweaker2/utils/BaseCraftingRemoval.java +++ b/src/main/java/modtweaker/utils/BaseCraftingRemoval.java @@ -1,13 +1,13 @@ -package modtweaker2.utils; +package modtweaker.utils; -import static modtweaker2.helpers.InputHelper.toIItemStack; -import static modtweaker2.helpers.StackHelper.matches; +import static modtweaker.helpers.InputHelper.toIItemStack; +import static modtweaker.helpers.StackHelper.matches; import java.util.LinkedList; import java.util.List; import minetweaker.api.item.IIngredient; -import modtweaker2.helpers.LogHelper; +import modtweaker.helpers.LogHelper; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; @@ -32,4 +32,4 @@ public class BaseCraftingRemoval extends BaseListRemoval { return recipes; } -} \ No newline at end of file +} diff --git a/src/main/java/modtweaker2/utils/BaseListAddition.java b/src/main/java/modtweaker/utils/BaseListAddition.java similarity index 84% rename from src/main/java/modtweaker2/utils/BaseListAddition.java rename to src/main/java/modtweaker/utils/BaseListAddition.java index 9e16460..2c1bac6 100644 --- a/src/main/java/modtweaker2/utils/BaseListAddition.java +++ b/src/main/java/modtweaker/utils/BaseListAddition.java @@ -1,8 +1,8 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.List; -import modtweaker2.helpers.LogHelper; +import modtweaker.helpers.LogHelper; public abstract class BaseListAddition extends BaseListModification { @@ -55,11 +55,11 @@ public abstract class BaseListAddition extends BaseListModification { @Override public String describe() { - return String.format("[ModTweaker2] Adding %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); + return String.format("[ModTweaker] Adding %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); } @Override public String describeUndo() { - return String.format("[ModTweaker2] Removing %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); + return String.format("[ModTweaker] Removing %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); } -} \ No newline at end of file +} diff --git a/src/main/java/modtweaker2/utils/BaseListModification.java b/src/main/java/modtweaker/utils/BaseListModification.java similarity index 99% rename from src/main/java/modtweaker2/utils/BaseListModification.java rename to src/main/java/modtweaker/utils/BaseListModification.java index 0569512..3af7954 100644 --- a/src/main/java/modtweaker2/utils/BaseListModification.java +++ b/src/main/java/modtweaker/utils/BaseListModification.java @@ -1,4 +1,4 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.LinkedList; import java.util.List; @@ -120,4 +120,4 @@ public abstract class BaseListModification extends BaseUndoable { return true; } -} \ No newline at end of file +} diff --git a/src/main/java/modtweaker2/utils/BaseListRemoval.java b/src/main/java/modtweaker/utils/BaseListRemoval.java similarity index 86% rename from src/main/java/modtweaker2/utils/BaseListRemoval.java rename to src/main/java/modtweaker/utils/BaseListRemoval.java index 96b6b6f..45fa2b1 100644 --- a/src/main/java/modtweaker2/utils/BaseListRemoval.java +++ b/src/main/java/modtweaker/utils/BaseListRemoval.java @@ -1,6 +1,6 @@ -package modtweaker2.utils; +package modtweaker.utils; -import modtweaker2.helpers.LogHelper; +import modtweaker.helpers.LogHelper; import java.util.List; @@ -54,11 +54,11 @@ public abstract class BaseListRemoval extends BaseListModification { @Override public String describe() { - return String.format("[ModTweaker2] Removing %d %s Recipe(s) for %s", this.recipes.size(), this.name, this.getRecipeInfo()); + return String.format("[ModTweaker] Removing %d %s Recipe(s) for %s", this.recipes.size(), this.name, this.getRecipeInfo()); } @Override public String describeUndo() { - return String.format("[ModTweaker2] Restoring %d %s Recipe(s) for %s", this.recipes.size(), this.name, this.getRecipeInfo()); + return String.format("[ModTweaker] Restoring %d %s Recipe(s) for %s", this.recipes.size(), this.name, this.getRecipeInfo()); } } diff --git a/src/main/java/modtweaker2/utils/BaseMapAddition.java b/src/main/java/modtweaker/utils/BaseMapAddition.java similarity index 87% rename from src/main/java/modtweaker2/utils/BaseMapAddition.java rename to src/main/java/modtweaker/utils/BaseMapAddition.java index 67bbfca..9aa1fa6 100644 --- a/src/main/java/modtweaker2/utils/BaseMapAddition.java +++ b/src/main/java/modtweaker/utils/BaseMapAddition.java @@ -1,11 +1,11 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.AbstractMap; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import modtweaker2.helpers.LogHelper; +import modtweaker.helpers.LogHelper; public abstract class BaseMapAddition extends BaseMapModification { @@ -67,11 +67,11 @@ public abstract class BaseMapAddition extends BaseMapModification { @Override public String describe() { - return String.format("[ModTweaker2] Adding %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); + return String.format("[ModTweaker] Adding %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); } @Override public String describeUndo() { - return String.format("[ModTweaker2] Removing %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); + return String.format("[ModTweaker] Removing %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); } } diff --git a/src/main/java/modtweaker2/utils/BaseMapModification.java b/src/main/java/modtweaker/utils/BaseMapModification.java similarity index 98% rename from src/main/java/modtweaker2/utils/BaseMapModification.java rename to src/main/java/modtweaker/utils/BaseMapModification.java index ac71c80..0255dd8 100644 --- a/src/main/java/modtweaker2/utils/BaseMapModification.java +++ b/src/main/java/modtweaker/utils/BaseMapModification.java @@ -1,4 +1,4 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/modtweaker2/utils/BaseMapRemoval.java b/src/main/java/modtweaker/utils/BaseMapRemoval.java similarity index 85% rename from src/main/java/modtweaker2/utils/BaseMapRemoval.java rename to src/main/java/modtweaker/utils/BaseMapRemoval.java index dcdc9ce..0cfb831 100644 --- a/src/main/java/modtweaker2/utils/BaseMapRemoval.java +++ b/src/main/java/modtweaker/utils/BaseMapRemoval.java @@ -1,9 +1,9 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.Map; import java.util.Map.Entry; -import modtweaker2.helpers.LogHelper; +import modtweaker.helpers.LogHelper; public abstract class BaseMapRemoval extends BaseMapModification { @@ -52,11 +52,11 @@ public abstract class BaseMapRemoval extends BaseMapModification { @Override public String describe() { - return String.format("[ModTweaker2] Removing %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); + return String.format("[ModTweaker] Removing %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); } @Override public String describeUndo() { - return String.format("[ModTweaker2] Restoring %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); + return String.format("[ModTweaker] Restoring %d %s Recipe(s) for %s", recipes.size(), name, getRecipeInfo()); } } diff --git a/src/main/java/modtweaker2/utils/BaseMultiModification.java b/src/main/java/modtweaker/utils/BaseMultiModification.java similarity index 97% rename from src/main/java/modtweaker2/utils/BaseMultiModification.java rename to src/main/java/modtweaker/utils/BaseMultiModification.java index c8fd478..6257b34 100644 --- a/src/main/java/modtweaker2/utils/BaseMultiModification.java +++ b/src/main/java/modtweaker/utils/BaseMultiModification.java @@ -1,4 +1,4 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.LinkedList; diff --git a/src/main/java/modtweaker2/utils/BaseUndoable.java b/src/main/java/modtweaker/utils/BaseUndoable.java similarity index 80% rename from src/main/java/modtweaker2/utils/BaseUndoable.java rename to src/main/java/modtweaker/utils/BaseUndoable.java index a6cf6e1..1f0d46f 100644 --- a/src/main/java/modtweaker2/utils/BaseUndoable.java +++ b/src/main/java/modtweaker/utils/BaseUndoable.java @@ -1,4 +1,4 @@ -package modtweaker2.utils; +package modtweaker.utils; import minetweaker.IUndoableAction; @@ -25,12 +25,12 @@ public abstract class BaseUndoable implements IUndoableAction { @Override public String describe() { - return String.format("[ModTweaker2] Altering %s Recipe(s) for %s", this.name, this.getRecipeInfo()); + return String.format("[ModTweaker] Altering %s Recipe(s) for %s", this.name, this.getRecipeInfo()); } @Override public String describeUndo() { - return String.format("[ModTweaker2] Reverting %s Recipe(s) changes for %s", this.name, this.getRecipeInfo()); + return String.format("[ModTweaker] Reverting %s Recipe(s) changes for %s", this.name, this.getRecipeInfo()); } @Override @@ -59,4 +59,4 @@ public abstract class BaseUndoable implements IUndoableAction { public Object getOverrideKey() { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/modtweaker2/utils/TweakerPlugin.java b/src/main/java/modtweaker/utils/TweakerPlugin.java similarity index 96% rename from src/main/java/modtweaker2/utils/TweakerPlugin.java rename to src/main/java/modtweaker/utils/TweakerPlugin.java index e300e05..61b9b3b 100644 --- a/src/main/java/modtweaker2/utils/TweakerPlugin.java +++ b/src/main/java/modtweaker/utils/TweakerPlugin.java @@ -1,4 +1,4 @@ -package modtweaker2.utils; +package modtweaker.utils; import java.util.ArrayList; diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 1a037ce..7796c91 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,6 +1,6 @@ [ { - "modid": "modtweaker2", + "modid": "modtweaker", "name": "Mod Tweaker 2", "description": "ModTweaker is an addon for MineTweaker 3.", "version": "${version}",