diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java index 478d668..b48cf2c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/api/minecraft/MineTweakerMC.java @@ -15,16 +15,16 @@ import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; import minetweaker.api.world.IBiome; import minetweaker.api.world.IDimension; -import minetweaker.mc19.block.MCBlockDefinition; -import minetweaker.mc19.block.MCSpecificBlock; -import minetweaker.mc19.data.NBTConverter; -import minetweaker.mc19.item.MCItemStack; -import minetweaker.mc19.oredict.MCOreDictEntry; -import minetweaker.mc19.player.MCPlayer; -import minetweaker.mc19.world.MCDimension; -import minetweaker.mc19.block.MCWorldBlock; -import minetweaker.mc19.liquid.MCLiquidStack; -import minetweaker.mc19.world.MCBiome; +import minetweaker.mc1710.block.MCBlockDefinition; +import minetweaker.mc1710.block.MCSpecificBlock; +import minetweaker.mc1710.data.NBTConverter; +import minetweaker.mc1710.item.MCItemStack; +import minetweaker.mc1710.oredict.MCOreDictEntry; +import minetweaker.mc1710.player.MCPlayer; +import minetweaker.mc1710.world.MCDimension; +import minetweaker.mc1710.block.MCWorldBlock; +import minetweaker.mc1710.liquid.MCLiquidStack; +import minetweaker.mc1710.world.MCBiome; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java similarity index 93% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java index 4bde714..7880546 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/FMLEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -1,4 +1,4 @@ -package minetweaker.mc19; +package minetweaker.mc1710; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; @@ -8,8 +8,8 @@ import minetweaker.api.event.PlayerLoggedOutEvent; import minetweaker.api.event.PlayerSmeltedEvent; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; -import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; -import minetweaker.mc19.recipes.MCCraftingInventory; +import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; +import minetweaker.mc1710.recipes.MCCraftingInventory; import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java index 5bd9b83..657effb 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/ForgeEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1710; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import minetweaker.MineTweakerImplementationAPI; @@ -12,7 +12,7 @@ import minetweaker.api.formatting.IFormattedText; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.tooltip.IngredientTooltips; -import minetweaker.mc19.formatting.IMCFormattedString; +import minetweaker.mc1710.formatting.IMCFormattedString; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import org.lwjgl.input.Keyboard; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/GuiCannotRemodify.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/GuiCannotRemodify.java index 324fca8..452526b 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/GuiCannotRemodify.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/GuiCannotRemodify.java @@ -1,4 +1,4 @@ -package minetweaker.mc19; +package minetweaker.mc1710; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java similarity index 76% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java index c5cf80e..bee2839 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MCPlatformFunctions.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java @@ -4,15 +4,15 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1710; import minetweaker.IPlatformFunctions; import minetweaker.api.chat.IChatMessage; import minetweaker.api.item.IItemDefinition; -import static minetweaker.mc19.MineTweakerMod.NETWORK; -import minetweaker.mc19.chat.MCChatMessage; -import minetweaker.mc19.item.MCItemDefinition; -import minetweaker.mc19.network.MineTweakerLoadScriptsPacket; + +import minetweaker.mc1710.item.MCItemDefinition; +import minetweaker.mc1710.network.MineTweakerLoadScriptsPacket; +import minetweaker.mc1710.chat.MCChatMessage; import net.minecraft.item.Item; /** @@ -32,7 +32,7 @@ public class MCPlatformFunctions implements IPlatformFunctions { @Override public void distributeScripts(byte[] data) { - NETWORK.sendToAll(new MineTweakerLoadScriptsPacket(data)); + MineTweakerMod.NETWORK.sendToAll(new MineTweakerLoadScriptsPacket(data)); } @Override diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java similarity index 87% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index 0753c84..e979659 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1710; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; @@ -16,21 +16,21 @@ import cpw.mods.fml.relauncher.Side; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; import minetweaker.api.logger.FileLogger; -import minetweaker.mc19.brackets.ItemBracketHandler; -import minetweaker.mc19.brackets.LiquidBracketHandler; -import minetweaker.mc19.client.MCClient; -import minetweaker.mc19.formatting.MCFormatter; -import minetweaker.mc19.furnace.FuelTweaker; -import minetweaker.mc19.furnace.MCFurnaceManager; -import minetweaker.mc19.game.MCGame; -import minetweaker.mc19.mods.MCLoadedMods; -import minetweaker.mc19.network.*; -import minetweaker.mc19.oredict.MCOreDict; -import minetweaker.mc19.recipes.MCRecipeManager; -import minetweaker.mc19.server.MCServer; -import minetweaker.mc19.util.MineTweakerHacks; -import minetweaker.mc19.util.MineTweakerPlatformUtils; -import minetweaker.mc19.vanilla.MCVanilla; +import minetweaker.mc1710.brackets.ItemBracketHandler; +import minetweaker.mc1710.brackets.LiquidBracketHandler; +import minetweaker.mc1710.client.MCClient; +import minetweaker.mc1710.formatting.MCFormatter; +import minetweaker.mc1710.furnace.FuelTweaker; +import minetweaker.mc1710.furnace.MCFurnaceManager; +import minetweaker.mc1710.game.MCGame; +import minetweaker.mc1710.mods.MCLoadedMods; +import minetweaker.mc1710.network.*; +import minetweaker.mc1710.oredict.MCOreDict; +import minetweaker.mc1710.recipes.MCRecipeManager; +import minetweaker.mc1710.server.MCServer; +import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc1710.util.MineTweakerPlatformUtils; +import minetweaker.mc1710.vanilla.MCVanilla; import minetweaker.runtime.IScriptProvider; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; @@ -46,7 +46,7 @@ import java.io.File; * * @author Stan Hebben */ -@Mod(modid = MineTweakerMod.MODID, version = "3.0.0") +@Mod(modid = MineTweakerMod.MODID, version = "3.0.4") public class MineTweakerMod { public static final String MODID = "MineTweaker3"; public static final String MCVERSION = "1.7.10"; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerRegistry.java similarity index 93% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerRegistry.java index 52c4bb6..464f066 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/MineTweakerRegistry.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerRegistry.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19; +package minetweaker.mc1710; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java index 15be30a..63e2ac1 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetBlockHardnessAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetBlockHardnessAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1710.actions; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java index 279eedb..d0a64c8 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackSizeAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackSizeAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1710.actions; import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java index 00f06f3..13fc0b6 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetStackmaxDamageAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetStackmaxDamageAction.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1710.actions; import minetweaker.IUndoableAction; import net.minecraft.item.ItemStack; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetTranslationAction.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java similarity index 94% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetTranslationAction.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java index e40f551..0f889b4 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/actions/SetTranslationAction.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/actions/SetTranslationAction.java @@ -4,12 +4,12 @@ * and open the template in the editor. */ -package minetweaker.mc19.actions; +package minetweaker.mc1710.actions; import java.io.ByteArrayInputStream; import java.nio.charset.Charset; import minetweaker.IUndoableAction; -import minetweaker.mc19.util.MineTweakerHacks; +import minetweaker.mc1710.util.MineTweakerHacks; import net.minecraft.util.StringTranslate; /** diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java index ed7256d..d300b98 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCBlockDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCBlockDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1710.block; import minetweaker.api.block.IBlockDefinition; import net.minecraft.block.Block; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCItemBlock.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCItemBlock.java index 4c93f37..1cd153e 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCItemBlock.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCItemBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1710.block; import java.util.Collections; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java index de20eff..352101c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCSpecificBlock.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCSpecificBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1710.block; import java.util.Collections; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java index ac0b44a..70d659d 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/block/MCWorldBlock.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/block/MCWorldBlock.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.block; +package minetweaker.mc1710.block; import java.util.Collections; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java index 2ae8ebf..773f50d 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/ItemBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/ItemBracketHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.brackets; +package minetweaker.mc1710.brackets; import static minetweaker.api.minecraft.MineTweakerMC.getIItemStackWildcardSize; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java index 482a50f..8473478 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/LiquidBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/LiquidBracketHandler.java @@ -1,4 +1,4 @@ -package minetweaker.mc19.brackets; +package minetweaker.mc1710.brackets; import java.util.HashMap; import java.util.List; @@ -6,7 +6,7 @@ import java.util.Map; import minetweaker.IBracketHandler; import minetweaker.annotations.BracketHandler; -import minetweaker.mc19.liquid.MCLiquidStack; +import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.runtime.GlobalRegistry; import net.minecraftforge.fluids.Fluid; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java index fa7f9c8..680eb63 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/brackets/OreBracketHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/brackets/OreBracketHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.brackets; +package minetweaker.mc1710.brackets; import java.util.ArrayList; import java.util.List; @@ -12,7 +12,7 @@ import java.util.regex.Pattern; import minetweaker.IBracketHandler; import minetweaker.MineTweakerAPI; import minetweaker.annotations.BracketHandler; -import minetweaker.mc19.oredict.MCOreDictEntry; +import minetweaker.mc1710.oredict.MCOreDictEntry; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.runtime.GlobalRegistry; import stanhebben.zenscript.compiler.IEnvironmentGlobal; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java index b9098cd..1085d92 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/chat/MCChatMessage.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/chat/MCChatMessage.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.chat; +package minetweaker.mc1710.chat; import minetweaker.api.chat.IChatMessage; import net.minecraft.util.ChatComponentText; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/client/MCClient.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/client/MCClient.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java index c27c74a..3cb694c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/client/MCClient.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/client/MCClient.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.client; +package minetweaker.mc1710.client; import cpw.mods.fml.client.FMLClientHandler; import minetweaker.api.client.IClient; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTConverter.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTConverter.java index f8c4994..bebebbf 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTConverter.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTConverter.java @@ -4,14 +4,15 @@ * and open the template in the editor. */ -package minetweaker.mc19.data; +package minetweaker.mc1710.data; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; -import minetweaker.mc19.util.MineTweakerHacks; + +import minetweaker.mc1710.util.MineTweakerHacks; import minetweaker.api.data.DataByte; import minetweaker.api.data.DataByteArray; import minetweaker.api.data.DataDouble; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTUpdater.java similarity index 92% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTUpdater.java index 9ca16df..da1b6bd 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/data/NBTUpdater.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/data/NBTUpdater.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.data; +package minetweaker.mc1710.data; import java.util.Map; import minetweaker.api.data.IData; @@ -34,7 +34,7 @@ public class NBTUpdater extends NBTConverter implements IDataConverter NBTTagCompound tag = (NBTTagCompound) nbt.getTag(entry.getKey()); nbt.setTag(entry.getKey(), entry.getValue().convert(new NBTUpdater(nbt))); } else { - nbt.setTag(entry.getKey(), NBTConverter.from(entry.getValue())); + nbt.setTag(entry.getKey(), from(entry.getValue())); } } } else if (entry.getValue() != null) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java index cdd8945..758a0c8 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/entity/MCEntityDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/entity/MCEntityDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.entity; +package minetweaker.mc1710.entity; import cpw.mods.fml.common.registry.EntityRegistry; import minetweaker.api.entity.IEntityDefinition; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java index e6967b1..312ad6f 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedMarkupString.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedMarkupString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1710.formatting; import minetweaker.api.formatting.IFormattedText; import net.minecraft.util.EnumChatFormatting; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java index b2c0610..6920aea 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedString.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1710.formatting; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java similarity index 97% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java index 6c394ff..62fc90c 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/FormattedStringJoin.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/FormattedStringJoin.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1710.formatting; import java.util.Arrays; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java similarity index 91% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java index 0eef75c..36912d6 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/IMCFormattedString.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/IMCFormattedString.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1710.formatting; import minetweaker.api.formatting.IFormattedText; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java index fe69d01..35e89f1 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/formatting/MCFormatter.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/formatting/MCFormatter.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.formatting; +package minetweaker.mc1710.formatting; import minetweaker.api.formatting.IFormattedText; import minetweaker.api.formatting.IFormatter; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java index 1291879..a05f20e 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/FuelTweaker.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/FuelTweaker.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.furnace; +package minetweaker.mc1710.furnace; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java index 04be2c0..aaabd99 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/MCFurnaceManager.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/MCFurnaceManager.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.furnace; +package minetweaker.mc1710.furnace; import cpw.mods.fml.common.registry.GameRegistry; import minetweaker.IUndoableAction; @@ -14,7 +14,7 @@ import minetweaker.api.item.IItemStack; import minetweaker.api.recipes.FurnaceRecipe; import minetweaker.api.recipes.IFurnaceManager; import minetweaker.api.recipes.IFurnaceRecipe; -import minetweaker.mc19.item.MCItemStack; +import minetweaker.mc1710.item.MCItemStack; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/SetFuelPattern.java similarity index 90% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/SetFuelPattern.java index 2ee5383..61e724d 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/furnace/SetFuelPattern.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/furnace/SetFuelPattern.java @@ -1,4 +1,4 @@ -package minetweaker.mc19.furnace; +package minetweaker.mc1710.furnace; import minetweaker.api.item.IIngredient; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/game/MCGame.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java similarity index 93% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/game/MCGame.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java index 4329344..4803403 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/game/MCGame.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/game/MCGame.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.game; +package minetweaker.mc1710.game; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -22,12 +22,12 @@ import minetweaker.api.liquid.ILiquidDefinition; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.world.IBiome; // TODO Find this -// import minetweaker.mc19.GuiCannotRemodify; -import minetweaker.mc19.entity.MCEntityDefinition; -import minetweaker.mc19.item.MCItemDefinition; -import minetweaker.mc19.liquid.MCLiquidDefinition; -import minetweaker.mc19.util.MineTweakerHacks; -import minetweaker.mc19.util.MineTweakerPlatformUtils; +// import GuiCannotRemodify; +import minetweaker.mc1710.entity.MCEntityDefinition; +import minetweaker.mc1710.item.MCItemDefinition; +import minetweaker.mc1710.liquid.MCLiquidDefinition; +import minetweaker.mc1710.util.MineTweakerHacks; +import minetweaker.mc1710.util.MineTweakerPlatformUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java index 20182bf..892cd37 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.item; +package minetweaker.mc1710.item; import java.util.ArrayList; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java index 1a8a798..56dcb11 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/item/MCItemStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/item/MCItemStack.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.item; +package minetweaker.mc1710.item; import static minetweaker.api.minecraft.MineTweakerMC.getItemStack; @@ -28,13 +28,13 @@ import minetweaker.api.item.WeightedItemStack; import minetweaker.api.liquid.ILiquidStack; import minetweaker.api.oredict.IOreDictEntry; import minetweaker.api.player.IPlayer; -import minetweaker.mc19.actions.SetBlockHardnessAction; -import minetweaker.mc19.actions.SetStackSizeAction; -import minetweaker.mc19.actions.SetStackmaxDamageAction; -import minetweaker.mc19.actions.SetTranslationAction; -import minetweaker.mc19.block.MCItemBlock; -import minetweaker.mc19.data.NBTConverter; -import minetweaker.mc19.liquid.MCLiquidStack; +import minetweaker.mc1710.actions.SetBlockHardnessAction; +import minetweaker.mc1710.actions.SetStackSizeAction; +import minetweaker.mc1710.actions.SetStackmaxDamageAction; +import minetweaker.mc1710.actions.SetTranslationAction; +import minetweaker.mc1710.block.MCItemBlock; +import minetweaker.mc1710.data.NBTConverter; +import minetweaker.mc1710.liquid.MCLiquidStack; import minetweaker.util.ArrayUtil; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java similarity index 99% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java index 3548488..fb52167 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidDefinition.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidDefinition.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.liquid; +package minetweaker.mc1710.liquid; import java.util.ArrayList; import java.util.List; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java similarity index 98% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java index 0760536..8df2d3e 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/liquid/MCLiquidStack.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/liquid/MCLiquidStack.java @@ -4,11 +4,11 @@ * and open the template in the editor. */ -package minetweaker.mc19.liquid; +package minetweaker.mc1710.liquid; import java.util.Collections; import java.util.List; -import minetweaker.mc19.data.NBTConverter; +import minetweaker.mc1710.data.NBTConverter; import minetweaker.api.data.IData; import minetweaker.api.item.IIngredient; import minetweaker.api.item.IItemCondition; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java index 44e0d81..e9517bc 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCLoadedMods.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCLoadedMods.java @@ -1,4 +1,4 @@ -package minetweaker.mc19.mods; +package minetweaker.mc1710.mods; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCMod.java similarity index 95% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCMod.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCMod.java index e300a8a..3ec189a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/mods/MCMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/mods/MCMod.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.mods; +package minetweaker.mc1710.mods; import cpw.mods.fml.common.ModContainer; import minetweaker.api.mods.IMod; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java similarity index 96% rename from MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java rename to MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java index cfd1c11..9212a7e 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc19/network/MineTweakerCopyClipboardHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java @@ -4,7 +4,7 @@ * and open the template in the editor. */ -package minetweaker.mc19.network; +package minetweaker.mc1710.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -29,4 +29,4 @@ public class MineTweakerCopyClipboardHandler implements IMessageHandler