Updated to 1.10.2

Removed 1.9 support
This commit is contained in:
Jared committed 2016-07-03 18:20:54 +02:00
1 parent a7e6f13c60
commit e5b27c19b7
79 files changed
+194 -180

No files matched your search

+12
View File
@@ -12,6 +12,18 @@
/MineTweaker3-API/*
!/MineTweaker3-API/src
!/MineTweaker3-MC1102-Main
/MineTweaker3-MC1102-Main/*
!/MineTweaker3-MC1102-Main/src
!/MineTweaker3-MC1102-Main/build.gradle
/MineTweaker3-MC1102-Main/bin
!/MineTweaker3-MC1102-Mod-JEI
/MineTweaker3-MC1102-Mod-JEI/*
!/MineTweaker3-MC1102-Mod-JEI/src
!/MineTweaker3-MC1102-Mod-JEI/libs
!/MineTweaker3-MC1102-Mod-JEI/build.gradle
!/MineTweaker3-MC19-Main
/MineTweaker3-MC19-Main/*
!/MineTweaker3-MC19-Main/src
@@ -14,11 +14,11 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.9-" + ext.mineTweakerVersion
version = "1.10.2-" + ext.mineTweakerVersion
archivesBaseName = project.projectDir.name
minecraft {
version = forgeVersion19
version = forgeVersion1102
runDir = "eclipse"
mappings = "snapshot_20160518"
}
@@ -31,7 +31,7 @@ dependencies {
task makeRegistry(type: RegisterZenClassesTask) {
inputDir = file('build/classes/main')
outputDir = file('build/classes/main')
className = 'minetweaker.mc19.MineTweakerRegistry'
className = 'minetweaker.mc1102.MineTweakerRegistry'
}
tasks.jar.dependsOn(makeRegistry)
@@ -12,16 +12,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.block.MCWorldBlock;
import minetweaker.mc19.data.NBTConverter;
import minetweaker.mc19.item.MCItemStack;
import minetweaker.mc19.liquid.MCLiquidStack;
import minetweaker.mc19.oredict.MCOreDictEntry;
import minetweaker.mc19.player.MCPlayer;
import minetweaker.mc19.world.MCBiome;
import minetweaker.mc19.world.MCDimension;
import minetweaker.mc1102.block.MCBlockDefinition;
import minetweaker.mc1102.block.MCSpecificBlock;
import minetweaker.mc1102.block.MCWorldBlock;
import minetweaker.mc1102.data.NBTConverter;
import minetweaker.mc1102.item.MCItemStack;
import minetweaker.mc1102.liquid.MCLiquidStack;
import minetweaker.mc1102.oredict.MCOreDictEntry;
import minetweaker.mc1102.player.MCPlayer;
import minetweaker.mc1102.world.MCBiome;
import minetweaker.mc1102.world.MCDimension;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -1,4 +1,4 @@
package minetweaker.mc19;
package minetweaker.mc1102;
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.mc1102.network.MineTweakerLoadScriptsPacket;
import minetweaker.mc1102.recipes.MCCraftingInventory;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.gameevent.PlayerEvent;
@@ -4,14 +4,14 @@
* and open the template in the editor.
*/
package minetweaker.mc19;
package minetweaker.mc1102;
import minetweaker.MineTweakerImplementationAPI;
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.mc1102.formatting.IMCFormattedString;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -1,4 +1,4 @@
package minetweaker.mc19;
package minetweaker.mc1102;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
@@ -4,18 +4,18 @@
* and open the template in the editor.
*/
package minetweaker.mc19;
package minetweaker.mc1102;
import minetweaker.IPlatformFunctions;
import minetweaker.api.chat.IChatMessage;
import minetweaker.api.item.IItemDefinition;
import minetweaker.mc19.chat.MCChatMessage;
import minetweaker.mc19.item.MCItemDefinition;
import minetweaker.mc19.network.MineTweakerLoadScriptsPacket;
import minetweaker.mc1102.chat.MCChatMessage;
import minetweaker.mc1102.item.MCItemDefinition;
import minetweaker.mc1102.network.MineTweakerLoadScriptsPacket;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
import static minetweaker.mc19.MineTweakerMod.NETWORK;
import static minetweaker.mc1102.MineTweakerMod.NETWORK;
/**
* @author Stan
@@ -4,27 +4,27 @@
* and open the template in the editor.
*/
package minetweaker.mc19;
package minetweaker.mc1102;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.api.logger.FileLogger;
import minetweaker.mc19.brackets.ItemBracketHandler;
import minetweaker.mc19.brackets.LiquidBracketHandler;
import minetweaker.mc19.brackets.OreBracketHandler;
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.mc1102.brackets.ItemBracketHandler;
import minetweaker.mc1102.brackets.LiquidBracketHandler;
import minetweaker.mc1102.brackets.OreBracketHandler;
import minetweaker.mc1102.client.MCClient;
import minetweaker.mc1102.formatting.MCFormatter;
import minetweaker.mc1102.furnace.FuelTweaker;
import minetweaker.mc1102.furnace.MCFurnaceManager;
import minetweaker.mc1102.game.MCGame;
import minetweaker.mc1102.mods.MCLoadedMods;
import minetweaker.mc1102.network.*;
import minetweaker.mc1102.oredict.MCOreDict;
import minetweaker.mc1102.recipes.MCRecipeManager;
import minetweaker.mc1102.server.MCServer;
import minetweaker.mc1102.util.MineTweakerHacks;
import minetweaker.mc1102.util.MineTweakerPlatformUtils;
import minetweaker.mc1102.vanilla.MCVanilla;
import minetweaker.runtime.GlobalRegistry;
import minetweaker.runtime.IScriptProvider;
import minetweaker.runtime.providers.ScriptProviderCascade;
@@ -49,10 +49,10 @@ import java.io.File;
*
* @author Stan Hebben
*/
@Mod(modid = MineTweakerMod.MODID, version = "3.0.9")
@Mod(modid = MineTweakerMod.MODID, version = "3.0.10")
public class MineTweakerMod {
public static final String MODID = "MineTweaker3";
public static final String MCVERSION = "1.9.4";
public static final String MCVERSION = "1.10.2";
public static final SimpleNetworkWrapper NETWORK = NetworkRegistry.INSTANCE.newSimpleChannel(MODID);
@@ -135,6 +135,12 @@ public class MineTweakerMod {
@EventHandler
public void onServerAboutToStart(FMLServerAboutToStartEvent ev) {
this.server = ev.getServer();
}
@EventHandler
public void onServerStarting(FMLServerStartingEvent ev) {
this.server = ev.getServer();
// starts before loading worlds
// perfect place to start MineTweaker!
@@ -152,11 +158,6 @@ public class MineTweakerMod {
MineTweakerImplementationAPI.setScriptProvider(cascaded);
MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer()));
}
@EventHandler
public void onServerStarting(FMLServerStartingEvent ev) {
this.server = ev.getServer();
}
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19;
package minetweaker.mc1102;
import java.util.List;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.actions;
package minetweaker.mc1102.actions;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.actions;
package minetweaker.mc1102.actions;
import minetweaker.IUndoableAction;
import net.minecraft.item.ItemStack;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.actions;
package minetweaker.mc1102.actions;
import minetweaker.IUndoableAction;
import net.minecraft.item.ItemStack;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.block;
package minetweaker.mc1102.block;
import minetweaker.api.block.IBlockDefinition;
import net.minecraft.block.Block;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.block;
package minetweaker.mc1102.block;
import minetweaker.api.block.BlockPatternOr;
import minetweaker.api.block.IBlock;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.block;
package minetweaker.mc1102.block;
import minetweaker.api.block.BlockPatternOr;
import minetweaker.api.block.IBlock;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.block;
package minetweaker.mc1102.block;
import minetweaker.api.block.BlockPatternOr;
import minetweaker.api.block.IBlock;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.brackets;
package minetweaker.mc1102.brackets;
import minetweaker.IBracketHandler;
import minetweaker.MineTweakerAPI;
@@ -1,9 +1,9 @@
package minetweaker.mc19.brackets;
package minetweaker.mc1102.brackets;
import minetweaker.IBracketHandler;
import minetweaker.annotations.BracketHandler;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.mc19.liquid.MCLiquidStack;
import minetweaker.mc1102.liquid.MCLiquidStack;
import minetweaker.runtime.GlobalRegistry;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
@@ -4,13 +4,13 @@
* and open the template in the editor.
*/
package minetweaker.mc19.brackets;
package minetweaker.mc1102.brackets;
import minetweaker.IBracketHandler;
import minetweaker.MineTweakerAPI;
import minetweaker.annotations.BracketHandler;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.mc19.oredict.MCOreDictEntry;
import minetweaker.mc1102.oredict.MCOreDictEntry;
import minetweaker.runtime.GlobalRegistry;
import stanhebben.zenscript.compiler.IEnvironmentGlobal;
import stanhebben.zenscript.expression.ExpressionCallStatic;
@@ -1,4 +1,4 @@
package minetweaker.mc19.brewing;
package minetweaker.mc1102.brewing;
import minetweaker.api.item.IItemStack;
import minetweaker.api.item.IngredientItem;
@@ -6,7 +6,7 @@ import minetweaker.api.item.IngredientOr;
import minetweaker.api.recipes.BrewingRecipe;
import minetweaker.api.recipes.IBrewingManager;
import minetweaker.api.recipes.IBrewingRecipe;
import minetweaker.mc19.item.MCItemStack;
import minetweaker.mc1102.item.MCItemStack;
import minetweaker.util.ArrayUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.brewing.AbstractBrewingRecipe;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.chat;
package minetweaker.mc1102.chat;
import minetweaker.api.chat.IChatMessage;
import net.minecraft.util.text.ITextComponent;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.client;
package minetweaker.mc1102.client;
import minetweaker.api.client.IClient;
import minetweaker.api.minecraft.MineTweakerMC;
@@ -4,10 +4,10 @@
* and open the template in the editor.
*/
package minetweaker.mc19.data;
package minetweaker.mc1102.data;
import minetweaker.api.data.*;
import minetweaker.mc19.util.MineTweakerHacks;
import minetweaker.mc1102.util.MineTweakerHacks;
import net.minecraft.nbt.*;
import java.util.*;
@@ -31,17 +31,17 @@ public class NBTConverter implements IDataConverter<NBTBase>{
switch(nbt.getId()){
case 1: // byte
return new DataByte(((NBTBase.NBTPrimitive) nbt).getByte());
return new DataByte(((NBTPrimitive) nbt).getByte());
case 2: // short
return new DataShort(((NBTBase.NBTPrimitive) nbt).getShort());
return new DataShort(((NBTPrimitive) nbt).getShort());
case 3: // int
return new DataInt(((NBTBase.NBTPrimitive) nbt).getInt());
return new DataInt(((NBTPrimitive) nbt).getInt());
case 4: // long
return new DataLong(((NBTBase.NBTPrimitive) nbt).getLong());
return new DataLong(((NBTPrimitive) nbt).getLong());
case 5: // float
return new DataFloat(((NBTBase.NBTPrimitive) nbt).getFloat());
return new DataFloat(((NBTPrimitive) nbt).getFloat());
case 6: // double
return new DataDouble(((NBTBase.NBTPrimitive) nbt).getDouble());
return new DataDouble(((NBTPrimitive) nbt).getDouble());
case 7: // byte[]
return new DataByteArray(((NBTTagByteArray) nbt).getByteArray(), immutable);
case 8: // string
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.data;
package minetweaker.mc1102.data;
import minetweaker.api.data.IData;
import minetweaker.api.data.IDataConverter;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.entity;
package minetweaker.mc1102.entity;
import minetweaker.api.entity.IEntityDefinition;
import net.minecraftforge.fml.common.registry.EntityRegistry;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.formatting;
package minetweaker.mc1102.formatting;
import minetweaker.api.formatting.IFormattedText;
import net.minecraft.util.text.TextFormatting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.formatting;
package minetweaker.mc1102.formatting;
import minetweaker.api.formatting.IFormattedText;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.formatting;
package minetweaker.mc1102.formatting;
import minetweaker.api.formatting.IFormattedText;
import net.minecraft.util.text.TextFormatting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.formatting;
package minetweaker.mc1102.formatting;
import minetweaker.api.formatting.IFormattedText;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.formatting;
package minetweaker.mc1102.formatting;
import minetweaker.api.formatting.IFormattedText;
import minetweaker.api.formatting.IFormatter;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.furnace;
package minetweaker.mc1102.furnace;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemStack;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.furnace;
package minetweaker.mc1102.furnace;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -13,7 +13,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.mc1102.item.MCItemStack;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraftforge.fml.common.registry.GameRegistry;
@@ -1,4 +1,4 @@
package minetweaker.mc19.furnace;
package minetweaker.mc1102.furnace;
import minetweaker.api.item.IIngredient;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.game;
package minetweaker.mc1102.game;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -15,11 +15,11 @@ import minetweaker.api.item.IItemDefinition;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.world.IBiome;
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 minetweaker.mc1102.entity.MCEntityDefinition;
import minetweaker.mc1102.item.MCItemDefinition;
import minetweaker.mc1102.liquid.MCLiquidDefinition;
import minetweaker.mc1102.util.MineTweakerHacks;
import minetweaker.mc1102.util.MineTweakerPlatformUtils;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.item.Item;
@@ -34,7 +34,7 @@ import java.util.Map;
import java.util.Set;
// TODO Find this
// import minetweaker.mc19.GuiCannotRemodify;
// import minetweaker.mc1102.GuiCannotRemodify;
/**
* @author Stan
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.item;
package minetweaker.mc1102.item;
import minetweaker.MineTweakerAPI;
import minetweaker.api.item.IItemDefinition;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.item;
package minetweaker.mc1102.item;
import minetweaker.MineTweakerAPI;
import minetweaker.api.block.IBlock;
@@ -14,12 +14,12 @@ import minetweaker.api.item.*;
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.block.MCItemBlock;
import minetweaker.mc19.data.NBTConverter;
import minetweaker.mc19.liquid.MCLiquidStack;
import minetweaker.mc1102.actions.SetBlockHardnessAction;
import minetweaker.mc1102.actions.SetStackSizeAction;
import minetweaker.mc1102.actions.SetStackmaxDamageAction;
import minetweaker.mc1102.block.MCItemBlock;
import minetweaker.mc1102.data.NBTConverter;
import minetweaker.mc1102.liquid.MCLiquidStack;
import minetweaker.util.ArrayUtil;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.liquid;
package minetweaker.mc1102.liquid;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -4,14 +4,14 @@
* and open the template in the editor.
*/
package minetweaker.mc19.liquid;
package minetweaker.mc1102.liquid;
import minetweaker.api.data.IData;
import minetweaker.api.item.*;
import minetweaker.api.liquid.ILiquidDefinition;
import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.player.IPlayer;
import minetweaker.mc19.data.NBTConverter;
import minetweaker.mc1102.data.NBTConverter;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fluids.FluidStack;
@@ -1,4 +1,4 @@
package minetweaker.mc19.mods;
package minetweaker.mc1102.mods;
import minetweaker.api.mods.ILoadedMods;
import minetweaker.api.mods.IMod;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.mods;
package minetweaker.mc1102.mods;
import minetweaker.api.mods.IMod;
import net.minecraftforge.fml.common.ModContainer;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.network;
package minetweaker.mc1102.network;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -28,4 +28,4 @@ public class MineTweakerCopyClipboardHandler implements IMessageHandler<MineTwea
return null;
}
}
}
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.network;
package minetweaker.mc1102.network;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -4,11 +4,11 @@
* and open the template in the editor.
*/
package minetweaker.mc19.network;
package minetweaker.mc1102.network;
import minetweaker.MineTweakerAPI;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.mc19.client.MCClient;
import minetweaker.mc1102.client.MCClient;
import minetweaker.runtime.providers.ScriptProviderMemory;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.network;
package minetweaker.mc1102.network;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.network;
package minetweaker.mc1102.network;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.network;
package minetweaker.mc1102.network;
import io.netty.buffer.ByteBuf;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.oredict;
package minetweaker.mc1102.oredict;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.oredict.IOreDict;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.oredict;
package minetweaker.mc1102.oredict;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -13,7 +13,7 @@ import minetweaker.api.liquid.ILiquidStack;
import minetweaker.api.oredict.IOreDictEntry;
import minetweaker.api.oredict.IngredientOreDict;
import minetweaker.api.player.IPlayer;
import minetweaker.mc19.util.MineTweakerHacks;
import minetweaker.mc1102.util.MineTweakerHacks;
import minetweaker.util.ArrayUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
@@ -1,4 +1,4 @@
package minetweaker.mc19.player;
package minetweaker.mc1102.player;
import minetweaker.MineTweakerAPI;
import minetweaker.api.chat.IChatMessage;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.player;
package minetweaker.mc1102.player;
import minetweaker.MineTweakerAPI;
import minetweaker.api.chat.IChatMessage;
@@ -12,10 +12,10 @@ import minetweaker.api.data.IData;
import minetweaker.api.item.IItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.player.IPlayer;
import minetweaker.mc19.MineTweakerMod;
import minetweaker.mc19.data.NBTConverter;
import minetweaker.mc19.network.MineTweakerCopyClipboardPacket;
import minetweaker.mc19.network.MineTweakerOpenBrowserPacket;
import minetweaker.mc1102.MineTweakerMod;
import minetweaker.mc1102.data.NBTConverter;
import minetweaker.mc1102.network.MineTweakerCopyClipboardPacket;
import minetweaker.mc1102.network.MineTweakerOpenBrowserPacket;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.text.ITextComponent;
@@ -1,4 +1,4 @@
package minetweaker.mc19.player;
package minetweaker.mc1102.player;
import minetweaker.MineTweakerAPI;
import minetweaker.api.chat.IChatMessage;
@@ -4,13 +4,13 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.item.IItemStack;
import minetweaker.api.player.IPlayer;
import minetweaker.api.recipes.ICraftingInventory;
import minetweaker.mc19.player.MCPlayer;
import minetweaker.mc19.util.MineTweakerHacks;
import minetweaker.mc1102.player.MCPlayer;
import minetweaker.mc1102.util.MineTweakerHacks;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.*;
import net.minecraft.item.ItemStack;
@@ -1,4 +1,4 @@
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -7,7 +7,7 @@ import minetweaker.api.item.IItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.player.IPlayer;
import minetweaker.api.recipes.*;
import minetweaker.mc19.util.MineTweakerHacks;
import minetweaker.mc1102.util.MineTweakerHacks;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.InventoryCrafting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.item.IIngredient;
import minetweaker.api.item.IItemStack;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.recipes.ShapedRecipe;
import net.minecraft.inventory.InventoryCrafting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.item.IItemStack;
import minetweaker.api.recipes.ShapedRecipe;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.recipes.ShapedRecipe;
import net.minecraft.inventory.InventoryCrafting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.recipes.ShapelessRecipe;
import net.minecraft.inventory.InventoryCrafting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.recipes.ShapelessRecipe;
import net.minecraft.inventory.InventoryCrafting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.recipes;
package minetweaker.mc1102.recipes;
import minetweaker.api.recipes.ShapelessRecipe;
import net.minecraft.inventory.InventoryCrafting;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.server;
package minetweaker.mc1102.server;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -14,9 +14,9 @@ import minetweaker.api.server.AbstractServer;
import minetweaker.api.server.ICommandFunction;
import minetweaker.api.server.ICommandTabCompletion;
import minetweaker.api.server.ICommandValidator;
import minetweaker.mc19.MineTweakerMod;
import minetweaker.mc19.player.CommandBlockPlayer;
import minetweaker.mc19.player.RconPlayer;
import minetweaker.mc1102.MineTweakerMod;
import minetweaker.mc1102.player.CommandBlockPlayer;
import minetweaker.mc1102.player.RconPlayer;
import net.minecraft.command.CommandException;
import net.minecraft.command.CommandHandler;
import net.minecraft.command.ICommand;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.server;
package minetweaker.mc1102.server;
import minetweaker.api.chat.IChatMessage;
import minetweaker.api.data.IData;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.util;
package minetweaker.mc1102.util;
import com.google.common.collect.BiMap;
import minetweaker.MineTweakerAPI;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.util;
package minetweaker.mc1102.util;
/**
* @author Stanneke
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.util;
package minetweaker.mc1102.util;
import net.minecraft.entity.EntityLivingBase;
import net.minecraftforge.fml.client.FMLClientHandler;
@@ -4,7 +4,7 @@
// * and open the template in the editor.
// */
//
//package minetweaker.mc19.vanilla;
//package minetweaker.mc1102.vanilla;
//
//import minetweaker.IUndoableAction;
//import minetweaker.MineTweakerAPI;
@@ -13,7 +13,7 @@
//import minetweaker.api.minecraft.MineTweakerMC;
//import minetweaker.api.vanilla.ILootRegistry;
//import minetweaker.api.vanilla.LootEntry;
//import minetweaker.mc19.util.MineTweakerHacks;
//import minetweaker.mc1102.util.MineTweakerHacks;
//import net.minecraft.item.ItemStack;
//import net.minecraft.world.storage.loot.LootEntryItem;
//import net.minecraft.world.storage.loot.functions.LootFunction;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.vanilla;
package minetweaker.mc1102.vanilla;
import minetweaker.IUndoableAction;
import minetweaker.MineTweakerAPI;
@@ -13,7 +13,7 @@ import minetweaker.api.item.IItemStack;
import minetweaker.api.item.WeightedItemStack;
import minetweaker.api.minecraft.MineTweakerMC;
import minetweaker.api.vanilla.ISeedRegistry;
import minetweaker.mc19.util.MineTweakerHacks;
import minetweaker.mc1102.util.MineTweakerHacks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.WeightedRandom;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.vanilla;
package minetweaker.mc1102.vanilla;
import minetweaker.api.vanilla.ILootRegistry;
import minetweaker.api.vanilla.ISeedRegistry;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.world;
package minetweaker.mc1102.world;
import minetweaker.api.world.IBiome;
import net.minecraft.world.biome.Biome;
@@ -4,7 +4,7 @@
* and open the template in the editor.
*/
package minetweaker.mc19.world;
package minetweaker.mc1102.world;
import minetweaker.api.block.IBlock;
import minetweaker.api.minecraft.MineTweakerMC;
File renamed without changes.

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

@@ -19,11 +19,11 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.9-" + ext.mineTweakerVersion
version = "1.10.2-" + ext.mineTweakerVersion
archivesBaseName = project.projectDir.name
minecraft {
version = forgeVersion19
version = forgeVersion1102
runDir = "eclipse"
mappings = "snapshot_20160518"
useDepAts = true
@@ -37,8 +37,8 @@ repositories {
dependencies {
compile project(':ZenScript')
compile project(':MineTweaker3-API')
compile project(':MineTweaker3-MC19-Main')
deobfCompile "mezz.jei:jei_1.9.4:3.4.0.204"
compile project(':MineTweaker3-MC1102-Main')
deobfCompile "mezz.jei:jei_1.10:3.7.0.218"
}
task makeRegistry(type: RegisterZenClassesTask) {
@@ -3,6 +3,7 @@ package minetweaker.mods.jei;
import mezz.jei.api.*;
import minetweaker.MineTweakerImplementationAPI;
import minetweaker.util.IEventHandler;
import sun.util.resources.cldr.zh.TimeZoneNames_zh;
import javax.annotation.Nonnull;
@@ -46,7 +46,7 @@ import java.io.File;
*
* @author Stan Hebben
*/
@Mod(modid = MineTweakerMod.MODID, version = "3.0.9")
@Mod(modid = MineTweakerMod.MODID, version = "3.0.10")
public class MineTweakerMod {
public static final String MODID = "MineTweaker3";
public static final String MCVERSION = "1.7.10";
@@ -49,7 +49,7 @@ import java.io.File;
*
* @author Stan Hebben
*/
@Mod(modid = MineTweakerMod.MODID, version = "3.0.9")
@Mod(modid = MineTweakerMod.MODID, version = "3.0.10")
public class MineTweakerMod {
public static final String MODID = "MineTweaker3";
public static final String MCVERSION = "1.8.9";
+17 -17
View File
@@ -11,9 +11,9 @@ task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper
subprojects.each { subproject -> evaluationDependsOn( subproject.path ) }
task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" } + projects18.collect { ':' + it + ':setupDecompWorkspace'} +projects19.collect { ':' + it + ':setupDecompWorkspace'}) {}
task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" } + projects18.collect { ':' + it + ':setupDecompWorkspace'} + projects1102.collect { ':' + it + ':setupDecompWorkspace'}) {}
task setupCIWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupCIWorkspace" } + projects18.collect { ':' + it + ':setupCIWorkspace'} +projects19.collect { ':' + it + ':setupCIWorkspace'}) {}
task setupCIWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupCIWorkspace" } + projects18.collect { ':' + it + ':setupCIWorkspace'} + projects1102.collect { ':' + it + ':setupCIWorkspace'}) {}
task assembleMC1710(type: Jar, dependsOn: [\
':ZenScript:build',
@@ -43,16 +43,16 @@ task assembleMC18(type: Jar, dependsOn: [\
}
}
task assembleMC19(type: Jar, dependsOn: [\
task assembleMC1102(type: Jar, dependsOn: [\
':ZenScript:build',
':MineTweaker3-API:build']
+ projects19.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.9.4-${mineTweakerVersion}.jar"
+ projects1102.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.10.2-${mineTweakerVersion}.jar"
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
for (p in projects19) {
for (p in projects1102) {
from zipTree(project(p).jar.archivePath)
}
}
@@ -79,15 +79,15 @@ task assembleDevBase18(type: Jar, dependsOn: [
from project(':MineTweaker3-MC18-Main').sourceSets.main.output
}
task assembleDevBase19(type: Jar, dependsOn: [
task assembleDevBase1102(type: Jar, dependsOn: [
':ZenScript:build',
':MineTweaker3-API:build',
':MineTweaker3-MC19-Main:build']) {
archiveName="CraftTweaker-Dev-1.9.4-${mineTweakerVersion}.jar"
':MineTweaker3-MC1102-Main:build']) {
archiveName="CraftTweaker-Dev-1.10.2-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
from project(':MineTweaker3-MC19-Main').sourceSets.main.output
from project(':MineTweaker3-MC1102-Main').sourceSets.main.output
}
task assembleDevFull1710(type: Jar, dependsOn: [
@@ -119,16 +119,16 @@ task assembleDevFull18(type: Jar, dependsOn: [
}
}
task assembleDevFull19(type: Jar, dependsOn: [
task assembleDevFull1102(type: Jar, dependsOn: [
':ZenScript:build',
':MineTweaker3-API:build']
+ projects19.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.9.4-${mineTweakerVersion}.jar"
+ projects1102.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.10.2-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
for (p in projects19) {
for (p in projects1102) {
from project(p).sourceSets.main.output
}
}
@@ -136,13 +136,13 @@ task assembleDevFull19(type: Jar, dependsOn: [
task assembleAll(dependsOn: [
assembleMC1710,
assembleMC18,
assembleMC19,
assembleMC1102,
assembleDevBase1710,
assembleDevBase18,
assembleDevBase19,
assembleDevBase1102,
assembleDevFull1710,
assembleDevFull18,
assembleDevFull19]) {
assembleDevFull1102]) {
}
configurations {
+8 -8
View File
@@ -4,7 +4,7 @@ import javax.tools.ToolProvider
// ### Global settings ###
// #######################
ext.mineTweakerVersion = "3.0.9"
ext.mineTweakerVersion = "3.0.10"
if (System.getenv('BUILD_NUMBER') != null)
project.mineTweakerVersion += "."+System.getenv('BUILD_NUMBER')
else {
@@ -42,12 +42,12 @@ ext.projects18 = [
'MineTweaker3-MC18-Mod-JEI'
]
// ####################
// ### 1.9 settings ###
// ####################
// #######################
// ### 1.10.2 settings ###
// #######################
ext.forgeVersion19 = "1.9.4-12.17.0.1910-1.9.4"
ext.projects19 = [
'MineTweaker3-MC19-Main',
'MineTweaker3-MC19-Mod-JEI'
ext.forgeVersion1102 = "1.10.2-12.18.0.2005-1.10.0"
ext.projects1102 = [
'MineTweaker3-MC1102-Main',
'MineTweaker3-MC1102-Mod-JEI'
]