mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 11:59:14 +00:00
Reorganize folders for modules
This commit is contained in:
1 parent
2c14f315de
commit
e2f0558b6f
370 files changed
+4274
-4788
No files matched your search
@@ -11,32 +11,29 @@ import org.apache.logging.log4j.Logger;
|
||||
import tconstruct.achievements.TAchievements;
|
||||
import tconstruct.client.TControls;
|
||||
import tconstruct.client.event.EventCloakRender;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.common.TRecipes;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.Detailing;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
import tconstruct.plugins.PluginController;
|
||||
import tconstruct.mechworks.landmine.behavior.Behavior;
|
||||
import tconstruct.mechworks.landmine.behavior.stackCombo.SpecialStackHandler;
|
||||
import tconstruct.util.EnvironmentChecks;
|
||||
import tconstruct.util.TCraftingHandler;
|
||||
import tconstruct.util.TEventHandler;
|
||||
import tconstruct.util.TEventHandlerAchievement;
|
||||
import tconstruct.util.config.DimensionBlacklist;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.util.landmine.behavior.Behavior;
|
||||
import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler;
|
||||
import tconstruct.util.network.packet.PacketPipeline;
|
||||
import tconstruct.util.player.TPlayerHandler;
|
||||
import tconstruct.worldgen.SlimeIslandGen;
|
||||
import tconstruct.worldgen.TBaseWorldGenerator;
|
||||
import tconstruct.worldgen.TerrainGenEventHandler;
|
||||
import tconstruct.worldgen.village.ComponentSmeltery;
|
||||
import tconstruct.worldgen.village.ComponentToolWorkshop;
|
||||
import tconstruct.worldgen.village.TVillageTrades;
|
||||
import tconstruct.worldgen.village.VillageSmelteryHandler;
|
||||
import tconstruct.worldgen.village.VillageToolStationHandler;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.gen.SlimeIslandGen;
|
||||
import tconstruct.world.gen.TBaseWorldGenerator;
|
||||
import tconstruct.world.gen.TerrainGenEventHandler;
|
||||
import tconstruct.world.village.ComponentSmeltery;
|
||||
import tconstruct.world.village.ComponentToolWorkshop;
|
||||
import tconstruct.world.village.TVillageTrades;
|
||||
import tconstruct.world.village.VillageSmelteryHandler;
|
||||
import tconstruct.world.village.VillageToolStationHandler;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
@@ -103,7 +100,7 @@ public class TConstruct
|
||||
|
||||
EnvironmentChecks.verifyEnvironmentSanity();
|
||||
MinecraftForge.EVENT_BUS.register(events = new TEventHandler());
|
||||
PluginController.registerModules();
|
||||
//PluginController.registerModules();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
@@ -120,14 +117,9 @@ public class TConstruct
|
||||
basinCasting = new LiquidCasting();
|
||||
chiselDetailing = new Detailing();
|
||||
|
||||
content = new TContent();
|
||||
|
||||
recipes = new TRecipes();
|
||||
|
||||
events = new TEventHandler();
|
||||
MinecraftForge.EVENT_BUS.register(events);
|
||||
MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement());
|
||||
recipes.oreRegistry();
|
||||
|
||||
proxy.registerRenderer();
|
||||
proxy.addNames();
|
||||
@@ -137,7 +129,7 @@ public class TConstruct
|
||||
|
||||
GameRegistry.registerWorldGenerator(new TBaseWorldGenerator(), 0);
|
||||
MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler());
|
||||
GameRegistry.registerFuelHandler(content);
|
||||
//GameRegistry.registerFuelHandler(content);
|
||||
FMLCommonHandler.instance().bus().register(new TCraftingHandler());
|
||||
NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy);
|
||||
|
||||
@@ -183,7 +175,7 @@ public class TConstruct
|
||||
}
|
||||
|
||||
DimensionBlacklist.getBadBimensions();
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool, 2), 2);
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TinkerWorld.slimePool, 2), 2);
|
||||
|
||||
if (PHConstruct.achievementsEnabled)
|
||||
{
|
||||
@@ -200,10 +192,6 @@ public class TConstruct
|
||||
packetPipeline.postInitialise();
|
||||
Behavior.registerBuiltInBehaviors();
|
||||
SpecialStackHandler.registerBuiltInStackHandlers();
|
||||
recipes.modIntegration();
|
||||
recipes.addOreDictionarySmelteryRecipes();
|
||||
content.createEntities();
|
||||
recipes.modRecipes();
|
||||
|
||||
moduleLoader.postInit();
|
||||
}
|
||||
@@ -223,8 +211,6 @@ public class TConstruct
|
||||
return chiselDetailing;
|
||||
}
|
||||
|
||||
public static TContent content;
|
||||
public static TRecipes recipes;
|
||||
public static TEventHandler events;
|
||||
public static TPlayerHandler playerTracker;
|
||||
public static LiquidCasting tableCasting;
|
||||
|
||||
@@ -0,0 +1,209 @@
|
||||
package tconstruct.armor;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.armor.blocks.DryingRack;
|
||||
import tconstruct.armor.items.ArmorBasic;
|
||||
import tconstruct.armor.items.DiamondApple;
|
||||
import tconstruct.armor.items.ExoArmor;
|
||||
import tconstruct.armor.items.HeartCanister;
|
||||
import tconstruct.armor.items.Jerky;
|
||||
import tconstruct.armor.items.Knapsack;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.armor.EnumArmorPart;
|
||||
import tconstruct.library.crafting.DryingRackRecipes;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.items.GoldenHead;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
@Mod(modid = "TinkerArmor", name = "TinkerArmor", version = "${tinkerarmorversion}")
|
||||
public class TinkerArmor
|
||||
{
|
||||
@Instance("TinkerArmor")
|
||||
public static TinkerArmor instance;
|
||||
public static Item diamondApple;
|
||||
public static Item jerky;
|
||||
// public static Item stonePattern;
|
||||
// public static Item netherPattern;
|
||||
public static Block dryingRack;
|
||||
// Wearables
|
||||
public static Item heavyHelmet;
|
||||
public static Item heavyChestplate;
|
||||
public static Item heavyPants;
|
||||
public static Item heavyBoots;
|
||||
public static Item glove;
|
||||
public static Item knapsack;
|
||||
public static Item heartCanister;
|
||||
// Armor - basic
|
||||
public static Item helmetWood;
|
||||
public static Item chestplateWood;
|
||||
public static Item leggingsWood;
|
||||
// Armor - exosuit
|
||||
public static Item exoGoggles;
|
||||
public static Item exoChest;
|
||||
public static Item exoPants;
|
||||
public static Item exoShoes;
|
||||
public static Item bootsWood;
|
||||
public static ArmorMaterial materialWood;
|
||||
|
||||
@EventHandler
|
||||
public void preInit (FMLPreInitializationEvent event)
|
||||
{
|
||||
|
||||
|
||||
TinkerArmor.dryingRack = new DryingRack().setBlockName("Armor.DryingRack");
|
||||
TinkerArmor.diamondApple = new DiamondApple().setUnlocalizedName("tconstruct.apple.diamond");
|
||||
GameRegistry.registerItem(TinkerArmor.diamondApple, "diamondApple");
|
||||
boolean foodOverhaul = false;
|
||||
if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food"))
|
||||
{
|
||||
foodOverhaul = true;
|
||||
}
|
||||
|
||||
TinkerArmor.jerky = new Jerky(foodOverhaul).setUnlocalizedName("tconstruct.jerky");
|
||||
GameRegistry.registerItem(TinkerArmor.jerky, "jerky");
|
||||
|
||||
// Wearables
|
||||
// heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet,
|
||||
// 0).setUnlocalizedName("tconstruct.HeavyHelmet");
|
||||
TinkerArmor.heartCanister = new HeartCanister().setUnlocalizedName("tconstruct.canister");
|
||||
// heavyBoots = new TArmorBase(PHConstruct.heavyBoots,
|
||||
// 3).setUnlocalizedName("tconstruct.HeavyBoots");
|
||||
// glove = new
|
||||
// Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove");
|
||||
TinkerArmor.knapsack = new Knapsack().setUnlocalizedName("tconstruct.storage");
|
||||
TinkerTools.goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
|
||||
// GameRegistry.registerItem(TRepo.heavyHelmet, "heavyHelmet");
|
||||
GameRegistry.registerItem(TinkerArmor.heartCanister, "heartCanister");
|
||||
// GameRegistry.registerItem(TRepo.heavyBoots, "heavyBoots");
|
||||
// GameRegistry.registerItem(TRepo.glove, "glove");
|
||||
GameRegistry.registerItem(TinkerArmor.knapsack, "knapsack");
|
||||
|
||||
LiquidCasting basinCasting = TConstruct.getBasinCasting();
|
||||
TinkerArmor.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3);
|
||||
TinkerArmor.helmetWood = new ArmorBasic(TinkerArmor.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood");
|
||||
TinkerArmor.chestplateWood = new ArmorBasic(TinkerArmor.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood");
|
||||
TinkerArmor.leggingsWood = new ArmorBasic(TinkerArmor.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood");
|
||||
TinkerArmor.bootsWood = new ArmorBasic(TinkerArmor.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood");
|
||||
GameRegistry.registerItem(TinkerArmor.helmetWood, "helmetWood");
|
||||
GameRegistry.registerItem(TinkerArmor.chestplateWood, "chestplateWood");
|
||||
GameRegistry.registerItem(TinkerArmor.leggingsWood, "leggingsWood");
|
||||
GameRegistry.registerItem(TinkerArmor.bootsWood, "bootsWood");
|
||||
|
||||
TinkerArmor.exoGoggles = new ExoArmor(EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles");
|
||||
TinkerArmor.exoChest = new ExoArmor(EnumArmorPart.CHEST, "exosuit").setUnlocalizedName("tconstruct.exoChest");
|
||||
TinkerArmor.exoPants = new ExoArmor(EnumArmorPart.PANTS, "exosuit").setUnlocalizedName("tconstruct.exoPants");
|
||||
TinkerArmor.exoShoes = new ExoArmor(EnumArmorPart.SHOES, "exosuit").setUnlocalizedName("tconstruct.exoShoes");
|
||||
|
||||
GameRegistry.registerItem(TinkerArmor.exoGoggles, "helmetExo");
|
||||
GameRegistry.registerItem(TinkerArmor.exoChest, "chestplateExo");
|
||||
GameRegistry.registerItem(TinkerArmor.exoPants, "leggingsExo");
|
||||
GameRegistry.registerItem(TinkerArmor.exoShoes, "bootsExo");
|
||||
|
||||
TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(TinkerArmor.diamondApple, 1, 0));
|
||||
|
||||
TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(TinkerArmor.heartCanister, 1, 0));
|
||||
TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(TinkerArmor.heartCanister, 1, 1));
|
||||
TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(TinkerArmor.heartCanister, 1, 2));
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void init (FMLInitializationEvent event)
|
||||
{
|
||||
craftingTableRecipes();
|
||||
addRecipesForDryingRack();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void postInit (FMLPostInitializationEvent evt)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void craftingTableRecipes ()
|
||||
{
|
||||
|
||||
// Armor Recipes
|
||||
Object[] helm = new String[] { "www", "w w" };
|
||||
Object[] chest = new String[] { "w w", "www", "www" };
|
||||
Object[] pants = new String[] { "www", "w w", "w w" };
|
||||
Object[] shoes = new String[] { "w w", "w w" };
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.helmetWood, helm, 'w', "logWood"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.chestplateWood, chest, 'w', "logWood"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.leggingsWood, pants, 'w', "logWood"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(TinkerArmor.bootsWood, shoes, 'w', "logWood"));
|
||||
|
||||
ItemStack exoGoggleStack = new ItemStack(TinkerArmor.exoGoggles);
|
||||
ItemStack exoChestStack = new ItemStack(TinkerArmor.exoChest);
|
||||
ItemStack exoPantsStack = new ItemStack(TinkerArmor.exoPants);
|
||||
ItemStack exoShoesStack = new ItemStack(TinkerArmor.exoShoes);
|
||||
if (PHConstruct.exoCraftingEnabled)
|
||||
{
|
||||
ToolBuilder.instance.addArmorTag(exoGoggleStack);
|
||||
ToolBuilder.instance.addArmorTag(exoChestStack);
|
||||
ToolBuilder.instance.addArmorTag(exoPantsStack);
|
||||
ToolBuilder.instance.addArmorTag(exoShoesStack);
|
||||
GameRegistry.addShapedRecipe(exoGoggleStack, helm, 'w', new ItemStack(TinkerTools.largePlate, 1, 14));
|
||||
GameRegistry.addShapedRecipe(exoChestStack, chest, 'w', new ItemStack(TinkerTools.largePlate, 1, 14));
|
||||
GameRegistry.addShapedRecipe(exoPantsStack, pants, 'w', new ItemStack(TinkerTools.largePlate, 1, 14));
|
||||
GameRegistry.addShapedRecipe(exoShoesStack, shoes, 'w', new ItemStack(TinkerTools.largePlate, 1, 14));
|
||||
}
|
||||
|
||||
// Accessories
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminum"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), "##", "##", '#', "ingotAluminium"));
|
||||
// GameRegistry.addRecipe(new ShapedOreRecipe(new
|
||||
// ItemStack(TRepo.heartCanister, 1, 0), "##", "##", '#',
|
||||
// "ingotNaturalAluminum"));
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 0), " # ", "#B#", " # ", '#', "ingotTin", 'B', Items.bone));
|
||||
|
||||
GameRegistry.addRecipe(new ItemStack(TinkerArmor.diamondApple), " d ", "d#d", " d ", 'd', new ItemStack(Items.diamond), '#', new ItemStack(Items.apple));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.diamondApple), new ItemStack(TinkerTools.materials, 1, 8), new ItemStack(
|
||||
TinkerArmor.heartCanister, 1, 0), new ItemStack(TinkerArmor.heartCanister, 1, 1));
|
||||
GameRegistry.addShapelessRecipe(new ItemStack(TinkerArmor.heartCanister, 1, 4), new ItemStack(TinkerArmor.heartCanister, 1, 2), new ItemStack(TinkerArmor.heartCanister, 1, 3), new ItemStack(
|
||||
Items.golden_apple, 1, 1));
|
||||
//GameRegistry.addShapelessRecipe(new ItemStack(heartCanister, 1, 6), new ItemStack(heartCanister, 1, 0), new ItemStack(heartCanister, 1, 4), new ItemStack(heartCanister, 1, 5));
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2),
|
||||
'm', "ingotGold"));
|
||||
ItemStack aluBrass = new ItemStack(TinkerTools.materials, 1, 14);
|
||||
GameRegistry.addRecipe(new ItemStack(TinkerArmor.knapsack, 1, 0), "###", "rmr", "###", '#', new ItemStack(Items.leather), 'r', new ItemStack(TinkerTools.toughRod, 1, 2), 'm', aluBrass);
|
||||
// Drying Rack Recipes
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(TinkerArmor.dryingRack, 1, 0), "bbb", 'b', "slabWood"));
|
||||
}
|
||||
|
||||
protected static void addRecipesForDryingRack ()
|
||||
{
|
||||
// Drying rack
|
||||
DryingRackRecipes.addDryingRecipe(Items.beef, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 0));
|
||||
DryingRackRecipes.addDryingRecipe(Items.chicken, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 1));
|
||||
DryingRackRecipes.addDryingRecipe(Items.porkchop, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 2));
|
||||
// DryingRackRecipes.addDryingRecipe(Item.muttonRaw, 20 * 60 * 5, new
|
||||
// ItemStack(TRepo.jerky, 1, 3));
|
||||
DryingRackRecipes.addDryingRecipe(Items.fish, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 4));
|
||||
DryingRackRecipes.addDryingRecipe(Items.rotten_flesh, 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 5));
|
||||
DryingRackRecipes.addDryingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 0), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 6));
|
||||
DryingRackRecipes.addDryingRecipe(new ItemStack(TinkerWorld.strangeFood, 1, 1), 20 * 60 * 5, new ItemStack(TinkerArmor.jerky, 1, 7));
|
||||
|
||||
// DryingRackRecipes.addDryingRecipe(new ItemStack(TRepo.jerky, 1, 5),
|
||||
// 20 * 60 * 10, Item.leather);
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package tconstruct.blocks;
|
||||
package tconstruct.armor.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -16,8 +16,8 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.armor.modelblock.DryingRackRender;
|
||||
import tconstruct.blocks.logic.DryingRackLogic;
|
||||
import tconstruct.client.block.DryingRackRender;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
+2
-1
@@ -1,9 +1,10 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.smeltery.inventory.ActiveContainer;
|
||||
import tconstruct.util.player.ArmorExtended;
|
||||
|
||||
public class ArmorExtendedContainer extends ActiveContainer
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
+2
-2
@@ -1,9 +1,9 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.util.landmine.behavior.Behavior;
|
||||
import tconstruct.mechworks.landmine.behavior.Behavior;
|
||||
|
||||
public class SlotBehavedOnly extends Slot
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
+2
-2
@@ -1,10 +1,10 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.items.armor.Knapsack;
|
||||
import tconstruct.armor.items.Knapsack;
|
||||
|
||||
public class SlotKnapsack extends Slot
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import mantle.blocks.BlockUtils;
|
||||
import net.minecraft.block.Block;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.inventory;
|
||||
package tconstruct.armor.inventory;
|
||||
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.Slot;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+1
-2
@@ -1,9 +1,8 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.armor.ArmorCore;
|
||||
import tconstruct.library.armor.EnumArmorPart;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.item.Item;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+3
-1
@@ -1,7 +1,9 @@
|
||||
package tconstruct.items;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.world.items.SpecialFood;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.armor;
|
||||
package tconstruct.armor.items;
|
||||
|
||||
import net.minecraft.client.model.ModelBiped;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package tconstruct.client.armor;
|
||||
package tconstruct.armor.model;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -15,7 +15,7 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.items.ArmorPattern;
|
||||
import tconstruct.armor.items.ArmorPattern;
|
||||
|
||||
public class RenderArmorCast implements IItemRenderer
|
||||
{
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.client.armor;
|
||||
package tconstruct.armor.model;
|
||||
|
||||
import net.minecraft.client.model.ModelBase;
|
||||
import net.minecraft.client.model.ModelRenderer;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.client.block;
|
||||
package tconstruct.armor.modelblock;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
package tconstruct.client.block;
|
||||
package tconstruct.armor.modelblock;
|
||||
|
||||
import net.minecraft.client.renderer.entity.RenderItem;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.tileentity.TileEntity;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.DryingRackLogic;
|
||||
import tconstruct.entity.FancyEntityItem;
|
||||
import tconstruct.tools.entity.FancyEntityItem;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.modifiers.armor;
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.UUID;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.modifiers.armor;
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.modifiers.armor;
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.UUID;
|
||||
@@ -0,0 +1,6 @@
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
public class AModJumpBoost
|
||||
{
|
||||
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.modifiers.armor;
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.UUID;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.modifiers.armor;
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
import java.util.UUID;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.modifiers.armor;
|
||||
package tconstruct.armor.modifiers;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
package tconstruct.blocks.logic;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
|
||||
public class RedwireLogic extends TileEntity
|
||||
{
|
||||
byte facesUsed;
|
||||
byte type;
|
||||
byte distanceTravelled;
|
||||
byte maxDistance;
|
||||
|
||||
public void readCustomNBT (NBTTagCompound tags)
|
||||
{
|
||||
/*
|
||||
* hasMaster = tags.getBoolean("HasMaster"); if (hasMaster) { int
|
||||
* xCenter = tags.getInteger("xCenter"); int yCenter =
|
||||
* tags.getInteger("yCenter"); int zCenter = tags.getInteger("zCenter");
|
||||
* master = new CoordTuple(xCenter, yCenter, zCenter); masterID =
|
||||
* tags.getShort("MasterID"); masterMeat = tags.getByte("masterMeat"); }
|
||||
*/
|
||||
}
|
||||
|
||||
public void writeCustomNBT (NBTTagCompound tags)
|
||||
{
|
||||
/*
|
||||
* tags.setBoolean("HasMaster", hasMaster); if (hasMaster) {
|
||||
* tags.setInteger("xCenter", master.x); tags.setInteger("yCenter",
|
||||
* master.y); tags.setInteger("zCenter", master.z);
|
||||
* tags.setShort("MasterID", masterID); tags.setByte("masterMeat",
|
||||
* masterMeat); }
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.readFromNBT(tags);
|
||||
readCustomNBT(tags);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT (NBTTagCompound tags)
|
||||
{
|
||||
super.writeToNBT(tags);
|
||||
writeCustomNBT(tags);
|
||||
}
|
||||
|
||||
/* Packets */
|
||||
@Override
|
||||
public Packet getDescriptionPacket ()
|
||||
{
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
writeCustomNBT(tag);
|
||||
return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 1, tag);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDataPacket (NetworkManager net, S35PacketUpdateTileEntity packet)
|
||||
{
|
||||
readCustomNBT(packet.func_148857_g());
|
||||
worldObj.func_147479_m(xCoord, yCoord, zCoord);
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidClassic;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import tconstruct.entity.BlueSlime;
|
||||
import tconstruct.world.entity.BlueSlime;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -17,8 +17,8 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
import net.minecraftforge.common.IPlantable;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -99,7 +99,7 @@ public class SlimeGrass extends MantleBlock
|
||||
@Override
|
||||
public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ)
|
||||
{
|
||||
world.setBlock(x, y, z, TRepo.craftedSoil, 5, 3);
|
||||
world.setBlock(x, y, z, TinkerTools.craftedSoil, 5, 3);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -109,7 +109,7 @@ public class SlimeGrass extends MantleBlock
|
||||
{
|
||||
if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && par1World.getBlockLightOpacity(par2, par3 + 1, par4) > 2)
|
||||
{
|
||||
par1World.setBlock(par2, par3, par4, TRepo.craftedSoil, 5, 3);
|
||||
par1World.setBlock(par2, par3, par4, TinkerTools.craftedSoil, 5, 3);
|
||||
}
|
||||
else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
|
||||
{
|
||||
@@ -129,7 +129,7 @@ public class SlimeGrass extends MantleBlock
|
||||
return;
|
||||
}
|
||||
int blockMeta = par1World.getBlockMetadata(posX, posY, posZ);
|
||||
if (block == TRepo.craftedSoil)
|
||||
if (block == TinkerTools.craftedSoil)
|
||||
{
|
||||
if (blockMeta == 5)
|
||||
par1World.setBlock(posX, posY, posZ, (Block) this, 0, 3);
|
||||
@@ -145,6 +145,6 @@ public class SlimeGrass extends MantleBlock
|
||||
if (metadata == 1)
|
||||
return Blocks.dirt;
|
||||
else
|
||||
return TRepo.craftedSoil;
|
||||
return TinkerTools.craftedSoil;
|
||||
}
|
||||
}
|
||||
@@ -11,8 +11,8 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -103,7 +103,7 @@ public class SlimeLeaves extends BlockLeaves
|
||||
@Override
|
||||
public Item getItemDropped (int p_149650_1_, Random p_149650_2_, int p_149650_3_)
|
||||
{
|
||||
return Item.getItemFromBlock(TRepo.slimeSapling);
|
||||
return Item.getItemFromBlock(TinkerWorld.slimeSapling);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -151,7 +151,7 @@ public class SlimeLeaves extends BlockLeaves
|
||||
|
||||
if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0)
|
||||
{
|
||||
this.dropBlockAsItem(world, x, y, z, new ItemStack(TRepo.strangeFood, 1, 0));
|
||||
this.dropBlockAsItem(world, x, y, z, new ItemStack(TinkerWorld.strangeFood, 1, 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,10 +14,10 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.worldgen.SlimeTreeGen;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.gen.SlimeTreeGen;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -51,7 +51,7 @@ public class SlimeSapling extends BlockSapling
|
||||
@Override
|
||||
public boolean canPlaceBlockOn (Block id)
|
||||
{
|
||||
return id == Blocks.grass || id == Blocks.dirt || id == TRepo.slimeGrass || id == TRepo.craftedSoil;
|
||||
return id == Blocks.grass || id == Blocks.dirt || id == TinkerWorld.slimeGrass || id == TinkerTools.craftedSoil;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,8 +13,8 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.Explosion;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.client.block.BarricadeRender;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.world.model.BarricadeRender;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@ import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.DamageSource;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.client.block.PunjiRender;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.model.PunjiRender;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -59,7 +59,7 @@ public class Punji extends MantleBlock
|
||||
if (meta < 4)
|
||||
{
|
||||
ItemStack stack = player.getCurrentEquippedItem();
|
||||
if (stack != null && stack.getItem() == Item.getItemFromBlock(TRepo.punji))
|
||||
if (stack != null && stack.getItem() == Item.getItemFromBlock(TinkerWorld.punji))
|
||||
{
|
||||
world.setBlockMetadataWithNotify(x, y, z, meta + 1, 3);
|
||||
world.playSoundEffect((double) ((float) x + 0.5F), (double) ((float) y + 0.5F), (double) ((float) z + 0.5F), this.stepSound.soundName, (this.stepSound.getVolume() + 1.0F) / 2.0F,
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.client.block;
|
||||
package tconstruct.client;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.client.block;
|
||||
package tconstruct.client;
|
||||
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -22,8 +22,8 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.client.event.sound.SoundLoadEvent;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.client.armor.WingModel;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.armor.model.WingModel;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.util.player.TPlayerStats;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
@@ -83,11 +83,11 @@ public class TClientEvents
|
||||
{
|
||||
if (event.map.getTextureType() == 0)
|
||||
{
|
||||
for (int i = 0; i < TRepo.fluidBlocks.length; i++)
|
||||
for (int i = 0; i < TinkerSmeltery.fluidBlocks.length; i++)
|
||||
{
|
||||
TRepo.fluids[i].setIcons(TRepo.fluidBlocks[i].getIcon(0, 0), TRepo.fluidBlocks[i].getIcon(2, 0));
|
||||
TinkerSmeltery.fluids[i].setIcons(TinkerSmeltery.fluidBlocks[i].getIcon(0, 0), TinkerSmeltery.fluidBlocks[i].getIcon(2, 0));
|
||||
}
|
||||
TRepo.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]);
|
||||
TinkerSmeltery.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.client;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.init.Blocks;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -19,9 +19,9 @@ public class TClientTickHandler
|
||||
@SubscribeEvent
|
||||
public void tickEnd (ClientTickEvent event)
|
||||
{
|
||||
TRepo.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P);
|
||||
TRepo.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P);
|
||||
TRepo.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P);
|
||||
TinkerWorld.oreBerry.setGraphicsLevel(Blocks.leaves.field_150121_P);
|
||||
TinkerWorld.oreBerrySecond.setGraphicsLevel(Blocks.leaves.field_150121_P);
|
||||
TinkerWorld.slimeLeaves.setGraphicsLevel(Blocks.leaves.field_150121_P);
|
||||
if (mc.thePlayer != null && mc.thePlayer.onGround)
|
||||
controlInstance.landOnGround();
|
||||
}
|
||||
|
||||
@@ -60,44 +60,10 @@ import org.lwjgl.opengl.GL11;
|
||||
import org.w3c.dom.Document;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.AdaptiveSmelteryLogic;
|
||||
import tconstruct.blocks.logic.CastingBasinLogic;
|
||||
import tconstruct.blocks.logic.CastingTableLogic;
|
||||
import tconstruct.blocks.logic.CraftingStationLogic;
|
||||
import tconstruct.armor.TinkerArmor;
|
||||
import tconstruct.armor.modelblock.DryingRackRender;
|
||||
import tconstruct.armor.modelblock.DryingRackSpecialRender;
|
||||
import tconstruct.blocks.logic.DryingRackLogic;
|
||||
import tconstruct.blocks.logic.FrypanLogic;
|
||||
import tconstruct.blocks.logic.FurnaceLogic;
|
||||
import tconstruct.blocks.logic.PartBuilderLogic;
|
||||
import tconstruct.blocks.logic.PatternChestLogic;
|
||||
import tconstruct.blocks.logic.SmelteryLogic;
|
||||
import tconstruct.blocks.logic.StencilTableLogic;
|
||||
import tconstruct.blocks.logic.TileEntityLandmine;
|
||||
import tconstruct.blocks.logic.ToolForgeLogic;
|
||||
import tconstruct.blocks.logic.ToolStationLogic;
|
||||
import tconstruct.client.block.BarricadeRender;
|
||||
import tconstruct.client.block.BlockRenderCastingChannel;
|
||||
import tconstruct.client.block.CastingBasinSpecialRender;
|
||||
import tconstruct.client.block.CastingTableSpecialRenderer;
|
||||
import tconstruct.client.block.DryingRackRender;
|
||||
import tconstruct.client.block.DryingRackSpecialRender;
|
||||
import tconstruct.client.block.FrypanRender;
|
||||
import tconstruct.client.block.OreberryRender;
|
||||
import tconstruct.client.block.PaneConnectedRender;
|
||||
import tconstruct.client.block.PaneRender;
|
||||
import tconstruct.client.block.PunjiRender;
|
||||
import tconstruct.client.block.RenderLandmine;
|
||||
import tconstruct.client.block.SearedRender;
|
||||
import tconstruct.client.block.SlimeChannelRender;
|
||||
import tconstruct.client.block.SlimePadRender;
|
||||
import tconstruct.client.block.SmelteryRender;
|
||||
import tconstruct.client.block.TableForgeRender;
|
||||
import tconstruct.client.block.TableRender;
|
||||
import tconstruct.client.block.TankAirRender;
|
||||
import tconstruct.client.block.TankRender;
|
||||
import tconstruct.client.entity.CartRender;
|
||||
import tconstruct.client.entity.CrystalRender;
|
||||
import tconstruct.client.entity.FancyItemRender;
|
||||
import tconstruct.client.entity.SlimeRender;
|
||||
import tconstruct.client.entity.item.ExplosiveRender;
|
||||
import tconstruct.client.entity.projectile.ArrowRenderCustom;
|
||||
import tconstruct.client.entity.projectile.DaggerRenderCustom;
|
||||
@@ -124,23 +90,48 @@ import tconstruct.client.tabs.InventoryTabKnapsack;
|
||||
import tconstruct.client.tabs.InventoryTabVanilla;
|
||||
import tconstruct.client.tabs.TabRegistry;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.BlueSlime;
|
||||
import tconstruct.entity.CartEntity;
|
||||
import tconstruct.entity.Crystal;
|
||||
import tconstruct.entity.FancyEntityItem;
|
||||
import tconstruct.entity.item.EntityLandmineFirework;
|
||||
import tconstruct.entity.item.ExplosivePrimed;
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.entity.projectile.LaunchedPotion;
|
||||
import tconstruct.inventory.ContainerLandmine;
|
||||
import tconstruct.items.ManualInfo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.client.TConstructClientRegistry;
|
||||
import tconstruct.library.client.ToolGuiElement;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.mechworks.entity.item.EntityLandmineFirework;
|
||||
import tconstruct.mechworks.entity.item.ExplosivePrimed;
|
||||
import tconstruct.mechworks.inventory.ContainerLandmine;
|
||||
import tconstruct.mechworks.logic.TileEntityLandmine;
|
||||
import tconstruct.mechworks.model.CartRender;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.smeltery.logic.AdaptiveSmelteryLogic;
|
||||
import tconstruct.smeltery.logic.CastingBasinLogic;
|
||||
import tconstruct.smeltery.logic.CastingTableLogic;
|
||||
import tconstruct.smeltery.logic.SmelteryLogic;
|
||||
import tconstruct.smeltery.model.BlockRenderCastingChannel;
|
||||
import tconstruct.smeltery.model.CastingBasinSpecialRender;
|
||||
import tconstruct.smeltery.model.CastingTableSpecialRenderer;
|
||||
import tconstruct.smeltery.model.PaneConnectedRender;
|
||||
import tconstruct.smeltery.model.PaneRender;
|
||||
import tconstruct.smeltery.model.SearedRender;
|
||||
import tconstruct.smeltery.model.SmelteryRender;
|
||||
import tconstruct.smeltery.model.TankAirRender;
|
||||
import tconstruct.smeltery.model.TankRender;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.entity.ArrowEntity;
|
||||
import tconstruct.tools.entity.DaggerEntity;
|
||||
import tconstruct.tools.entity.FancyEntityItem;
|
||||
import tconstruct.tools.entity.LaunchedPotion;
|
||||
import tconstruct.tools.items.ManualInfo;
|
||||
import tconstruct.tools.logic.CraftingStationLogic;
|
||||
import tconstruct.tools.logic.FrypanLogic;
|
||||
import tconstruct.tools.logic.FurnaceLogic;
|
||||
import tconstruct.tools.logic.PartBuilderLogic;
|
||||
import tconstruct.tools.logic.PatternChestLogic;
|
||||
import tconstruct.tools.logic.StencilTableLogic;
|
||||
import tconstruct.tools.logic.ToolForgeLogic;
|
||||
import tconstruct.tools.logic.ToolStationLogic;
|
||||
import tconstruct.tools.model.FancyItemRender;
|
||||
import tconstruct.tools.model.FrypanRender;
|
||||
import tconstruct.tools.model.TableForgeRender;
|
||||
import tconstruct.tools.model.TableRender;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.util.player.ArmorExtended;
|
||||
import tconstruct.util.player.KnapsackInventory;
|
||||
@@ -152,6 +143,18 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.registry.VillagerRegistry;
|
||||
import tconstruct.util.player.TPlayerStats;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.entity.BlueSlime;
|
||||
import tconstruct.world.entity.CartEntity;
|
||||
import tconstruct.world.entity.Crystal;
|
||||
import tconstruct.world.model.BarricadeRender;
|
||||
import tconstruct.world.model.CrystalRender;
|
||||
import tconstruct.world.model.OreberryRender;
|
||||
import tconstruct.world.model.PunjiRender;
|
||||
import tconstruct.world.model.RenderLandmine;
|
||||
import tconstruct.world.model.SlimeChannelRender;
|
||||
import tconstruct.world.model.SlimePadRender;
|
||||
import tconstruct.world.model.SlimeRender;
|
||||
|
||||
public class TProxyClient extends TProxyCommon
|
||||
{
|
||||
@@ -348,12 +351,12 @@ public class TProxyClient extends TProxyCommon
|
||||
// RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class,
|
||||
// new PlayerArmorRender()); // <-- Works, woo!
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(TRepo.shortbow, new CustomBowRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(TinkerTools.shortbow, new CustomBowRenderer());
|
||||
VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png"));
|
||||
|
||||
ToolCoreRenderer renderer = new ToolCoreRenderer();
|
||||
MinecraftForgeClient.registerItemRenderer(TRepo.arrow, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TRepo.dagger, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TinkerTools.arrow, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TinkerTools.dagger, renderer);
|
||||
|
||||
addRenderMappings();
|
||||
addToolButtons();
|
||||
@@ -398,32 +401,32 @@ public class TProxyClient extends TProxyCommon
|
||||
|
||||
public void initManualIcons ()
|
||||
{
|
||||
MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TRepo.manualBook, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TRepo.smeltery));
|
||||
MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TRepo.blankPattern, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("castingtable", new ItemStack(TRepo.searedBlock));
|
||||
MantleClientRegistry.registerManualIcon("smelterybook", new ItemStack(TinkerTools.manualBook, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("smeltery", new ItemStack(TinkerSmeltery.smeltery));
|
||||
MantleClientRegistry.registerManualIcon("blankcast", new ItemStack(TinkerTools.blankPattern, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("castingtable", new ItemStack(TinkerSmeltery.searedBlock));
|
||||
// MantleClientRegistry.registerManualIcon("liquidiron", new
|
||||
// ItemStack(TRepo.liquidMetalStill));
|
||||
MantleClientRegistry.registerManualIcon("lavatank", new ItemStack(TRepo.lavaTank));
|
||||
MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TRepo.smeltery, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("drain", new ItemStack(TRepo.smeltery, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TRepo.searedBlock, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TRepo.materials, 1, 13));
|
||||
MantleClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TRepo.materials, 1, 14));
|
||||
MantleClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TRepo.materials, 1, 5));
|
||||
MantleClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TRepo.materials, 1, 15));
|
||||
MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TRepo.blankPattern, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5));
|
||||
MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10));
|
||||
MantleClientRegistry.registerManualIcon("lavatank", new ItemStack(TinkerSmeltery.lavaTank));
|
||||
MantleClientRegistry.registerManualIcon("searedbrick", new ItemStack(TinkerSmeltery.smeltery, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("drain", new ItemStack(TinkerSmeltery.smeltery, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("faucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TinkerTools.materials, 1, 13));
|
||||
MantleClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TinkerTools.materials, 1, 14));
|
||||
MantleClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TinkerTools.materials, 1, 5));
|
||||
MantleClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TinkerTools.materials, 1, 15));
|
||||
MantleClientRegistry.registerManualIcon("blankpattern", new ItemStack(TinkerTools.blankPattern, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5));
|
||||
MantleClientRegistry.registerManualIcon("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10));
|
||||
MantleClientRegistry.registerManualIcon("torch", new ItemStack(Blocks.torch));
|
||||
MantleClientRegistry.registerManualIcon("sapling", new ItemStack(Blocks.sapling));
|
||||
MantleClientRegistry.registerManualIcon("workbench", new ItemStack(Blocks.crafting_table));
|
||||
MantleClientRegistry.registerManualIcon("coal", new ItemStack(Items.coal));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18));
|
||||
MantleClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.materials, 1, 7));
|
||||
MantleClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TinkerTools.materials, 1, 18));
|
||||
MantleClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7));
|
||||
|
||||
// Tool Materials
|
||||
MantleClientRegistry.registerManualIcon("woodplanks", new ItemStack(Blocks.planks));
|
||||
@@ -434,92 +437,92 @@ public class TProxyClient extends TProxyCommon
|
||||
MantleClientRegistry.registerManualIcon("bone", new ItemStack(Items.bone));
|
||||
MantleClientRegistry.registerManualIcon("obsidian", new ItemStack(Blocks.obsidian));
|
||||
MantleClientRegistry.registerManualIcon("netherrack", new ItemStack(Blocks.netherrack));
|
||||
MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TRepo.materials, 1, 17));
|
||||
MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TRepo.materials, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TRepo.materials, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TRepo.materials, 1, 3));
|
||||
MantleClientRegistry.registerManualIcon("arditeingot", new ItemStack(TRepo.materials, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("copperingot", new ItemStack(TRepo.materials, 1, 9));
|
||||
MantleClientRegistry.registerManualIcon("steelingot", new ItemStack(TRepo.materials, 1, 16));
|
||||
MantleClientRegistry.registerManualIcon("pigironingot", new ItemStack(TRepo.materials, 1, 34));
|
||||
MantleClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TinkerTools.materials, 1, 17));
|
||||
MantleClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1));
|
||||
MantleClientRegistry.registerManualIcon("paperstack", new ItemStack(TinkerTools.materials, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TinkerTools.materials, 1, 3));
|
||||
MantleClientRegistry.registerManualIcon("arditeingot", new ItemStack(TinkerTools.materials, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("copperingot", new ItemStack(TinkerTools.materials, 1, 9));
|
||||
MantleClientRegistry.registerManualIcon("steelingot", new ItemStack(TinkerTools.materials, 1, 16));
|
||||
MantleClientRegistry.registerManualIcon("pigironingot", new ItemStack(TinkerTools.materials, 1, 34));
|
||||
|
||||
// Tool parts
|
||||
MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TRepo.pickaxeHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("shovelhead", new ItemStack(TRepo.shovelHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("axehead", new ItemStack(TRepo.hatchetHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("swordblade", new ItemStack(TRepo.swordBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("pan", new ItemStack(TRepo.frypanHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("board", new ItemStack(TRepo.signHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("knifeblade", new ItemStack(TRepo.knifeBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("chiselhead", new ItemStack(TRepo.chiselHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("pickhead", new ItemStack(TinkerTools.pickaxeHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("shovelhead", new ItemStack(TinkerTools.shovelHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("axehead", new ItemStack(TinkerTools.hatchetHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("swordblade", new ItemStack(TinkerTools.swordBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("pan", new ItemStack(TinkerTools.frypanHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("board", new ItemStack(TinkerTools.signHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("knifeblade", new ItemStack(TinkerTools.knifeBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("chiselhead", new ItemStack(TinkerTools.chiselHead, 1, 2));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("hammerhead", new ItemStack(TRepo.hammerHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TRepo.excavatorHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("scythehead", new ItemStack(TRepo.scytheBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TRepo.broadAxeHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TRepo.largeSwordBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("hammerhead", new ItemStack(TinkerTools.hammerHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TinkerTools.excavatorHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("scythehead", new ItemStack(TinkerTools.scytheBlade, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TinkerTools.broadAxeHead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TinkerTools.largeSwordBlade, 1, 2));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("toolrod", new ItemStack(Items.stick));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("binding", new ItemStack(TRepo.binding, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("wideguard", new ItemStack(TRepo.wideGuard, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("handguard", new ItemStack(TRepo.handGuard, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("crossbar", new ItemStack(TRepo.crossbar, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("binding", new ItemStack(TinkerTools.binding, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("wideguard", new ItemStack(TinkerTools.wideGuard, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("handguard", new ItemStack(TinkerTools.handGuard, 1, 4));
|
||||
MantleClientRegistry.registerManualIcon("crossbar", new ItemStack(TinkerTools.crossbar, 1, 4));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("toughrod", new ItemStack(TRepo.toughRod, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("toughbinding", new ItemStack(TRepo.toughBinding, 1, 17));
|
||||
MantleClientRegistry.registerManualIcon("largeplate", new ItemStack(TRepo.largePlate, 1, 17));
|
||||
MantleClientRegistry.registerManualIcon("toughrod", new ItemStack(TinkerTools.toughRod, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("toughbinding", new ItemStack(TinkerTools.toughBinding, 1, 17));
|
||||
MantleClientRegistry.registerManualIcon("largeplate", new ItemStack(TinkerTools.largePlate, 1, 17));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("bowstring", new ItemStack(TRepo.bowstring, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TRepo.arrowhead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TRepo.fletching, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("bowstring", new ItemStack(TinkerTools.bowstring, 1, 0));
|
||||
MantleClientRegistry.registerManualIcon("arrowhead", new ItemStack(TinkerTools.arrowhead, 1, 2));
|
||||
MantleClientRegistry.registerManualIcon("fletching", new ItemStack(TinkerTools.fletching, 1, 0));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TRepo.buckets, 1, 16));
|
||||
MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TRepo.buckets, 1, 15));
|
||||
MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TRepo.buckets, 1, 25));
|
||||
MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TRepo.buckets, 1, 24));
|
||||
MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TRepo.buckets, 1, 23));
|
||||
MantleClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TinkerSmeltery.buckets, 1, 16));
|
||||
MantleClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TinkerSmeltery.buckets, 1, 15));
|
||||
MantleClientRegistry.registerManualIcon("gluebucket", new ItemStack(TinkerSmeltery.buckets, 1, 25));
|
||||
MantleClientRegistry.registerManualIcon("slimebucket", new ItemStack(TinkerSmeltery.buckets, 1, 24));
|
||||
MantleClientRegistry.registerManualIcon("enderbucket", new ItemStack(TinkerSmeltery.buckets, 1, 23));
|
||||
|
||||
// ToolIcons
|
||||
MantleClientRegistry.registerManualIcon("pickicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.binding, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.shovelHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.binding, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.shovelHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("mattockicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.shovelHead, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hatchetHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.shovelHead, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("swordicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.wideGuard, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.wideGuard, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("longswordicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.handGuard, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.handGuard, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("rapiericon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("daggerIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.knifeBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.frypanHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.signHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.chiselHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.knifeBlade, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.crossbar, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.frypanHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.signHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.chiselHead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), null, ""));
|
||||
MantleClientRegistry.registerManualIcon("shortbowIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.toolRod, 1, 10), new ItemStack(TRepo.bowstring, 1, 0), new ItemStack(TRepo.toolRod, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.toolRod, 1, 10), new ItemStack(TinkerTools.bowstring, 1, 0), new ItemStack(TinkerTools.toolRod, 1, 12), ""));
|
||||
MantleClientRegistry.registerManualIcon("arrowIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.arrowhead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.fletching, 1, 0), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.arrowhead, 1, 10), new ItemStack(TinkerTools.toolRod, 1, 11), new ItemStack(TinkerTools.fletching, 1, 0), ""));
|
||||
|
||||
MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hammerHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack(
|
||||
TRepo.largePlate, 1, 12), new ItemStack(TRepo.largePlate, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack(
|
||||
TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughBinding, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.excavatorHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack(
|
||||
TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughBinding, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.scytheBlade, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack(
|
||||
TRepo.toughBinding, 1, 12), new ItemStack(TRepo.toughRod, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.largeSwordBlade, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack(
|
||||
TRepo.largePlate, 1, 12), new ItemStack(TRepo.toughRod, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.broadAxeHead, 1, 10), new ItemStack(TRepo.toughRod, 1, 11), new ItemStack(
|
||||
TRepo.broadAxeHead, 1, 12), new ItemStack(TRepo.toughBinding, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.hammerHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(
|
||||
TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.largePlate, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(
|
||||
TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.excavatorHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(
|
||||
TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.scytheBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(
|
||||
TinkerTools.toughBinding, 1, 12), new ItemStack(TinkerTools.toughRod, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.largeSwordBlade, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(
|
||||
TinkerTools.largePlate, 1, 12), new ItemStack(TinkerTools.toughRod, 8), ""));
|
||||
MantleClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.broadAxeHead, 1, 10), new ItemStack(TinkerTools.toughRod, 1, 11), new ItemStack(
|
||||
TinkerTools.broadAxeHead, 1, 12), new ItemStack(TinkerTools.toughBinding, 8), ""));
|
||||
}
|
||||
|
||||
public void initManualRecipes ()
|
||||
{
|
||||
ItemStack pattern = new ItemStack(TRepo.blankPattern, 1, 0);
|
||||
ItemStack pattern = new ItemStack(TinkerTools.blankPattern, 1, 0);
|
||||
|
||||
ItemStack stick = new ItemStack(Items.stick, 1, 0);
|
||||
ItemStack plank = new ItemStack(Blocks.planks, 1, 0);
|
||||
@@ -537,47 +540,47 @@ public class TProxyClient extends TProxyCommon
|
||||
ItemStack glass = new ItemStack(Blocks.glass, 1, 0);
|
||||
ItemStack ironblock = new ItemStack(Blocks.iron_block, 1, 0);
|
||||
|
||||
ItemStack grout = new ItemStack(TRepo.craftedSoil, 2, 1);
|
||||
ItemStack searedbrick = new ItemStack(TRepo.materials, 1, 2);
|
||||
ItemStack searedbrickBlock = new ItemStack(TRepo.smeltery, 1, 2);
|
||||
ItemStack grout = new ItemStack(TinkerTools.craftedSoil, 2, 1);
|
||||
ItemStack searedbrick = new ItemStack(TinkerTools.materials, 1, 2);
|
||||
ItemStack searedbrickBlock = new ItemStack(TinkerSmeltery.smeltery, 1, 2);
|
||||
|
||||
ItemStack coal = new ItemStack(Items.coal);
|
||||
ItemStack paper = new ItemStack(Items.paper);
|
||||
ItemStack slimeball = new ItemStack(Items.slime_ball);
|
||||
ItemStack slimyMud = new ItemStack(TRepo.craftedSoil);
|
||||
ItemStack slimyMud = new ItemStack(TinkerTools.craftedSoil);
|
||||
ItemStack blazerod = new ItemStack(Items.blaze_rod);
|
||||
ItemStack firecharge = new ItemStack(Items.fire_charge);
|
||||
ItemStack string = new ItemStack(Items.string);
|
||||
|
||||
ItemStack silkyCloth = new ItemStack(TRepo.materials, 1, 25);
|
||||
ItemStack silkyCloth = new ItemStack(TinkerTools.materials, 1, 25);
|
||||
|
||||
ItemStack graveyardsoil = new ItemStack(TRepo.craftedSoil, 1, 3);
|
||||
ItemStack consecratedsoil = new ItemStack(TRepo.craftedSoil, 1, 4);
|
||||
ItemStack graveyardsoil = new ItemStack(TinkerTools.craftedSoil, 1, 3);
|
||||
ItemStack consecratedsoil = new ItemStack(TinkerTools.craftedSoil, 1, 4);
|
||||
|
||||
// TConstruct recipes
|
||||
MantleClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Items.book), paper, paper, paper, string, pattern, pattern, null, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Items.paper), pattern, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0), null, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1), null, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TinkerTools.manualBook, 1, 0), new ItemStack(Items.paper), pattern, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TinkerTools.manualBook, 1, 1), new ItemStack(TinkerTools.manualBook, 1, 0), null, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TinkerTools.manualBook, 1, 2), new ItemStack(TinkerTools.manualBook, 1, 1), null, null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank);
|
||||
MantleClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0), null, pattern, null, workbench);
|
||||
MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1), null, pattern, null, log);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5), null, pattern, null, chest);
|
||||
MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10), null, pattern, null, plank);
|
||||
MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Items.slime_ball), null, null);
|
||||
MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TRepo.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
|
||||
TRepo.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
|
||||
MantleClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TinkerTools.toolStationWood, 1, 0), null, pattern, null, workbench);
|
||||
MantleClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TinkerTools.toolStationWood, 1, 1), null, pattern, null, log);
|
||||
MantleClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TinkerTools.toolStationWood, 1, 5), null, pattern, null, chest);
|
||||
MantleClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TinkerTools.toolStationWood, 1, 10), null, pattern, null, plank);
|
||||
MantleClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TinkerWorld.slimeChannel, 1, 0), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Items.redstone), null, null);
|
||||
MantleClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimeChannel), new ItemStack(Items.slime_ball), null, null);
|
||||
MantleClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TinkerTools.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
|
||||
TinkerTools.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
|
||||
|
||||
MantleClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand);
|
||||
MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TRepo.materials, 1, 1), slimyMud);
|
||||
MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TRepo.materials, 1, 0), paper, paper, paper, paper);
|
||||
MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TRepo.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble,
|
||||
MantleClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TinkerTools.materials, 1, 1), slimyMud);
|
||||
MantleClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TinkerTools.materials, 1, 0), paper, paper, paper, paper);
|
||||
MantleClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TinkerTools.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble,
|
||||
mossycobble, mossycobble);
|
||||
MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge,
|
||||
MantleClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TinkerTools.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Items.lava_bucket), firecharge,
|
||||
blazerod, firecharge, blazerod);
|
||||
MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TRepo.materials, 1, 24), string, string, string, string);
|
||||
MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null,
|
||||
MantleClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TinkerTools.materials, 1, 24), string, string, string, string);
|
||||
MantleClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TinkerTools.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Items.emerald), silkyCloth, null,
|
||||
silkyCloth, null);
|
||||
|
||||
MantleClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Blocks.dirt), new ItemStack(Items.rotten_flesh), new ItemStack(Items.dye, 1, 15), null);
|
||||
@@ -585,60 +588,60 @@ public class TProxyClient extends TProxyCommon
|
||||
|
||||
MantleClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay);
|
||||
MantleClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout);
|
||||
MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TRepo.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TRepo.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
MantleClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TinkerSmeltery.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TinkerSmeltery.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
searedbrick, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TRepo.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null);
|
||||
MantleClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TinkerArmor.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null, null);
|
||||
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TRepo.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TinkerSmeltery.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
searedbrick);
|
||||
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TRepo.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick,
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TinkerSmeltery.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick, searedbrick,
|
||||
searedbrick, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TRepo.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TRepo.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass,
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TinkerSmeltery.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TinkerSmeltery.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick, glass,
|
||||
searedbrick);
|
||||
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TRepo.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TinkerSmeltery.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
null, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TRepo.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
|
||||
MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TRepo.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TRepo.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TinkerSmeltery.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
|
||||
MantleClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TinkerSmeltery.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
MantleClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TinkerSmeltery.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
searedbrick, searedbrick);
|
||||
|
||||
// Traps
|
||||
ItemStack reed = new ItemStack(Items.sugar);
|
||||
MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TRepo.punji), reed, null, reed, null, reed, null, reed, null, reed);
|
||||
MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TRepo.barricadeOak), null, log, null, log);
|
||||
MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TinkerWorld.punji), reed, null, reed, null, reed, null, reed, null, reed);
|
||||
MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log);
|
||||
|
||||
// Machines
|
||||
ItemStack alubrassIngot = new ItemStack(TRepo.materials, 1, 14);
|
||||
ItemStack bronzeIngot = new ItemStack(TRepo.materials, 1, 13);
|
||||
ItemStack blankCast = new ItemStack(TRepo.blankPattern, 1, 1);
|
||||
ItemStack alubrassIngot = new ItemStack(TinkerTools.materials, 1, 14);
|
||||
ItemStack bronzeIngot = new ItemStack(TinkerTools.materials, 1, 13);
|
||||
ItemStack blankCast = new ItemStack(TinkerTools.blankPattern, 1, 1);
|
||||
ItemStack redstone = new ItemStack(Items.redstone);
|
||||
|
||||
// Modifier recipes
|
||||
ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), "");
|
||||
ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.pickaxeHead, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.binding, 1, 6), "");
|
||||
MantleClientRegistry.registerManualIcon("ironpick", ironpick);
|
||||
ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.handGuard, 1, 10), "");
|
||||
ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TinkerTools.swordBlade, 1, 6), new ItemStack(TinkerTools.toolRod, 1, 2), new ItemStack(TinkerTools.handGuard, 1, 10), "");
|
||||
MantleClientRegistry.registerManualIcon("ironlongsword", ironlongsword);
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Items.diamond));
|
||||
TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Items.emerald));
|
||||
TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Items.redstone), new ItemStack(Blocks.redstone_block));
|
||||
TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 7));
|
||||
TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 7));
|
||||
TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Items.dye, 1, 4), new ItemStack(Blocks.lapis_block));
|
||||
TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 6));
|
||||
TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 6));
|
||||
TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block));
|
||||
TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Items.blaze_powder));
|
||||
TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TRepo.materials, 1, 8));
|
||||
TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 26));
|
||||
TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TRepo.largePlate, 1, 6));
|
||||
TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TinkerTools.materials, 1, 8));
|
||||
TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TinkerTools.materials, 1, 26));
|
||||
TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TinkerTools.largePlate, 1, 6));
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Blocks.piston));
|
||||
TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Items.ender_pearl), new ItemStack(Blocks.obsidian));
|
||||
TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Items.fermented_spider_eye));
|
||||
TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TRepo.craftedSoil, 1, 4));
|
||||
TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TinkerTools.craftedSoil, 1, 4));
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Blocks.dirt));
|
||||
TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Blocks.dirt));
|
||||
@@ -646,13 +649,13 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Items.diamond), new ItemStack(Blocks.gold_block));
|
||||
TConstructClientRegistry.registerManualModifier("tier1.5free", ironpick.copy(), new ItemStack(Items.golden_apple, 1, 1), new ItemStack(Blocks.diamond_block));
|
||||
TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Items.nether_star));
|
||||
TConstructClientRegistry.registerManualModifier("creativefree", ironpick.copy(), new ItemStack(TRepo.creativeModifier));
|
||||
TConstructClientRegistry.registerManualModifier("creativefree", ironpick.copy(), new ItemStack(TinkerTools.creativeModifier));
|
||||
|
||||
TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TRepo.speedBlock), new ItemStack(TRepo.moltenTin, 1), new ItemStack(Blocks.gravel));
|
||||
TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TRepo.clearGlass), new ItemStack(TRepo.moltenGlass, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TRepo.smeltery, 1, 4), new ItemStack(TRepo.moltenStone, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Blocks.end_stone), new ItemStack(TRepo.moltenEnder, 1), new ItemStack(Blocks.obsidian));
|
||||
TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TRepo.materials, 1, 36), new ItemStack(TRepo.glueFluidBlock, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TinkerSmeltery.speedBlock), new ItemStack(TinkerSmeltery.moltenTin, 1), new ItemStack(Blocks.gravel));
|
||||
TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TinkerSmeltery.clearGlass), new ItemStack(TinkerSmeltery.moltenGlass, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TinkerSmeltery.smeltery, 1, 4), new ItemStack(TinkerSmeltery.moltenStone, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Blocks.end_stone), new ItemStack(TinkerSmeltery.moltenEnder, 1), new ItemStack(Blocks.obsidian));
|
||||
TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TinkerTools.materials, 1, 36), new ItemStack(TinkerSmeltery.glueFluidBlock, 1), null);
|
||||
|
||||
}
|
||||
|
||||
@@ -801,13 +804,13 @@ public class TProxyClient extends TProxyCommon
|
||||
String[] bowstringTypes = { "string", "magicfabric", "flamestring" };
|
||||
for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++)
|
||||
{
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TinkerTools.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
|
||||
}
|
||||
|
||||
String[] fletching = { "feather", "leaf", "slime", "blueslime" };
|
||||
for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++)
|
||||
{
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.arrow, arrowIter, "tinker", fletching[arrowIter], true);
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TinkerTools.arrow, arrowIter, "tinker", fletching[arrowIter], true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1010,7 +1013,7 @@ public class TProxyClient extends TProxyCommon
|
||||
}
|
||||
else if (par1Str.equals("blueslime"))
|
||||
{
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TRepo.strangeFood);
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TinkerWorld.strangeFood);
|
||||
}
|
||||
else if (par1Str.equals("heart"))
|
||||
{
|
||||
|
||||
@@ -9,8 +9,8 @@ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.item.ExplosivePrimed;
|
||||
import tconstruct.mechworks.entity.item.ExplosivePrimed;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -52,7 +52,7 @@ public class ExplosiveRender extends Render
|
||||
|
||||
f2 = (1.0F - ((float) par1EntityTNTPrimed.fuse - par9 + 1.0F) / 100.0F) * 0.8F;
|
||||
this.bindEntityTexture(par1EntityTNTPrimed);
|
||||
this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
|
||||
this.blockRenderer.renderBlockAsItem(TinkerWorld.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
|
||||
|
||||
if (par1EntityTNTPrimed.fuse / 5 % 2 == 0)
|
||||
{
|
||||
|
||||
@@ -20,7 +20,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.tools.entity.ArrowEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.tools.entity.ArrowEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.tools.entity.DaggerEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import net.minecraftforge.client.ForgeHooksClient;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.tools.entity.DaggerEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.entity.projectile.LaunchedPotion;
|
||||
import tconstruct.tools.entity.LaunchedPotion;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -24,11 +24,11 @@ import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.component.SmelteryComponent;
|
||||
import tconstruct.blocks.logic.AdaptiveSmelteryLogic;
|
||||
import tconstruct.inventory.ActiveContainer;
|
||||
import tconstruct.inventory.AdaptiveSmelteryContainer;
|
||||
import tconstruct.library.component.MultiFluidTank;
|
||||
import tconstruct.smeltery.component.SmelteryComponent;
|
||||
import tconstruct.smeltery.inventory.ActiveContainer;
|
||||
import tconstruct.smeltery.inventory.AdaptiveSmelteryContainer;
|
||||
import tconstruct.smeltery.logic.AdaptiveSmelteryLogic;
|
||||
|
||||
public class AdaptiveSmelteryGui extends NewContainerGui
|
||||
{
|
||||
|
||||
@@ -11,9 +11,9 @@ import net.minecraft.util.ResourceLocation;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.armor.inventory.ArmorExtendedContainer;
|
||||
import tconstruct.client.tabs.InventoryTabArmorExtended;
|
||||
import tconstruct.client.tabs.TabRegistry;
|
||||
import tconstruct.inventory.ArmorExtendedContainer;
|
||||
import tconstruct.util.player.ArmorExtended;
|
||||
|
||||
public class ArmorExtendedGui extends InventoryEffectRenderer
|
||||
|
||||
@@ -16,9 +16,9 @@ import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.CraftingStationLogic;
|
||||
import tconstruct.library.armor.ArmorCore;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.tools.logic.CraftingStationLogic;
|
||||
|
||||
public class CraftingStationGui extends GuiContainer
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.FrypanLogic;
|
||||
import tconstruct.tools.logic.FrypanLogic;
|
||||
|
||||
public class FrypanGui extends GuiContainer
|
||||
{
|
||||
|
||||
@@ -7,8 +7,8 @@ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.FurnaceLogic;
|
||||
import tconstruct.inventory.FurnaceContainer;
|
||||
import tconstruct.tools.inventory.FurnaceContainer;
|
||||
import tconstruct.tools.logic.FurnaceLogic;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@ import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.inventory.ContainerLandmine;
|
||||
import tconstruct.util.landmine.behavior.Behavior;
|
||||
import tconstruct.mechworks.inventory.ContainerLandmine;
|
||||
import tconstruct.mechworks.landmine.behavior.Behavior;
|
||||
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -8,9 +8,9 @@ import net.minecraft.util.StatCollector;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.armor.inventory.KnapsackContainer;
|
||||
import tconstruct.client.tabs.InventoryTabKnapsack;
|
||||
import tconstruct.client.tabs.TabRegistry;
|
||||
import tconstruct.inventory.KnapsackContainer;
|
||||
import tconstruct.util.player.KnapsackInventory;
|
||||
|
||||
public class KnapsackGui extends InventoryEffectRenderer
|
||||
|
||||
@@ -24,8 +24,8 @@ import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.inventory.ActiveContainer;
|
||||
import tconstruct.inventory.ActiveSlot;
|
||||
import tconstruct.smeltery.inventory.ActiveContainer;
|
||||
import tconstruct.smeltery.inventory.ActiveSlot;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -12,12 +12,12 @@ import net.minecraft.world.World;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.PartBuilderLogic;
|
||||
import tconstruct.inventory.ActiveContainer;
|
||||
import tconstruct.inventory.PartCrafterChestContainer;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.PatternBuilder;
|
||||
import tconstruct.library.tools.TToolMaterial;
|
||||
import tconstruct.smeltery.inventory.ActiveContainer;
|
||||
import tconstruct.tools.inventory.PartCrafterChestContainer;
|
||||
import tconstruct.tools.logic.PartBuilderLogic;
|
||||
|
||||
public class PartCrafterGui extends NewContainerGui
|
||||
{
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.world.World;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.PatternChestLogic;
|
||||
import tconstruct.tools.logic.PatternChestLogic;
|
||||
|
||||
public class PatternChestGui extends GuiContainer
|
||||
{
|
||||
|
||||
@@ -22,9 +22,9 @@ import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL12;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.SmelteryLogic;
|
||||
import tconstruct.inventory.ActiveContainer;
|
||||
import tconstruct.inventory.SmelteryContainer;
|
||||
import tconstruct.smeltery.inventory.ActiveContainer;
|
||||
import tconstruct.smeltery.inventory.SmelteryContainer;
|
||||
import tconstruct.smeltery.logic.SmelteryLogic;
|
||||
import tconstruct.util.network.packet.PacketSmeltery;
|
||||
|
||||
public class SmelteryGui extends NewContainerGui
|
||||
|
||||
@@ -11,9 +11,9 @@ import net.minecraft.world.World;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.StencilTableLogic;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.inventory.PatternShaperContainer;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.inventory.PatternShaperContainer;
|
||||
import tconstruct.tools.logic.StencilTableLogic;
|
||||
import tconstruct.util.network.packet.PacketStencilTable;
|
||||
|
||||
public class StencilTableGui extends GuiContainer
|
||||
@@ -85,7 +85,7 @@ public class StencilTableGui extends GuiContainer
|
||||
protected void actionPerformed (GuiButton button)
|
||||
{
|
||||
ItemStack pattern = logic.getStackInSlot(0);
|
||||
if (pattern != null && pattern.getItem() == TRepo.blankPattern)
|
||||
if (pattern != null && pattern.getItem() == TinkerTools.blankPattern)
|
||||
{
|
||||
int meta = pattern.getItemDamage();
|
||||
if (meta == 0)
|
||||
@@ -95,18 +95,18 @@ public class StencilTableGui extends GuiContainer
|
||||
patternIndex++;
|
||||
if (patternIndex == 21)
|
||||
patternIndex++;
|
||||
if (patternIndex >= TRepo.patternOutputs.length - 1)
|
||||
if (patternIndex >= TinkerTools.patternOutputs.length - 1)
|
||||
patternIndex = 0;
|
||||
}
|
||||
else if (button.id == 1)
|
||||
{
|
||||
patternIndex--;
|
||||
if (patternIndex < 0)
|
||||
patternIndex = TRepo.patternOutputs.length - 2;
|
||||
patternIndex = TinkerTools.patternOutputs.length - 2;
|
||||
if (patternIndex == 21)
|
||||
patternIndex--;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TRepo.woodPattern, 1, patternIndex + 1);
|
||||
ItemStack stack = new ItemStack(TinkerTools.woodPattern, 1, patternIndex + 1);
|
||||
logic.setInventorySlotContents(1, stack);
|
||||
updateServer(stack);
|
||||
}
|
||||
|
||||
@@ -4,9 +4,9 @@ import net.minecraft.client.gui.GuiButton;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.blocks.logic.ToolForgeLogic;
|
||||
import tconstruct.library.client.TConstructClientRegistry;
|
||||
import tconstruct.library.client.ToolGuiElement;
|
||||
import tconstruct.tools.logic.ToolForgeLogic;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -19,12 +19,12 @@ import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.ToolStationLogic;
|
||||
import tconstruct.inventory.ActiveContainer;
|
||||
import tconstruct.inventory.ToolStationContainer;
|
||||
import tconstruct.library.client.TConstructClientRegistry;
|
||||
import tconstruct.library.client.ToolGuiElement;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.smeltery.inventory.ActiveContainer;
|
||||
import tconstruct.tools.inventory.ToolStationContainer;
|
||||
import tconstruct.tools.logic.ToolStationLogic;
|
||||
import tconstruct.util.network.packet.PacketToolStation;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
package tconstruct.client.tabs;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.armor.TinkerArmor;
|
||||
import tconstruct.client.TControls;
|
||||
import tconstruct.client.TProxyClient;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
public class InventoryTabKnapsack extends AbstractTab
|
||||
{
|
||||
public InventoryTabKnapsack()
|
||||
{
|
||||
super(0, 0, 0, new ItemStack(TRepo.knapsack));
|
||||
super(0, 0, 0, new ItemStack(TinkerArmor.knapsack));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -21,6 +21,6 @@ public class InventoryTabKnapsack extends AbstractTab
|
||||
@Override
|
||||
public boolean shouldAddToList ()
|
||||
{
|
||||
return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TRepo.knapsack;
|
||||
return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TinkerArmor.knapsack;
|
||||
}
|
||||
}
|
||||
@@ -1,969 +0,0 @@
|
||||
package tconstruct.common;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
import mantle.blocks.BlockUtils;
|
||||
import mantle.items.abstracts.CraftingItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.MapColor;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.material.MaterialLiquid;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.stats.Achievement;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
import net.minecraftforge.common.ChestGenHooks;
|
||||
import net.minecraftforge.common.util.EnumHelper;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.achievements.TAchievements;
|
||||
import tconstruct.blocks.BlockLandmine;
|
||||
import tconstruct.blocks.BloodBlock;
|
||||
import tconstruct.blocks.CastingChannelBlock;
|
||||
import tconstruct.blocks.ConveyorBase;
|
||||
import tconstruct.blocks.CraftingSlab;
|
||||
import tconstruct.blocks.CraftingStationBlock;
|
||||
import tconstruct.blocks.DryingRack;
|
||||
import tconstruct.blocks.EquipBlock;
|
||||
import tconstruct.blocks.FurnaceSlab;
|
||||
import tconstruct.blocks.GlassBlockConnected;
|
||||
import tconstruct.blocks.GlassBlockConnectedMeta;
|
||||
import tconstruct.blocks.GlassPaneConnected;
|
||||
import tconstruct.blocks.GlassPaneStained;
|
||||
import tconstruct.blocks.GlueBlock;
|
||||
import tconstruct.blocks.GlueFluid;
|
||||
import tconstruct.blocks.GravelOre;
|
||||
import tconstruct.blocks.LavaTankBlock;
|
||||
import tconstruct.blocks.MeatBlock;
|
||||
import tconstruct.blocks.MetalOre;
|
||||
import tconstruct.blocks.MultiBrick;
|
||||
import tconstruct.blocks.MultiBrickFancy;
|
||||
import tconstruct.blocks.OreberryBush;
|
||||
import tconstruct.blocks.OreberryBushEssence;
|
||||
import tconstruct.blocks.SearedBlock;
|
||||
import tconstruct.blocks.SearedSlab;
|
||||
import tconstruct.blocks.SlabBase;
|
||||
import tconstruct.blocks.SlimeExplosive;
|
||||
import tconstruct.blocks.SlimePad;
|
||||
import tconstruct.blocks.SmelteryBlock;
|
||||
import tconstruct.blocks.SoilBlock;
|
||||
import tconstruct.blocks.SpeedBlock;
|
||||
import tconstruct.blocks.SpeedSlab;
|
||||
import tconstruct.blocks.StoneLadder;
|
||||
import tconstruct.blocks.StoneTorch;
|
||||
import tconstruct.blocks.TConstructFluid;
|
||||
import tconstruct.blocks.TMetalBlock;
|
||||
import tconstruct.blocks.TankAirBlock;
|
||||
import tconstruct.blocks.ToolForgeBlock;
|
||||
import tconstruct.blocks.ToolStationBlock;
|
||||
import tconstruct.blocks.WoodRail;
|
||||
import tconstruct.blocks.slime.SlimeFluid;
|
||||
import tconstruct.blocks.slime.SlimeGel;
|
||||
import tconstruct.blocks.slime.SlimeGrass;
|
||||
import tconstruct.blocks.slime.SlimeLeaves;
|
||||
import tconstruct.blocks.slime.SlimeSapling;
|
||||
import tconstruct.blocks.slime.SlimeTallGrass;
|
||||
import tconstruct.blocks.traps.BarricadeBlock;
|
||||
import tconstruct.blocks.traps.Punji;
|
||||
import tconstruct.client.StepSoundSlime;
|
||||
import tconstruct.entity.BlueSlime;
|
||||
import tconstruct.entity.Crystal;
|
||||
import tconstruct.entity.FancyEntityItem;
|
||||
import tconstruct.entity.item.EntityLandmineFirework;
|
||||
import tconstruct.entity.item.ExplosivePrimed;
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.entity.projectile.LaunchedPotion;
|
||||
import tconstruct.items.Bowstring;
|
||||
import tconstruct.items.CreativeModifier;
|
||||
import tconstruct.items.DiamondApple;
|
||||
import tconstruct.items.FilledBucket;
|
||||
import tconstruct.items.Fletching;
|
||||
import tconstruct.items.GoldenHead;
|
||||
import tconstruct.items.Jerky;
|
||||
import tconstruct.items.Manual;
|
||||
import tconstruct.items.MaterialItem;
|
||||
import tconstruct.items.MetalPattern;
|
||||
import tconstruct.items.OreBerries;
|
||||
import tconstruct.items.Pattern;
|
||||
import tconstruct.items.StrangeFood;
|
||||
import tconstruct.items.TitleIcon;
|
||||
import tconstruct.items.ToolPart;
|
||||
import tconstruct.items.ToolPartHidden;
|
||||
import tconstruct.items.ToolShard;
|
||||
import tconstruct.items.armor.ArmorBasic;
|
||||
import tconstruct.items.armor.ExoArmor;
|
||||
import tconstruct.items.armor.HeartCanister;
|
||||
import tconstruct.items.armor.Knapsack;
|
||||
import tconstruct.items.tools.Arrow;
|
||||
import tconstruct.items.tools.BattleSign;
|
||||
import tconstruct.items.tools.Battleaxe;
|
||||
import tconstruct.items.tools.Broadsword;
|
||||
import tconstruct.items.tools.Chisel;
|
||||
import tconstruct.items.tools.Cleaver;
|
||||
import tconstruct.items.tools.Cutlass;
|
||||
import tconstruct.items.tools.Dagger;
|
||||
import tconstruct.items.tools.Excavator;
|
||||
import tconstruct.items.tools.FryingPan;
|
||||
import tconstruct.items.tools.Hammer;
|
||||
import tconstruct.items.tools.Hatchet;
|
||||
import tconstruct.items.tools.Longsword;
|
||||
import tconstruct.items.tools.LumberAxe;
|
||||
import tconstruct.items.tools.Mattock;
|
||||
import tconstruct.items.tools.Pickaxe;
|
||||
import tconstruct.items.tools.PotionLauncher;
|
||||
import tconstruct.items.tools.Rapier;
|
||||
import tconstruct.items.tools.Scythe;
|
||||
import tconstruct.items.tools.Shortbow;
|
||||
import tconstruct.items.tools.Shovel;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.armor.EnumArmorPart;
|
||||
import tconstruct.library.crafting.LiquidCasting;
|
||||
import tconstruct.library.crafting.PatternBuilder;
|
||||
import tconstruct.library.util.IPattern;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.IFuelHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class TContent implements IFuelHandler
|
||||
{
|
||||
// Temporary items
|
||||
// public static Item armorTest = new ArmorStandard(2445, 4,
|
||||
// EnumArmorPart.HELMET).setCreativeTab(CreativeTabs.tabAllSearch);
|
||||
|
||||
public TContent()
|
||||
{
|
||||
registerItems();
|
||||
TRecipes.registerItemRecipes();
|
||||
registerBlocks();
|
||||
TRecipes.registerBlockRecipes();
|
||||
registerMaterials();
|
||||
addCraftingRecipes();
|
||||
setupToolTabs();
|
||||
addLoot();
|
||||
if (PHConstruct.achievementsEnabled)
|
||||
{
|
||||
addAchievements();
|
||||
}
|
||||
}
|
||||
|
||||
public void createEntities ()
|
||||
{
|
||||
EntityRegistry.registerModEntity(FancyEntityItem.class, "Fancy Item", 0, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(DaggerEntity.class, "Dagger", 1, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(Crystal.class, "Crystal", 2, TConstruct.instance, 32, 3, true);
|
||||
EntityRegistry.registerModEntity(LaunchedPotion.class, "Launched Potion", 3, TConstruct.instance, 32, 3, true);
|
||||
EntityRegistry.registerModEntity(ArrowEntity.class, "Arrow", 4, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(EntityLandmineFirework.class, "LandmineFirework", 5, TConstruct.instance, 32, 5, true);
|
||||
EntityRegistry.registerModEntity(ExplosivePrimed.class, "SlimeExplosive", 6, TConstruct.instance, 32, 5, true);
|
||||
// EntityRegistry.registerModEntity(CartEntity.class, "Small Wagon", 1,
|
||||
// TConstruct.instance, 32, 5, true);
|
||||
|
||||
EntityRegistry.registerModEntity(BlueSlime.class, "EdibleSlime", 12, TConstruct.instance, 64, 5, true);
|
||||
// EntityRegistry.registerModEntity(MetalSlime.class, "MetalSlime", 13,
|
||||
// TConstruct.instance, 64, 5, true);
|
||||
}
|
||||
|
||||
void registerBlocks ()
|
||||
{
|
||||
// Tool Station
|
||||
TRepo.toolStationWood = new ToolStationBlock(Material.wood).setBlockName("ToolStation");
|
||||
TRepo.toolForge = new ToolForgeBlock(Material.iron).setBlockName("ToolForge");
|
||||
TRepo.craftingStationWood = new CraftingStationBlock(Material.wood).setBlockName("CraftingStation");
|
||||
TRepo.craftingSlabWood = new CraftingSlab(Material.wood).setBlockName("CraftingSlab");
|
||||
TRepo.furnaceSlab = new FurnaceSlab(Material.rock).setBlockName("FurnaceSlab");
|
||||
|
||||
TRepo.heldItemBlock = new EquipBlock(Material.wood).setBlockName("Frypan");
|
||||
|
||||
/* battlesignBlock = new BattlesignBlock(PHConstruct.battlesignBlock).setUnlocalizedName("Battlesign");
|
||||
GameRegistry.registerBlock(battlesignBlock, "BattlesignBlock");
|
||||
ameRegistry.registerTileEntity(BattlesignLogic.class, "BattlesignLogic");*/
|
||||
|
||||
TRepo.craftedSoil = new SoilBlock().setLightOpacity(0).setBlockName("TConstruct.Soil");
|
||||
TRepo.craftedSoil.stepSound = Block.soundTypeGravel;
|
||||
|
||||
TRepo.searedSlab = new SearedSlab().setBlockName("SearedSlab");
|
||||
TRepo.searedSlab.stepSound = Block.soundTypeStone;
|
||||
|
||||
TRepo.speedSlab = new SpeedSlab().setBlockName("SpeedSlab");
|
||||
TRepo.speedSlab.stepSound = Block.soundTypeStone;
|
||||
|
||||
TRepo.metalBlock = new TMetalBlock(Material.iron, 10.0F).setBlockName("tconstruct.metalblock");
|
||||
TRepo.metalBlock.stepSound = Block.soundTypeMetal;
|
||||
|
||||
TRepo.meatBlock = new MeatBlock().setBlockName("tconstruct.meatblock");
|
||||
TRepo.glueBlock = new GlueBlock().setBlockName("GlueBlock").setCreativeTab(TConstructRegistry.blockTab);
|
||||
|
||||
TRepo.woolSlab1 = new SlabBase(Material.cloth, Blocks.wool, 0, 8).setBlockName("cloth");
|
||||
TRepo.woolSlab1.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations);
|
||||
TRepo.woolSlab2 = new SlabBase(Material.cloth, Blocks.wool, 8, 8).setBlockName("cloth");
|
||||
TRepo.woolSlab2.setStepSound(Block.soundTypeCloth).setCreativeTab(CreativeTabs.tabDecorations);
|
||||
|
||||
// Smeltery
|
||||
TRepo.smeltery = new SmelteryBlock().setBlockName("Smeltery");
|
||||
TRepo.smelteryNether = new SmelteryBlock("nether").setBlockName("Smeltery");
|
||||
TRepo.lavaTank = new LavaTankBlock().setBlockName("LavaTank");
|
||||
TRepo.lavaTank.setStepSound(Block.soundTypeGlass);
|
||||
TRepo.lavaTankNether = new LavaTankBlock("nether").setStepSound(Block.soundTypeGlass).setBlockName("LavaTank");
|
||||
|
||||
TRepo.searedBlock = new SearedBlock().setBlockName("SearedBlock");
|
||||
TRepo.searedBlockNether = new SearedBlock("nether").setBlockName("SearedBlock");
|
||||
|
||||
TRepo.castingChannel = (new CastingChannelBlock()).setBlockName("CastingChannel");
|
||||
|
||||
TRepo.tankAir = new TankAirBlock(Material.leaves).setBlockUnbreakable().setBlockName("tconstruct.tank.air");
|
||||
|
||||
// Traps
|
||||
TRepo.landmine = new BlockLandmine().setHardness(0.5F).setResistance(0F).setStepSound(Block.soundTypeMetal).setCreativeTab(CreativeTabs.tabRedstone).setBlockName("landmine");
|
||||
TRepo.punji = new Punji().setBlockName("trap.punji");
|
||||
TRepo.barricadeOak = new BarricadeBlock(Blocks.log, 0).setBlockName("trap.barricade.oak");
|
||||
TRepo.barricadeSpruce = new BarricadeBlock(Blocks.log, 1).setBlockName("trap.barricade.spruce");
|
||||
TRepo.barricadeBirch = new BarricadeBlock(Blocks.log, 2).setBlockName("trap.barricade.birch");
|
||||
TRepo.barricadeJungle = new BarricadeBlock(Blocks.log, 3).setBlockName("trap.barricade.jungle");
|
||||
TRepo.slimeExplosive = new SlimeExplosive().setHardness(0.0F).setStepSound(Block.soundTypeGrass).setBlockName("explosive.slime");
|
||||
|
||||
TRepo.dryingRack = new DryingRack().setBlockName("Armor.DryingRack");
|
||||
|
||||
// Liquids
|
||||
TRepo.liquidMetal = new MaterialLiquid(MapColor.tntColor);
|
||||
|
||||
TRepo.moltenIronFluid = new Fluid("iron.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenIronFluid))
|
||||
TRepo.moltenIronFluid = FluidRegistry.getFluid("iron.molten");
|
||||
TRepo.moltenIron = new TConstructFluid(TRepo.moltenIronFluid, Material.lava, "liquid_iron").setBlockName("fluid.molten.iron");
|
||||
GameRegistry.registerBlock(TRepo.moltenIron, "fluid.molten.iron");
|
||||
TRepo.moltenIronFluid.setBlock(TRepo.moltenIron).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 0), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenGoldFluid = new Fluid("gold.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenGoldFluid))
|
||||
TRepo.moltenGoldFluid = FluidRegistry.getFluid("gold.molten");
|
||||
TRepo.moltenGold = new TConstructFluid(TRepo.moltenGoldFluid, Material.lava, "liquid_gold").setBlockName("fluid.molten.gold");
|
||||
GameRegistry.registerBlock(TRepo.moltenGold, "fluid.molten.gold");
|
||||
TRepo.moltenGoldFluid.setBlock(TRepo.moltenGold).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGoldFluid, 1000), new ItemStack(TRepo.buckets, 1, 1), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenCopperFluid = new Fluid("copper.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenCopperFluid))
|
||||
TRepo.moltenCopperFluid = FluidRegistry.getFluid("copper.molten");
|
||||
TRepo.moltenCopper = new TConstructFluid(TRepo.moltenCopperFluid, Material.lava, "liquid_copper").setBlockName("fluid.molten.copper");
|
||||
GameRegistry.registerBlock(TRepo.moltenCopper, "fluid.molten.copper");
|
||||
TRepo.moltenCopperFluid.setBlock(TRepo.moltenCopper).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCopperFluid, 1000), new ItemStack(TRepo.buckets, 1, 2), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenTinFluid = new Fluid("tin.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenTinFluid))
|
||||
TRepo.moltenTinFluid = FluidRegistry.getFluid("tin.molten");
|
||||
TRepo.moltenTin = new TConstructFluid(TRepo.moltenTinFluid, Material.lava, "liquid_tin").setBlockName("fluid.molten.tin");
|
||||
GameRegistry.registerBlock(TRepo.moltenTin, "fluid.molten.tin");
|
||||
TRepo.moltenTinFluid.setBlock(TRepo.moltenTin).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenTinFluid, 1000), new ItemStack(TRepo.buckets, 1, 3), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenAluminumFluid = new Fluid("aluminum.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenAluminumFluid))
|
||||
TRepo.moltenAluminumFluid = FluidRegistry.getFluid("aluminum.molten");
|
||||
TRepo.moltenAluminum = new TConstructFluid(TRepo.moltenAluminumFluid, Material.lava, "liquid_aluminum").setBlockName("fluid.molten.aluminum");
|
||||
GameRegistry.registerBlock(TRepo.moltenAluminum, "fluid.molten.aluminum");
|
||||
TRepo.moltenAluminumFluid.setBlock(TRepo.moltenAluminum).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAluminumFluid, 1000), new ItemStack(TRepo.buckets, 1, 4), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenCobaltFluid = new Fluid("cobalt.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenCobaltFluid))
|
||||
TRepo.moltenCobaltFluid = FluidRegistry.getFluid("cobalt.molten");
|
||||
TRepo.moltenCobalt = new TConstructFluid(TRepo.moltenCobaltFluid, Material.lava, "liquid_cobalt").setBlockName("fluid.molten.cobalt");
|
||||
GameRegistry.registerBlock(TRepo.moltenCobalt, "fluid.molten.cobalt");
|
||||
TRepo.moltenCobaltFluid.setBlock(TRepo.moltenCobalt).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenCobaltFluid, 1000), new ItemStack(TRepo.buckets, 1, 5), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenArditeFluid = new Fluid("ardite.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenArditeFluid))
|
||||
TRepo.moltenArditeFluid = FluidRegistry.getFluid("ardite.molten");
|
||||
TRepo.moltenArdite = new TConstructFluid(TRepo.moltenArditeFluid, Material.lava, "liquid_ardite").setBlockName("fluid.molten.ardite");
|
||||
GameRegistry.registerBlock(TRepo.moltenArdite, "fluid.molten.ardite");
|
||||
TRepo.moltenArditeFluid.setBlock(TRepo.moltenArdite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenArditeFluid, 1000), new ItemStack(TRepo.buckets, 1, 6), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenBronzeFluid = new Fluid("bronze.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenBronzeFluid))
|
||||
TRepo.moltenBronzeFluid = FluidRegistry.getFluid("bronze.molten");
|
||||
TRepo.moltenBronze = new TConstructFluid(TRepo.moltenBronzeFluid, Material.lava, "liquid_bronze").setBlockName("fluid.molten.bronze");
|
||||
GameRegistry.registerBlock(TRepo.moltenBronze, "fluid.molten.bronze");
|
||||
TRepo.moltenBronzeFluid.setBlock(TRepo.moltenBronze).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenBronzeFluid, 1000), new ItemStack(TRepo.buckets, 1, 7), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenAlubrassFluid = new Fluid("aluminumbrass.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenAlubrassFluid))
|
||||
TRepo.moltenAlubrassFluid = FluidRegistry.getFluid("aluminumbrass.molten");
|
||||
TRepo.moltenAlubrass = new TConstructFluid(TRepo.moltenAlubrassFluid, Material.lava, "liquid_alubrass").setBlockName("fluid.molten.alubrass");
|
||||
GameRegistry.registerBlock(TRepo.moltenAlubrass, "fluid.molten.alubrass");
|
||||
TRepo.moltenAlubrassFluid.setBlock(TRepo.moltenAlubrass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlubrassFluid, 1000), new ItemStack(TRepo.buckets, 1, 8), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenManyullynFluid = new Fluid("manyullyn.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenManyullynFluid))
|
||||
TRepo.moltenManyullynFluid = FluidRegistry.getFluid("manyullyn.molten");
|
||||
TRepo.moltenManyullyn = new TConstructFluid(TRepo.moltenManyullynFluid, Material.lava, "liquid_manyullyn").setBlockName("fluid.molten.manyullyn");
|
||||
GameRegistry.registerBlock(TRepo.moltenManyullyn, "fluid.molten.manyullyn");
|
||||
TRepo.moltenManyullynFluid.setBlock(TRepo.moltenManyullyn).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenManyullynFluid, 1000), new ItemStack(TRepo.buckets, 1, 9), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenAlumiteFluid = new Fluid("alumite.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenAlumiteFluid))
|
||||
TRepo.moltenAlumiteFluid = FluidRegistry.getFluid("alumite.molten");
|
||||
TRepo.moltenAlumite = new TConstructFluid(TRepo.moltenAlumiteFluid, Material.lava, "liquid_alumite").setBlockName("fluid.molten.alumite");
|
||||
GameRegistry.registerBlock(TRepo.moltenAlumite, "fluid.molten.alumite");
|
||||
TRepo.moltenAlumiteFluid.setBlock(TRepo.moltenAlumite).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenAlumiteFluid, 1000), new ItemStack(TRepo.buckets, 1, 10), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenObsidianFluid = new Fluid("obsidian.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenObsidianFluid))
|
||||
TRepo.moltenObsidianFluid = FluidRegistry.getFluid("obsidian.molten");
|
||||
TRepo.moltenObsidian = new TConstructFluid(TRepo.moltenObsidianFluid, Material.lava, "liquid_obsidian").setBlockName("fluid.molten.obsidian");
|
||||
GameRegistry.registerBlock(TRepo.moltenObsidian, "fluid.molten.obsidian");
|
||||
TRepo.moltenObsidianFluid.setBlock(TRepo.moltenObsidian).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenObsidianFluid, 1000), new ItemStack(TRepo.buckets, 1, 11), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenSteelFluid = new Fluid("steel.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenSteelFluid))
|
||||
TRepo.moltenSteelFluid = FluidRegistry.getFluid("steel.molten");
|
||||
TRepo.moltenSteel = new TConstructFluid(TRepo.moltenSteelFluid, Material.lava, "liquid_steel").setBlockName("fluid.molten.steel");
|
||||
GameRegistry.registerBlock(TRepo.moltenSteel, "fluid.molten.steel");
|
||||
TRepo.moltenSteelFluid.setBlock(TRepo.moltenSteel).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSteelFluid, 1000), new ItemStack(TRepo.buckets, 1, 12), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenGlassFluid = new Fluid("glass.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenGlassFluid))
|
||||
TRepo.moltenGlassFluid = FluidRegistry.getFluid("glass.molten");
|
||||
TRepo.moltenGlass = new TConstructFluid(TRepo.moltenGlassFluid, Material.lava, "liquid_glass", true).setBlockName("fluid.molten.glass");
|
||||
GameRegistry.registerBlock(TRepo.moltenGlass, "fluid.molten.glass");
|
||||
TRepo.moltenGlassFluid.setBlock(TRepo.moltenGlass).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenGlassFluid, 1000), new ItemStack(TRepo.buckets, 1, 13), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenStoneFluid = new Fluid("stone.seared");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenStoneFluid))
|
||||
TRepo.moltenStoneFluid = FluidRegistry.getFluid("stone.seared");
|
||||
TRepo.moltenStone = new TConstructFluid(TRepo.moltenStoneFluid, Material.lava, "liquid_stone").setBlockName("molten.stone");
|
||||
GameRegistry.registerBlock(TRepo.moltenStone, "molten.stone");
|
||||
TRepo.moltenStoneFluid.setBlock(TRepo.moltenStone).setLuminosity(12).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenStoneFluid, 1000), new ItemStack(TRepo.buckets, 1, 14), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenEmeraldFluid = new Fluid("emerald.liquid");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenEmeraldFluid))
|
||||
TRepo.moltenEmeraldFluid = FluidRegistry.getFluid("emerald.liquid");
|
||||
TRepo.moltenEmerald = new TConstructFluid(TRepo.moltenEmeraldFluid, Material.water, "liquid_villager").setBlockName("molten.emerald");
|
||||
GameRegistry.registerBlock(TRepo.moltenEmerald, "molten.emerald");
|
||||
TRepo.moltenEmeraldFluid.setBlock(TRepo.moltenEmerald).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEmeraldFluid, 1000), new ItemStack(TRepo.buckets, 1, 15), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.bloodFluid = new Fluid("blood");
|
||||
if (!FluidRegistry.registerFluid(TRepo.bloodFluid))
|
||||
TRepo.bloodFluid = FluidRegistry.getFluid("blood");
|
||||
TRepo.blood = new BloodBlock(TRepo.bloodFluid, Material.water, "liquid_cow").setBlockName("liquid.blood");
|
||||
GameRegistry.registerBlock(TRepo.blood, "liquid.blood");
|
||||
TRepo.bloodFluid.setBlock(TRepo.blood).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.bloodFluid, 1000), new ItemStack(TRepo.buckets, 1, 16), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenNickelFluid = new Fluid("nickel.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenNickelFluid))
|
||||
TRepo.moltenNickelFluid = FluidRegistry.getFluid("nickel.molten");
|
||||
TRepo.moltenNickel = new TConstructFluid(TRepo.moltenNickelFluid, Material.lava, "liquid_ferrous").setBlockName("fluid.molten.nickel");
|
||||
GameRegistry.registerBlock(TRepo.moltenNickel, "fluid.molten.nickel");
|
||||
TRepo.moltenNickelFluid.setBlock(TRepo.moltenNickel).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenNickelFluid, 1000), new ItemStack(TRepo.buckets, 1, 17), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenLeadFluid = new Fluid("lead.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenLeadFluid))
|
||||
TRepo.moltenLeadFluid = FluidRegistry.getFluid("lead.molten");
|
||||
TRepo.moltenLead = new TConstructFluid(TRepo.moltenLeadFluid, Material.lava, "liquid_lead").setBlockName("fluid.molten.lead");
|
||||
GameRegistry.registerBlock(TRepo.moltenLead, "fluid.molten.lead");
|
||||
TRepo.moltenLeadFluid.setBlock(TRepo.moltenLead).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenLeadFluid, 1000), new ItemStack(TRepo.buckets, 1, 18), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenSilverFluid = new Fluid("silver.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenSilverFluid))
|
||||
TRepo.moltenSilverFluid = FluidRegistry.getFluid("silver.molten");
|
||||
TRepo.moltenSilver = new TConstructFluid(TRepo.moltenSilverFluid, Material.lava, "liquid_silver").setBlockName("fluid.molten.silver");
|
||||
GameRegistry.registerBlock(TRepo.moltenSilver, "fluid.molten.silver");
|
||||
TRepo.moltenSilverFluid.setBlock(TRepo.moltenSilver).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenSilverFluid, 1000), new ItemStack(TRepo.buckets, 1, 19), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenShinyFluid = new Fluid("platinum.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenShinyFluid))
|
||||
TRepo.moltenShinyFluid = FluidRegistry.getFluid("platinum.molten");
|
||||
TRepo.moltenShiny = new TConstructFluid(TRepo.moltenShinyFluid, Material.lava, "liquid_shiny").setBlockName("fluid.molten.shiny");
|
||||
GameRegistry.registerBlock(TRepo.moltenShiny, "fluid.molten.shiny");
|
||||
TRepo.moltenShinyFluid.setBlock(TRepo.moltenShiny).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenShinyFluid, 1000), new ItemStack(TRepo.buckets, 1, 20), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenInvarFluid = new Fluid("invar.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenInvarFluid))
|
||||
TRepo.moltenInvarFluid = FluidRegistry.getFluid("invar.molten");
|
||||
TRepo.moltenInvar = new TConstructFluid(TRepo.moltenInvarFluid, Material.lava, "liquid_invar").setBlockName("fluid.molten.invar");
|
||||
GameRegistry.registerBlock(TRepo.moltenInvar, "fluid.molten.invar");
|
||||
TRepo.moltenInvarFluid.setBlock(TRepo.moltenInvar).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenInvarFluid, 1000), new ItemStack(TRepo.buckets, 1, 21), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenElectrumFluid = new Fluid("electrum.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenElectrumFluid))
|
||||
TRepo.moltenElectrumFluid = FluidRegistry.getFluid("electrum.molten");
|
||||
TRepo.moltenElectrum = new TConstructFluid(TRepo.moltenElectrumFluid, Material.lava, "liquid_electrum").setBlockName("fluid.molten.electrum");
|
||||
GameRegistry.registerBlock(TRepo.moltenElectrum, "fluid.molten.electrum");
|
||||
TRepo.moltenElectrumFluid.setBlock(TRepo.moltenElectrum).setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenElectrumFluid, 1000), new ItemStack(TRepo.buckets, 1, 22), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.moltenEnderFluid = new Fluid("ender");
|
||||
if (!FluidRegistry.registerFluid(TRepo.moltenEnderFluid))
|
||||
{
|
||||
TRepo.moltenEnderFluid = FluidRegistry.getFluid("ender");
|
||||
TRepo.moltenEnder = TRepo.moltenEnderFluid.getBlock();
|
||||
if (TRepo.moltenEnder == null)
|
||||
TConstruct.logger.info("Molten ender block missing!");
|
||||
}
|
||||
else
|
||||
{
|
||||
TRepo.moltenEnder = new TConstructFluid(TRepo.moltenEnderFluid, Material.water, "liquid_ender").setBlockName("fluid.ender");
|
||||
GameRegistry.registerBlock(TRepo.moltenEnder, "fluid.ender");
|
||||
TRepo.moltenEnderFluid.setBlock(TRepo.moltenEnder).setDensity(3000).setViscosity(6000);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.moltenEnderFluid, 1000), new ItemStack(TRepo.buckets, 1, 23), new ItemStack(Items.bucket)));
|
||||
}
|
||||
|
||||
// Slime
|
||||
TRepo.slimeStep = new StepSoundSlime("mob.slime", 1.0f, 1.0f);
|
||||
|
||||
TRepo.blueSlimeFluid = new Fluid("slime.blue");
|
||||
if (!FluidRegistry.registerFluid(TRepo.blueSlimeFluid))
|
||||
TRepo.blueSlimeFluid = FluidRegistry.getFluid("slime.blue");
|
||||
TRepo.slimePool = new SlimeFluid(TRepo.blueSlimeFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep).setBlockName("liquid.slime");
|
||||
GameRegistry.registerBlock(TRepo.slimePool, "liquid.slime");
|
||||
TRepo.blueSlimeFluid.setBlock(TRepo.slimePool);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.blueSlimeFluid, 1000), new ItemStack(TRepo.buckets, 1, 24), new ItemStack(Items.bucket)));
|
||||
|
||||
// Glue
|
||||
TRepo.glueFluid = new Fluid("glue").setDensity(6000).setViscosity(6000).setTemperature(200);
|
||||
if (!FluidRegistry.registerFluid(TRepo.glueFluid))
|
||||
TRepo.glueFluid = FluidRegistry.getFluid("glue");
|
||||
TRepo.glueFluidBlock = new GlueFluid(TRepo.glueFluid, Material.water).setCreativeTab(TConstructRegistry.blockTab).setStepSound(TRepo.slimeStep).setBlockName("liquid.glue");
|
||||
GameRegistry.registerBlock(TRepo.glueFluidBlock, "liquid.glue");
|
||||
TRepo.glueFluid.setBlock(TRepo.glueFluidBlock);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.glueFluid, 1000), new ItemStack(TRepo.buckets, 1, 25), new ItemStack(Items.bucket)));
|
||||
|
||||
TRepo.pigIronFluid = new Fluid("pigiron.molten");
|
||||
if (!FluidRegistry.registerFluid(TRepo.pigIronFluid))
|
||||
TRepo.pigIronFluid = FluidRegistry.getFluid("pigiron.molten");
|
||||
else
|
||||
TRepo.pigIronFluid.setDensity(3000).setViscosity(6000).setTemperature(1300);
|
||||
FluidContainerRegistry.registerFluidContainer(new FluidContainerData(new FluidStack(TRepo.pigIronFluid, 1000), new ItemStack(TRepo.buckets, 1, 26), new ItemStack(Items.bucket)));
|
||||
TRepo.fluids = new Fluid[] { TRepo.moltenIronFluid, TRepo.moltenGoldFluid, TRepo.moltenCopperFluid, TRepo.moltenTinFluid, TRepo.moltenAluminumFluid, TRepo.moltenCobaltFluid,
|
||||
TRepo.moltenArditeFluid, TRepo.moltenBronzeFluid, TRepo.moltenAlubrassFluid, TRepo.moltenManyullynFluid, TRepo.moltenAlumiteFluid, TRepo.moltenObsidianFluid, TRepo.moltenSteelFluid,
|
||||
TRepo.moltenGlassFluid, TRepo.moltenStoneFluid, TRepo.moltenEmeraldFluid, TRepo.bloodFluid, TRepo.moltenNickelFluid, TRepo.moltenLeadFluid, TRepo.moltenSilverFluid,
|
||||
TRepo.moltenShinyFluid, TRepo.moltenInvarFluid, TRepo.moltenElectrumFluid, TRepo.moltenEnderFluid, TRepo.blueSlimeFluid, TRepo.glueFluid, TRepo.pigIronFluid };
|
||||
TRepo.fluidBlocks = new Block[] { TRepo.moltenIron, TRepo.moltenGold, TRepo.moltenCopper, TRepo.moltenTin, TRepo.moltenAluminum, TRepo.moltenCobalt, TRepo.moltenArdite, TRepo.moltenBronze,
|
||||
TRepo.moltenAlubrass, TRepo.moltenManyullyn, TRepo.moltenAlumite, TRepo.moltenObsidian, TRepo.moltenSteel, TRepo.moltenGlass, TRepo.moltenStone, TRepo.moltenEmerald, TRepo.blood,
|
||||
TRepo.moltenNickel, TRepo.moltenLead, TRepo.moltenSilver, TRepo.moltenShiny, TRepo.moltenInvar, TRepo.moltenElectrum, TRepo.moltenEnder, TRepo.slimePool, TRepo.glueFluidBlock };
|
||||
// Slime Islands
|
||||
TRepo.slimeGel = new SlimeGel().setStepSound(TRepo.slimeStep).setLightOpacity(0).setBlockName("slime.gel");
|
||||
TRepo.slimeGrass = new SlimeGrass().setStepSound(Block.soundTypeGrass).setLightOpacity(0).setBlockName("slime.grass");
|
||||
TRepo.slimeTallGrass = new SlimeTallGrass().setStepSound(Block.soundTypeGrass).setBlockName("slime.grass.tall");
|
||||
TRepo.slimeLeaves = (SlimeLeaves) new SlimeLeaves().setStepSound(TRepo.slimeStep).setLightOpacity(0).setBlockName("slime.leaves");
|
||||
TRepo.slimeSapling = (SlimeSapling) new SlimeSapling().setStepSound(TRepo.slimeStep).setBlockName("slime.sapling");
|
||||
TRepo.slimeChannel = new ConveyorBase(Material.water, "greencurrent").setHardness(0.3f).setStepSound(TRepo.slimeStep).setBlockName("slime.channel");
|
||||
TRepo.bloodChannel = new ConveyorBase(Material.water, "liquid_cow").setHardness(0.3f).setStepSound(TRepo.slimeStep).setBlockName("blood.channel");
|
||||
TRepo.slimePad = new SlimePad(Material.cloth).setStepSound(TRepo.slimeStep).setHardness(0.3f).setBlockName("slime.pad");
|
||||
|
||||
// Decoration
|
||||
TRepo.stoneTorch = new StoneTorch().setBlockName("decoration.stonetorch");
|
||||
TRepo.stoneLadder = new StoneLadder().setBlockName("decoration.stoneladder");
|
||||
TRepo.multiBrick = new MultiBrick().setBlockName("Decoration.Brick");
|
||||
TRepo.multiBrickFancy = new MultiBrickFancy().setBlockName("Decoration.BrickFancy");
|
||||
|
||||
// Ores
|
||||
String[] berryOres = new String[] { "berry_iron", "berry_gold", "berry_copper", "berry_tin", "berry_iron_ripe", "berry_gold_ripe", "berry_copper_ripe", "berry_tin_ripe" };
|
||||
TRepo.oreBerry = (OreberryBush) new OreberryBush(berryOres, 0, 4, new String[] { "oreIron", "oreGold", "oreCopper", "oreTin" }).setBlockName("ore.berries.one");
|
||||
String[] berryOresTwo = new String[] { "berry_aluminum", "berry_essence", "", "", "berry_aluminum_ripe", "berry_essence_ripe", "", "" };
|
||||
TRepo.oreBerrySecond = (OreberryBush) new OreberryBushEssence(berryOresTwo, 4, 2, new String[] { "oreAluminum", "oreSilver" }).setBlockName("ore.berries.two");
|
||||
|
||||
String[] oreTypes = new String[] { "nether_slag", "nether_cobalt", "nether_ardite", "ore_copper", "ore_tin", "ore_aluminum", "ore_slag" };
|
||||
TRepo.oreSlag = new MetalOre(Material.rock, 10.0F, oreTypes).setBlockName("tconstruct.stoneore");
|
||||
TRepo.oreSlag.setHarvestLevel("pickaxe", 4, 1);
|
||||
TRepo.oreSlag.setHarvestLevel("pickaxe", 4, 2);
|
||||
TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 3);
|
||||
TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 4);
|
||||
TRepo.oreSlag.setHarvestLevel("pickaxe", 1, 5);
|
||||
|
||||
TRepo.oreGravel = new GravelOre().setBlockName("GravelOre").setBlockName("tconstruct.gravelore");
|
||||
TRepo.oreGravel.setHarvestLevel("shovel", 1, 0);
|
||||
TRepo.oreGravel.setHarvestLevel("shovel", 2, 1);
|
||||
TRepo.oreGravel.setHarvestLevel("shovel", 1, 2);
|
||||
TRepo.oreGravel.setHarvestLevel("shovel", 1, 3);
|
||||
TRepo.oreGravel.setHarvestLevel("shovel", 1, 4);
|
||||
TRepo.oreGravel.setHarvestLevel("shovel", 4, 5);
|
||||
|
||||
TRepo.speedBlock = new SpeedBlock().setBlockName("SpeedBlock");
|
||||
|
||||
// Glass
|
||||
TRepo.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock");
|
||||
TRepo.clearGlass.stepSound = Block.soundTypeGlass;
|
||||
TRepo.glassPane = new GlassPaneConnected("clear", false);
|
||||
TRepo.stainedGlassClear = new GlassBlockConnectedMeta("stained", true, "white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue",
|
||||
"brown", "green", "red", "black").setBlockName("GlassBlock.StainedClear");
|
||||
TRepo.stainedGlassClear.stepSound = Block.soundTypeGlass;
|
||||
TRepo.stainedGlassClearPane = new GlassPaneStained();
|
||||
|
||||
// Rail
|
||||
TRepo.woodenRail = new WoodRail().setStepSound(Block.soundTypeWood).setCreativeTab(TConstructRegistry.blockTab).setBlockName("rail.wood");
|
||||
|
||||
}
|
||||
|
||||
void registerItems ()
|
||||
{
|
||||
TRepo.titleIcon = new TitleIcon().setUnlocalizedName("tconstruct.titleicon");
|
||||
GameRegistry.registerItem(TRepo.titleIcon, "titleIcon");
|
||||
String[] blanks = new String[] { "blank_pattern", "blank_cast", "blank_cast" };
|
||||
TRepo.blankPattern = new CraftingItem(blanks, blanks, "materials/", "tinker", TConstructRegistry.materialTab).setUnlocalizedName("tconstruct.Pattern");
|
||||
GameRegistry.registerItem(TRepo.blankPattern, "blankPattern");
|
||||
|
||||
TRepo.materials = new MaterialItem().setUnlocalizedName("tconstruct.Materials");
|
||||
TRepo.toolRod = new ToolPart("_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod");
|
||||
TRepo.toolShard = new ToolShard("_chunk").setUnlocalizedName("tconstruct.ToolShard");
|
||||
TRepo.woodPattern = new Pattern("pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern");
|
||||
TRepo.metalPattern = new MetalPattern("cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern");
|
||||
// armorPattern = new ArmorPattern(PHConstruct.armorPattern,
|
||||
// "armorcast_",
|
||||
// "materials/").setUnlocalizedName("tconstruct.ArmorPattern");
|
||||
GameRegistry.registerItem(TRepo.materials, "materials");
|
||||
GameRegistry.registerItem(TRepo.woodPattern, "woodPattern");
|
||||
GameRegistry.registerItem(TRepo.metalPattern, "metalPattern");
|
||||
// GameRegistry.registerItem(TRepo.armorPattern, "armorPattern");
|
||||
|
||||
TConstructRegistry.addItemToDirectory("blankPattern", TRepo.blankPattern);
|
||||
TConstructRegistry.addItemToDirectory("woodPattern", TRepo.woodPattern);
|
||||
TConstructRegistry.addItemToDirectory("metalPattern", TRepo.metalPattern);
|
||||
// TConstructRegistry.addItemToDirectory("armorPattern", armorPattern);
|
||||
|
||||
String[] patternTypes = { "ingot", "toolRod", "pickaxeHead", "shovelHead", "hatchetHead", "swordBlade", "wideGuard", "handGuard", "crossbar", "binding", "frypanHead", "signHead",
|
||||
"knifeBlade", "chiselHead", "toughRod", "toughBinding", "largePlate", "broadAxeHead", "scytheHead", "excavatorHead", "largeBlade", "hammerHead", "fullGuard" };
|
||||
|
||||
for (int i = 1; i < patternTypes.length; i++)
|
||||
{
|
||||
TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Pattern", new ItemStack(TRepo.woodPattern, 1, i));
|
||||
}
|
||||
for (int i = 0; i < patternTypes.length; i++)
|
||||
{
|
||||
TConstructRegistry.addItemStackToDirectory(patternTypes[i] + "Cast", new ItemStack(TRepo.metalPattern, 1, i));
|
||||
}
|
||||
/*
|
||||
* String[] armorPartTypes = { "helmet", "chestplate", "leggings",
|
||||
* "boots" }; for (int i = 1; i < armorPartTypes.length; i++) {
|
||||
* TConstructRegistry.addItemStackToDirectory(armorPartTypes[i] +
|
||||
* "Cast", new ItemStack(armorPattern, 1, i)); }
|
||||
*/
|
||||
|
||||
TRepo.manualBook = new Manual();
|
||||
GameRegistry.registerItem(TRepo.manualBook, "manualBook");
|
||||
TRepo.buckets = new FilledBucket(BlockUtils.getBlockFromItem(TRepo.buckets));
|
||||
GameRegistry.registerItem(TRepo.buckets, "buckets");
|
||||
|
||||
TRepo.pickaxe = new Pickaxe();
|
||||
TRepo.shovel = new Shovel();
|
||||
TRepo.hatchet = new Hatchet();
|
||||
TRepo.broadsword = new Broadsword();
|
||||
TRepo.longsword = new Longsword();
|
||||
TRepo.rapier = new Rapier();
|
||||
TRepo.dagger = new Dagger();
|
||||
TRepo.cutlass = new Cutlass();
|
||||
|
||||
TRepo.frypan = new FryingPan();
|
||||
TRepo.battlesign = new BattleSign();
|
||||
TRepo.mattock = new Mattock();
|
||||
TRepo.chisel = new Chisel();
|
||||
|
||||
TRepo.lumberaxe = new LumberAxe();
|
||||
TRepo.cleaver = new Cleaver();
|
||||
TRepo.scythe = new Scythe();
|
||||
TRepo.excavator = new Excavator();
|
||||
TRepo.hammer = new Hammer();
|
||||
TRepo.battleaxe = new Battleaxe();
|
||||
|
||||
TRepo.shortbow = new Shortbow();
|
||||
TRepo.arrow = new Arrow();
|
||||
|
||||
Item[] tools = { TRepo.pickaxe, TRepo.shovel, TRepo.hatchet, TRepo.broadsword, TRepo.longsword, TRepo.rapier, TRepo.dagger, TRepo.cutlass, TRepo.frypan, TRepo.battlesign, TRepo.mattock,
|
||||
TRepo.chisel, TRepo.lumberaxe, TRepo.cleaver, TRepo.scythe, TRepo.excavator, TRepo.hammer, TRepo.battleaxe, TRepo.shortbow, TRepo.arrow };
|
||||
String[] toolStrings = { "pickaxe", "shovel", "hatchet", "broadsword", "longsword", "rapier", "dagger", "cutlass", "frypan", "battlesign", "mattock", "chisel", "lumberaxe", "cleaver",
|
||||
"scythe", "excavator", "hammer", "battleaxe", "shortbow", "arrow" };
|
||||
|
||||
for (int i = 0; i < tools.length; i++)
|
||||
{
|
||||
GameRegistry.registerItem(tools[i], toolStrings[i]); // 1.7 compat
|
||||
TConstructRegistry.addItemToDirectory(toolStrings[i], tools[i]);
|
||||
}
|
||||
|
||||
TRepo.potionLauncher = new PotionLauncher().setUnlocalizedName("tconstruct.PotionLauncher");
|
||||
GameRegistry.registerItem(TRepo.potionLauncher, "potionLauncher");
|
||||
|
||||
TRepo.pickaxeHead = new ToolPart("_pickaxe_head", "PickHead").setUnlocalizedName("tconstruct.PickaxeHead");
|
||||
TRepo.shovelHead = new ToolPart("_shovel_head", "ShovelHead").setUnlocalizedName("tconstruct.ShovelHead");
|
||||
TRepo.hatchetHead = new ToolPart("_axe_head", "AxeHead").setUnlocalizedName("tconstruct.AxeHead");
|
||||
TRepo.binding = new ToolPart("_binding", "Binding").setUnlocalizedName("tconstruct.Binding");
|
||||
TRepo.toughBinding = new ToolPart("_toughbind", "ToughBind").setUnlocalizedName("tconstruct.ThickBinding");
|
||||
TRepo.toughRod = new ToolPart("_toughrod", "ToughRod").setUnlocalizedName("tconstruct.ThickRod");
|
||||
TRepo.largePlate = new ToolPart("_largeplate", "LargePlate").setUnlocalizedName("tconstruct.LargePlate");
|
||||
|
||||
TRepo.swordBlade = new ToolPart("_sword_blade", "SwordBlade").setUnlocalizedName("tconstruct.SwordBlade");
|
||||
TRepo.wideGuard = new ToolPart("_large_guard", "LargeGuard").setUnlocalizedName("tconstruct.LargeGuard");
|
||||
TRepo.handGuard = new ToolPart("_medium_guard", "MediumGuard").setUnlocalizedName("tconstruct.MediumGuard");
|
||||
TRepo.crossbar = new ToolPart("_crossbar", "Crossbar").setUnlocalizedName("tconstruct.Crossbar");
|
||||
TRepo.knifeBlade = new ToolPart("_knife_blade", "KnifeBlade").setUnlocalizedName("tconstruct.KnifeBlade");
|
||||
TRepo.fullGuard = new ToolPartHidden("_full_guard", "FullGuard").setUnlocalizedName("tconstruct.FullGuard");
|
||||
|
||||
TRepo.frypanHead = new ToolPart("_frypan_head", "FrypanHead").setUnlocalizedName("tconstruct.FrypanHead");
|
||||
TRepo.signHead = new ToolPart("_battlesign_head", "SignHead").setUnlocalizedName("tconstruct.SignHead");
|
||||
TRepo.chiselHead = new ToolPart("_chisel_head", "ChiselHead").setUnlocalizedName("tconstruct.ChiselHead");
|
||||
|
||||
TRepo.scytheBlade = new ToolPart("_scythe_head", "ScytheHead").setUnlocalizedName("tconstruct.ScytheBlade");
|
||||
TRepo.broadAxeHead = new ToolPart("_lumberaxe_head", "LumberHead").setUnlocalizedName("tconstruct.LumberHead");
|
||||
TRepo.excavatorHead = new ToolPart("_excavator_head", "ExcavatorHead").setUnlocalizedName("tconstruct.ExcavatorHead");
|
||||
TRepo.largeSwordBlade = new ToolPart("_large_sword_blade", "LargeSwordBlade").setUnlocalizedName("tconstruct.LargeSwordBlade");
|
||||
TRepo.hammerHead = new ToolPart("_hammer_head", "HammerHead").setUnlocalizedName("tconstruct.HammerHead");
|
||||
|
||||
TRepo.bowstring = new Bowstring().setUnlocalizedName("tconstruct.Bowstring");
|
||||
TRepo.arrowhead = new ToolPart("_arrowhead", "ArrowHead").setUnlocalizedName("tconstruct.Arrowhead");
|
||||
TRepo.fletching = new Fletching().setUnlocalizedName("tconstruct.Fletching");
|
||||
|
||||
Item[] toolParts = { TRepo.toolRod, TRepo.toolShard, TRepo.pickaxeHead, TRepo.shovelHead, TRepo.hatchetHead, TRepo.binding, TRepo.toughBinding, TRepo.toughRod, TRepo.largePlate,
|
||||
TRepo.swordBlade, TRepo.wideGuard, TRepo.handGuard, TRepo.crossbar, TRepo.knifeBlade, TRepo.fullGuard, TRepo.frypanHead, TRepo.signHead, TRepo.chiselHead, TRepo.scytheBlade,
|
||||
TRepo.broadAxeHead, TRepo.excavatorHead, TRepo.largeSwordBlade, TRepo.hammerHead, TRepo.bowstring, TRepo.fletching, TRepo.arrowhead };
|
||||
String[] toolPartStrings = { "toolRod", "toolShard", "pickaxeHead", "shovelHead", "hatchetHead", "binding", "toughBinding", "toughRod", "heavyPlate", "swordBlade", "wideGuard", "handGuard",
|
||||
"crossbar", "knifeBlade", "fullGuard", "frypanHead", "signHead", "chiselHead", "scytheBlade", "broadAxeHead", "excavatorHead", "largeSwordBlade", "hammerHead", "bowstring",
|
||||
"fletching", "arrowhead" };
|
||||
|
||||
for (int i = 0; i < toolParts.length; i++)
|
||||
{
|
||||
GameRegistry.registerItem(toolParts[i], toolPartStrings[i]); // 1.7
|
||||
// compat
|
||||
TConstructRegistry.addItemToDirectory(toolPartStrings[i], toolParts[i]);
|
||||
}
|
||||
|
||||
TRepo.diamondApple = new DiamondApple().setUnlocalizedName("tconstruct.apple.diamond");
|
||||
TRepo.strangeFood = new StrangeFood().setUnlocalizedName("tconstruct.strangefood");
|
||||
TRepo.oreBerries = new OreBerries().setUnlocalizedName("oreberry");
|
||||
GameRegistry.registerItem(TRepo.diamondApple, "diamondApple");
|
||||
GameRegistry.registerItem(TRepo.strangeFood, "strangeFood");
|
||||
GameRegistry.registerItem(TRepo.oreBerries, "oreBerries");
|
||||
|
||||
boolean foodOverhaul = false;
|
||||
if (Loader.isModLoaded("HungerOverhaul") || Loader.isModLoaded("fc_food"))
|
||||
{
|
||||
foodOverhaul = true;
|
||||
}
|
||||
|
||||
TRepo.jerky = new Jerky(foodOverhaul).setUnlocalizedName("tconstruct.jerky");
|
||||
GameRegistry.registerItem(TRepo.jerky, "jerky");
|
||||
|
||||
// Wearables
|
||||
// heavyHelmet = new TArmorBase(PHConstruct.heavyHelmet,
|
||||
// 0).setUnlocalizedName("tconstruct.HeavyHelmet");
|
||||
TRepo.heartCanister = new HeartCanister().setUnlocalizedName("tconstruct.canister");
|
||||
// heavyBoots = new TArmorBase(PHConstruct.heavyBoots,
|
||||
// 3).setUnlocalizedName("tconstruct.HeavyBoots");
|
||||
// glove = new
|
||||
// Glove(PHConstruct.glove).setUnlocalizedName("tconstruct.Glove");
|
||||
TRepo.knapsack = new Knapsack().setUnlocalizedName("tconstruct.storage");
|
||||
TRepo.goldHead = new GoldenHead(4, 1.2F, false).setAlwaysEdible().setPotionEffect(Potion.regeneration.id, 10, 0, 1.0F).setUnlocalizedName("goldenhead");
|
||||
// GameRegistry.registerItem(TRepo.heavyHelmet, "heavyHelmet");
|
||||
GameRegistry.registerItem(TRepo.heartCanister, "heartCanister");
|
||||
// GameRegistry.registerItem(TRepo.heavyBoots, "heavyBoots");
|
||||
// GameRegistry.registerItem(TRepo.glove, "glove");
|
||||
GameRegistry.registerItem(TRepo.knapsack, "knapsack");
|
||||
GameRegistry.registerItem(TRepo.goldHead, "goldHead");
|
||||
|
||||
TRepo.creativeModifier = new CreativeModifier().setUnlocalizedName("tconstruct.modifier.creative");
|
||||
GameRegistry.registerItem(TRepo.creativeModifier, "creativeModifier");
|
||||
|
||||
LiquidCasting basinCasting = TConstruct.getBasinCasting();
|
||||
TRepo.materialWood = EnumHelper.addArmorMaterial("WOOD", 2, new int[] { 1, 2, 2, 1 }, 3);
|
||||
TRepo.helmetWood = new ArmorBasic(TRepo.materialWood, 0, "wood").setUnlocalizedName("tconstruct.helmetWood");
|
||||
TRepo.chestplateWood = new ArmorBasic(TRepo.materialWood, 1, "wood").setUnlocalizedName("tconstruct.chestplateWood");
|
||||
TRepo.leggingsWood = new ArmorBasic(TRepo.materialWood, 2, "wood").setUnlocalizedName("tconstruct.leggingsWood");
|
||||
TRepo.bootsWood = new ArmorBasic(TRepo.materialWood, 3, "wood").setUnlocalizedName("tconstruct.bootsWood");
|
||||
GameRegistry.registerItem(TRepo.helmetWood, "helmetWood");
|
||||
GameRegistry.registerItem(TRepo.chestplateWood, "chestplateWood");
|
||||
GameRegistry.registerItem(TRepo.leggingsWood, "leggingsWood");
|
||||
GameRegistry.registerItem(TRepo.bootsWood, "bootsWood");
|
||||
|
||||
TRepo.exoGoggles = new ExoArmor(EnumArmorPart.HELMET, "exosuit").setUnlocalizedName("tconstruct.exoGoggles");
|
||||
TRepo.exoChest = new ExoArmor(EnumArmorPart.CHEST, "exosuit").setUnlocalizedName("tconstruct.exoChest");
|
||||
TRepo.exoPants = new ExoArmor(EnumArmorPart.PANTS, "exosuit").setUnlocalizedName("tconstruct.exoPants");
|
||||
TRepo.exoShoes = new ExoArmor(EnumArmorPart.SHOES, "exosuit").setUnlocalizedName("tconstruct.exoShoes");
|
||||
|
||||
GameRegistry.registerItem(TRepo.exoGoggles, "helmetExo");
|
||||
GameRegistry.registerItem(TRepo.exoChest, "chestplateExo");
|
||||
GameRegistry.registerItem(TRepo.exoPants, "leggingsExo");
|
||||
GameRegistry.registerItem(TRepo.exoShoes, "bootsExo");
|
||||
|
||||
String[] materialStrings = { "paperStack", "greenSlimeCrystal", "searedBrick", "ingotCobalt", "ingotArdite", "ingotManyullyn", "mossBall", "lavaCrystal", "necroticBone", "ingotCopper",
|
||||
"ingotTin", "ingotAluminum", "rawAluminum", "ingotBronze", "ingotAluminumBrass", "ingotAlumite", "ingotSteel", "blueSlimeCrystal", "ingotObsidian", "nuggetIron", "nuggetCopper",
|
||||
"nuggetTin", "nuggetAluminum", "nuggetSilver", "nuggetAluminumBrass", "silkyCloth", "silkyJewel", "nuggetObsidian", "nuggetCobalt", "nuggetArdite", "nuggetManyullyn", "nuggetBronze",
|
||||
"nuggetAlumite", "nuggetSteel", "ingotPigIron", "nuggetPigIron", "glueball" };
|
||||
|
||||
for (int i = 0; i < materialStrings.length; i++)
|
||||
{
|
||||
TConstructRegistry.addItemStackToDirectory(materialStrings[i], new ItemStack(TRepo.materials, 1, i));
|
||||
}
|
||||
|
||||
String[] oreberries = { "Iron", "Gold", "Copper", "Tin", "Aluminum", "Essence" };
|
||||
|
||||
for (int i = 0; i < oreberries.length; i++)
|
||||
{
|
||||
TConstructRegistry.addItemStackToDirectory("oreberry" + oreberries[i], new ItemStack(TRepo.oreBerries, 1, i));
|
||||
}
|
||||
|
||||
TConstructRegistry.addItemStackToDirectory("diamondApple", new ItemStack(TRepo.diamondApple, 1, 0));
|
||||
TConstructRegistry.addItemStackToDirectory("blueSlimeFood", new ItemStack(TRepo.strangeFood, 1, 0));
|
||||
|
||||
TConstructRegistry.addItemStackToDirectory("canisterEmpty", new ItemStack(TRepo.heartCanister, 1, 0));
|
||||
TConstructRegistry.addItemStackToDirectory("miniRedHeart", new ItemStack(TRepo.heartCanister, 1, 1));
|
||||
TConstructRegistry.addItemStackToDirectory("canisterRedHeart", new ItemStack(TRepo.heartCanister, 1, 2));
|
||||
|
||||
// Vanilla stack sizes
|
||||
Items.wooden_door.setMaxStackSize(16);
|
||||
Items.iron_door.setMaxStackSize(16);
|
||||
Items.boat.setMaxStackSize(16);
|
||||
Items.minecart.setMaxStackSize(3);
|
||||
// Items.minecartEmpty.setMaxStackSize(3);
|
||||
// Items.minecartCrate.setMaxStackSize(3);
|
||||
// Items.minecartPowered.setMaxStackSize(3);
|
||||
Items.cake.setMaxStackSize(16);
|
||||
// Block.torchWood.setTickRandomly(false);
|
||||
}
|
||||
|
||||
void registerMaterials ()
|
||||
{
|
||||
TConstructRegistry.addToolMaterial(0, "Wood", "Wooden ", 0, 59, 200, 0, 1.0F, 0, 0f, "\u00A7e", "");
|
||||
TConstructRegistry.addToolMaterial(1, "Stone", 1, 131, 400, 1, 0.5F, 0, 1f, "", StatCollector.translateToLocal("materialtraits.stonebound"));
|
||||
TConstructRegistry.addToolMaterial(2, "Iron", 2, 250, 600, 2, 1.3F, 1, 0f, "\u00A7f", "");
|
||||
TConstructRegistry.addToolMaterial(3, "Flint", 1, 171, 525, 2, 0.7F, 0, 0f, "\u00A78", "");
|
||||
TConstructRegistry.addToolMaterial(4, "Cactus", 1, 150, 500, 2, 1.0F, 0, -1f, "\u00A72", StatCollector.translateToLocal("materialtraits.jagged"));
|
||||
TConstructRegistry.addToolMaterial(5, "Bone", 1, 200, 400, 1, 1.0F, 0, 0f, "\u00A7e", "");
|
||||
TConstructRegistry.addToolMaterial(6, "Obsidian", 3, 89, 700, 2, 0.8F, 3, 0f, "\u00A7d", "");
|
||||
TConstructRegistry.addToolMaterial(7, "Netherrack", 2, 131, 400, 1, 1.2F, 0, 1f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound"));
|
||||
TConstructRegistry.addToolMaterial(8, "Slime", 0, 500, 150, 0, 1.5F, 0, 0f, "\u00A7a", "");
|
||||
TConstructRegistry.addToolMaterial(9, "Paper", 0, 30, 200, 0, 0.3F, 0, 0f, "\u00A7f", StatCollector.translateToLocal("materialtraits.writable"));
|
||||
TConstructRegistry.addToolMaterial(10, "Cobalt", 4, 800, 1100, 3, 1.75F, 2, 0f, "\u00A73", "");
|
||||
TConstructRegistry.addToolMaterial(11, "Ardite", 4, 600, 800, 3, 2.0F, 0, 2f, "\u00A74", StatCollector.translateToLocal("materialtraits.stonebound"));
|
||||
TConstructRegistry.addToolMaterial(12, "Manyullyn", 5, 1200, 900, 4, 2.5F, 0, 0f, "\u00A75", "");
|
||||
TConstructRegistry.addToolMaterial(13, "Copper", 1, 180, 500, 2, 1.15F, 0, 0f, "\u00A7c", "");
|
||||
TConstructRegistry.addToolMaterial(14, "Bronze", 2, 350, 700, 2, 1.3F, 1, 0f, "\u00A76", "");
|
||||
TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", "");
|
||||
TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", "");
|
||||
TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", "");
|
||||
TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", StatCollector.translateToLocal("materialtraits.tasty"));
|
||||
|
||||
TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); // Wood
|
||||
TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); // Stone
|
||||
TConstructRegistry.addBowMaterial(2, 576, 40, 1.2f); // Iron
|
||||
TConstructRegistry.addBowMaterial(3, 10, 80, 0.2f); // Flint
|
||||
TConstructRegistry.addBowMaterial(4, 384, 20, 1.0f); // Cactus
|
||||
TConstructRegistry.addBowMaterial(5, 192, 30, 1.0f); // Bone
|
||||
TConstructRegistry.addBowMaterial(6, 10, 80, 0.2f); // Obsidian
|
||||
TConstructRegistry.addBowMaterial(7, 10, 80, 0.2f); // Netherrack
|
||||
TConstructRegistry.addBowMaterial(8, 1536, 20, 1.2f); // Slime
|
||||
TConstructRegistry.addBowMaterial(9, 48, 25, 0.5f); // Paper
|
||||
TConstructRegistry.addBowMaterial(10, 1152, 40, 1.2f); // Cobalt
|
||||
TConstructRegistry.addBowMaterial(11, 960, 40, 1.2f); // Ardite
|
||||
TConstructRegistry.addBowMaterial(12, 1536, 40, 1.2f); // Manyullyn
|
||||
TConstructRegistry.addBowMaterial(13, 384, 40, 1.2f); // Copper
|
||||
TConstructRegistry.addBowMaterial(14, 576, 40, 1.2f); // Bronze
|
||||
TConstructRegistry.addBowMaterial(15, 768, 40, 1.2f); // Alumite
|
||||
TConstructRegistry.addBowMaterial(16, 768, 40, 1.2f); // Steel
|
||||
TConstructRegistry.addBowMaterial(17, 576, 20, 1.2f); // Blue Slime
|
||||
TConstructRegistry.addBowMaterial(18, 384, 20, 1.2f); // Slime
|
||||
|
||||
// Material ID, mass, fragility
|
||||
TConstructRegistry.addArrowMaterial(0, 0.69F, 1.0F, 100F); // Wood
|
||||
TConstructRegistry.addArrowMaterial(1, 2.5F, 5.0F, 100F); // Stone
|
||||
TConstructRegistry.addArrowMaterial(2, 7.2F, 0.5F, 100F); // Iron
|
||||
TConstructRegistry.addArrowMaterial(3, 2.65F, 1.0F, 100F); // Flint
|
||||
TConstructRegistry.addArrowMaterial(4, 0.76F, 1.0F, 100F); // Cactus
|
||||
TConstructRegistry.addArrowMaterial(5, 0.69F, 1.0F, 100); // Bone
|
||||
TConstructRegistry.addArrowMaterial(6, 2.4F, 1.0F, 100F); // Obsidian
|
||||
TConstructRegistry.addArrowMaterial(7, 3.5F, 1.0F, 100F); // Netherrack
|
||||
TConstructRegistry.addArrowMaterial(8, 0.42F, 0.0F, 100F); // Slime
|
||||
TConstructRegistry.addArrowMaterial(9, 1.1F, 3.0F, 90F); // Paper
|
||||
TConstructRegistry.addArrowMaterial(10, 8.9F, 0.25F, 100F); // Cobalt
|
||||
TConstructRegistry.addArrowMaterial(11, 7.2F, 0.25F, 100F); // Ardite
|
||||
TConstructRegistry.addArrowMaterial(12, 10.6F, 0.1F, 100F); // Manyullyn
|
||||
TConstructRegistry.addArrowMaterial(13, 8.96F, 0.5F, 100F); // Copper
|
||||
TConstructRegistry.addArrowMaterial(14, 7.9F, 0.25F, 100F); // Bronze
|
||||
TConstructRegistry.addArrowMaterial(15, 4.7F, 0.25F, 100F); // Alumite
|
||||
TConstructRegistry.addArrowMaterial(16, 7.6F, 0.25F, 100F); // Steel
|
||||
TConstructRegistry.addArrowMaterial(17, 0.42F, 0.0F, 100F); // Blue
|
||||
// Slime
|
||||
TConstructRegistry.addArrowMaterial(18, 6.8F, 0.5F, 100F); // Iron
|
||||
|
||||
TConstructRegistry.addBowstringMaterial(0, 2, new ItemStack(Items.string), new ItemStack(TRepo.bowstring, 1, 0), 1F, 1F, 1f); // String
|
||||
TConstructRegistry.addFletchingMaterial(0, 2, new ItemStack(Items.feather), new ItemStack(TRepo.fletching, 1, 0), 100F, 0F, 0.05F); // Feather
|
||||
for (int i = 0; i < 4; i++)
|
||||
TConstructRegistry.addFletchingMaterial(1, 2, new ItemStack(Blocks.leaves, 1, i), new ItemStack(TRepo.fletching, 1, 1), 75F, 0F, 0.2F); // All four vanialla Leaves
|
||||
TConstructRegistry.addFletchingMaterial(2, 2, new ItemStack(TRepo.materials, 1, 1), new ItemStack(TRepo.fletching, 1, 2), 100F, 0F, 0.12F); // Slime
|
||||
TConstructRegistry.addFletchingMaterial(3, 2, new ItemStack(TRepo.materials, 1, 17), new ItemStack(TRepo.fletching, 1, 3), 100F, 0F, 0.12F); // BlueSlime
|
||||
|
||||
PatternBuilder pb = PatternBuilder.instance;
|
||||
if (PHConstruct.enableTWood)
|
||||
pb.registerFullMaterial(Blocks.planks, 2, StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick), new ItemStack(Items.stick), 0);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.wood"), new ItemStack(Items.stick, 2), new ItemStack(Items.stick), 0);
|
||||
if (PHConstruct.enableTStone)
|
||||
{
|
||||
pb.registerFullMaterial(Blocks.stone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 1);
|
||||
pb.registerMaterial(Blocks.cobblestone, 2, StatCollector.translateToLocal("gui.partbuilder.material.stone"));
|
||||
}
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.stone"), new ItemStack(TRepo.toolShard, 1, 1), new ItemStack(TRepo.toolRod, 1, 1), 0);
|
||||
pb.registerFullMaterial(Items.iron_ingot, 2, StatCollector.translateToLocal("gui.partbuilder.material.iron"), new ItemStack(TRepo.toolShard, 1, 2), new ItemStack(TRepo.toolRod, 1, 2), 2);
|
||||
if (PHConstruct.enableTFlint)
|
||||
pb.registerFullMaterial(Items.flint, 2, StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.flint"), new ItemStack(TRepo.toolShard, 1, 3), new ItemStack(TRepo.toolRod, 1, 3), 3);
|
||||
if (PHConstruct.enableTCactus)
|
||||
pb.registerFullMaterial(Blocks.cactus, 2, StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cactus"), new ItemStack(TRepo.toolShard, 1, 4), new ItemStack(TRepo.toolRod, 1, 4), 4);
|
||||
if (PHConstruct.enableTBone)
|
||||
pb.registerFullMaterial(Items.bone, 2, StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bone"), new ItemStack(Items.dye, 1, 15), new ItemStack(Items.bone), 5);
|
||||
pb.registerFullMaterial(Blocks.obsidian, 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian"), new ItemStack(TRepo.toolShard, 1, 6), new ItemStack(TRepo.toolRod, 1, 6), 6);
|
||||
pb.registerMaterial(new ItemStack(TRepo.materials, 1, 18), 2, StatCollector.translateToLocal("gui.partbuilder.material.obsidian"));
|
||||
if (PHConstruct.enableTNetherrack)
|
||||
pb.registerFullMaterial(Blocks.netherrack, 2, StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.netherrack"), new ItemStack(TRepo.toolShard, 1, 7), new ItemStack(TRepo.toolRod, 1, 7), 7);
|
||||
if (PHConstruct.enableTSlime)
|
||||
pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 1), 2, StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 8), 8);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.slime"), new ItemStack(TRepo.toolShard, 1, 8), new ItemStack(TRepo.toolRod, 1, 17), 8);
|
||||
if (PHConstruct.enableTPaper)
|
||||
pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 0), 2, StatCollector.translateToLocal("gui.partbuilder.material.paper"), new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(Items.paper, 2), new ItemStack(TRepo.toolRod, 1, 9), 9);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.cobalt"), new ItemStack(TRepo.toolShard, 1, 10), new ItemStack(TRepo.toolRod, 1, 10), 10);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.ardite"), new ItemStack(TRepo.toolShard, 1, 11), new ItemStack(TRepo.toolRod, 1, 11), 11);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.manyullyn"), new ItemStack(TRepo.toolShard, 1, 12), new ItemStack(TRepo.toolRod, 1, 12), 12);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.copper"), new ItemStack(TRepo.toolShard, 1, 13), new ItemStack(TRepo.toolRod, 1, 13), 13);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.bronze"), new ItemStack(TRepo.toolShard, 1, 14), new ItemStack(TRepo.toolRod, 1, 14), 14);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.alumite"), new ItemStack(TRepo.toolShard, 1, 15), new ItemStack(TRepo.toolRod, 1, 15), 15);
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.steel"), new ItemStack(TRepo.toolShard, 1, 16), new ItemStack(TRepo.toolRod, 1, 16), 16);
|
||||
if (PHConstruct.enableTBlueSlime)
|
||||
pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 17), 2, StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17);
|
||||
else
|
||||
pb.registerMaterialSet(StatCollector.translateToLocal("gui.partbuilder.material.blueslime"), new ItemStack(TRepo.toolShard, 1, 17), new ItemStack(TRepo.toolRod, 1, 17), 17);
|
||||
pb.registerFullMaterial(new ItemStack(TRepo.materials, 1, 34), 2, StatCollector.translateToLocal("gui.partbuilder.material.pigiron"), new ItemStack(TRepo.toolShard, 1, 18), new ItemStack(TRepo.toolRod, 1, 18), 18);
|
||||
|
||||
pb.addToolPattern((IPattern) TRepo.woodPattern);
|
||||
}
|
||||
|
||||
void addCraftingRecipes ()
|
||||
{
|
||||
TRecipes.addPartMapping();
|
||||
TRecipes.addRecipesForToolBuilder();
|
||||
TRecipes.addRecipesForTableCasting();
|
||||
TRecipes.addRecipesForBasinCasting();
|
||||
TRecipes.addRecipesForSmeltery();
|
||||
TRecipes.addRecipesForChisel();
|
||||
TRecipes.addRecipesForFurnace();
|
||||
TRecipes.addRecipesForCraftingTable();
|
||||
TRecipes.addRecipesForDryingRack();
|
||||
}
|
||||
|
||||
void setupToolTabs ()
|
||||
{
|
||||
TConstructRegistry.materialTab.init(new ItemStack(TRepo.manualBook, 1, 0));
|
||||
TConstructRegistry.partTab.init(new ItemStack(TRepo.titleIcon, 1, 255));
|
||||
TConstructRegistry.blockTab.init(new ItemStack(TRepo.toolStationWood));
|
||||
ItemStack tool = new ItemStack(TRepo.longsword, 1, 0);
|
||||
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
compound.setTag("InfiTool", new NBTTagCompound());
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderHead", 2);
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderHandle", 0);
|
||||
compound.getCompoundTag("InfiTool").setInteger("RenderAccessory", 10);
|
||||
tool.setTagCompound(compound);
|
||||
|
||||
// TConstruct.
|
||||
TConstructRegistry.toolTab.init(tool);
|
||||
}
|
||||
|
||||
public void addLoot ()
|
||||
{
|
||||
// Item, min, max, weight
|
||||
ChestGenHooks.getInfo(ChestGenHooks.DUNGEON_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 5));
|
||||
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_DESERT_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 10));
|
||||
ChestGenHooks.getInfo(ChestGenHooks.PYRAMID_JUNGLE_CHEST).addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 10));
|
||||
|
||||
TRepo.tinkerHouseChest = new ChestGenHooks("TinkerHouse", new WeightedRandomChestContent[0], 3, 27);
|
||||
TRepo.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.heartCanister, 1, 1), 1, 1, 1));
|
||||
int[] validTypes = { 0, 1, 2, 3, 4, 5, 6, 8, 9, 13, 14, 17 };
|
||||
Item[] partTypes = { TRepo.pickaxeHead, TRepo.shovelHead, TRepo.hatchetHead, TRepo.binding, TRepo.swordBlade, TRepo.wideGuard, TRepo.handGuard, TRepo.crossbar, TRepo.knifeBlade,
|
||||
TRepo.frypanHead, TRepo.signHead, TRepo.chiselHead };
|
||||
|
||||
for (int partIter = 0; partIter < partTypes.length; partIter++)
|
||||
{
|
||||
for (int typeIter = 0; typeIter < validTypes.length; typeIter++)
|
||||
{
|
||||
TRepo.tinkerHouseChest.addItem(new WeightedRandomChestContent(new ItemStack(partTypes[partIter], 1, validTypes[typeIter]), 1, 1, 15));
|
||||
}
|
||||
}
|
||||
|
||||
TRepo.tinkerHousePatterns = new ChestGenHooks("TinkerPatterns", new WeightedRandomChestContent[0], 5, 30);
|
||||
for (int i = 0; i < 13; i++)
|
||||
{
|
||||
TRepo.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.woodPattern, 1, i + 1), 1, 3, 20));
|
||||
}
|
||||
TRepo.tinkerHousePatterns.addItem(new WeightedRandomChestContent(new ItemStack(TRepo.woodPattern, 1, 22), 1, 3, 40));
|
||||
}
|
||||
|
||||
public static String[] liquidNames;
|
||||
|
||||
@Override
|
||||
public int getBurnTime (ItemStack fuel)
|
||||
{
|
||||
if (fuel.getItem() == TRepo.materials && fuel.getItemDamage() == 7)
|
||||
return 26400;
|
||||
return 0;
|
||||
}
|
||||
|
||||
public void addAchievements ()
|
||||
{
|
||||
HashMap<String, Achievement> achievements = TAchievements.achievements;
|
||||
|
||||
achievements.put("tconstruct:beginner", new Achievement("tconstruct:beginner", "tconstruct.beginner", 0, 0, TRepo.manualBook, null));// .setIndependent());
|
||||
achievements.put("tconstruct:pattern", new Achievement("tconstruct:pattern", "tconstruct.pattern", 2, 1, TRepo.blankPattern, achievements.get("tconstruct:beginner")));
|
||||
achievements.put("tconstruct:tinkerer", new Achievement("tconstruct:tinkerer", "tconstruct.tinkerer", 2, 2, new ItemStack(TRepo.titleIcon, 1, 4096), achievements.get("tconstruct:pattern")));
|
||||
achievements.put("tconstruct:preparedFight",
|
||||
new Achievement("tconstruct:preparedFight", "tconstruct.preparedFight", 1, 3, new ItemStack(TRepo.titleIcon, 1, 4097), achievements.get("tconstruct:tinkerer")));
|
||||
achievements.put("tconstruct:proTinkerer",
|
||||
new Achievement("tconstruct:proTinkerer", "tconstruct.proTinkerer", 4, 4, new ItemStack(TRepo.titleIcon, 1, 4098), achievements.get("tconstruct:tinkerer")).setSpecial());
|
||||
achievements.put("tconstruct:smelteryMaker", new Achievement("tconstruct:smelteryMaker", "tconstruct.smelteryMaker", -2, -1, TRepo.smeltery, achievements.get("tconstruct:beginner")));
|
||||
achievements.put("tconstruct:enemySlayer",
|
||||
new Achievement("tconstruct:enemySlayer", "tconstruct.enemySlayer", 0, 5, new ItemStack(TRepo.titleIcon, 1, 4099), achievements.get("tconstruct:preparedFight")));
|
||||
achievements.put("tconstruct:dualConvenience",
|
||||
new Achievement("tconstruct:dualConvenience", "tconstruct.dualConvenience", 0, 7, new ItemStack(TRepo.titleIcon, 1, 4100), achievements.get("tconstruct:enemySlayer")).setSpecial());
|
||||
achievements.put("tconstruct:doingItWrong",
|
||||
new Achievement("tconstruct:doingItWrong", "tconstruct.doingItWrong", -2, -3, new ItemStack(TRepo.manualBook, 1, 2), achievements.get("tconstruct:smelteryMaker")));
|
||||
achievements.put("tconstruct:betterCrafting",
|
||||
new Achievement("tconstruct:betterCrafting", "tconstruct.betterCrafting", -2, 2, TRepo.craftingStationWood, achievements.get("tconstruct:beginner")));
|
||||
}
|
||||
}
|
||||
@@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.TileEntityLandmine;
|
||||
import tconstruct.inventory.ArmorExtendedContainer;
|
||||
import tconstruct.inventory.ContainerLandmine;
|
||||
import tconstruct.inventory.KnapsackContainer;
|
||||
import tconstruct.armor.inventory.ArmorExtendedContainer;
|
||||
import tconstruct.armor.inventory.KnapsackContainer;
|
||||
import tconstruct.mechworks.inventory.ContainerLandmine;
|
||||
import tconstruct.mechworks.logic.TileEntityLandmine;
|
||||
import tconstruct.util.player.TPlayerStats;
|
||||
|
||||
/**
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,285 +0,0 @@
|
||||
package tconstruct.common;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor.ArmorMaterial;
|
||||
import net.minecraftforge.common.ChestGenHooks;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import tconstruct.blocks.OreberryBush;
|
||||
import tconstruct.blocks.slime.SlimeLeaves;
|
||||
import tconstruct.blocks.slime.SlimeSapling;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.modifiers.tools.ModAttack;
|
||||
import tconstruct.modifiers.tools.ModFlux;
|
||||
import tconstruct.modifiers.tools.ModLapis;
|
||||
|
||||
public class TRepo
|
||||
{
|
||||
// Supresses console spam when iguana's tweaks remove stuff
|
||||
public static boolean supressMissingToolLogs = false;
|
||||
|
||||
// Patterns and other materials
|
||||
public static Item blankPattern;
|
||||
public static Item materials;
|
||||
public static Item toolRod;
|
||||
public static Item toolShard;
|
||||
public static Item woodPattern;
|
||||
public static Item metalPattern;
|
||||
// public static Item armorPattern;
|
||||
|
||||
public static Item manualBook;
|
||||
public static Item buckets;
|
||||
public static Item titleIcon;
|
||||
|
||||
public static Item strangeFood;
|
||||
public static Item diamondApple;
|
||||
public static Item jerky;
|
||||
// public static Item stonePattern;
|
||||
// public static Item netherPattern;
|
||||
|
||||
// Tools
|
||||
public static ToolCore pickaxe;
|
||||
public static ToolCore shovel;
|
||||
public static ToolCore hatchet;
|
||||
public static ToolCore broadsword;
|
||||
public static ToolCore longsword;
|
||||
public static ToolCore rapier;
|
||||
public static ToolCore dagger;
|
||||
public static ToolCore cutlass;
|
||||
|
||||
public static ToolCore frypan;
|
||||
public static ToolCore battlesign;
|
||||
public static ToolCore chisel;
|
||||
public static ToolCore mattock;
|
||||
|
||||
public static ToolCore scythe;
|
||||
public static ToolCore lumberaxe;
|
||||
public static ToolCore cleaver;
|
||||
public static ToolCore excavator;
|
||||
public static ToolCore hammer;
|
||||
public static ToolCore battleaxe;
|
||||
|
||||
public static ToolCore shortbow;
|
||||
public static ToolCore arrow;
|
||||
|
||||
public static Item potionLauncher;
|
||||
|
||||
// Tool parts
|
||||
public static Item binding;
|
||||
public static Item toughBinding;
|
||||
public static Item toughRod;
|
||||
public static Item largePlate;
|
||||
|
||||
public static Item pickaxeHead;
|
||||
public static Item shovelHead;
|
||||
public static Item hatchetHead;
|
||||
public static Item frypanHead;
|
||||
public static Item signHead;
|
||||
public static Item chiselHead;
|
||||
public static Item scytheBlade;
|
||||
public static Item broadAxeHead;
|
||||
public static Item excavatorHead;
|
||||
public static Item hammerHead;
|
||||
|
||||
public static Item swordBlade;
|
||||
public static Item largeSwordBlade;
|
||||
public static Item knifeBlade;
|
||||
|
||||
public static Item wideGuard;
|
||||
public static Item handGuard;
|
||||
public static Item crossbar;
|
||||
public static Item fullGuard;
|
||||
|
||||
public static Item bowstring;
|
||||
public static Item arrowhead;
|
||||
public static Item fletching;
|
||||
|
||||
// Crafting blocks
|
||||
public static Block toolStationWood;
|
||||
public static Block toolStationStone;
|
||||
public static Block toolForge;
|
||||
public static Block craftingStationWood;
|
||||
public static Block craftingSlabWood;
|
||||
public static Block furnaceSlab;
|
||||
|
||||
public static Block heldItemBlock;
|
||||
public static Block battlesignBlock;
|
||||
public static Block craftedSoil;
|
||||
|
||||
public static Block smeltery;
|
||||
public static Block lavaTank;
|
||||
public static Block searedBlock;
|
||||
public static Block castingChannel;
|
||||
public static Block metalBlock;
|
||||
public static Block tankAir;
|
||||
public static Block smelteryNether;
|
||||
public static Block lavaTankNether;
|
||||
public static Block searedBlockNether;
|
||||
|
||||
public static Block dryingRack;
|
||||
|
||||
// Decoration
|
||||
public static Block stoneTorch;
|
||||
public static Block stoneLadder;
|
||||
public static Block multiBrick;
|
||||
public static Block multiBrickFancy;
|
||||
|
||||
public static Block searedSlab;
|
||||
public static Block speedSlab;
|
||||
|
||||
public static Block meatBlock;
|
||||
public static Block woolSlab1;
|
||||
public static Block woolSlab2;
|
||||
public static Block glueBlock;
|
||||
|
||||
// Traps
|
||||
public static Block landmine;
|
||||
public static Block punji;
|
||||
public static Block barricadeOak;
|
||||
public static Block barricadeSpruce;
|
||||
public static Block barricadeBirch;
|
||||
public static Block barricadeJungle;
|
||||
public static Block slimeExplosive;
|
||||
|
||||
// InfiBlocks
|
||||
public static Block speedBlock;
|
||||
public static Block clearGlass;
|
||||
// public static Block stainedGlass;
|
||||
public static Block stainedGlassClear;
|
||||
public static Block glassPane;
|
||||
// public static Block stainedGlassPane;
|
||||
public static Block stainedGlassClearPane;
|
||||
public static Block glassMagicSlab;
|
||||
public static Block stainedGlassMagicSlab;
|
||||
public static Block stainedGlassClearMagicSlab;
|
||||
|
||||
// Liquids
|
||||
public static Material liquidMetal;
|
||||
|
||||
public static Fluid moltenIronFluid;
|
||||
public static Fluid moltenGoldFluid;
|
||||
public static Fluid moltenCopperFluid;
|
||||
public static Fluid moltenTinFluid;
|
||||
public static Fluid moltenAluminumFluid;
|
||||
public static Fluid moltenCobaltFluid;
|
||||
public static Fluid moltenArditeFluid;
|
||||
public static Fluid moltenBronzeFluid;
|
||||
public static Fluid moltenAlubrassFluid;
|
||||
public static Fluid moltenManyullynFluid;
|
||||
public static Fluid moltenAlumiteFluid;
|
||||
public static Fluid moltenObsidianFluid;
|
||||
public static Fluid moltenSteelFluid;
|
||||
public static Fluid moltenGlassFluid;
|
||||
public static Fluid moltenStoneFluid;
|
||||
public static Fluid moltenEmeraldFluid;
|
||||
public static Fluid bloodFluid;
|
||||
public static Fluid moltenNickelFluid;
|
||||
public static Fluid moltenLeadFluid;
|
||||
public static Fluid moltenSilverFluid;
|
||||
public static Fluid moltenShinyFluid;
|
||||
public static Fluid moltenInvarFluid;
|
||||
public static Fluid moltenElectrumFluid;
|
||||
public static Fluid moltenEnderFluid;
|
||||
public static Fluid blueSlimeFluid;
|
||||
public static Fluid pigIronFluid;
|
||||
|
||||
public static Block moltenIron;
|
||||
public static Block moltenGold;
|
||||
public static Block moltenCopper;
|
||||
public static Block moltenTin;
|
||||
public static Block moltenAluminum;
|
||||
public static Block moltenCobalt;
|
||||
public static Block moltenArdite;
|
||||
public static Block moltenBronze;
|
||||
public static Block moltenAlubrass;
|
||||
public static Block moltenManyullyn;
|
||||
public static Block moltenAlumite;
|
||||
public static Block moltenObsidian;
|
||||
public static Block moltenSteel;
|
||||
public static Block moltenGlass;
|
||||
public static Block moltenStone;
|
||||
public static Block moltenEmerald;
|
||||
public static Block blood;
|
||||
public static Block moltenNickel;
|
||||
public static Block moltenLead;
|
||||
public static Block moltenSilver;
|
||||
public static Block moltenShiny;
|
||||
public static Block moltenInvar;
|
||||
public static Block moltenElectrum;
|
||||
public static Block moltenEnder;
|
||||
|
||||
// Slime
|
||||
public static SoundType slimeStep;
|
||||
public static Block slimePool;
|
||||
public static Block slimeGel;
|
||||
public static Block slimeGrass;
|
||||
public static Block slimeTallGrass;
|
||||
public static SlimeLeaves slimeLeaves;
|
||||
public static SlimeSapling slimeSapling;
|
||||
|
||||
public static Block slimeChannel;
|
||||
public static Block slimePad;
|
||||
public static Block bloodChannel;
|
||||
|
||||
// Glue
|
||||
public static Fluid glueFluid;
|
||||
public static Block glueFluidBlock;
|
||||
|
||||
// Ores
|
||||
public static Block oreSlag;
|
||||
public static Block oreGravel;
|
||||
public static OreberryBush oreBerry;
|
||||
public static OreberryBush oreBerrySecond;
|
||||
public static Item oreBerries;
|
||||
|
||||
// Tool modifiers
|
||||
public static ModFlux modFlux;
|
||||
public static ModLapis modLapis;
|
||||
public static ModAttack modAttack;
|
||||
|
||||
public static Item creativeModifier;
|
||||
|
||||
// Wearables
|
||||
public static Item heavyHelmet;
|
||||
public static Item heavyChestplate;
|
||||
public static Item heavyPants;
|
||||
public static Item heavyBoots;
|
||||
public static Item glove;
|
||||
public static Item knapsack;
|
||||
|
||||
public static Item heartCanister;
|
||||
public static Item goldHead;
|
||||
|
||||
// Rail-related
|
||||
public static Block woodenRail;
|
||||
|
||||
// Chest hooks
|
||||
public static ChestGenHooks tinkerHouseChest;
|
||||
public static ChestGenHooks tinkerHousePatterns;
|
||||
|
||||
// Armor - basic
|
||||
public static Item helmetWood;
|
||||
public static Item chestplateWood;
|
||||
public static Item leggingsWood;
|
||||
public static Item bootsWood;
|
||||
public static ArmorMaterial materialWood;
|
||||
|
||||
// Armor - exosuit
|
||||
public static Item exoGoggles;
|
||||
public static Item exoChest;
|
||||
public static Item exoPants;
|
||||
public static Item exoShoes;
|
||||
|
||||
public static Fluid[] fluids = new Fluid[27];
|
||||
public static Block[] fluidBlocks = new Block[26];
|
||||
|
||||
// recipe stuff
|
||||
public static boolean thaumcraftAvailable;
|
||||
public static boolean initRecipes;
|
||||
public static Item[] patternOutputs;
|
||||
public static FluidStack[] liquids;
|
||||
|
||||
}
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.items.blocks;
|
||||
package tconstruct.common.itemblocks;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
@@ -1,48 +0,0 @@
|
||||
package tconstruct.entity;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
|
||||
|
||||
public class FakeBlockEntity extends Entity implements IEntityAdditionalSpawnData
|
||||
{
|
||||
|
||||
public FakeBlockEntity(World world)
|
||||
{
|
||||
super(world);
|
||||
preventEntitySpawning = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void entityInit ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void readEntityFromNBT (NBTTagCompound var1)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void writeEntityToNBT (NBTTagCompound var1)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeSpawnData (ByteBuf buffer)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readSpawnData (ByteBuf additionalData)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -10,9 +10,9 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -73,13 +73,13 @@ public class Arrow extends ToolCore
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.arrowhead;
|
||||
return TinkerTools.arrowhead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.fletching;
|
||||
return TinkerTools.fletching;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -105,7 +105,7 @@ public class Arrow extends ToolCore
|
||||
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, 3), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, "");
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
if (!TinkerTools.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
|
||||
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
|
||||
@@ -128,9 +128,9 @@ public class Arrow extends ToolCore
|
||||
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
if (!TinkerTools.supressMissingToolLogs)
|
||||
{
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
if (!TinkerTools.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warn("Creative builder failed tool for Vanilla style" + this.getToolName());
|
||||
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -61,7 +61,7 @@ public class BattleSign extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.signHead;
|
||||
return TinkerTools.signHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,11 +15,11 @@ import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -57,25 +57,25 @@ public class Battleaxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.broadAxeHead;
|
||||
return TinkerTools.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.broadAxeHead;
|
||||
return TinkerTools.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TRepo.toughBinding;
|
||||
return TinkerTools.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,11 +22,11 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
|
||||
import net.minecraftforge.event.entity.player.ArrowNockEvent;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.entity.ArrowEntity;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -65,7 +65,7 @@ public abstract class BowBase extends ToolCore
|
||||
time = event.charge;
|
||||
|
||||
boolean creative = player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
|
||||
int slotID = getInventorySlotContainItem(TRepo.arrow, player.inventory);
|
||||
int slotID = getInventorySlotContainItem(TinkerTools.arrow, player.inventory);
|
||||
int arrowID = getInventorySlotContainItem(Items.arrow, player.inventory);
|
||||
int arrowState = 0;
|
||||
ItemStack tinkerArrow = null;
|
||||
@@ -151,7 +151,7 @@ public abstract class BowBase extends ToolCore
|
||||
// if (tinkerArrow != null)
|
||||
if (slotID != -1 && (arrowID == -1 || slotID < arrowID))
|
||||
{
|
||||
player.inventory.consumeInventoryItem(TRepo.arrow);
|
||||
player.inventory.consumeInventoryItem(TinkerTools.arrow);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -222,7 +222,7 @@ public abstract class BowBase extends ToolCore
|
||||
return event.result;
|
||||
}
|
||||
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TRepo.arrow)))
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItemStack(new ItemStack(Items.arrow)) || player.inventory.hasItemStack(new ItemStack(TinkerTools.arrow)))
|
||||
{
|
||||
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
|
||||
}
|
||||
@@ -773,7 +773,7 @@ public abstract class BowBase extends ToolCore
|
||||
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, 0), accessoryStack, extraStack, name + getToolName());
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
if (!TinkerTools.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
|
||||
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
|
||||
public class Broadsword extends Weapon
|
||||
{
|
||||
@@ -15,13 +15,13 @@ public class Broadsword extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.swordBlade;
|
||||
return TinkerTools.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.wideGuard;
|
||||
return TinkerTools.wideGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,10 +12,10 @@ import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.MovingObjectPosition.MovingObjectType;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.Detailing.DetailInput;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -213,7 +213,7 @@ public class Chisel extends ToolCore
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.chiselHead;
|
||||
return TinkerTools.chiselHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,9 +7,9 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -25,25 +25,25 @@ public class Cleaver extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.largeSwordBlade;
|
||||
return TinkerTools.largeSwordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.largePlate;
|
||||
return TinkerTools.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
|
||||
public class Cutlass extends Weapon
|
||||
{
|
||||
@@ -15,13 +15,13 @@ public class Cutlass extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.swordBlade;
|
||||
return TinkerTools.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.fullGuard;
|
||||
return TinkerTools.fullGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,9 +5,9 @@ import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.entity.DaggerEntity;
|
||||
|
||||
public class Dagger extends Weapon
|
||||
{
|
||||
@@ -101,12 +101,12 @@ public class Dagger extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.knifeBlade;
|
||||
return TinkerTools.knifeBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.crossbar;
|
||||
return TinkerTools.crossbar;
|
||||
}
|
||||
}
|
||||
@@ -9,11 +9,11 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -42,25 +42,25 @@ public class Excavator extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.excavatorHead;
|
||||
return TinkerTools.excavatorHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.largePlate;
|
||||
return TinkerTools.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TRepo.toughBinding;
|
||||
return TinkerTools.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,11 +12,11 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.blocks.logic.EquipLogic;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.logic.EquipLogic;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -125,14 +125,14 @@ public class FryingPan extends Weapon
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z))
|
||||
else if (!TinkerTools.heldItemBlock.canPlaceBlockAt(world, x, y, z))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
world.setBlock(x, y, z, TRepo.heldItemBlock, 0, 3);
|
||||
TRepo.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
world.setBlock(x, y, z, TinkerTools.heldItemBlock, 0, 3);
|
||||
TinkerTools.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
world.playSoundEffect(x, y, z, "tinker:frypan_hit", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 0.65F);
|
||||
|
||||
EquipLogic logic = (EquipLogic) world.getTileEntity(x, y, z);
|
||||
@@ -147,7 +147,7 @@ public class FryingPan extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.frypanHead;
|
||||
return TinkerTools.frypanHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -14,12 +14,12 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -73,25 +73,25 @@ public class Hammer extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.hammerHead;
|
||||
return TinkerTools.hammerHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.largePlate;
|
||||
return TinkerTools.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TRepo.largePlate;
|
||||
return TinkerTools.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,9 +6,9 @@ import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -50,7 +50,7 @@ public class Hatchet extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.hatchetHead;
|
||||
return TinkerTools.hatchetHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -8,8 +8,8 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -102,13 +102,13 @@ public class Longsword extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.swordBlade;
|
||||
return TinkerTools.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.handGuard;
|
||||
return TinkerTools.handGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -9,11 +9,11 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -324,25 +324,25 @@ public class LumberAxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.broadAxeHead;
|
||||
return TinkerTools.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.largePlate;
|
||||
return TinkerTools.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TRepo.toughBinding;
|
||||
return TinkerTools.toughBinding;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -9,10 +9,10 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.DualHarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
|
||||
public class Mattock extends DualHarvestTool
|
||||
@@ -59,13 +59,13 @@ public class Mattock extends DualHarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.hatchetHead;
|
||||
return TinkerTools.hatchetHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.shovelHead;
|
||||
return TinkerTools.shovelHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -128,7 +128,7 @@ public class Mattock extends DualHarvestTool
|
||||
ItemStack tool = ToolBuilder.instance.buildTool(new ItemStack(getHeadItem(), 1, id), new ItemStack(getHandleItem(), 1, id), accessoryStack, extraStack, name + getToolName());
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
if (!TinkerTools.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warn("Creative builder failed tool for " + name + this.getToolName());
|
||||
TConstruct.logger.warn("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -2,8 +2,8 @@ package tconstruct.items.tools;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
|
||||
public class Pickaxe extends HarvestTool
|
||||
{
|
||||
@@ -30,13 +30,13 @@ public class Pickaxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.pickaxeHead;
|
||||
return TinkerTools.pickaxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.binding;
|
||||
return TinkerTools.binding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,7 +15,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.entity.projectile.LaunchedPotion;
|
||||
import tconstruct.tools.entity.LaunchedPotion;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
|
||||
public class Rapier extends Weapon
|
||||
{
|
||||
@@ -75,13 +75,13 @@ public class Rapier extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.swordBlade;
|
||||
return TinkerTools.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.crossbar;
|
||||
return TinkerTools.crossbar;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,11 +19,11 @@ import net.minecraft.stats.StatList;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.IShearable;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -52,25 +52,25 @@ public class Scythe extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.scytheBlade;
|
||||
return TinkerTools.scytheBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.toughBinding;
|
||||
return TinkerTools.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TRepo.toughRod;
|
||||
return TinkerTools.toughRod;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -55,19 +55,19 @@ public class Shortbow extends BowBase
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.toolRod;
|
||||
return TinkerTools.toolRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TRepo.bowstring;
|
||||
return TinkerTools.bowstring;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TRepo.toolRod;
|
||||
return TinkerTools.toolRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,8 +2,8 @@ package tconstruct.items.tools;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -32,7 +32,7 @@ public class Shovel extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TRepo.shovelHead;
|
||||
return TinkerTools.shovelHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,66 +4,67 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
|
||||
public enum FluidType
|
||||
{
|
||||
/** Vanilla Water Smelting **/
|
||||
Water(Blocks.snow, 0, 20, FluidRegistry.getFluid("water"), false),
|
||||
/** Iron Smelting **/
|
||||
Iron(Blocks.iron_block, 0, 600, TRepo.moltenIronFluid, true),
|
||||
Iron(Blocks.iron_block, 0, 600, TinkerSmeltery.moltenIronFluid, true),
|
||||
/** Gold Smelting **/
|
||||
Gold(Blocks.gold_block, 0, 400, TRepo.moltenGoldFluid, false),
|
||||
Gold(Blocks.gold_block, 0, 400, TinkerSmeltery.moltenGoldFluid, false),
|
||||
/** Tin Smelting **/
|
||||
Tin(TRepo.metalBlock, 5, 400, TRepo.moltenTinFluid, false),
|
||||
Tin(TinkerSmeltery.metalBlock, 5, 400, TinkerSmeltery.moltenTinFluid, false),
|
||||
/** Copper Smelting **/
|
||||
Copper(TRepo.metalBlock, 3, 550, TRepo.moltenCopperFluid, true),
|
||||
Copper(TinkerSmeltery.metalBlock, 3, 550, TinkerSmeltery.moltenCopperFluid, true),
|
||||
/** Aluminum Smelting **/
|
||||
Aluminum(TRepo.metalBlock, 6, 350, TRepo.moltenAluminumFluid, false),
|
||||
Aluminum(TinkerSmeltery.metalBlock, 6, 350, TinkerSmeltery.moltenAluminumFluid, false),
|
||||
/** Natural Aluminum Smelting **/
|
||||
NaturalAluminum(TRepo.oreSlag, 6, 350, TRepo.moltenAluminumFluid, false),
|
||||
NaturalAluminum(TinkerWorld.oreSlag, 6, 350, TinkerSmeltery.moltenAluminumFluid, false),
|
||||
/** Cobalt Smelting **/
|
||||
Cobalt(TRepo.metalBlock, 0, 650, TRepo.moltenCobaltFluid, true),
|
||||
Cobalt(TinkerSmeltery.metalBlock, 0, 650, TinkerSmeltery.moltenCobaltFluid, true),
|
||||
/** Ardite Smelting **/
|
||||
Ardite(TRepo.metalBlock, 1, 650, TRepo.moltenArditeFluid, true),
|
||||
Ardite(TinkerSmeltery.metalBlock, 1, 650, TinkerSmeltery.moltenArditeFluid, true),
|
||||
/** AluminumBrass Smelting **/
|
||||
AluminumBrass(TRepo.metalBlock, 7, 350, TRepo.moltenAlubrassFluid, false),
|
||||
AluminumBrass(TinkerSmeltery.metalBlock, 7, 350, TinkerSmeltery.moltenAlubrassFluid, false),
|
||||
/** Alumite Smelting **/
|
||||
Alumite(TRepo.metalBlock, 8, 800, TRepo.moltenAlumiteFluid, true),
|
||||
Alumite(TinkerSmeltery.metalBlock, 8, 800, TinkerSmeltery.moltenAlumiteFluid, true),
|
||||
/** Manyullyn Smelting **/
|
||||
Manyullyn(TRepo.metalBlock, 2, 750, TRepo.moltenManyullynFluid, true),
|
||||
Manyullyn(TinkerSmeltery.metalBlock, 2, 750, TinkerSmeltery.moltenManyullynFluid, true),
|
||||
/** Bronze Smelting **/
|
||||
Bronze(TRepo.metalBlock, 4, 500, TRepo.moltenBronzeFluid, true),
|
||||
Bronze(TinkerSmeltery.metalBlock, 4, 500, TinkerSmeltery.moltenBronzeFluid, true),
|
||||
/** Steel Smelting **/
|
||||
Steel(TRepo.metalBlock, 9, 700, TRepo.moltenSteelFluid, true),
|
||||
Steel(TinkerSmeltery.metalBlock, 9, 700, TinkerSmeltery.moltenSteelFluid, true),
|
||||
/** Nickel Smelting **/
|
||||
Nickel(TRepo.metalBlock, 0, 400, TRepo.moltenNickelFluid, false),
|
||||
Nickel(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenNickelFluid, false),
|
||||
/** Lead Smelting **/
|
||||
Lead(TRepo.metalBlock, 0, 400, TRepo.moltenLeadFluid, false),
|
||||
Lead(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenLeadFluid, false),
|
||||
/** Silver Smelting **/
|
||||
Silver(TRepo.metalBlock, 0, 400, TRepo.moltenSilverFluid, false),
|
||||
Silver(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenSilverFluid, false),
|
||||
/** Platinum Smelting **/
|
||||
Platinum(TRepo.metalBlock, 0, 400, TRepo.moltenShinyFluid, false),
|
||||
Platinum(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenShinyFluid, false),
|
||||
/** Invar Smelting **/
|
||||
Invar(TRepo.metalBlock, 0, 400, TRepo.moltenInvarFluid, false),
|
||||
Invar(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenInvarFluid, false),
|
||||
/** Electrum Smelting **/
|
||||
Electrum(TRepo.metalBlock, 0, 400, TRepo.moltenElectrumFluid, false),
|
||||
Electrum(TinkerSmeltery.metalBlock, 0, 400, TinkerSmeltery.moltenElectrumFluid, false),
|
||||
/** Obsidian Smelting **/
|
||||
Obsidian(Blocks.obsidian, 0, 750, TRepo.moltenObsidianFluid, true),
|
||||
Obsidian(Blocks.obsidian, 0, 750, TinkerSmeltery.moltenObsidianFluid, true),
|
||||
/** Ender Smelting **/
|
||||
Ender(TRepo.metalBlock, 10, 500, TRepo.moltenEnderFluid, false),
|
||||
Ender(TinkerSmeltery.metalBlock, 10, 500, TinkerSmeltery.moltenEnderFluid, false),
|
||||
/** Glass Smelting **/
|
||||
Glass(Blocks.sand, 0, 625, TRepo.moltenGlassFluid, false),
|
||||
Glass(Blocks.sand, 0, 625, TinkerSmeltery.moltenGlassFluid, false),
|
||||
/** Stone Smelting **/
|
||||
Stone(Blocks.stone, 0, 800, TRepo.moltenStoneFluid, true),
|
||||
Stone(Blocks.stone, 0, 800, TinkerSmeltery.moltenStoneFluid, true),
|
||||
/** Emerald Smelting **/
|
||||
Emerald(Blocks.emerald_ore, 0, 575, TRepo.moltenEmeraldFluid, false),
|
||||
Emerald(Blocks.emerald_ore, 0, 575, TinkerSmeltery.moltenEmeraldFluid, false),
|
||||
/** Slime Smelting **/
|
||||
Slime(TRepo.slimeGel, 0, 250, TRepo.blueSlimeFluid, false),
|
||||
Slime(TinkerWorld.slimeGel, 0, 250, TinkerWorld.blueSlimeFluid, false),
|
||||
/** Pigiron Smelting **/
|
||||
PigIron(TRepo.meatBlock, 0, 610, TRepo.pigIronFluid, true),
|
||||
PigIron(TinkerWorld.meatBlock, 0, 610, TinkerSmeltery.pigIronFluid, true),
|
||||
/** Glue Smelting **/
|
||||
Glue(TRepo.glueBlock, 0, 125, TRepo.glueFluid, false);
|
||||
Glue(TinkerSmeltery.glueBlock, 0, 125, TinkerSmeltery.glueFluid, false);
|
||||
|
||||
public final Block renderBlock;
|
||||
public final int renderMeta;
|
||||
|
||||
@@ -22,10 +22,10 @@ import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import tconstruct.entity.FancyEntityItem;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.tools.entity.FancyEntityItem;
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
package tconstruct.mechworks;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
|
||||
import tconstruct.armor.TinkerArmor;
|
||||
import tconstruct.blocks.SlabBase;
|
||||
import tconstruct.blocks.logic.DryingRackLogic;
|
||||
import tconstruct.blocks.slime.SlimeFluid;
|
||||
import tconstruct.blocks.slime.SlimeGel;
|
||||
import tconstruct.blocks.slime.SlimeGrass;
|
||||
import tconstruct.blocks.slime.SlimeLeaves;
|
||||
import tconstruct.blocks.slime.SlimeSapling;
|
||||
import tconstruct.blocks.slime.SlimeTallGrass;
|
||||
import tconstruct.blocks.traps.BarricadeBlock;
|
||||
import tconstruct.blocks.traps.Punji;
|
||||
import tconstruct.client.StepSoundSlime;
|
||||
import tconstruct.common.itemblocks.MetadataItemBlock;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.mechworks.blocks.BlockLandmine;
|
||||
import tconstruct.mechworks.itemblocks.ItemBlockLandmine;
|
||||
import tconstruct.mechworks.logic.TileEntityLandmine;
|
||||
import tconstruct.smeltery.TinkerSmeltery;
|
||||
import tconstruct.smeltery.blocks.MetalOre;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.tools.blocks.MultiBrick;
|
||||
import tconstruct.tools.blocks.MultiBrickFancy;
|
||||
import tconstruct.tools.itemblocks.MultiBrickFancyItem;
|
||||
import tconstruct.tools.itemblocks.MultiBrickItem;
|
||||
import tconstruct.world.TinkerWorld;
|
||||
import tconstruct.world.blocks.ConveyorBase;
|
||||
import tconstruct.world.blocks.GravelOre;
|
||||
import tconstruct.world.blocks.MeatBlock;
|
||||
import tconstruct.world.blocks.OreberryBush;
|
||||
import tconstruct.world.blocks.OreberryBushEssence;
|
||||
import tconstruct.world.blocks.SlimeExplosive;
|
||||
import tconstruct.world.blocks.SlimePad;
|
||||
import tconstruct.world.blocks.StoneLadder;
|
||||
import tconstruct.world.blocks.StoneTorch;
|
||||
import tconstruct.world.blocks.WoodRail;
|
||||
import tconstruct.world.itemblocks.BarricadeItem;
|
||||
import tconstruct.world.itemblocks.GravelOreItem;
|
||||
import tconstruct.world.itemblocks.HamboneItemBlock;
|
||||
import tconstruct.world.itemblocks.MetalOreItemBlock;
|
||||
import tconstruct.world.itemblocks.OreberryBushItem;
|
||||
import tconstruct.world.itemblocks.OreberryBushSecondItem;
|
||||
import tconstruct.world.itemblocks.SlimeGelItemBlock;
|
||||
import tconstruct.world.itemblocks.SlimeGrassItemBlock;
|
||||
import tconstruct.world.itemblocks.SlimeLeavesItemBlock;
|
||||
import tconstruct.world.itemblocks.SlimeSaplingItemBlock;
|
||||
import tconstruct.world.itemblocks.SlimeTallGrassItem;
|
||||
import tconstruct.world.itemblocks.WoolSlab1Item;
|
||||
import tconstruct.world.itemblocks.WoolSlab2Item;
|
||||
import tconstruct.world.items.OreBerries;
|
||||
import tconstruct.world.items.StrangeFood;
|
||||
import cpw.mods.fml.common.Mod;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
@Mod(modid = "TinkerMechworks", name = "TinkerMechworks", version = "${tinkermechworksversion}")
|
||||
public class TinkerMechworks
|
||||
{
|
||||
|
||||
@EventHandler
|
||||
public void preInit (FMLPreInitializationEvent event)
|
||||
{
|
||||
// Traps
|
||||
GameRegistry.registerBlock(TinkerWorld.landmine, ItemBlockLandmine.class, "Redstone.Landmine");
|
||||
GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine");
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void init (FMLInitializationEvent event)
|
||||
{
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void postInit (FMLPostInitializationEvent evt)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
+5
-5
@@ -1,4 +1,4 @@
|
||||
package tconstruct.blocks;
|
||||
package tconstruct.mechworks.blocks;
|
||||
|
||||
import static net.minecraftforge.common.util.ForgeDirection.DOWN;
|
||||
import static net.minecraftforge.common.util.ForgeDirection.EAST;
|
||||
@@ -37,11 +37,11 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.LandmineExplodeLogic;
|
||||
import tconstruct.blocks.logic.TileEntityLandmine;
|
||||
import tconstruct.client.block.RenderLandmine;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.util.landmine.Helper;
|
||||
import tconstruct.mechworks.landmine.Helper;
|
||||
import tconstruct.mechworks.logic.LandmineExplodeLogic;
|
||||
import tconstruct.mechworks.logic.TileEntityLandmine;
|
||||
import tconstruct.world.model.RenderLandmine;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package tconstruct.entity.item;
|
||||
package tconstruct.mechworks.entity.item;
|
||||
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
Loaded 100 of 370 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user