mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-18 11:29:29 +00:00
TContent refactor Part 1
This commit is contained in:
1 parent
241bfcf0d5
commit
1a74c0768f
77 files changed
+1884
-5647
No files matched your search
@@ -143,11 +143,10 @@ public class TConstruct
|
||||
MinecraftForge.EVENT_BUS.register(new EventCloakRender());
|
||||
}
|
||||
|
||||
content.intermodCommunication();
|
||||
TwilightForestConfig.initProps(PHConstruct.cfglocation);
|
||||
BOPConfig.initProps(PHConstruct.cfglocation);
|
||||
DimensionBlacklist.getbaddimensions();
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0));
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TRepo.slimePool.blockID, 0));
|
||||
|
||||
PluginController.getController().init();
|
||||
|
||||
|
||||
@@ -1,198 +0,0 @@
|
||||
package tconstruct;
|
||||
|
||||
import tconstruct.achievements.TAchievements;
|
||||
|
||||
import cpw.mods.fml.common.*;
|
||||
import cpw.mods.fml.common.Mod.EventHandler;
|
||||
import cpw.mods.fml.common.Mod.Instance;
|
||||
import cpw.mods.fml.common.event.*;
|
||||
import cpw.mods.fml.common.network.*;
|
||||
import cpw.mods.fml.common.registry.*;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import java.util.logging.Logger;
|
||||
import net.minecraft.crash.CallableMinecraftVersion;
|
||||
import net.minecraft.world.gen.structure.MapGenStructureIO;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import tconstruct.client.event.EventCloakRender;
|
||||
import tconstruct.common.*;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.*;
|
||||
import tconstruct.library.util.TabTools;
|
||||
import tconstruct.plugins.PluginController;
|
||||
import tconstruct.util.*;
|
||||
import tconstruct.util.config.*;
|
||||
import tconstruct.util.landmine.behavior.Behavior;
|
||||
import tconstruct.util.landmine.behavior.stackCombo.SpecialStackHandler;
|
||||
import tconstruct.util.player.TPlayerHandler;
|
||||
import tconstruct.worldgen.*;
|
||||
import tconstruct.worldgen.village.*;
|
||||
|
||||
/** TConstruct, the tool mod.
|
||||
* Craft your tools with style, then modify until the original is gone!
|
||||
* @author mDiyo
|
||||
*/
|
||||
|
||||
<<<<<<< HEAD:src/tconstruct/TConstruct.java
|
||||
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_1.5.1", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion")
|
||||
=======
|
||||
@Mod(modid = "TConstruct", name = "TConstruct", version = "1.6.X_2.0a", dependencies = "required-after:Forge@[8.9,);after:ForgeMultipart;after:MineFactoryReloaded;after:NotEnoughItems;after:Waila;after:ThermalExpansion")
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/TConstruct.java
|
||||
@NetworkMod(serverSideRequired = false, clientSideRequired = true, channels = { "TConstruct" }, packetHandler = tconstruct.util.network.TPacketHandler.class)
|
||||
public class TConstruct
|
||||
{
|
||||
/** The value of one ingot in millibuckets */
|
||||
public static final int ingotLiquidValue = 144;
|
||||
public static final int oreLiquidValue = ingotLiquidValue * 2;
|
||||
public static final int blockLiquidValue = ingotLiquidValue * 9;
|
||||
public static final int chunkLiquidValue = ingotLiquidValue / 2;
|
||||
public static final int nuggetLiquidValue = ingotLiquidValue / 9;
|
||||
|
||||
public static final int liquidUpdateAmount = 6;
|
||||
|
||||
// Shared mod logger
|
||||
public static final Logger logger = Logger.getLogger("TConstruct");
|
||||
|
||||
/* Instance of this mod, used for grabbing prototype fields */
|
||||
@Instance("TConstruct")
|
||||
public static TConstruct instance;
|
||||
/* Proxies for sides, used for graphics processing */
|
||||
@SidedProxy(clientSide = "tconstruct.client.TProxyClient", serverSide = "tconstruct.common.TProxyCommon")
|
||||
public static TProxyCommon proxy;
|
||||
|
||||
public TConstruct()
|
||||
{
|
||||
logger.setParent(FMLCommonHandler.instance().getFMLLogger());
|
||||
if (Loader.isModLoaded("Natura"))
|
||||
{
|
||||
TConstruct.logger.info("[TConstruct] Natura, what are we going to do tomorrow night?");
|
||||
TConstruct.logger.info("[Natura] TConstruct, we're going to take over the world!");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
TConstruct.logger.info("[TConstruct] Preparing to take over the world");
|
||||
}
|
||||
|
||||
EnvironmentChecks.verifyEnvironmentSanity();
|
||||
|
||||
PluginController.getController().registerBuiltins();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void preInit (FMLPreInitializationEvent event)
|
||||
{
|
||||
|
||||
PHConstruct.initProps(event.getModConfigurationDirectory());
|
||||
TConstructRegistry.materialTab = new TabTools("TConstructMaterials");
|
||||
TConstructRegistry.toolTab = new TabTools("TConstructTools");
|
||||
TConstructRegistry.blockTab = new TabTools("TConstructBlocks");
|
||||
|
||||
tableCasting = new LiquidCasting();
|
||||
basinCasting = new LiquidCasting();
|
||||
chiselDetailing = new Detailing();
|
||||
|
||||
content = new TContent();
|
||||
|
||||
events = new TEventHandler();
|
||||
MinecraftForge.EVENT_BUS.register(events);
|
||||
MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement());
|
||||
content.oreRegistry();
|
||||
|
||||
proxy.registerRenderer();
|
||||
proxy.addNames();
|
||||
proxy.readManuals();
|
||||
proxy.registerKeys();
|
||||
proxy.registerTickHandler();
|
||||
|
||||
GameRegistry.registerWorldGenerator(new TBaseWorldGenerator());
|
||||
MinecraftForge.TERRAIN_GEN_BUS.register(new TerrainGenEventHandler());
|
||||
GameRegistry.registerFuelHandler(content);
|
||||
GameRegistry.registerCraftingHandler(new TCraftingHandler());
|
||||
NetworkRegistry.instance().registerGuiHandler(instance, proxy);
|
||||
|
||||
if (PHConstruct.addToVillages)
|
||||
{
|
||||
// adds to the villager spawner egg
|
||||
VillagerRegistry.instance().registerVillagerId(78943);
|
||||
// moved down, not needed if 'addToVillages' is false
|
||||
VillagerRegistry.instance().registerVillageTradeHandler(78943, new TVillageTrades());
|
||||
VillagerRegistry.instance().registerVillageCreationHandler(new VillageToolStationHandler());
|
||||
VillagerRegistry.instance().registerVillageCreationHandler(new VillageSmelteryHandler());
|
||||
try
|
||||
{
|
||||
if (new CallableMinecraftVersion(null).minecraftVersion().equals("1.6.4"))
|
||||
{
|
||||
MapGenStructureIO.func_143031_a(ComponentToolWorkshop.class, "TConstruct:ToolWorkshopStructure");
|
||||
MapGenStructureIO.func_143031_a(ComponentSmeltery.class, "TConstruct:SmelteryStructure");
|
||||
}
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
playerTracker = new TPlayerHandler();
|
||||
GameRegistry.registerPlayerTracker(playerTracker);
|
||||
MinecraftForge.EVENT_BUS.register(playerTracker);
|
||||
|
||||
PluginController.getController().preInit();
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void init (FMLInitializationEvent event)
|
||||
{
|
||||
if (event.getSide() == Side.CLIENT)
|
||||
{
|
||||
MinecraftForge.EVENT_BUS.register(new EventCloakRender());
|
||||
}
|
||||
|
||||
content.intermodCommunication();
|
||||
TwilightForestConfig.initProps(PHConstruct.cfglocation);
|
||||
BOPConfig.initProps(PHConstruct.cfglocation);
|
||||
DimensionBlacklist.getbaddimensions();
|
||||
GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0));
|
||||
|
||||
PluginController.getController().init();
|
||||
|
||||
if(PHConstruct.achievementsEnabled){
|
||||
TAchievements.init();
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void postInit (FMLPostInitializationEvent evt)
|
||||
{
|
||||
proxy.postInit();
|
||||
Behavior.registerBuiltInBehaviors();
|
||||
SpecialStackHandler.registerBuiltInStackHandlers();
|
||||
content.modIntegration();
|
||||
content.addOreDictionarySmelteryRecipes();
|
||||
content.createEntities();
|
||||
content.modRecipes();
|
||||
|
||||
PluginController.getController().postInit();
|
||||
}
|
||||
|
||||
public static LiquidCasting getTableCasting ()
|
||||
{
|
||||
return tableCasting;
|
||||
}
|
||||
|
||||
public static LiquidCasting getBasinCasting ()
|
||||
{
|
||||
return basinCasting;
|
||||
}
|
||||
|
||||
public static Detailing getChiselDetailing ()
|
||||
{
|
||||
return chiselDetailing;
|
||||
}
|
||||
|
||||
public static TContent content;
|
||||
public static TEventHandler events;
|
||||
public static TPlayerHandler playerTracker;
|
||||
public static LiquidCasting tableCasting;
|
||||
public static LiquidCasting basinCasting;
|
||||
public static Detailing chiselDetailing;
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import tconstruct.blocks.logic.ToolForgeLogic;
|
||||
import tconstruct.blocks.logic.ToolStationLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.blocks.InventorySlab;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
@@ -142,9 +143,9 @@ public class CraftingSlab extends InventorySlab
|
||||
PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(x, y, z);
|
||||
for (int i = 1; i <= 13; i++)
|
||||
{
|
||||
logic.setInventorySlotContents(i - 1, new ItemStack(TContent.woodPattern, 1, i));
|
||||
logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i));
|
||||
}
|
||||
logic.setInventorySlotContents(13, new ItemStack(TContent.woodPattern, 1, 22));
|
||||
logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22));
|
||||
}
|
||||
}
|
||||
super.onBlockPlacedBy(world, x, y, z, entityliving, stack);
|
||||
|
||||
@@ -10,6 +10,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
|
||||
public class LiquidMetalFinite extends BlockFluidFinite
|
||||
@@ -20,7 +21,7 @@ public class LiquidMetalFinite extends BlockFluidFinite
|
||||
|
||||
public LiquidMetalFinite(int id, Fluid fluid, String texture)
|
||||
{
|
||||
super(id, fluid, TContent.liquidMetal);
|
||||
super(id, fluid, TRepo.liquidMetal);
|
||||
this.texture = texture;
|
||||
this.setCreativeTab(TConstructRegistry.blockTab);
|
||||
}
|
||||
|
||||
@@ -5,9 +5,9 @@ import java.util.Random;
|
||||
|
||||
import tconstruct.client.block.OreberryRender;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockLeavesBase;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -187,7 +187,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
if (meta >= 12)
|
||||
{
|
||||
world.setBlock(x, y, z, blockID, meta - 4, 3);
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, 1, meta % 4 + itemMeat));
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, 1, meta % 4 + itemMeat));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -206,7 +206,7 @@ public class OreberryBush extends BlockLeavesBase implements IPlantable
|
||||
return true;
|
||||
|
||||
world.setBlock(x, y, z, blockID, meta - 4, 3);
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat));
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.oreBerries, random.nextInt(3) + 1, meta % 4 + itemMeat));
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package tconstruct.blocks;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -34,11 +34,11 @@ public class SearedSlab extends SlabBase
|
||||
{
|
||||
meta = meta % 8;
|
||||
if (meta == 0)
|
||||
return TContent.smeltery.getIcon(side, 2);
|
||||
return TRepo.smeltery.getIcon(side, 2);
|
||||
if (meta <= 3)
|
||||
return TContent.smeltery.getIcon(side, meta + 3);
|
||||
return TRepo.smeltery.getIcon(side, meta + 3);
|
||||
|
||||
return TContent.smeltery.getIcon(side, meta + 4);
|
||||
return TRepo.smeltery.getIcon(side, meta + 4);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -13,6 +13,7 @@ import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.client.block.SlimePadRender;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -131,16 +132,16 @@ public class SlimePad extends Block
|
||||
@SideOnly(Side.CLIENT)
|
||||
public Icon getIcon (int side, int meta)
|
||||
{
|
||||
return TContent.slimeGel.getIcon(side, 1);
|
||||
return TRepo.slimeGel.getIcon(side, 1);
|
||||
}
|
||||
|
||||
public Icon getFluidIcon (int meta)
|
||||
{
|
||||
return TContent.slimeChannel.getIcon(2, 0);
|
||||
return TRepo.slimeChannel.getIcon(2, 0);
|
||||
}
|
||||
|
||||
public Icon getNubIcon (int meta)
|
||||
{
|
||||
return TContent.slimeGel.getIcon(0, 0);
|
||||
return TRepo.slimeGel.getIcon(0, 0);
|
||||
}
|
||||
}
|
||||
@@ -11,6 +11,7 @@ import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.ColorizerGrass;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -43,7 +44,7 @@ public class SoilSlab extends SlabBase
|
||||
case 2:
|
||||
return Block.mycelium.getIcon(1, 0);
|
||||
default:
|
||||
return TContent.craftedSoil.getIcon(side, meta - 3);
|
||||
return TRepo.craftedSoil.getIcon(side, meta - 3);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ package tconstruct.blocks;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -35,7 +35,7 @@ public class SpeedSlab extends SlabBase
|
||||
public Icon getIcon (int side, int meta)
|
||||
{
|
||||
meta = meta % 8;
|
||||
return TContent.speedBlock.getIcon(side, meta);
|
||||
return TRepo.speedBlock.getIcon(side, meta);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -10,9 +10,9 @@ import tconstruct.blocks.logic.ToolForgeLogic;
|
||||
import tconstruct.client.block.TableForgeRender;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TProxyCommon;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.blocks.InventoryBlock;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockFarmland;
|
||||
import net.minecraft.block.BlockHalfSlab;
|
||||
@@ -81,7 +81,7 @@ public class ToolForgeBlock extends InventoryBlock
|
||||
case 3:
|
||||
return Block.blockEmerald.getIcon(side, 0);
|
||||
default:
|
||||
return TContent.metalBlock.getIcon(side, meta - 4);
|
||||
return TRepo.metalBlock.getIcon(side, meta - 4);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -9,10 +9,10 @@ import tconstruct.blocks.logic.StencilTableLogic;
|
||||
import tconstruct.blocks.logic.ToolStationLogic;
|
||||
import tconstruct.client.block.TableRender;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.blocks.InventoryBlock;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -204,9 +204,9 @@ public class ToolStationBlock extends InventoryBlock
|
||||
PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(x, y, z);
|
||||
for (int i = 1; i <= 13; i++)
|
||||
{
|
||||
logic.setInventorySlotContents(i - 1, new ItemStack(TContent.woodPattern, 1, i));
|
||||
logic.setInventorySlotContents(i - 1, new ItemStack(TRepo.woodPattern, 1, i));
|
||||
}
|
||||
logic.setInventorySlotContents(13, new ItemStack(TContent.woodPattern, 1, 22));
|
||||
logic.setInventorySlotContents(13, new ItemStack(TRepo.woodPattern, 1, 22));
|
||||
}
|
||||
}
|
||||
super.onBlockPlacedBy(world, x, y, z, par5EntityLiving, par6ItemStack);
|
||||
|
||||
@@ -9,6 +9,7 @@ import net.minecraft.nbt.NBTTagIntArray;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.component.TankLayerScan;
|
||||
import tconstruct.library.util.CoordTuple;
|
||||
import tconstruct.library.util.IServantLogic;
|
||||
@@ -32,7 +33,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
protected boolean checkAir (int x, int y, int z)
|
||||
{
|
||||
Block block = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
if (block == null || block.isAirBlock(world, x, y, z) || block == TContent.tankAir)
|
||||
if (block == null || block.isAirBlock(world, x, y, z) || block == TRepo.tankAir)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
@@ -52,7 +53,7 @@ public class SmelteryScan extends TankLayerScan
|
||||
if (be instanceof IServantLogic)
|
||||
{
|
||||
boolean ret = ((IServantLogic) be).setPotentialMaster(this.imaster, this.world, x, y, z);
|
||||
if (ret && block == TContent.lavaTank)
|
||||
if (ret && block == TRepo.lavaTank)
|
||||
lavaTanks.add(new CoordTuple(x, y, z));
|
||||
return ret;
|
||||
}
|
||||
@@ -70,9 +71,9 @@ public class SmelteryScan extends TankLayerScan
|
||||
{
|
||||
for (CoordTuple coord : airCoords)
|
||||
{
|
||||
if (world.getBlockId(coord.x, coord.y, coord.z) != TContent.tankAir.blockID)
|
||||
if (world.getBlockId(coord.x, coord.y, coord.z) != TRepo.tankAir.blockID)
|
||||
{
|
||||
world.setBlock(coord.x, coord.y, coord.z, TContent.tankAir.blockID);
|
||||
world.setBlock(coord.x, coord.y, coord.z, TRepo.tankAir.blockID);
|
||||
IServantLogic servant = (IServantLogic) world.getBlockTileEntity(coord.x, coord.y, coord.z);
|
||||
servant.verifyMaster(imaster, world, master.xCoord, master.yCoord, master.zCoord);
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.component.SmelteryComponent;
|
||||
import tconstruct.blocks.component.SmelteryScan;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.inventory.AdaptiveSmelteryContainer;
|
||||
import tconstruct.library.blocks.AdaptiveInventoryLogic;
|
||||
import tconstruct.library.component.IComponentHolder;
|
||||
@@ -42,7 +43,7 @@ public class AdaptiveSmelteryLogic extends AdaptiveInventoryLogic implements IAc
|
||||
boolean updateFluids = false;
|
||||
boolean recheckStructure = false;
|
||||
boolean updateAir = false;
|
||||
SmelteryScan structure = new SmelteryScan(this, TContent.smeltery, TContent.lavaTank);
|
||||
SmelteryScan structure = new SmelteryScan(this, TRepo.smeltery, TRepo.lavaTank);
|
||||
MultiFluidTank multitank = new MultiFluidTank();
|
||||
SmelteryComponent smeltery = new SmelteryComponent(this, structure, multitank, 800);
|
||||
HashMap<CoordTuple, LiquidDataInstance> airUpdates = new HashMap<CoordTuple, LiquidDataInstance>();
|
||||
|
||||
@@ -31,6 +31,7 @@ import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import net.minecraftforge.fluids.IFluidTank;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.inventory.SmelteryContainer;
|
||||
import tconstruct.library.blocks.InventoryLogic;
|
||||
import tconstruct.library.crafting.Smeltery;
|
||||
@@ -320,7 +321,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
if (currentLiquid + 40 < maxLiquid)
|
||||
{
|
||||
int amount = villager.isChild() ? 5 : 40;
|
||||
this.fill(new FluidStack(TContent.moltenEmeraldFluid, amount), true);
|
||||
this.fill(new FluidStack(TRepo.moltenEmeraldFluid, amount), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -331,7 +332,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
{
|
||||
if (currentLiquid + 125 < maxLiquid)
|
||||
{
|
||||
this.fill(new FluidStack(TContent.moltenEnderFluid, 125), true);
|
||||
this.fill(new FluidStack(TRepo.moltenEnderFluid, 125), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -342,7 +343,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
{
|
||||
if (currentLiquid + 40 < maxLiquid)
|
||||
{
|
||||
this.fill(new FluidStack(TContent.moltenIronFluid, 40), true);
|
||||
this.fill(new FluidStack(TRepo.moltenIronFluid, 40), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -353,7 +354,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
{
|
||||
if (currentLiquid + 108 < maxLiquid)
|
||||
{
|
||||
this.fill(new FluidStack(TContent.glueFluid, 108), true);
|
||||
this.fill(new FluidStack(TRepo.glueFluid, 108), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -365,7 +366,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
if (currentLiquid + 40 < maxLiquid)
|
||||
{
|
||||
int amount = (living.isChild() || living instanceof EntityPlayer) ? 5 : 40;
|
||||
this.fill(new FluidStack(TContent.bloodFluid, amount), true);
|
||||
this.fill(new FluidStack(TRepo.bloodFluid, amount), true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -673,7 +674,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
//worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
//worldObj.markBlockForRenderUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
|
||||
|
||||
/*@Override
|
||||
public void setInventorySlotContents (int slot, ItemStack itemstack)
|
||||
{
|
||||
@@ -864,7 +865,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
Block block = Block.blocksList[blockID];
|
||||
if (block != null && !block.isAirBlock(worldObj, xPos, y, zPos))
|
||||
{
|
||||
if (blockID == TContent.smeltery.blockID)
|
||||
if (blockID == TRepo.smeltery.blockID)
|
||||
return validateBottom(x, y, z, count);
|
||||
else
|
||||
return count;
|
||||
@@ -899,7 +900,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
{
|
||||
for (int zPos = z - 1; zPos <= z + 1; zPos++)
|
||||
{
|
||||
if (worldObj.getBlockId(xPos, y, zPos) == TContent.smeltery.blockID && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2))
|
||||
if (worldObj.getBlockId(xPos, y, zPos) == TRepo.smeltery.blockID && (worldObj.getBlockMetadata(xPos, y, zPos) >= 2))
|
||||
bottomBricks++;
|
||||
}
|
||||
}
|
||||
@@ -919,7 +920,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci
|
||||
{
|
||||
int tempBricks = 0;
|
||||
int blockID = worldObj.getBlockId(x, y, z);
|
||||
if (blockID == TContent.smeltery.blockID || blockID == TContent.lavaTank.blockID)
|
||||
if (blockID == TRepo.smeltery.blockID || blockID == TRepo.lavaTank.blockID)
|
||||
{
|
||||
TileEntity te = worldObj.getBlockTileEntity(x, y, z);
|
||||
if (te == this)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package tconstruct.blocks.logic;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.inventory.PatternShaperContainer;
|
||||
import tconstruct.library.blocks.InventoryLogic;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
@@ -45,10 +46,10 @@ public class StencilTableLogic extends InventoryLogic implements ISidedInventory
|
||||
public void setInventorySlotContents (int slot, ItemStack itemstack)
|
||||
{
|
||||
super.setInventorySlotContents(slot, itemstack);
|
||||
if (slot == 0 && itemstack != null && itemstack.getItem() == TContent.blankPattern)//instanceof tconstruct.items.Pattern)
|
||||
if (slot == 0 && itemstack != null && itemstack.getItem() == TRepo.blankPattern)//instanceof tconstruct.items.Pattern)
|
||||
{
|
||||
if (itemstack.getItemDamage() == 0)
|
||||
setInventorySlotContents(1, new ItemStack(TContent.woodPattern, 1, 1));
|
||||
setInventorySlotContents(1, new ItemStack(TRepo.woodPattern, 1, 1));
|
||||
/*else if (itemstack.getItemDamage() == 1)
|
||||
setInventorySlotContents(1, new ItemStack(TContent.metalPattern, 1, 0));*/
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ import net.minecraftforge.common.EnumPlantType;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import net.minecraftforge.common.IPlantable;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -93,7 +94,7 @@ public class SlimeGrass extends Block
|
||||
|
||||
public void onPlantGrow (World world, int x, int y, int z, int sourceX, int sourceY, int sourceZ)
|
||||
{
|
||||
world.setBlock(x, y, z, TContent.craftedSoil.blockID, 5, 3);
|
||||
world.setBlock(x, y, z, TRepo.craftedSoil.blockID, 5, 3);
|
||||
}
|
||||
|
||||
public void updateTick (World par1World, int par2, int par3, int par4, Random par5Random)
|
||||
@@ -102,7 +103,7 @@ public class SlimeGrass extends Block
|
||||
{
|
||||
if (par1World.getBlockLightValue(par2, par3 + 1, par4) < 4 && par1World.getBlockLightOpacity(par2, par3 + 1, par4) > 2)
|
||||
{
|
||||
par1World.setBlock(par2, par3, par4, TContent.craftedSoil.blockID, 5, 3);
|
||||
par1World.setBlock(par2, par3, par4, TRepo.craftedSoil.blockID, 5, 3);
|
||||
}
|
||||
else if (par1World.getBlockLightValue(par2, par3 + 1, par4) >= 9)
|
||||
{
|
||||
@@ -122,7 +123,7 @@ public class SlimeGrass extends Block
|
||||
return;
|
||||
}
|
||||
int blockMeta = par1World.getBlockMetadata(posX, posY, posZ);
|
||||
if (blockID == TContent.craftedSoil.blockID)
|
||||
if (blockID == TRepo.craftedSoil.blockID)
|
||||
{
|
||||
if (blockMeta == 5)
|
||||
par1World.setBlock(posX, posY, posZ, this.blockID, 0, 3);
|
||||
@@ -136,7 +137,7 @@ public class SlimeGrass extends Block
|
||||
public int idDropped (int metadata, Random random, int fortune)
|
||||
{
|
||||
if (metadata == 1)
|
||||
return TContent.craftedSoil.blockID;
|
||||
return TRepo.craftedSoil.blockID;
|
||||
else
|
||||
return Block.dirt.blockID;
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import net.minecraft.util.Icon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -96,7 +97,7 @@ public class SlimeLeaves extends BlockLeaves
|
||||
*/
|
||||
public int idDropped (int par1, Random par2Random, int par3)
|
||||
{
|
||||
return TContent.slimeSapling.blockID;
|
||||
return TRepo.slimeSapling.blockID;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -143,7 +144,7 @@ public class SlimeLeaves extends BlockLeaves
|
||||
|
||||
if ((meta & 3) == 0 && world.rand.nextInt(dropChance) == 0)
|
||||
{
|
||||
this.dropBlockAsItem_do(world, x, y, z, new ItemStack(TContent.strangeFood, 1, 0));
|
||||
this.dropBlockAsItem_do(world, x, y, z, new ItemStack(TRepo.strangeFood, 1, 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import net.minecraft.util.Icon;
|
||||
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 cpw.mods.fml.relauncher.Side;
|
||||
@@ -47,7 +48,7 @@ public class SlimeSapling extends BlockSapling
|
||||
|
||||
public boolean canThisPlantGrowOnThisBlockID (int id)
|
||||
{
|
||||
return id == Block.grass.blockID || id == Block.dirt.blockID || id == TContent.slimeGrass.blockID || id == TContent.craftedSoil.blockID;
|
||||
return id == Block.grass.blockID || id == Block.dirt.blockID || id == TRepo.slimeGrass.blockID || id == TRepo.craftedSoil.blockID;
|
||||
}
|
||||
|
||||
public void updateTick (World world, int x, int y, int z, Random random)
|
||||
|
||||
@@ -19,6 +19,7 @@ import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.client.block.PunjiRender;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -59,7 +60,7 @@ public class Punji extends Block
|
||||
if (meta < 4)
|
||||
{
|
||||
ItemStack stack = player.getCurrentEquippedItem();
|
||||
if (stack != null && stack.itemID == TContent.punji.blockID)
|
||||
if (stack != null && stack.itemID == TRepo.punji.blockID)
|
||||
{
|
||||
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.getPlaceSound(),
|
||||
|
||||
@@ -2,7 +2,9 @@ package tconstruct.client;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.relauncher.*;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.audio.SoundManager;
|
||||
@@ -24,6 +26,7 @@ import net.minecraftforge.fluids.*;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.client.armor.WingModel;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.util.player.TPlayerStats;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@@ -77,11 +80,11 @@ public class TClientEvents
|
||||
{
|
||||
if (event.map.textureType == 0)
|
||||
{
|
||||
for (int i = 0; i < TContent.fluidBlocks.length; i++)
|
||||
for (int i = 0; i < TRepo.fluidBlocks.length; i++)
|
||||
{
|
||||
TContent.fluids[i].setIcons(TContent.fluidBlocks[i].getIcon(0, 0), TContent.fluidBlocks[i].getIcon(2, 0));
|
||||
TRepo.fluids[i].setIcons(TRepo.fluidBlocks[i].getIcon(0, 0), TRepo.fluidBlocks[i].getIcon(2, 0));
|
||||
}
|
||||
TContent.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]);
|
||||
TRepo.pigIronFluid.setIcons(stillIcons[0], flowIcons[0]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,7 +219,7 @@ public class TClientEvents
|
||||
GuiIngameForge.left_height += 10;
|
||||
if (absorb > 0)
|
||||
GuiIngameForge.left_height += 10;
|
||||
|
||||
|
||||
event.setCanceled(true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.common.ITickHandler;
|
||||
import cpw.mods.fml.common.TickType;
|
||||
|
||||
@@ -19,9 +20,9 @@ public class TClientTickHandler implements ITickHandler
|
||||
@Override
|
||||
public void tickEnd (EnumSet<TickType> type, Object... tickData)
|
||||
{
|
||||
TContent.oreBerry.setGraphicsLevel(Block.leaves.graphicsLevel);
|
||||
TContent.oreBerrySecond.setGraphicsLevel(Block.leaves.graphicsLevel);
|
||||
TContent.slimeLeaves.setGraphicsLevel(Block.leaves.graphicsLevel);
|
||||
TRepo.oreBerry.setGraphicsLevel(Block.leaves.graphicsLevel);
|
||||
TRepo.oreBerrySecond.setGraphicsLevel(Block.leaves.graphicsLevel);
|
||||
TRepo.slimeLeaves.setGraphicsLevel(Block.leaves.graphicsLevel);
|
||||
/*if (mc.thePlayer != null && !mc.thePlayer.isAirBorne)
|
||||
controlInstance.landOnGround();*/
|
||||
}
|
||||
|
||||
@@ -247,12 +247,12 @@ public class TProxyClient extends TProxyCommon
|
||||
// RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class,
|
||||
// new PlayerArmorRender()); // <-- Works, woo!
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(TRepo.shortbow.itemID, new CustomBowRenderer());
|
||||
VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png"));
|
||||
|
||||
ToolCoreRenderer renderer = new ToolCoreRenderer();
|
||||
MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TRepo.arrow.itemID, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TRepo.dagger.itemID, renderer);
|
||||
|
||||
addRenderMappings();
|
||||
addToolButtons();
|
||||
@@ -294,32 +294,32 @@ public class TProxyClient extends TProxyCommon
|
||||
|
||||
public void initManualIcons ()
|
||||
{
|
||||
TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TContent.manualBook, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TContent.smeltery));
|
||||
TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TContent.blankPattern, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TContent.searedBlock));
|
||||
TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TRepo.manualBook, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TRepo.smeltery));
|
||||
TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TRepo.blankPattern, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TRepo.searedBlock));
|
||||
// TConstructClientRegistry.registerManualIcon("liquidiron", new
|
||||
// ItemStack(TContent.liquidMetalStill));
|
||||
TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TContent.lavaTank));
|
||||
TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TContent.smeltery, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TContent.smeltery, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TContent.searedBlock, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TContent.materials, 1, 13));
|
||||
TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TContent.materials, 1, 14));
|
||||
TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TContent.materials, 1, 5));
|
||||
TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TContent.materials, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TContent.blankPattern, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TContent.toolStationWood, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TContent.toolStationWood, 1, 5));
|
||||
TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10));
|
||||
// ItemStack(TRepo.liquidMetalStill));
|
||||
TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TRepo.lavaTank));
|
||||
TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TRepo.smeltery, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TRepo.smeltery, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TRepo.searedBlock, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TRepo.materials, 1, 13));
|
||||
TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TRepo.materials, 1, 14));
|
||||
TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TRepo.materials, 1, 5));
|
||||
TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TRepo.materials, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TRepo.blankPattern, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5));
|
||||
TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10));
|
||||
TConstructClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood));
|
||||
TConstructClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling));
|
||||
TConstructClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench));
|
||||
TConstructClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TContent.materials, 1, 18));
|
||||
TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TContent.materials, 1, 7));
|
||||
TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TRepo.materials, 1, 18));
|
||||
TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TRepo.materials, 1, 7));
|
||||
|
||||
// Tool Materials
|
||||
TConstructClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks));
|
||||
@@ -330,93 +330,93 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone));
|
||||
TConstructClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack));
|
||||
TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TContent.materials, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TContent.materials, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TContent.materials, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TContent.materials, 1, 3));
|
||||
TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9));
|
||||
TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34));
|
||||
TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TRepo.materials, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TRepo.materials, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TRepo.materials, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TRepo.materials, 1, 3));
|
||||
TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TRepo.materials, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TRepo.materials, 1, 9));
|
||||
TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TRepo.materials, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TRepo.materials, 1, 34));
|
||||
|
||||
|
||||
// Tool parts
|
||||
TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.hatchetHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TContent.swordBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TContent.frypanHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("board", new ItemStack(TContent.signHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TContent.knifeBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TContent.chiselHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TRepo.pickaxeHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TRepo.shovelHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TRepo.hatchetHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TRepo.swordBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TRepo.frypanHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("board", new ItemStack(TRepo.signHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TRepo.knifeBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TRepo.chiselHead, 1, 2));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TContent.hammerHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TContent.excavatorHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TContent.scytheBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TContent.broadAxeHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TContent.largeSwordBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TRepo.hammerHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TRepo.excavatorHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TRepo.scytheBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TRepo.broadAxeHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TRepo.largeSwordBlade, 1, 2));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TContent.binding, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TContent.wideGuard, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TContent.handGuard, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TContent.crossbar, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TRepo.binding, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TRepo.wideGuard, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TRepo.handGuard, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TRepo.crossbar, 1, 4));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TContent.toughRod, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TContent.toughBinding, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.largePlate, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TRepo.toughRod, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TRepo.toughBinding, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TRepo.largePlate, 1, 17));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TRepo.bowstring, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TRepo.arrowhead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TRepo.fletching, 1, 0));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25));
|
||||
TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TContent.buckets, 1, 24));
|
||||
TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TContent.buckets, 1, 23));
|
||||
TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TRepo.buckets, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TRepo.buckets, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TRepo.buckets, 1, 25));
|
||||
TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TRepo.buckets, 1, 24));
|
||||
TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TRepo.buckets, 1, 23));
|
||||
|
||||
// ToolIcons
|
||||
TConstructClientRegistry.registerManualIcon("pickicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.binding, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.shovelHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.binding, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.shovelHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("mattockicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.hatchetHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.shovelHead, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("swordicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.wideGuard, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.wideGuard, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("longswordicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.handGuard, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.handGuard, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("rapiericon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("daggerIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.knifeBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.frypanHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.signHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.chiselHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.knifeBlade, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.crossbar, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.frypanHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.signHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TRepo.chiselHead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("shortbowIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.toolRod, 1, 10), new ItemStack(TRepo.bowstring, 1, 0), new ItemStack(TRepo.toolRod, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("arrowIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), ""));
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TRepo.arrowhead, 1, 10), new ItemStack(TRepo.toolRod, 1, 11), new ItemStack(TRepo.fletching, 1, 0), ""));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
|
||||
TContent.largePlate, 1, 12), new ItemStack(TContent.largePlate, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
|
||||
TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TContent.excavatorHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
|
||||
new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.scytheBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
|
||||
TContent.toughBinding, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.largeSwordBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
|
||||
new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
|
||||
new ItemStack(TContent.broadAxeHead, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
|
||||
TConstructClientRegistry.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), ""));
|
||||
TConstructClientRegistry.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), ""));
|
||||
TConstructClientRegistry.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), ""));
|
||||
TConstructClientRegistry.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), ""));
|
||||
TConstructClientRegistry.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), ""));
|
||||
TConstructClientRegistry.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), ""));
|
||||
}
|
||||
|
||||
public void initManualRecipes ()
|
||||
{
|
||||
ItemStack pattern = new ItemStack(TContent.blankPattern, 1, 0);
|
||||
ItemStack pattern = new ItemStack(TRepo.blankPattern, 1, 0);
|
||||
|
||||
ItemStack stick = new ItemStack(Item.stick, 1, 0);
|
||||
ItemStack plank = new ItemStack(Block.planks, 1, 0);
|
||||
@@ -434,47 +434,47 @@ public class TProxyClient extends TProxyCommon
|
||||
ItemStack glass = new ItemStack(Block.glass, 1, 0);
|
||||
ItemStack ironblock = new ItemStack(Block.blockIron, 1, 0);
|
||||
|
||||
ItemStack grout = new ItemStack(TContent.craftedSoil, 2, 1);
|
||||
ItemStack searedbrick = new ItemStack(TContent.materials, 1, 2);
|
||||
ItemStack searedbrickBlock = new ItemStack(TContent.smeltery, 1, 2);
|
||||
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 coal = new ItemStack(Item.coal);
|
||||
ItemStack paper = new ItemStack(Item.paper);
|
||||
ItemStack slimeball = new ItemStack(Item.slimeBall);
|
||||
ItemStack slimyMud = new ItemStack(TContent.craftedSoil);
|
||||
ItemStack slimyMud = new ItemStack(TRepo.craftedSoil);
|
||||
ItemStack blazerod = new ItemStack(Item.blazeRod);
|
||||
ItemStack firecharge = new ItemStack(Item.fireballCharge);
|
||||
ItemStack string = new ItemStack(Item.silk);
|
||||
|
||||
ItemStack silkyCloth = new ItemStack(TContent.materials, 1, 25);
|
||||
ItemStack silkyCloth = new ItemStack(TRepo.materials, 1, 25);
|
||||
|
||||
ItemStack graveyardsoil = new ItemStack(TContent.craftedSoil, 1, 3);
|
||||
ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4);
|
||||
ItemStack graveyardsoil = new ItemStack(TRepo.craftedSoil, 1, 3);
|
||||
ItemStack consecratedsoil = new ItemStack(TRepo.craftedSoil, 1, 4);
|
||||
|
||||
// TConstruct recipes
|
||||
TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TRepo.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TRepo.manualBook, 1, 1), new ItemStack(TRepo.manualBook, 1, 0), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TRepo.manualBook, 1, 2), new ItemStack(TRepo.manualBook, 1, 1), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TContent.toolStationWood, 1, 0), null, pattern, null, workbench);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1), null, pattern, null, log);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TContent.toolStationWood, 1, 5), null, pattern, null, chest);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10), null, pattern, null, plank);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TContent.slimeChannel, 1, 0), new ItemStack(TContent.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TContent.slimePad, 1, 0), new ItemStack(TContent.slimeChannel), new ItemStack(Item.slimeBall), null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TContent.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
|
||||
TContent.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TRepo.toolStationWood, 1, 0), null, pattern, null, workbench);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TRepo.toolStationWood, 1, 1), null, pattern, null, log);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TRepo.toolStationWood, 1, 5), null, pattern, null, chest);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TRepo.toolStationWood, 1, 10), null, pattern, null, plank);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TRepo.slimeChannel, 1, 0), new ItemStack(TRepo.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TRepo.slimePad, 1, 0), new ItemStack(TRepo.slimeChannel), new ItemStack(Item.slimeBall), null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TRepo.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
|
||||
TRepo.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand);
|
||||
TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TContent.materials, 1, 1), slimyMud);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TContent.materials, 1, 0), paper, paper, paper, paper);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TContent.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble,
|
||||
TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TRepo.materials, 1, 1), slimyMud);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TRepo.materials, 1, 0), paper, paper, paper, paper);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TRepo.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble,
|
||||
mossycobble, mossycobble, mossycobble);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TContent.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava),
|
||||
TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TRepo.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava),
|
||||
firecharge, blazerod, firecharge, blazerod);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TContent.materials, 1, 24), string, string, string, string);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TContent.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TRepo.materials, 1, 24), string, string, string, string);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TRepo.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null,
|
||||
silkyCloth, null);
|
||||
|
||||
TConstructClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null);
|
||||
@@ -482,63 +482,63 @@ public class TProxyClient extends TProxyCommon
|
||||
|
||||
TConstructClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay);
|
||||
TConstructClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TContent.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TContent.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TRepo.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TRepo.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TRepo.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null,
|
||||
null);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TRepo.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
searedbrick);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TRepo.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick,
|
||||
searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TContent.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TRepo.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass,
|
||||
searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TContent.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TRepo.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick,
|
||||
glass, searedbrick);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TContent.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TRepo.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
searedbrick, null, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TContent.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TRepo.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TRepo.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick,
|
||||
searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TRepo.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
searedbrick, searedbrick);
|
||||
|
||||
//Traps
|
||||
ItemStack reed = new ItemStack(Item.reed);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TRepo.punji), reed, null, reed, null, reed, null, reed, null, reed);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TRepo.barricadeOak), null, log, null, log);
|
||||
|
||||
//Machines
|
||||
ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14);
|
||||
ItemStack bronzeIngot = new ItemStack(TContent.materials, 1, 13);
|
||||
ItemStack blankCast = new ItemStack(TContent.blankPattern, 1, 1);
|
||||
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 redstone = new ItemStack(Item.redstone);
|
||||
|
||||
// Modifier recipes
|
||||
ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), "");
|
||||
ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TRepo.pickaxeHead, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.binding, 1, 6), "");
|
||||
TConstructClientRegistry.registerManualIcon("ironpick", ironpick);
|
||||
ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.handGuard, 1, 10), "");
|
||||
ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TRepo.swordBlade, 1, 6), new ItemStack(TRepo.toolRod, 1, 2), new ItemStack(TRepo.handGuard, 1, 10), "");
|
||||
TConstructClientRegistry.registerManualIcon("ironlongsword", ironlongsword);
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond));
|
||||
TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald));
|
||||
TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Item.redstone), new ItemStack(Block.blockRedstone));
|
||||
TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 7));
|
||||
TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 7));
|
||||
TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis));
|
||||
TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 6));
|
||||
TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TRepo.materials, 1, 6));
|
||||
TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz));
|
||||
TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder));
|
||||
TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TContent.materials, 1, 8));
|
||||
TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TContent.materials, 1, 26));
|
||||
TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.largePlate, 1, 6));
|
||||
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("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase));
|
||||
TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye));
|
||||
TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4));
|
||||
TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TRepo.craftedSoil, 1, 4));
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt));
|
||||
TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt));
|
||||
@@ -546,11 +546,11 @@ public class TProxyClient extends TProxyCommon
|
||||
TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold));
|
||||
TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar));
|
||||
|
||||
TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel));
|
||||
TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TContent.materials, 1, 36), new ItemStack(TContent.glueFluidBlock, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TRepo.speedBlock), new ItemStack(TRepo.moltenTin, 1), new ItemStack(Block.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(Block.whiteStone), new ItemStack(TRepo.moltenEnder, 1), new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TRepo.materials, 1, 36), new ItemStack(TRepo.glueFluidBlock, 1), null);
|
||||
|
||||
}
|
||||
|
||||
@@ -721,13 +721,13 @@ public class TProxyClient extends TProxyCommon
|
||||
String[] bowstringTypes = { "string", "magicfabric", "flamestring" };
|
||||
for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++)
|
||||
{
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
|
||||
}
|
||||
|
||||
String[] fletching = { "feather", "leaf", "slime", "blueslime" };
|
||||
for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++)
|
||||
{
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.arrow, arrowIter, "tinker", fletching[arrowIter], true);
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TRepo.arrow, arrowIter, "tinker", fletching[arrowIter], true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -929,7 +929,7 @@ public class TProxyClient extends TProxyCommon
|
||||
}
|
||||
else if (par1Str.equals("blueslime"))
|
||||
{
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TContent.strangeFood);
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TRepo.strangeFood);
|
||||
}
|
||||
else if (par1Str.equals("heart"))
|
||||
{
|
||||
@@ -966,7 +966,7 @@ public class TProxyClient extends TProxyCommon
|
||||
@Override
|
||||
public void postInit ()
|
||||
{
|
||||
//MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast());
|
||||
//MinecraftForgeClient.registerItemRenderer(TRepo.armorPattern.itemID, new RenderArmorCast());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,996 +0,0 @@
|
||||
package tconstruct.client;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import cpw.mods.fml.client.registry.*;
|
||||
import cpw.mods.fml.common.registry.*;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
import javax.xml.parsers.*;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.inventory.GuiInventory;
|
||||
import net.minecraft.client.model.ModelSlime;
|
||||
import net.minecraft.client.particle.*;
|
||||
import net.minecraft.client.renderer.*;
|
||||
import net.minecraft.client.renderer.entity.*;
|
||||
import net.minecraft.client.settings.*;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fluids.RenderBlockFluid;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.w3c.dom.Document;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.SlimeExplosive;
|
||||
import tconstruct.blocks.logic.*;
|
||||
import tconstruct.client.armor.RenderArmorCast;
|
||||
import tconstruct.client.block.*;
|
||||
import tconstruct.client.entity.*;
|
||||
import tconstruct.client.entity.item.ExplosiveRender;
|
||||
import tconstruct.client.entity.projectile.*;
|
||||
import tconstruct.client.gui.*;
|
||||
import tconstruct.client.pages.*;
|
||||
import tconstruct.client.tabs.*;
|
||||
import tconstruct.common.*;
|
||||
import tconstruct.entity.*;
|
||||
import tconstruct.entity.item.*;
|
||||
import tconstruct.entity.item.*;
|
||||
import tconstruct.entity.projectile.*;
|
||||
import tconstruct.inventory.ContainerLandmine;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.client.*;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import tconstruct.util.player.*;
|
||||
|
||||
public class TProxyClient extends TProxyCommon
|
||||
{
|
||||
public static SmallFontRenderer smallFontRenderer;
|
||||
public static Icon metalBall;
|
||||
public static Minecraft mc;
|
||||
public static RenderItem itemRenderer = new RenderItem();
|
||||
|
||||
public static ArmorExtended armorExtended = new ArmorExtended();
|
||||
public static KnapsackInventory knapsack = new KnapsackInventory();
|
||||
|
||||
@Override
|
||||
public Object getClientGuiElement (int ID, EntityPlayer player, World world, int x, int y, int z)
|
||||
{
|
||||
if (ID == toolStationID)
|
||||
return new ToolStationGui(player.inventory, (ToolStationLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
if (ID == partBuilderID)
|
||||
return new PartCrafterGui(player.inventory, (PartBuilderLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
if (ID == patternChestID)
|
||||
return new PatternChestGui(player.inventory, (PatternChestLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
if (ID == frypanGuiID)
|
||||
return new FrypanGui(player.inventory, (FrypanLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
if (ID == smelteryGuiID)
|
||||
{
|
||||
if (PHConstruct.newSmeltery)
|
||||
return new AdaptiveSmelteryGui(player.inventory, (AdaptiveSmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
else
|
||||
return new SmelteryGui(player.inventory, (SmelteryLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
}
|
||||
if (ID == stencilTableID)
|
||||
return new StencilTableGui(player.inventory, (StencilTableLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
if (ID == toolForgeID)
|
||||
return new ToolForgeGui(player.inventory, (ToolForgeLogic) world.getBlockTileEntity(x, y, z), world, x, y, z);
|
||||
|
||||
if (ID == landmineID)
|
||||
return new GuiLandmine(new ContainerLandmine(player, (TileEntityLandmine) world.getBlockTileEntity(x, y, z)));
|
||||
if (ID == craftingStationID)
|
||||
return new CraftingStationGui(player.inventory, (CraftingStationLogic) world.getBlockTileEntity(x, y, z), x, y, z);
|
||||
|
||||
if (ID == furnaceID)
|
||||
return new FurnaceGui(player.inventory, (FurnaceLogic) world.getBlockTileEntity(x, y, z));
|
||||
|
||||
if (ID == manualGuiID)
|
||||
{
|
||||
ItemStack stack = player.getCurrentEquippedItem();
|
||||
return new GuiManual(stack, TProxyClient.getManualFromStack(stack));
|
||||
}
|
||||
if (ID == inventoryGui)
|
||||
{
|
||||
GuiInventory inventory = new GuiInventory(player);
|
||||
TabRegistry.addTabsToInventory(inventory);
|
||||
return inventory;
|
||||
}
|
||||
if (ID == armorGuiID)
|
||||
{
|
||||
TProxyClient.armorExtended.init(Minecraft.getMinecraft().thePlayer);
|
||||
return new ArmorExtendedGui(player.inventory, TProxyClient.armorExtended);
|
||||
}
|
||||
if (ID == knapsackGuiID)
|
||||
{
|
||||
TProxyClient.knapsack.init(Minecraft.getMinecraft().thePlayer);
|
||||
return new KnapsackGui(player.inventory, TProxyClient.knapsack);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void renderStandardInvBlock (RenderBlocks renderblocks, Block block, int meta)
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, -1F, 0.0F);
|
||||
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 1.0F, 0.0F);
|
||||
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 0.0F, -1F);
|
||||
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 0.0F, 1.0F);
|
||||
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(-1F, 0.0F, 0.0F);
|
||||
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(1.0F, 0.0F, 0.0F);
|
||||
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
|
||||
tessellator.draw();
|
||||
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
||||
}
|
||||
|
||||
public static void renderInvBlockFace (RenderBlocks renderblocks, Block block, int meta)
|
||||
{
|
||||
Tessellator tessellator = Tessellator.instance;
|
||||
GL11.glScalef(2f, 2f, 2f);
|
||||
GL11.glTranslatef(-0.5F, -0.5F, -0.5F);
|
||||
GL11.glRotatef(45, 0, 1, 0);
|
||||
GL11.glRotatef(60, 1, 0, 0);
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, -1F, 0.0F);
|
||||
renderblocks.renderFaceYNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(0, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 1.0F, 0.0F);
|
||||
renderblocks.renderFaceYPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(1, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 0.0F, -1F);
|
||||
renderblocks.renderFaceZNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(2, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(0.0F, 0.0F, 1.0F);
|
||||
renderblocks.renderFaceZPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(3, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(-1F, 0.0F, 0.0F);
|
||||
renderblocks.renderFaceXNeg(block, 0.0D, 0.0D, 0.0D, block.getIcon(4, meta));
|
||||
tessellator.draw();
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setNormal(1.0F, 0.0F, 0.0F);
|
||||
renderblocks.renderFaceXPos(block, 0.0D, 0.0D, 0.0D, block.getIcon(5, meta));
|
||||
tessellator.draw();
|
||||
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
||||
}
|
||||
|
||||
public static boolean classMatches (Object paramObject, String paramString)
|
||||
{
|
||||
try
|
||||
{
|
||||
return paramObject.getClass().getName().equals(paramString);
|
||||
}
|
||||
catch (Exception localException)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public void registerTickHandler ()
|
||||
{
|
||||
TickRegistry.registerTickHandler(new TClientTickHandler(), Side.CLIENT);
|
||||
// TickRegistry.registerTickHandler(new TimeTicker(), Side.CLIENT);
|
||||
// TickRegistry.registerTickHandler(new TCommonTickHandler(),
|
||||
// Side.CLIENT);
|
||||
}
|
||||
|
||||
/* Registers any rendering code. */
|
||||
public void registerRenderer ()
|
||||
{
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
MinecraftForge.EVENT_BUS.register(new TClientEvents());
|
||||
smallFontRenderer = new SmallFontRenderer(mc.gameSettings, new ResourceLocation("textures/font/ascii.png"), mc.renderEngine, false);
|
||||
RenderingRegistry.registerBlockHandler(new TableRender());
|
||||
RenderingRegistry.registerBlockHandler(new TableForgeRender());
|
||||
RenderingRegistry.registerBlockHandler(new FrypanRender());
|
||||
RenderingRegistry.registerBlockHandler(new TankRender());
|
||||
RenderingRegistry.registerBlockHandler(new TankAirRender());
|
||||
RenderingRegistry.registerBlockHandler(new SearedRender());
|
||||
RenderingRegistry.registerBlockHandler(new OreberryRender());
|
||||
RenderingRegistry.registerBlockHandler(new BarricadeRender());
|
||||
RenderingRegistry.registerBlockHandler(new DryingRackRender());
|
||||
RenderingRegistry.registerBlockHandler(new PaneRender());
|
||||
RenderingRegistry.registerBlockHandler(new PaneConnectedRender());
|
||||
RenderingRegistry.registerBlockHandler(new RenderLandmine());
|
||||
RenderingRegistry.registerBlockHandler(new PunjiRender());
|
||||
RenderingRegistry.registerBlockHandler(new RenderBlockFluid());
|
||||
RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel());
|
||||
RenderingRegistry.registerBlockHandler(new SlimeChannelRender());
|
||||
RenderingRegistry.registerBlockHandler(new SlimePadRender());
|
||||
|
||||
if (!PHConstruct.newSmeltery)
|
||||
RenderingRegistry.registerBlockHandler(new SmelteryRender());
|
||||
|
||||
// Special Renderers
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(CastingTableLogic.class, new CastingTableSpecialRenderer());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(CastingBasinLogic.class, new CastingBasinSpecialRender());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(DryingRackLogic.class, new DryingRackSpecialRender());
|
||||
// ClientRegistry.bindTileEntitySpecialRenderer(GolemCoreLogic.class,
|
||||
// new GolemCoreSpecialRender());
|
||||
|
||||
// Entities
|
||||
RenderingRegistry.registerEntityRenderingHandler(FancyEntityItem.class, new FancyItemRender());
|
||||
RenderingRegistry.registerEntityRenderingHandler(BlueSlime.class, new SlimeRender(new ModelSlime(16), new ModelSlime(0), 0.25F));
|
||||
|
||||
RenderingRegistry.registerEntityRenderingHandler(CartEntity.class, new CartRender());
|
||||
RenderingRegistry.registerEntityRenderingHandler(Crystal.class, new CrystalRender());
|
||||
RenderingRegistry.registerEntityRenderingHandler(LaunchedPotion.class, new LaunchedItemRender(Item.potion, 16384));
|
||||
RenderingRegistry.registerEntityRenderingHandler(DaggerEntity.class, new DaggerRenderCustom());
|
||||
RenderingRegistry.registerEntityRenderingHandler(ArrowEntity.class, new ArrowRenderCustom());
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityLandmineFirework.class, new RenderSnowball(Item.firework));
|
||||
RenderingRegistry.registerEntityRenderingHandler(ExplosivePrimed.class, new ExplosiveRender());
|
||||
// RenderingRegistry.registerEntityRenderingHandler(net.minecraft.entity.player.EntityPlayer.class,
|
||||
// new PlayerArmorRender()); // <-- Works, woo!
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(TContent.shortbow.itemID, new CustomBowRenderer());
|
||||
VillagerRegistry.instance().registerVillagerSkin(78943, new ResourceLocation("tinker", "textures/mob/villagertools.png"));
|
||||
|
||||
ToolCoreRenderer renderer = new ToolCoreRenderer();
|
||||
MinecraftForgeClient.registerItemRenderer(TContent.arrow.itemID, renderer);
|
||||
MinecraftForgeClient.registerItemRenderer(TContent.dagger.itemID, renderer);
|
||||
|
||||
addRenderMappings();
|
||||
addToolButtons();
|
||||
}
|
||||
|
||||
public static Document diary;
|
||||
public static Document volume1;
|
||||
public static Document volume2;
|
||||
public static Document smelter;
|
||||
|
||||
public void readManuals ()
|
||||
{
|
||||
DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
|
||||
diary = readManual("/assets/tinker/manuals/diary.xml", dbFactory);
|
||||
volume1 = readManual("/assets/tinker/manuals/firstday.xml", dbFactory);
|
||||
volume2 = readManual("/assets/tinker/manuals/materials.xml", dbFactory);
|
||||
smelter = readManual("/assets/tinker/manuals/smeltery.xml", dbFactory);
|
||||
initManualIcons();
|
||||
initManualRecipes();
|
||||
initManualPages();
|
||||
}
|
||||
|
||||
Document readManual (String location, DocumentBuilderFactory dbFactory)
|
||||
{
|
||||
try
|
||||
{
|
||||
InputStream stream = TConstruct.class.getResourceAsStream(location);
|
||||
DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
|
||||
Document doc = dBuilder.parse(stream);
|
||||
doc.getDocumentElement().normalize();
|
||||
return doc;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public void initManualIcons ()
|
||||
{
|
||||
TConstructClientRegistry.registerManualIcon("smelterybook", new ItemStack(TContent.manualBook, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("smeltery", new ItemStack(TContent.smeltery));
|
||||
TConstructClientRegistry.registerManualIcon("blankcast", new ItemStack(TContent.blankPattern, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("castingtable", new ItemStack(TContent.searedBlock));
|
||||
// TConstructClientRegistry.registerManualIcon("liquidiron", new
|
||||
// ItemStack(TContent.liquidMetalStill));
|
||||
TConstructClientRegistry.registerManualIcon("lavatank", new ItemStack(TContent.lavaTank));
|
||||
TConstructClientRegistry.registerManualIcon("searedbrick", new ItemStack(TContent.smeltery, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("drain", new ItemStack(TContent.smeltery, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("faucet", new ItemStack(TContent.searedBlock, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("bronzeingot", new ItemStack(TContent.materials, 1, 13));
|
||||
TConstructClientRegistry.registerManualIcon("alubrassingot", new ItemStack(TContent.materials, 1, 14));
|
||||
TConstructClientRegistry.registerManualIcon("manyullyningot", new ItemStack(TContent.materials, 1, 5));
|
||||
TConstructClientRegistry.registerManualIcon("alumiteingot", new ItemStack(TContent.materials, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("blankpattern", new ItemStack(TContent.blankPattern, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("toolstation", new ItemStack(TContent.toolStationWood, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("patternchest", new ItemStack(TContent.toolStationWood, 1, 5));
|
||||
TConstructClientRegistry.registerManualIcon("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10));
|
||||
TConstructClientRegistry.registerManualIcon("torch", new ItemStack(Block.torchWood));
|
||||
TConstructClientRegistry.registerManualIcon("sapling", new ItemStack(Block.sapling));
|
||||
TConstructClientRegistry.registerManualIcon("workbench", new ItemStack(Block.workbench));
|
||||
TConstructClientRegistry.registerManualIcon("coal", new ItemStack(Item.coal));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("obsidianingot", new ItemStack(TContent.materials, 1, 18));
|
||||
TConstructClientRegistry.registerManualIcon("lavacrystal", new ItemStack(TContent.materials, 1, 7));
|
||||
|
||||
// Tool Materials
|
||||
TConstructClientRegistry.registerManualIcon("woodplanks", new ItemStack(Block.planks));
|
||||
TConstructClientRegistry.registerManualIcon("stoneblock", new ItemStack(Block.stone));
|
||||
TConstructClientRegistry.registerManualIcon("ironingot", new ItemStack(Item.ingotIron));
|
||||
TConstructClientRegistry.registerManualIcon("flint", new ItemStack(Item.flint));
|
||||
TConstructClientRegistry.registerManualIcon("cactus", new ItemStack(Block.cactus));
|
||||
TConstructClientRegistry.registerManualIcon("bone", new ItemStack(Item.bone));
|
||||
TConstructClientRegistry.registerManualIcon("obsidian", new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualIcon("netherrack", new ItemStack(Block.netherrack));
|
||||
TConstructClientRegistry.registerManualIcon("blueslimecrystal", new ItemStack(TContent.materials, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("slimecrystal", new ItemStack(TContent.materials, 1, 1));
|
||||
TConstructClientRegistry.registerManualIcon("paperstack", new ItemStack(TContent.materials, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("cobaltingot", new ItemStack(TContent.materials, 1, 3));
|
||||
TConstructClientRegistry.registerManualIcon("arditeingot", new ItemStack(TContent.materials, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("copperingot", new ItemStack(TContent.materials, 1, 9));
|
||||
TConstructClientRegistry.registerManualIcon("steelingot", new ItemStack(TContent.materials, 1, 16));
|
||||
<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34));
|
||||
=======
|
||||
TConstructClientRegistry.registerManualIcon("pigironingot", new ItemStack(TContent.materials, 1, 34));
|
||||
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java
|
||||
|
||||
// Tool parts
|
||||
TConstructClientRegistry.registerManualIcon("pickhead", new ItemStack(TContent.pickaxeHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("shovelhead", new ItemStack(TContent.shovelHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("axehead", new ItemStack(TContent.hatchetHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("swordblade", new ItemStack(TContent.swordBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("pan", new ItemStack(TContent.frypanHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("board", new ItemStack(TContent.signHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("knifeblade", new ItemStack(TContent.knifeBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("chiselhead", new ItemStack(TContent.chiselHead, 1, 2));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("hammerhead", new ItemStack(TContent.hammerHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("excavatorhead", new ItemStack(TContent.excavatorHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("scythehead", new ItemStack(TContent.scytheBlade, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("broadaxehead", new ItemStack(TContent.broadAxeHead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("largeswordblade", new ItemStack(TContent.largeSwordBlade, 1, 2));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("toolrod", new ItemStack(Item.stick));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("binding", new ItemStack(TContent.binding, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("wideguard", new ItemStack(TContent.wideGuard, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("handguard", new ItemStack(TContent.handGuard, 1, 4));
|
||||
TConstructClientRegistry.registerManualIcon("crossbar", new ItemStack(TContent.crossbar, 1, 4));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("toughrod", new ItemStack(TContent.toughRod, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("toughbinding", new ItemStack(TContent.toughBinding, 1, 17));
|
||||
TConstructClientRegistry.registerManualIcon("largeplate", new ItemStack(TContent.largePlate, 1, 17));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("bowstring", new ItemStack(TContent.bowstring, 1, 0));
|
||||
TConstructClientRegistry.registerManualIcon("arrowhead", new ItemStack(TContent.arrowhead, 1, 2));
|
||||
TConstructClientRegistry.registerManualIcon("fletching", new ItemStack(TContent.fletching, 1, 0));
|
||||
<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java
|
||||
|
||||
=======
|
||||
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualIcon("bloodbucket", new ItemStack(TContent.buckets, 1, 16));
|
||||
TConstructClientRegistry.registerManualIcon("emeraldbucket", new ItemStack(TContent.buckets, 1, 15));
|
||||
TConstructClientRegistry.registerManualIcon("gluebucket", new ItemStack(TContent.buckets, 1, 25));
|
||||
TConstructClientRegistry.registerManualIcon("slimebucket", new ItemStack(TContent.buckets, 1, 24));
|
||||
TConstructClientRegistry.registerManualIcon("enderbucket", new ItemStack(TContent.buckets, 1, 23));
|
||||
|
||||
// ToolIcons
|
||||
TConstructClientRegistry.registerManualIcon("pickicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.binding, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("shovelicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.shovelHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("axeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("mattockicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.hatchetHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.shovelHead, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("swordicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.wideGuard, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("longswordicon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.handGuard, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("rapiericon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("daggerIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.knifeBlade, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.crossbar, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("frypanicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.frypanHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("battlesignicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.signHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("chiselicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.chiselHead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), null, ""));
|
||||
TConstructClientRegistry.registerManualIcon("shortbowIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.toolRod, 1, 10), new ItemStack(TContent.bowstring, 1, 0), new ItemStack(TContent.toolRod, 1, 12), ""));
|
||||
TConstructClientRegistry.registerManualIcon("arrowIcon",
|
||||
ToolBuilder.instance.buildTool(new ItemStack(TContent.arrowhead, 1, 10), new ItemStack(TContent.toolRod, 1, 11), new ItemStack(TContent.fletching, 1, 0), ""));
|
||||
|
||||
TConstructClientRegistry.registerManualIcon("hammericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.hammerHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
|
||||
TContent.largePlate, 1, 12), new ItemStack(TContent.largePlate, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("lumbericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
|
||||
TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("excavatoricon", ToolBuilder.instance.buildTool(new ItemStack(TContent.excavatorHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
|
||||
new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("scytheicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.scytheBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11), new ItemStack(
|
||||
TContent.toughBinding, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("cleavericon", ToolBuilder.instance.buildTool(new ItemStack(TContent.largeSwordBlade, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
|
||||
new ItemStack(TContent.largePlate, 1, 12), new ItemStack(TContent.toughRod, 8), ""));
|
||||
TConstructClientRegistry.registerManualIcon("battleaxeicon", ToolBuilder.instance.buildTool(new ItemStack(TContent.broadAxeHead, 1, 10), new ItemStack(TContent.toughRod, 1, 11),
|
||||
new ItemStack(TContent.broadAxeHead, 1, 12), new ItemStack(TContent.toughBinding, 8), ""));
|
||||
}
|
||||
|
||||
public void initManualRecipes ()
|
||||
{
|
||||
ItemStack pattern = new ItemStack(TContent.blankPattern, 1, 0);
|
||||
|
||||
ItemStack stick = new ItemStack(Item.stick, 1, 0);
|
||||
ItemStack plank = new ItemStack(Block.planks, 1, 0);
|
||||
<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java
|
||||
ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0);
|
||||
=======
|
||||
ItemStack plankSlab = new ItemStack(Block.woodSingleSlab, 1, 0);
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java
|
||||
ItemStack workbench = new ItemStack(Block.workbench, 1, 0);
|
||||
ItemStack chest = new ItemStack(Block.chest, 1, 0);
|
||||
ItemStack log = new ItemStack(Block.wood, 1, 0);
|
||||
ItemStack mossycobble = new ItemStack(Block.cobblestoneMossy);
|
||||
ItemStack netherrack = new ItemStack(Block.netherrack);
|
||||
|
||||
ItemStack dirt = new ItemStack(Block.dirt, 1, 0);
|
||||
ItemStack sand = new ItemStack(Block.sand, 1, 0);
|
||||
ItemStack gravel = new ItemStack(Block.gravel, 1, 0);
|
||||
ItemStack clay = new ItemStack(Item.clay, 1, 0);
|
||||
ItemStack glass = new ItemStack(Block.glass, 1, 0);
|
||||
ItemStack ironblock = new ItemStack(Block.blockIron, 1, 0);
|
||||
|
||||
ItemStack grout = new ItemStack(TContent.craftedSoil, 2, 1);
|
||||
ItemStack searedbrick = new ItemStack(TContent.materials, 1, 2);
|
||||
ItemStack searedbrickBlock = new ItemStack(TContent.smeltery, 1, 2);
|
||||
|
||||
ItemStack coal = new ItemStack(Item.coal);
|
||||
ItemStack paper = new ItemStack(Item.paper);
|
||||
ItemStack slimeball = new ItemStack(Item.slimeBall);
|
||||
ItemStack slimyMud = new ItemStack(TContent.craftedSoil);
|
||||
ItemStack blazerod = new ItemStack(Item.blazeRod);
|
||||
ItemStack firecharge = new ItemStack(Item.fireballCharge);
|
||||
ItemStack string = new ItemStack(Item.silk);
|
||||
|
||||
ItemStack silkyCloth = new ItemStack(TContent.materials, 1, 25);
|
||||
|
||||
ItemStack graveyardsoil = new ItemStack(TContent.craftedSoil, 1, 3);
|
||||
ItemStack consecratedsoil = new ItemStack(TContent.craftedSoil, 1, 4);
|
||||
|
||||
// TConstruct recipes
|
||||
<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null);
|
||||
=======
|
||||
TConstructClientRegistry.registerManualLargeRecipe("alternatebook", new ItemStack(Item.book), paper, paper, paper, string, pattern, pattern, null, null, null);
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook1", new ItemStack(TContent.manualBook, 1, 0), new ItemStack(Item.paper), pattern, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook2", new ItemStack(TContent.manualBook, 1, 1), new ItemStack(TContent.manualBook, 1, 0), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternbook3", new ItemStack(TContent.manualBook, 1, 2), new ItemStack(TContent.manualBook, 1, 1), null, null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("blankpattern", pattern, plank, stick, stick, plank);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("toolstation", new ItemStack(TContent.toolStationWood, 1, 0), null, pattern, null, workbench);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("partcrafter", new ItemStack(TContent.toolStationWood, 1, 1), null, pattern, null, log);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("patternchest", new ItemStack(TContent.toolStationWood, 1, 5), null, pattern, null, chest);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("stenciltable", new ItemStack(TContent.toolStationWood, 1, 10), null, pattern, null, plank);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("slimechannel", new ItemStack(TContent.slimeChannel, 1, 0), new ItemStack(TContent.slimeGel, 1, 0), new ItemStack(Item.redstone), null, null);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("bouncepad", new ItemStack(TContent.slimePad, 1, 0), new ItemStack(TContent.slimeChannel), new ItemStack(Item.slimeBall), null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("toolforge", new ItemStack(TContent.toolForge, 1, 0), searedbrickBlock, searedbrickBlock, searedbrickBlock, ironblock, new ItemStack(
|
||||
TContent.toolStationWood, 1, 0), ironblock, ironblock, null, ironblock);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("slimymud", slimyMud, null, slimeball, slimeball, null, slimeball, slimeball, null, dirt, sand);
|
||||
TConstructClientRegistry.registerManualFurnaceRecipe("slimecrystal", new ItemStack(TContent.materials, 1, 1), slimyMud);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("paperstack", new ItemStack(TContent.materials, 1, 0), paper, paper, paper, paper);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("mossball", new ItemStack(TContent.materials, 1, 6), mossycobble, mossycobble, mossycobble, mossycobble, mossycobble, mossycobble,
|
||||
mossycobble, mossycobble, mossycobble);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("lavacrystal", new ItemStack(TContent.materials, 1, 7), blazerod, firecharge, blazerod, firecharge, new ItemStack(Item.bucketLava),
|
||||
firecharge, blazerod, firecharge, blazerod);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("silkycloth", silkyCloth, string, string, string, string, new ItemStack(TContent.materials, 1, 24), string, string, string, string);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("silkyjewel", new ItemStack(TContent.materials, 1, 26), null, silkyCloth, null, silkyCloth, new ItemStack(Item.emerald), silkyCloth, null,
|
||||
silkyCloth, null);
|
||||
|
||||
TConstructClientRegistry.registerManualSmallRecipe("graveyardsoil", graveyardsoil, new ItemStack(Block.dirt), new ItemStack(Item.rottenFlesh), new ItemStack(Item.dyePowder, 1, 15), null);
|
||||
TConstructClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil);
|
||||
|
||||
TConstructClientRegistry.registerManualSmallRecipe("grout", grout, sand, gravel, null, clay);
|
||||
TConstructClientRegistry.registerManualFurnaceRecipe("searedbrick", searedbrick, grout);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("searedbricks", new ItemStack(TContent.smeltery, 1, 2), searedbrick, searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterycontroller", new ItemStack(TContent.smeltery, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("dryingrack", new ItemStack(TContent.dryingRack, 1, 0), null, null, null, plankSlab, plankSlab, plankSlab, null, null,
|
||||
null);
|
||||
<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
=======
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterydrain", new ItemStack(TContent.smeltery, 1, 1), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick, null,
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java
|
||||
searedbrick);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank1", new ItemStack(TContent.lavaTank, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, glass, searedbrick,
|
||||
searedbrick, searedbrick, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank2", new ItemStack(TContent.lavaTank, 1, 1), searedbrick, glass, searedbrick, glass, glass, glass, searedbrick, glass,
|
||||
searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytank3", new ItemStack(TContent.lavaTank, 1, 2), searedbrick, glass, searedbrick, searedbrick, glass, searedbrick, searedbrick,
|
||||
glass, searedbrick);
|
||||
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterytable", new ItemStack(TContent.searedBlock, 1, 0), searedbrick, searedbrick, searedbrick, searedbrick, null, searedbrick,
|
||||
searedbrick, null, searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelteryfaucet", new ItemStack(TContent.searedBlock, 1, 1), searedbrick, null, searedbrick, null, searedbrick, null, null, null, null);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("castingchannel", new ItemStack(TContent.castingChannel), null, null, null, searedbrick, null, searedbrick, searedbrick, searedbrick,
|
||||
searedbrick);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("smelterybasin", new ItemStack(TContent.searedBlock, 1, 2), searedbrick, null, searedbrick, searedbrick, null, searedbrick, searedbrick,
|
||||
searedbrick, searedbrick);
|
||||
|
||||
//Traps
|
||||
ItemStack reed = new ItemStack(Item.reed);
|
||||
TConstructClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TContent.punji), reed, null, reed, null, reed, null, reed, null, reed);
|
||||
TConstructClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TContent.barricadeOak), null, log, null, log);
|
||||
|
||||
//Machines
|
||||
ItemStack alubrassIngot = new ItemStack(TContent.materials, 1, 14);
|
||||
ItemStack bronzeIngot = new ItemStack(TContent.materials, 1, 13);
|
||||
ItemStack blankCast = new ItemStack(TContent.blankPattern, 1, 1);
|
||||
ItemStack redstone = new ItemStack(Item.redstone);
|
||||
|
||||
// Modifier recipes
|
||||
ItemStack ironpick = ToolBuilder.instance.buildTool(new ItemStack(TContent.pickaxeHead, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.binding, 1, 6), "");
|
||||
TConstructClientRegistry.registerManualIcon("ironpick", ironpick);
|
||||
ItemStack ironlongsword = ToolBuilder.instance.buildTool(new ItemStack(TContent.swordBlade, 1, 6), new ItemStack(TContent.toolRod, 1, 2), new ItemStack(TContent.handGuard, 1, 10), "");
|
||||
TConstructClientRegistry.registerManualIcon("ironlongsword", ironlongsword);
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("diamondmod", ironpick.copy(), new ItemStack(Item.diamond));
|
||||
TConstructClientRegistry.registerManualModifier("emeraldmod", ironpick.copy(), new ItemStack(Item.emerald));
|
||||
TConstructClientRegistry.registerManualModifier("redstonemod", ironpick.copy(), new ItemStack(Item.redstone), new ItemStack(Block.blockRedstone));
|
||||
TConstructClientRegistry.registerManualModifier("lavacrystalmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 7));
|
||||
TConstructClientRegistry.registerManualModifier("lapismod", ironpick.copy(), new ItemStack(Item.dyePowder, 1, 4), new ItemStack(Block.blockLapis));
|
||||
TConstructClientRegistry.registerManualModifier("mossmod", ironpick.copy(), new ItemStack(TContent.materials, 1, 6));
|
||||
TConstructClientRegistry.registerManualModifier("quartzmod", ironlongsword.copy(), new ItemStack(Item.netherQuartz), new ItemStack(Block.blockNetherQuartz));
|
||||
TConstructClientRegistry.registerManualModifier("blazemod", ironlongsword.copy(), new ItemStack(Item.blazePowder));
|
||||
TConstructClientRegistry.registerManualModifier("necroticmod", ironlongsword.copy(), new ItemStack(TContent.materials, 1, 8));
|
||||
TConstructClientRegistry.registerManualModifier("silkymod", ironpick.copy(), new ItemStack(TContent.materials, 1, 26));
|
||||
TConstructClientRegistry.registerManualModifier("reinforcedmod", ironpick.copy(), new ItemStack(TContent.largePlate, 1, 6));
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("pistonmod", ironlongsword.copy(), new ItemStack(Block.pistonBase));
|
||||
TConstructClientRegistry.registerManualModifier("beheadingmod", ironlongsword.copy(), new ItemStack(Item.enderPearl), new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualModifier("spidermod", ironlongsword.copy(), new ItemStack(Item.fermentedSpiderEye));
|
||||
TConstructClientRegistry.registerManualModifier("smitemod", ironlongsword.copy(), new ItemStack(TContent.craftedSoil, 1, 4));
|
||||
|
||||
<<<<<<< HEAD:src/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualModifier("electricmod", ironpick.copy(), new ItemStack(Block.dirt), new ItemStack(Block.dirt));
|
||||
=======
|
||||
>>>>>>> origin/gradle:src/main/java/tconstruct/client/TProxyClient.java
|
||||
TConstructClientRegistry.registerManualModifier("fluxmod", ironpick.copy(), new ItemStack(Block.dirt));
|
||||
TConstructClientRegistry.registerManualModifier("fluxmod2", ironpick.copy(), new ItemStack(Block.dirt));
|
||||
|
||||
TConstructClientRegistry.registerManualModifier("tier1free", ironpick.copy(), new ItemStack(Item.diamond), new ItemStack(Block.blockGold));
|
||||
TConstructClientRegistry.registerManualModifier("tier2free", ironpick.copy(), new ItemStack(Item.netherStar));
|
||||
|
||||
TConstructClientRegistry.registerManualSmeltery("brownstone", new ItemStack(TContent.speedBlock), new ItemStack(TContent.moltenTin, 1), new ItemStack(Block.gravel));
|
||||
TConstructClientRegistry.registerManualSmeltery("clearglass", new ItemStack(TContent.clearGlass), new ItemStack(TContent.moltenGlass, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("searedstone", new ItemStack(TContent.smeltery, 1, 4), new ItemStack(TContent.moltenStone, 1), null);
|
||||
TConstructClientRegistry.registerManualSmeltery("endstone", new ItemStack(Block.whiteStone), new ItemStack(TContent.moltenEnder, 1), new ItemStack(Block.obsidian));
|
||||
TConstructClientRegistry.registerManualSmeltery("glueball", new ItemStack(TContent.materials, 1, 36), new ItemStack(TContent.glueFluidBlock, 1), null);
|
||||
|
||||
}
|
||||
|
||||
public static Map<String, Class<? extends BookPage>> pageClasses = new HashMap<String, Class<? extends BookPage>>();
|
||||
|
||||
public static void registerManualPage (String type, Class<? extends BookPage> clazz)
|
||||
{
|
||||
pageClasses.put(type, clazz);
|
||||
}
|
||||
|
||||
public static Class<? extends BookPage> getPageClass (String type)
|
||||
{
|
||||
return pageClasses.get(type);
|
||||
}
|
||||
|
||||
void initManualPages ()
|
||||
{
|
||||
TProxyClient.registerManualPage("crafting", CraftingPage.class);
|
||||
TProxyClient.registerManualPage("picture", PicturePage.class);
|
||||
TProxyClient.registerManualPage("text", TextPage.class);
|
||||
TProxyClient.registerManualPage("intro", TextPage.class);
|
||||
TProxyClient.registerManualPage("sectionpage", SectionPage.class);
|
||||
TProxyClient.registerManualPage("intro", TitlePage.class);
|
||||
TProxyClient.registerManualPage("contents", ContentsTablePage.class);
|
||||
TProxyClient.registerManualPage("furnace", FurnacePage.class);
|
||||
TProxyClient.registerManualPage("sidebar", SidebarPage.class);
|
||||
TProxyClient.registerManualPage("materialstats", MaterialPage.class);
|
||||
TProxyClient.registerManualPage("toolpage", ToolPage.class);
|
||||
TProxyClient.registerManualPage("modifier", ModifierPage.class);
|
||||
TProxyClient.registerManualPage("blockcast", BlockCastPage.class);
|
||||
|
||||
TProxyClient.registerManualPage("blank", BlankPage.class);
|
||||
}
|
||||
|
||||
public static Document getManualFromStack (ItemStack stack)
|
||||
{
|
||||
switch (stack.getItemDamage())
|
||||
{
|
||||
case 0:
|
||||
return volume1;
|
||||
case 1:
|
||||
return volume2;
|
||||
case 2:
|
||||
return smelter;
|
||||
case 3:
|
||||
return diary;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
static int[][] itemIcons = { new int[] { 0, 3, 0 }, // Repair
|
||||
new int[] { 1, 4, 0 }, // Pickaxe
|
||||
new int[] { 2, 5, 0 }, // Shovel
|
||||
new int[] { 2, 6, 0 }, // Axe
|
||||
// new int[] {2, 9, 0}, //Lumber Axe
|
||||
// new int[] {1, 7, 0}, //Ice Axe
|
||||
new int[] { 3, 8, 0 }, // Mattock
|
||||
new int[] { 1, 0, 1 }, // Broadsword
|
||||
new int[] { 1, 1, 1 }, // Longsword
|
||||
new int[] { 1, 2, 1 }, // Rapier
|
||||
new int[] { 1, 5, 1 }, // Dagger
|
||||
new int[] { 2, 3, 1 }, // Frying pan
|
||||
new int[] { 2, 4, 1 }, // Battlesign
|
||||
new int[] { 2, 6, 1 } // Chisel
|
||||
};
|
||||
|
||||
static int[][] iconCoords = { new int[] { 0, 1, 2, 13 }, new int[] { 13, 13, 13, 13 }, // Repair
|
||||
new int[] { 0, 0, 1, 13 }, new int[] { 2, 3, 3, 13 }, // Pickaxe
|
||||
new int[] { 3, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Shovel
|
||||
new int[] { 2, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Axe
|
||||
// new int[] { 6, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, //Lumber
|
||||
// Axe
|
||||
// new int[] { 0, 0, 5, 13 }, new int[] { 2, 3, 3, 13 }, //Ice Axe
|
||||
new int[] { 2, 0, 3, 13 }, new int[] { 2, 3, 2, 13 }, // Mattock
|
||||
new int[] { 1, 0, 2, 13 }, new int[] { 2, 3, 3, 13 }, // Broadsword
|
||||
new int[] { 1, 0, 3, 13 }, new int[] { 2, 3, 3, 13 }, // Longsword
|
||||
new int[] { 1, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Rapier
|
||||
new int[] { 7, 0, 4, 13 }, new int[] { 2, 3, 3, 13 }, // Dagger
|
||||
new int[] { 4, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Frying
|
||||
// Pan
|
||||
new int[] { 5, 0, 13, 13 }, new int[] { 2, 3, 13, 13 }, // Battlesign
|
||||
new int[] { 7, 0, 13, 13 }, new int[] { 3, 3, 13, 13 } // Chisel
|
||||
};
|
||||
|
||||
static String[] toolNames = { "Repair and Modification", "Pickaxe", "Shovel", "Hatchet",
|
||||
// "Lumber Axe",
|
||||
// "Ice Axe",
|
||||
"Mattock", "Broadsword", "Longsword", "Rapier", "Dagger", "Frying Pan", "Battlesign", "Chisel" };
|
||||
|
||||
static String[] toolDescriptions = {
|
||||
"The main way to repair or change your tools. Place a tool and a material on the left to get started.",
|
||||
"The Pickaxe is a precise mining tool. It is effective on stone and ores.\n\nRequired parts:\n- Pickaxe Head\n- Tool Binding\n- Handle",
|
||||
"The Shovel is a precise digging tool. It is effective on dirt, sand, and snow.\n\nRequired parts:\n- Shovel Head\n- Handle",
|
||||
"The Hatchet is a basic chopping tool. It is effective on wood and leaves.\n\nRequired parts:\n- Axe Head\n- Handle",
|
||||
// "The Lumber Axe is a broad chopping tool. It harvests wood in a wide range and can fell entire trees.\n\nRequired parts:\n- Broad Axe Head\n- Handle",
|
||||
// "The Ice Axe is a tool for harvesting ice, mining, and attacking foes.\n\nSpecial Ability:\n- Wall Climb\nNatural Ability:\n- Ice Harvest\nDamage: Moderate\n\nRequired parts:\n- Pickaxe Head\n- Spike\n- Handle",
|
||||
"The Cutter Mattock is a versatile farming tool. It is effective on wood, dirt, and plants.\n\nSpecial Ability: Hoe\n\nRequired parts:\n- Axe Head\n- Shovel Head\n- Handle",
|
||||
"The Broadsword is a defensive weapon. Blocking cuts damage in half.\n\nSpecial Ability: Block\nDamage: Moderate\nDurability: High\n\nRequired parts:\n- Sword Blade\n- Wide Guard\n- Handle",
|
||||
"The Longsword is an offensive weapon. It is often used for charging into battle at full speed.\n\nNatural Ability:\n- Charge Boost\nSpecial Ability: Lunge\n\nDamage: Moderate\nDurability: Moderate",
|
||||
"The Rapier is a special weapon that relies on quick strikes to defeat foes.\n\nNatural Abilities:\n- Armor Pierce\n- Quick Strike\n- Charge Boost\nSpecial Ability:\n- Backpedal\n\nDamage: Low\nDurability: Low",
|
||||
"The Dagger is a short blade that can be thrown.\n\nSpecial Ability:\n- Throw Item\n\nDamage: Low\nDurability: Moderate\n\nRequired parts:\n- Knife Blade\n- Crossbar\n- Handle",
|
||||
"The Frying is a heavy weapon that uses sheer weight to stun foes.\n\nSpecial Ability: Block\nNatural Ability: Heavy\nShift+rClick: Place Frying Pan\nDamage: Low\nDurability: High\n\nRequired parts:\n- Pan\n- Handle",
|
||||
// "The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nShift-rClick: Place sign\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Board\n- Handle"
|
||||
"The Battlesign is an advance in weapon technology worthy of Zombie Pigmen everywhere.\n\nSpecial Ability: Block\nDamage: Low\nDurability: Average\n\nRequired parts:\n- Sign Board\n- Handle",
|
||||
"The Chisel is a utility tool that carves shapes into blocks.\n\nCrafting Grid:\n- Shape Items\nSpecial Ability: Chisel\nDurability: Average\n\nRequired parts:\n- Chisel Head\n- Handle" };
|
||||
|
||||
void addToolButtons ()
|
||||
{
|
||||
for (int i = 0; i < toolNames.length; i++)
|
||||
{
|
||||
addToolButton(itemIcons[i][0], itemIcons[i][1], itemIcons[i][2], iconCoords[i * 2], iconCoords[i * 2 + 1], toolNames[i], toolDescriptions[i]);
|
||||
}
|
||||
|
||||
addToolButton(3, 9, 1, new int[] { 0, 10, 0, 13 }, new int[] { 3, 3, 3, 13 }, "Shortbow",
|
||||
"The Shortbow is a ranged weapon. It fires arrows quickly and precisely at its foes.\n\nDraw Speed: Quick\n\nRequired parts:\n- Tool Rod\n- Bowstring\n- Tool Rod");
|
||||
addToolButton(7, 10, 1, new int[] { 11, 0, 12, 13 }, new int[] { 3, 3, 3, 13 }, "Arrow",
|
||||
"Arrows are projectiles usually fired from bows.\n\nRequired parts:\n- Arrowhead\n- Tool Rod\n- Fletching");
|
||||
addTierTwoButton(6, 13, 0, new int[] { 11, 8, 9, 9 }, new int[] { 2, 3, 2, 2 }, "Hammer",
|
||||
"The Hammer is a broad mining tool. It harvests blocks in a wide range and is effective against undead.\n\nNatural Abilities:\nArea of Effect\n- (3x3)\n- Smite\n\nDurability: High");
|
||||
addTierTwoButton(5, 11, 0, new int[] { 6, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Lumber Axe",
|
||||
"The Lumber Axe is a broad chopping tool. It can fell entire trees or gather wood in a wide range.\n\nNatural Abilities:\nArea of Effect\n- Fell Trees\n- (3x3x3)\n\nDurability: Average");
|
||||
addTierTwoButton(5, 12, 0, new int[] { 10, 8, 9, 9 }, new int[] { 2, 3, 2, 3 }, "Excavator",
|
||||
"The Excavator is a broad digging tool. It harvests soil and snow in a wide range.\n\nNatural Ability:\n- Area of Effect\n- (3x3)\n\nDurability: Average");
|
||||
addTierTwoButton(4, 10, 0, new int[] { 8, 8, 9, 8 }, new int[] { 2, 3, 3, 3 }, "Scythe",
|
||||
"The Scythe is a broad reaping tool. It is effective on plants and attacks enemies in a wide range.\n\nNatural Ability:\nArea of Effect\n- (3x3x3)\n\nDurability: Average\nDamage: Low, AoE");
|
||||
addTierTwoButton(5, 7, 1, new int[] { 6, 8, 9, 8 }, new int[] { 3, 3, 2, 3 }, "Cleaver",
|
||||
"The Cleaver is a heavy defensive weapon. It has powerful strikes, but is difficult to wield.\n\nSpecial Ability: Block\nNatural Ability:\n- Beheading\n\nDamage: High\nDurability: Average");
|
||||
addTierTwoButton(5, 8, 1, new int[] { 6, 8, 6, 9 }, new int[] { 2, 3, 2, 3 }, "Battleaxe",
|
||||
"The Battleaxe is a heavy offensive weapon. It is capable of bringing down small trees and can send foes flying.\n\nSpecial Ability: Block\nNatural Abilities:"
|
||||
+ "\n- Knockback\n- Area of Effect\n- (1x9)\n\nDamage: Average\nDurability: Average");
|
||||
}
|
||||
|
||||
void addToolButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body)
|
||||
{
|
||||
TConstructClientRegistry.addToolButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png"));
|
||||
}
|
||||
|
||||
void addTierTwoButton (int slotType, int xButton, int yButton, int[] xIcons, int[] yIcons, String title, String body)
|
||||
{
|
||||
TConstructClientRegistry.addTierTwoButton(new ToolGuiElement(slotType, xButton, yButton, xIcons, yIcons, title, body, "tinker", "textures/gui/icons.png"));
|
||||
}
|
||||
|
||||
void addRenderMappings ()
|
||||
{
|
||||
String[] partTypes = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel",
|
||||
"blueslime", "pigiron" };
|
||||
String[] effectTypes = { "diamond", "emerald", "redstone", "piston", "moss", "ice", "lava", "blaze", "necrotic", "flux", "lapis", "quartz", "silk", "beheading", "smite", "spider",
|
||||
"reinforced", "flux" };
|
||||
int[] universalEffects = { 0, 1, 4, 9, 16 };
|
||||
int[] weaponEffects = { 3, 5, 7, 13, 14, 15 };
|
||||
int[] harvestEffects = { 2 };
|
||||
int[] nonUtility = { 6, 8, 10, 11, 12 };
|
||||
|
||||
for (int partIter = 0; partIter < partTypes.length; partIter++)
|
||||
{
|
||||
TConstructClientRegistry.addMaterialRenderMapping(partIter, "tinker", partTypes[partIter], true);
|
||||
}
|
||||
|
||||
for (ToolCore tool : TConstructRegistry.getToolMapping())
|
||||
{
|
||||
for (int i = 0; i < effectTypes.length; i++)
|
||||
{
|
||||
TConstructClientRegistry.addEffectRenderMapping(tool, i, "tinker", effectTypes[i], true);
|
||||
}
|
||||
}
|
||||
|
||||
String[] bowstringTypes = { "string", "magicfabric", "flamestring" };
|
||||
for (int bowIter = 0; bowIter < bowstringTypes.length; bowIter++)
|
||||
{
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.shortbow, bowIter, "tinker", bowstringTypes[bowIter], true);
|
||||
}
|
||||
|
||||
String[] fletching = { "feather", "leaf", "slime", "blueslime" };
|
||||
for (int arrowIter = 0; arrowIter < fletching.length; arrowIter++)
|
||||
{
|
||||
TConstructClientRegistry.addAlternateMaterialRenderMapping(TContent.arrow, arrowIter, "tinker", fletching[arrowIter], true);
|
||||
}
|
||||
}
|
||||
|
||||
/* Keybindings */
|
||||
public static TControls controlInstance;
|
||||
|
||||
public void registerKeys ()
|
||||
{
|
||||
controlInstance = new TControls();
|
||||
TickRegistry.registerTickHandler(controlInstance, Side.CLIENT);
|
||||
uploadKeyBindingsToGame(Minecraft.getMinecraft().gameSettings, controlInstance);
|
||||
|
||||
TabRegistry.registerTab(new InventoryTabVanilla());
|
||||
TabRegistry.registerTab(new InventoryTabArmorExtended());
|
||||
TabRegistry.registerTab(new InventoryTabKnapsack());
|
||||
}
|
||||
|
||||
public void uploadKeyBindingsToGame (GameSettings settings, TKeyHandler keyhandler)
|
||||
{
|
||||
ArrayList<KeyBinding> harvestedBindings = Lists.newArrayList();
|
||||
for (KeyBinding kb : keyhandler.keyBindings)
|
||||
{
|
||||
harvestedBindings.add(kb);
|
||||
}
|
||||
|
||||
KeyBinding[] modKeyBindings = harvestedBindings.toArray(new KeyBinding[harvestedBindings.size()]);
|
||||
KeyBinding[] allKeys = new KeyBinding[settings.keyBindings.length + modKeyBindings.length];
|
||||
System.arraycopy(settings.keyBindings, 0, allKeys, 0, settings.keyBindings.length);
|
||||
System.arraycopy(modKeyBindings, 0, allKeys, settings.keyBindings.length, modKeyBindings.length);
|
||||
settings.keyBindings = allKeys;
|
||||
settings.loadOptions();
|
||||
}
|
||||
|
||||
public void spawnParticle (String particle, double xPos, double yPos, double zPos, double velX, double velY, double velZ)
|
||||
{
|
||||
this.doSpawnParticle(particle, xPos, yPos, zPos, velX, velY, velZ);
|
||||
}
|
||||
|
||||
public EntityFX doSpawnParticle (String par1Str, double par2, double par4, double par6, double par8, double par10, double par12)
|
||||
{
|
||||
if (this.mc == null)
|
||||
this.mc = Minecraft.getMinecraft();
|
||||
|
||||
if (this.mc.renderViewEntity != null && this.mc.effectRenderer != null)
|
||||
{
|
||||
int i = this.mc.gameSettings.particleSetting;
|
||||
|
||||
if (i == 1 && mc.theWorld.rand.nextInt(3) == 0)
|
||||
{
|
||||
i = 2;
|
||||
}
|
||||
|
||||
double d6 = this.mc.renderViewEntity.posX - par2;
|
||||
double d7 = this.mc.renderViewEntity.posY - par4;
|
||||
double d8 = this.mc.renderViewEntity.posZ - par6;
|
||||
EntityFX entityfx = null;
|
||||
|
||||
if (par1Str.equals("hugeexplosion"))
|
||||
{
|
||||
this.mc.effectRenderer.addEffect(entityfx = new EntityHugeExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12));
|
||||
}
|
||||
else if (par1Str.equals("largeexplode"))
|
||||
{
|
||||
this.mc.effectRenderer.addEffect(entityfx = new EntityLargeExplodeFX(mc.renderEngine, mc.theWorld, par2, par4, par6, par8, par10, par12));
|
||||
}
|
||||
else if (par1Str.equals("fireworksSpark"))
|
||||
{
|
||||
this.mc.effectRenderer.addEffect(entityfx = new EntityFireworkSparkFX(mc.theWorld, par2, par4, par6, par8, par10, par12, this.mc.effectRenderer));
|
||||
}
|
||||
|
||||
if (entityfx != null)
|
||||
{
|
||||
return (EntityFX) entityfx;
|
||||
}
|
||||
else
|
||||
{
|
||||
double d9 = 16.0D;
|
||||
|
||||
if (d6 * d6 + d7 * d7 + d8 * d8 > d9 * d9)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else if (i > 1)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (par1Str.equals("bubble"))
|
||||
{
|
||||
entityfx = new EntityBubbleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("suspended"))
|
||||
{
|
||||
entityfx = new EntitySuspendFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("depthsuspend"))
|
||||
{
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("townaura"))
|
||||
{
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("crit"))
|
||||
{
|
||||
entityfx = new EntityCritFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("smoke"))
|
||||
{
|
||||
entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("mobSpell"))
|
||||
{
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12);
|
||||
}
|
||||
else if (par1Str.equals("mobSpellAmbient"))
|
||||
{
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, 0.0D, 0.0D, 0.0D);
|
||||
((EntityFX) entityfx).setAlphaF(0.15F);
|
||||
((EntityFX) entityfx).setRBGColorF((float) par8, (float) par10, (float) par12);
|
||||
}
|
||||
else if (par1Str.equals("spell"))
|
||||
{
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("instantSpell"))
|
||||
{
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144);
|
||||
}
|
||||
else if (par1Str.equals("witchMagic"))
|
||||
{
|
||||
entityfx = new EntitySpellParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntitySpellParticleFX) entityfx).setBaseSpellTextureIndex(144);
|
||||
float f = mc.theWorld.rand.nextFloat() * 0.5F + 0.35F;
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F * f, 0.0F * f, 1.0F * f);
|
||||
}
|
||||
else if (par1Str.equals("note"))
|
||||
{
|
||||
entityfx = new EntityNoteFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("portal"))
|
||||
{
|
||||
entityfx = new EntityPortalFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("enchantmenttable"))
|
||||
{
|
||||
entityfx = new EntityEnchantmentTableParticleFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("explode"))
|
||||
{
|
||||
entityfx = new EntityExplodeFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("flame"))
|
||||
{
|
||||
entityfx = new EntityFlameFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("lava"))
|
||||
{
|
||||
entityfx = new EntityLavaFX(mc.theWorld, par2, par4, par6);
|
||||
}
|
||||
else if (par1Str.equals("footstep"))
|
||||
{
|
||||
entityfx = new EntityFootStepFX(mc.renderEngine, mc.theWorld, par2, par4, par6);
|
||||
}
|
||||
else if (par1Str.equals("splash"))
|
||||
{
|
||||
entityfx = new EntitySplashFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("largesmoke"))
|
||||
{
|
||||
entityfx = new EntitySmokeFX(mc.theWorld, par2, par4, par6, par8, par10, par12, 2.5F);
|
||||
}
|
||||
else if (par1Str.equals("cloud"))
|
||||
{
|
||||
entityfx = new EntityCloudFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("reddust"))
|
||||
{
|
||||
entityfx = new EntityReddustFX(mc.theWorld, par2, par4, par6, (float) par8, (float) par10, (float) par12);
|
||||
}
|
||||
else if (par1Str.equals("snowballpoof"))
|
||||
{
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, Item.snowball);
|
||||
}
|
||||
else if (par1Str.equals("dripWater"))
|
||||
{
|
||||
entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.water);
|
||||
}
|
||||
else if (par1Str.equals("dripLava"))
|
||||
{
|
||||
entityfx = new EntityDropParticleFX(mc.theWorld, par2, par4, par6, Material.lava);
|
||||
}
|
||||
else if (par1Str.equals("snowshovel"))
|
||||
{
|
||||
entityfx = new EntitySnowShovelFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("blueslime"))
|
||||
{
|
||||
entityfx = new EntityBreakingFX(mc.theWorld, par2, par4, par6, TContent.strangeFood);
|
||||
}
|
||||
else if (par1Str.equals("heart"))
|
||||
{
|
||||
entityfx = new EntityHeartFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
}
|
||||
else if (par1Str.equals("angryVillager"))
|
||||
{
|
||||
entityfx = new EntityHeartFX(mc.theWorld, par2, par4 + 0.5D, par6, par8, par10, par12);
|
||||
((EntityFX) entityfx).setParticleTextureIndex(81);
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F);
|
||||
}
|
||||
else if (par1Str.equals("happyVillager"))
|
||||
{
|
||||
entityfx = new EntityAuraFX(mc.theWorld, par2, par4, par6, par8, par10, par12);
|
||||
((EntityFX) entityfx).setParticleTextureIndex(82);
|
||||
((EntityFX) entityfx).setRBGColorF(1.0F, 1.0F, 1.0F);
|
||||
}
|
||||
|
||||
if (entityfx != null)
|
||||
{
|
||||
this.mc.effectRenderer.addEffect((EntityFX) entityfx);
|
||||
}
|
||||
|
||||
return (EntityFX) entityfx;
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit ()
|
||||
{
|
||||
//MinecraftForgeClient.registerItemRenderer(TContent.armorPattern.itemID, new RenderArmorCast());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -9,7 +9,7 @@ import net.minecraftforge.fluids.Fluid;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.*;
|
||||
import tconstruct.client.TProxyClient;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.CastingRecipe;
|
||||
|
||||
public class SearedRender implements ISimpleBlockRenderingHandler
|
||||
@@ -252,19 +252,19 @@ public class SearedRender implements ISimpleBlockRenderingHandler
|
||||
float yMin = 0F;
|
||||
int uID = world.getBlockId(x, y - 1, z);
|
||||
int uMeta = world.getBlockMetadata(x, y - 1, z);
|
||||
if (uID == TContent.searedBlock.blockID && uMeta == 0)
|
||||
if (uID == TRepo.searedBlock.blockID && uMeta == 0)
|
||||
{
|
||||
yMin = -0.125F;
|
||||
}
|
||||
else if (uID == TContent.searedBlock.blockID && uMeta == 2)
|
||||
else if (uID == TRepo.searedBlock.blockID && uMeta == 2)
|
||||
{
|
||||
yMin = -0.75F;
|
||||
}
|
||||
else if (uID == TContent.lavaTank.blockID)
|
||||
else if (uID == TRepo.lavaTank.blockID)
|
||||
{
|
||||
yMin = -1F;
|
||||
}
|
||||
else if (uID == TContent.castingChannel.blockID)
|
||||
else if (uID == TRepo.castingChannel.blockID)
|
||||
{
|
||||
yMin = -0.5F;
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import tconstruct.blocks.SlimePad;
|
||||
import tconstruct.client.TProxyClient;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.client.registry.RenderingRegistry;
|
||||
|
||||
@@ -18,7 +18,7 @@ public class SlimePadRender implements ISimpleBlockRenderingHandler
|
||||
{
|
||||
if (modelID == model)
|
||||
{
|
||||
TProxyClient.renderStandardInvBlock(renderer, TContent.slimeGel, metadata);
|
||||
TProxyClient.renderStandardInvBlock(renderer, TRepo.slimeGel, metadata);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import net.minecraft.util.ResourceLocation;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.item.ExplosivePrimed;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -53,7 +53,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(TContent.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
|
||||
this.blockRenderer.renderBlockAsItem(TRepo.slimeExplosive, 0, par1EntityTNTPrimed.getBrightness(par9));
|
||||
|
||||
if (par1EntityTNTPrimed.fuse / 5 % 2 == 0)
|
||||
{
|
||||
|
||||
@@ -16,8 +16,8 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import tconstruct.blocks.logic.StencilTableLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.inventory.PatternShaperContainer;
|
||||
|
||||
import cpw.mods.fml.common.network.PacketDispatcher;
|
||||
|
||||
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() == TContent.blankPattern)
|
||||
if (pattern != null && pattern.getItem() == TRepo.blankPattern)
|
||||
{
|
||||
int meta = pattern.getItemDamage();
|
||||
if (meta == 0)
|
||||
@@ -106,13 +106,13 @@ public class StencilTableGui extends GuiContainer
|
||||
if (patternIndex == 21)
|
||||
patternIndex--;
|
||||
}
|
||||
ItemStack stack = new ItemStack(TContent.woodPattern, 1, patternIndex + 1);
|
||||
ItemStack stack = new ItemStack(TRepo.woodPattern, 1, patternIndex + 1);
|
||||
logic.setInventorySlotContents(1, stack);
|
||||
updateServer(stack);
|
||||
}
|
||||
/*else if (meta == 1 || meta == 2)
|
||||
{
|
||||
ItemStack stack = new ItemStack(TContent.metalPattern, 1, 0);
|
||||
ItemStack stack = new ItemStack(TRepo.metalPattern, 1, 0);
|
||||
logic.setInventorySlotContents(1, stack);
|
||||
updateServer(stack);
|
||||
}*/
|
||||
|
||||
@@ -3,13 +3,13 @@ package tconstruct.client.tabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import tconstruct.client.TControls;
|
||||
import tconstruct.client.TProxyClient;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
public class InventoryTabKnapsack extends AbstractTab
|
||||
{
|
||||
public InventoryTabKnapsack()
|
||||
{
|
||||
super(0, 0, 0, new ItemStack(TContent.knapsack));
|
||||
super(0, 0, 0, new ItemStack(TRepo.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() == TContent.knapsack;
|
||||
return TProxyClient.armorExtended.inventory[2] != null && TProxyClient.armorExtended.inventory[2].getItem() == TRepo.knapsack;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -28,10 +28,10 @@ public class TProxyCommon implements IGuiHandler
|
||||
|
||||
public static int smelteryGuiID = 7;
|
||||
public static int furnaceID = 8;
|
||||
// public static int drawbridgeID = 9; // Moved to TMechworks
|
||||
// public static int drawbridgeID = 9; // Moved to TMechworks
|
||||
public static int landmineID = 10;
|
||||
public static int craftingStationID = 11;
|
||||
// public static int advDrawbridgeID = 12; // Moved to TMechworks
|
||||
// public static int advDrawbridgeID = 12; // Moved to TMechworks
|
||||
public static int inventoryGui = 100;
|
||||
public static int armorGuiID = 101;
|
||||
public static int knapsackGuiID = 102;
|
||||
@@ -99,10 +99,10 @@ public class TProxyCommon implements IGuiHandler
|
||||
{
|
||||
// As of 1.6.x, this is now handled by Minecraft itself for the most part.
|
||||
|
||||
LanguageRegistry.addName(TContent.potionLauncher, "Potion Launcher");
|
||||
LanguageRegistry.addName(TContent.knapsack, "Knapsack");
|
||||
LanguageRegistry.addName(TRepo.potionLauncher, "Potion Launcher");
|
||||
LanguageRegistry.addName(TRepo.knapsack, "Knapsack");
|
||||
|
||||
LanguageRegistry.addName(TContent.meatBlock, "Hambone");
|
||||
LanguageRegistry.addName(TRepo.meatBlock, "Hambone");
|
||||
}
|
||||
|
||||
public void readManuals ()
|
||||
|
||||
@@ -0,0 +1,187 @@
|
||||
package tconstruct.common;
|
||||
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
import net.minecraftforge.fluids.FluidRegistry;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import tconstruct.blocks.logic.AdaptiveDrainLogic;
|
||||
import tconstruct.blocks.logic.AdaptiveSmelteryLogic;
|
||||
import tconstruct.blocks.logic.CastingBasinLogic;
|
||||
import tconstruct.blocks.logic.CastingChannelLogic;
|
||||
import tconstruct.blocks.logic.CastingTableLogic;
|
||||
import tconstruct.blocks.logic.CraftingStationLogic;
|
||||
import tconstruct.blocks.logic.DryingRackLogic;
|
||||
import tconstruct.blocks.logic.FaucetLogic;
|
||||
import tconstruct.blocks.logic.FrypanLogic;
|
||||
import tconstruct.blocks.logic.FurnaceLogic;
|
||||
import tconstruct.blocks.logic.LavaTankLogic;
|
||||
import tconstruct.blocks.logic.MultiServantLogic;
|
||||
import tconstruct.blocks.logic.PartBuilderLogic;
|
||||
import tconstruct.blocks.logic.PatternChestLogic;
|
||||
import tconstruct.blocks.logic.SmelteryDrainLogic;
|
||||
import tconstruct.blocks.logic.SmelteryLogic;
|
||||
import tconstruct.blocks.logic.StencilTableLogic;
|
||||
import tconstruct.blocks.logic.TankAirLogic;
|
||||
import tconstruct.blocks.logic.TileEntityLandmine;
|
||||
import tconstruct.blocks.logic.ToolForgeLogic;
|
||||
import tconstruct.blocks.logic.ToolStationLogic;
|
||||
import tconstruct.items.blocks.BarricadeItem;
|
||||
import tconstruct.items.blocks.CastingChannelItem;
|
||||
import tconstruct.items.blocks.CraftedSoilItemBlock;
|
||||
import tconstruct.items.blocks.CraftingSlabItemBlock;
|
||||
import tconstruct.items.blocks.GlassBlockItem;
|
||||
import tconstruct.items.blocks.GlassPaneItem;
|
||||
import tconstruct.items.blocks.GravelOreItem;
|
||||
import tconstruct.items.blocks.HamboneItemBlock;
|
||||
import tconstruct.items.blocks.ItemBlockLandmine;
|
||||
import tconstruct.items.blocks.LavaTankItemBlock;
|
||||
import tconstruct.items.blocks.MetadataItemBlock;
|
||||
import tconstruct.items.blocks.MetalItemBlock;
|
||||
import tconstruct.items.blocks.MetalOreItemBlock;
|
||||
import tconstruct.items.blocks.MultiBrickFancyItem;
|
||||
import tconstruct.items.blocks.MultiBrickItem;
|
||||
import tconstruct.items.blocks.OreberryBushItem;
|
||||
import tconstruct.items.blocks.OreberryBushSecondItem;
|
||||
import tconstruct.items.blocks.SearedSlabItem;
|
||||
import tconstruct.items.blocks.SearedTableItemBlock;
|
||||
import tconstruct.items.blocks.SlimeGelItemBlock;
|
||||
import tconstruct.items.blocks.SlimeGrassItemBlock;
|
||||
import tconstruct.items.blocks.SlimeLeavesItemBlock;
|
||||
import tconstruct.items.blocks.SlimeSaplingItemBlock;
|
||||
import tconstruct.items.blocks.SlimeTallGrassItem;
|
||||
import tconstruct.items.blocks.SmelteryItemBlock;
|
||||
import tconstruct.items.blocks.SpeedBlockItem;
|
||||
import tconstruct.items.blocks.SpeedSlabItem;
|
||||
import tconstruct.items.blocks.StainedGlassClearItem;
|
||||
import tconstruct.items.blocks.StainedGlassClearPaneItem;
|
||||
import tconstruct.items.blocks.ToolStationItemBlock;
|
||||
import tconstruct.items.blocks.WoolSlab1Item;
|
||||
import tconstruct.items.blocks.WoolSlab2Item;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class TRecipes
|
||||
{
|
||||
static void registerBlockRecipes ()
|
||||
{
|
||||
//Tool Tables
|
||||
GameRegistry.registerBlock(TRepo.toolStationWood, ToolStationItemBlock.class, "ToolStationBlock");
|
||||
GameRegistry.registerTileEntity(ToolStationLogic.class, "ToolStation");
|
||||
GameRegistry.registerTileEntity(PartBuilderLogic.class, "PartCrafter");
|
||||
GameRegistry.registerTileEntity(PatternChestLogic.class, "PatternHolder");
|
||||
GameRegistry.registerTileEntity(StencilTableLogic.class, "PatternShaper");
|
||||
GameRegistry.registerBlock(TRepo.toolForge, MetadataItemBlock.class, "ToolForgeBlock");
|
||||
GameRegistry.registerTileEntity(ToolForgeLogic.class, "ToolForge");
|
||||
GameRegistry.registerBlock(TRepo.craftingStationWood, "CraftingStation");
|
||||
GameRegistry.registerTileEntity(CraftingStationLogic.class, "CraftingStation");
|
||||
GameRegistry.registerBlock(TRepo.craftingSlabWood, CraftingSlabItemBlock.class, "CraftingSlab");
|
||||
GameRegistry.registerBlock(TRepo.furnaceSlab, "FurnaceSlab");
|
||||
GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace");
|
||||
GameRegistry.registerBlock(TRepo.furnaceSlab, "FurnaceSlab");
|
||||
GameRegistry.registerTileEntity(FurnaceLogic.class, "TConstruct.Furnace");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.heldItemBlock, "HeldItemBlock");
|
||||
GameRegistry.registerTileEntity(FrypanLogic.class, "FrypanLogic");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.craftedSoil, CraftedSoilItemBlock.class, "CraftedSoil");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.searedSlab, SearedSlabItem.class, "SearedSlab");
|
||||
GameRegistry.registerBlock(TRepo.speedSlab, SpeedSlabItem.class, "SpeedSlab");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.metalBlock, MetalItemBlock.class, "MetalBlock");
|
||||
GameRegistry.registerBlock(TRepo.meatBlock, HamboneItemBlock.class, "MeatBlock");
|
||||
|
||||
OreDictionary.registerOre("hambone", new ItemStack(TRepo.meatBlock));
|
||||
GameRegistry.addRecipe(new ItemStack(TRepo.meatBlock), "mmm", "mbm", "mmm", 'b', new ItemStack(Item.bone), 'm', new ItemStack(Item.porkRaw));
|
||||
|
||||
GameRegistry.registerBlock(TRepo.glueBlock, "GlueBlock");
|
||||
OreDictionary.registerOre("blockRubber", new ItemStack(TRepo.glueBlock));
|
||||
|
||||
GameRegistry.registerBlock(TRepo.woolSlab1, WoolSlab1Item.class, "WoolSlab1");
|
||||
GameRegistry.registerBlock(TRepo.woolSlab2, WoolSlab2Item.class, "WoolSlab2");
|
||||
|
||||
//Smeltery stuff
|
||||
GameRegistry.registerBlock(TRepo.smeltery, SmelteryItemBlock.class, "Smeltery");
|
||||
if (PHConstruct.newSmeltery)
|
||||
{
|
||||
GameRegistry.registerTileEntity(AdaptiveSmelteryLogic.class, "TConstruct.Smeltery");
|
||||
GameRegistry.registerTileEntity(AdaptiveDrainLogic.class, "TConstruct.SmelteryDrain");
|
||||
}
|
||||
else
|
||||
{
|
||||
GameRegistry.registerTileEntity(SmelteryLogic.class, "TConstruct.Smeltery");
|
||||
GameRegistry.registerTileEntity(SmelteryDrainLogic.class, "TConstruct.SmelteryDrain");
|
||||
}
|
||||
GameRegistry.registerTileEntity(MultiServantLogic.class, "TConstruct.Servants");
|
||||
GameRegistry.registerBlock(TRepo.lavaTank, LavaTankItemBlock.class, "LavaTank");
|
||||
GameRegistry.registerTileEntity(LavaTankLogic.class, "TConstruct.LavaTank");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.searedBlock, SearedTableItemBlock.class, "SearedBlock");
|
||||
GameRegistry.registerTileEntity(CastingTableLogic.class, "CastingTable");
|
||||
GameRegistry.registerTileEntity(FaucetLogic.class, "Faucet");
|
||||
GameRegistry.registerTileEntity(CastingBasinLogic.class, "CastingBasin");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.castingChannel, CastingChannelItem.class, "CastingChannel");
|
||||
GameRegistry.registerTileEntity(CastingChannelLogic.class, "CastingChannel");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.tankAir, "TankAir");
|
||||
GameRegistry.registerTileEntity(TankAirLogic.class, "tconstruct.tank.air");
|
||||
|
||||
//Traps
|
||||
GameRegistry.registerBlock(TRepo.landmine, ItemBlockLandmine.class, "Redstone.Landmine");
|
||||
GameRegistry.registerTileEntity(TileEntityLandmine.class, "Landmine");
|
||||
GameRegistry.registerBlock(TRepo.punji, "trap.punji");
|
||||
GameRegistry.registerBlock(TRepo.barricadeOak, BarricadeItem.class, "trap.barricade.oak");
|
||||
GameRegistry.registerBlock(TRepo.barricadeSpruce, BarricadeItem.class, "trap.barricade.spruce");
|
||||
GameRegistry.registerBlock(TRepo.barricadeBirch, BarricadeItem.class, "trap.barricade.birch");
|
||||
GameRegistry.registerBlock(TRepo.barricadeJungle, BarricadeItem.class, "trap.barricade.jungle");
|
||||
GameRegistry.registerBlock(TRepo.slimeExplosive, MetadataItemBlock.class, "explosive.slime");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.dryingRack, "Armor.DryingRack");
|
||||
GameRegistry.registerTileEntity(DryingRackLogic.class, "Armor.DryingRack");
|
||||
//fluids
|
||||
|
||||
//Slime Islands
|
||||
GameRegistry.registerBlock(TRepo.slimeGel, SlimeGelItemBlock.class, "slime.gel");
|
||||
GameRegistry.registerBlock(TRepo.slimeGrass, SlimeGrassItemBlock.class, "slime.grass");
|
||||
GameRegistry.registerBlock(TRepo.slimeTallGrass, SlimeTallGrassItem.class, "slime.grass.tall");
|
||||
GameRegistry.registerBlock(TRepo.slimeLeaves, SlimeLeavesItemBlock.class, "slime.leaves");
|
||||
GameRegistry.registerBlock(TRepo.slimeSapling, SlimeSaplingItemBlock.class, "slime.sapling");
|
||||
GameRegistry.registerBlock(TRepo.slimeChannel, "slime.channel");
|
||||
GameRegistry.registerBlock(TRepo.slimePad, "slime.pad");
|
||||
TConstructRegistry.drawbridgeState[TRepo.slimePad.blockID] = 1;
|
||||
|
||||
//Decoration
|
||||
GameRegistry.registerBlock(TRepo.stoneTorch, "decoration.stonetorch");
|
||||
GameRegistry.registerBlock(TRepo.stoneLadder, "decoration.stoneladder");
|
||||
GameRegistry.registerBlock(TRepo.multiBrick, MultiBrickItem.class, "decoration.multibrick");
|
||||
GameRegistry.registerBlock(TRepo.multiBrickFancy, MultiBrickFancyItem.class, "decoration.multibrickfancy");
|
||||
|
||||
//Ores
|
||||
GameRegistry.registerBlock(TRepo.oreBerry, OreberryBushItem.class, "ore.berries.one");
|
||||
GameRegistry.registerBlock(TRepo.oreBerrySecond, OreberryBushSecondItem.class, "ore.berries.two");
|
||||
GameRegistry.registerBlock(TRepo.oreSlag, MetalOreItemBlock.class, "SearedBrick");
|
||||
GameRegistry.registerBlock(TRepo.oreGravel, GravelOreItem.class, "GravelOre");
|
||||
|
||||
GameRegistry.registerBlock(TRepo.speedBlock, SpeedBlockItem.class, "SpeedBlock");
|
||||
|
||||
//Glass
|
||||
GameRegistry.registerBlock(TRepo.clearGlass, GlassBlockItem.class, "GlassBlock");
|
||||
GameRegistry.registerBlock(TRepo.glassPane, GlassPaneItem.class, "GlassPane");
|
||||
GameRegistry.registerBlock(TRepo.stainedGlassClear, StainedGlassClearItem.class, "GlassBlock.StainedClear");
|
||||
GameRegistry.registerBlock(TRepo.stainedGlassClearPane, StainedGlassClearPaneItem.class, "GlassPaneClearStained");
|
||||
|
||||
//Rail
|
||||
GameRegistry.registerBlock(TRepo.woodenRail, "rail.wood");
|
||||
}
|
||||
|
||||
static void registerItemRecipes ()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,265 @@
|
||||
package tconstruct.common;
|
||||
|
||||
import tconstruct.blocks.OreberryBush;
|
||||
import tconstruct.blocks.slime.SlimeLeaves;
|
||||
import tconstruct.blocks.slime.SlimeSapling;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.modifiers.ModFlux;
|
||||
import tconstruct.modifiers.ModLapis;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.StepSound;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.EnumArmorMaterial;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.common.ChestGenHooks;
|
||||
import net.minecraftforge.fluids.Fluid;
|
||||
|
||||
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 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 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 StepSound 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;
|
||||
|
||||
//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 modF;
|
||||
public static ModLapis modL;
|
||||
|
||||
//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 EnumArmorMaterial materialWood;
|
||||
|
||||
|
||||
public static Fluid[] fluids = new Fluid[27];
|
||||
public static Block[] fluidBlocks = new Block[26];
|
||||
|
||||
|
||||
}
|
||||
@@ -21,6 +21,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
@@ -452,7 +453,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
this.entityDropItem(toolStack, 0f);
|
||||
if (rand.nextInt(5) == 0)
|
||||
{
|
||||
ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1);
|
||||
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
|
||||
this.entityDropItem(dropStack, 0f);
|
||||
}
|
||||
}
|
||||
@@ -520,7 +521,7 @@ public class BlueSlime extends EntityLiving implements IMob, IBossDisplayData
|
||||
*/
|
||||
protected int getDropItemId ()
|
||||
{
|
||||
return TContent.strangeFood.itemID;
|
||||
return TRepo.strangeFood.itemID;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.world.World;
|
||||
@@ -74,7 +74,7 @@ public class CraftingItem extends Item
|
||||
@Override
|
||||
public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
|
||||
{
|
||||
if(par1ItemStack.itemID == TContent.blankPattern.itemID){
|
||||
if(par1ItemStack.itemID == TRepo.blankPattern.itemID){
|
||||
par3EntityPlayer.addStat(TAchievements.achievements.get("tconstruct.pattern"), 1);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.util.List;
|
||||
import net.minecraftforge.fluids.BlockFluidFinite;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.blocks.logic.LiquidTextureLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -27,7 +27,7 @@ public class FilledBucket extends ItemBucket
|
||||
public FilledBucket(int id)
|
||||
{
|
||||
super(id, 0);
|
||||
//setTextureFile(TContent.craftingTexture);
|
||||
//setTextureFile(TRepo.craftingTexture);
|
||||
//setIconIndex(224);
|
||||
setUnlocalizedName("tconstruct.bucket");
|
||||
setContainerItem(Item.bucketEmpty);
|
||||
@@ -141,10 +141,10 @@ public class FilledBucket extends ItemBucket
|
||||
{
|
||||
try {
|
||||
int metadata = 0;
|
||||
if (TContent.fluidBlocks[type] instanceof BlockFluidFinite)
|
||||
if (TRepo.fluidBlocks[type] instanceof BlockFluidFinite)
|
||||
metadata = 7;
|
||||
|
||||
world.setBlock(clickX, clickY, clickZ, TContent.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids
|
||||
world.setBlock(clickX, clickY, clickZ, TRepo.fluidBlocks[type].blockID, metadata, 3); //TODO: Merge liquids
|
||||
} catch (ArrayIndexOutOfBoundsException ex) {
|
||||
TConstruct.logger.warning("AIOBE occured when placing bucket into world; " + ex);
|
||||
return false;
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import tconstruct.blocks.logic.TileEntityLandmine;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
/**
|
||||
*
|
||||
@@ -58,25 +58,25 @@ public class ItemBlockLandmine extends ItemBlock
|
||||
@Override
|
||||
public boolean placeBlockAt (ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata)
|
||||
{
|
||||
if (!world.setBlock(x, y, z, TContent.landmine.blockID, metadata, 3))
|
||||
if (!world.setBlock(x, y, z, TRepo.landmine.blockID, metadata, 3))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (world.getBlockId(x, y, z) == TContent.landmine.blockID)
|
||||
if (world.getBlockId(x, y, z) == TRepo.landmine.blockID)
|
||||
{
|
||||
TContent.landmine.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
|
||||
TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z);
|
||||
if (te == null)
|
||||
{
|
||||
te = (TileEntityLandmine) TContent.landmine.createTileEntity(world, metadata);
|
||||
te = (TileEntityLandmine) TRepo.landmine.createTileEntity(world, metadata);
|
||||
}
|
||||
|
||||
te.triggerType = stack.getItemDamage();
|
||||
world.setBlockTileEntity(x, y, z, te);
|
||||
|
||||
TContent.landmine.onPostBlockPlaced(world, x, y, z, metadata);
|
||||
TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -44,7 +44,7 @@ public class OreberryBushItem extends ItemBlock
|
||||
{
|
||||
Block block = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerry) && world.isAirBlock(x, y + 1, z))
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerry) && world.isAirBlock(x, y + 1, z))
|
||||
{
|
||||
world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3);
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.blocks;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -48,7 +48,7 @@ public class OreberryBushSecondItem extends ItemBlock
|
||||
{
|
||||
Block block = Block.blocksList[world.getBlockId(x, y, z)];
|
||||
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TContent.oreBerrySecond) && world.isAirBlock(x, y + 1, z))
|
||||
if (block != null && block.canSustainPlant(world, x, y, z, ForgeDirection.UP, (IPlantable) TRepo.oreBerrySecond) && world.isAirBlock(x, y + 1, z))
|
||||
{
|
||||
world.setBlock(x, y + 1, z, blockID, stack.getItemDamage() % 4, 3);
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
|
||||
@@ -4,7 +4,7 @@ import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.Icon;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -28,7 +28,7 @@ public class SlimeTallGrassItem extends ItemBlock
|
||||
public Icon getIconFromDamage (int meta)
|
||||
{
|
||||
int arr = MathHelper.clamp_int(meta, 0, blockType.length);
|
||||
return TContent.slimeTallGrass.getIcon(0, arr);
|
||||
return TRepo.slimeTallGrass.getIcon(0, arr);
|
||||
}
|
||||
|
||||
public String getUnlocalizedName (ItemStack itemstack)
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.items.tools;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
|
||||
@@ -73,13 +73,13 @@ public class Arrow extends ToolCore
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.arrowhead;
|
||||
return TRepo.arrowhead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.fletching;
|
||||
return TRepo.fletching;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -125,7 +125,7 @@ public class Arrow extends ToolCore
|
||||
|
||||
if (tool == null)
|
||||
{
|
||||
if (!TContent.supressMissingToolLogs)
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warning("Creative builder failed tool for Vanilla style" + this.getToolName());
|
||||
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.item.Item;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
@@ -99,7 +99,7 @@ public class BattleSign extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.signHead;
|
||||
return TRepo.signHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -58,25 +58,25 @@ public class Battleaxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.broadAxeHead;
|
||||
return TRepo.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.broadAxeHead;
|
||||
return TRepo.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.projectile.ArrowEntity;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -63,7 +63,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(TContent.arrow.itemID, player.inventory);
|
||||
int slotID = getInventorySlotContainItem(TRepo.arrow.itemID, player.inventory);
|
||||
int arrowID = getInventorySlotContainItem(Item.arrow.itemID, player.inventory);
|
||||
int arrowState = 0;
|
||||
ItemStack tinkerArrow = null;
|
||||
@@ -149,7 +149,7 @@ public abstract class BowBase extends ToolCore
|
||||
//if (tinkerArrow != null)
|
||||
if (slotID != -1 && (arrowID == -1 || slotID < arrowID))
|
||||
{
|
||||
player.inventory.consumeInventoryItem(TContent.arrow.itemID);
|
||||
player.inventory.consumeInventoryItem(TRepo.arrow.itemID);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -215,7 +215,7 @@ public abstract class BowBase extends ToolCore
|
||||
return event.result;
|
||||
}
|
||||
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TContent.arrow.itemID))
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Item.arrow.itemID) || player.inventory.hasItem(TRepo.arrow.itemID))
|
||||
{
|
||||
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
|
||||
}
|
||||
@@ -771,7 +771,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 (!TContent.supressMissingToolLogs)
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName());
|
||||
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.item.Item;
|
||||
|
||||
@@ -15,13 +15,13 @@ public class Broadsword extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.wideGuard;
|
||||
return TRepo.wideGuard;
|
||||
}
|
||||
|
||||
public float getDurabilityModifier ()
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.Detailing.DetailInput;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
@@ -211,7 +211,7 @@ public class Chisel extends ToolCore
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.chiselHead;
|
||||
return TRepo.chiselHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
@@ -25,25 +25,25 @@ public class Cleaver extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.largeSwordBlade;
|
||||
return TRepo.largeSwordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.tools;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
@@ -19,13 +19,13 @@ public class Cutlass extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.fullGuard;
|
||||
return TRepo.fullGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.entity.projectile.DaggerEntity;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -97,12 +97,12 @@ public class Dagger extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.knifeBlade;
|
||||
return TRepo.knifeBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.crossbar;
|
||||
return TRepo.crossbar;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -42,25 +42,25 @@ public class Excavator extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.excavatorHead;
|
||||
return TRepo.excavatorHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.items.tools;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.blocks.logic.EquipLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
@@ -121,14 +121,14 @@ public class FryingPan extends Weapon
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else if (!TContent.heldItemBlock.canPlaceBlockAt(world, x, y, z))
|
||||
else if (!TRepo.heldItemBlock.canPlaceBlockAt(world, x, y, z))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
world.setBlock(x, y, z, TContent.heldItemBlock.blockID, 0, 3);
|
||||
TContent.heldItemBlock.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
world.setBlock(x, y, z, TRepo.heldItemBlock.blockID, 0, 3);
|
||||
TRepo.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.getBlockTileEntity(x, y, z);
|
||||
@@ -143,7 +143,7 @@ public class FryingPan extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.frypanHead;
|
||||
return TRepo.frypanHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.items.tools;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
@@ -72,25 +72,25 @@ public class Hammer extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.hammerHead;
|
||||
return TRepo.hammerHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
public float getDurabilityModifier ()
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
@@ -48,7 +48,7 @@ public class Hatchet extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.hatchetHead;
|
||||
return TRepo.hatchetHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.client.entity.EntityPlayerSP;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -102,13 +102,13 @@ public class Longsword extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.handGuard;
|
||||
return TRepo.handGuard;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -323,25 +323,25 @@ public class LumberAxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.broadAxeHead;
|
||||
return TRepo.broadAxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.largePlate;
|
||||
return TRepo.largePlate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.DualHarvestTool;
|
||||
@@ -53,13 +53,13 @@ public class Mattock extends DualHarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.hatchetHead;
|
||||
return TRepo.hatchetHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.shovelHead;
|
||||
return TRepo.shovelHead;
|
||||
}
|
||||
|
||||
public int durabilityTypeAccessory ()
|
||||
@@ -120,7 +120,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 (!TContent.supressMissingToolLogs)
|
||||
if (!TRepo.supressMissingToolLogs)
|
||||
{
|
||||
TConstruct.logger.warning("Creative builder failed tool for " + name + this.getToolName());
|
||||
TConstruct.logger.warning("Make sure you do not have item ID conflicts");
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -30,13 +30,13 @@ public class Pickaxe extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.pickaxeHead;
|
||||
return TRepo.pickaxeHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.binding;
|
||||
return TRepo.binding;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.Weapon;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
@@ -73,13 +73,13 @@ public class Rapier extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.swordBlade;
|
||||
return TRepo.swordBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.crossbar;
|
||||
return TRepo.crossbar;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,7 +2,7 @@ package tconstruct.items.tools;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
@@ -45,25 +45,25 @@ public class Scythe extends Weapon
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.scytheBlade;
|
||||
return TRepo.scytheBlade;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.toughBinding;
|
||||
return TRepo.toughBinding;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getExtraItem ()
|
||||
{
|
||||
return TContent.toughRod;
|
||||
return TRepo.toughRod;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@@ -54,19 +54,19 @@ public class Shortbow extends BowBase
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.toolRod;
|
||||
return TRepo.toolRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getHandleItem ()
|
||||
{
|
||||
return TContent.bowstring;
|
||||
return TRepo.bowstring;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getAccessoryItem ()
|
||||
{
|
||||
return TContent.toolRod;
|
||||
return TRepo.toolRod;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package tconstruct.items.tools;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.HarvestTool;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.Item;
|
||||
@@ -32,7 +32,7 @@ public class Shovel extends HarvestTool
|
||||
@Override
|
||||
public Item getHeadItem ()
|
||||
{
|
||||
return TContent.shovelHead;
|
||||
return TRepo.shovelHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -2,66 +2,66 @@ package tconstruct.library.crafting;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
public enum FluidType
|
||||
{
|
||||
/** Vanilla Water Smelting **/
|
||||
Water(Block.snow.blockID, 0, 20, FluidRegistry.getFluid("water"), false),
|
||||
/** Iron Smelting **/
|
||||
Iron(Block.blockIron.blockID, 0, 600, TContent.moltenIronFluid, true),
|
||||
Iron(Block.blockIron.blockID, 0, 600, TRepo.moltenIronFluid, true),
|
||||
/** Gold Smelting **/
|
||||
Gold(Block.blockGold.blockID, 0, 400, TContent.moltenGoldFluid, false),
|
||||
Gold(Block.blockGold.blockID, 0, 400, TRepo.moltenGoldFluid, false),
|
||||
/** Tin Smelting **/
|
||||
Tin(TContent.metalBlock.blockID, 5, 400, TContent.moltenTinFluid, false),
|
||||
Tin(TRepo.metalBlock.blockID, 5, 400, TRepo.moltenTinFluid, false),
|
||||
/** Copper Smelting **/
|
||||
Copper(TContent.metalBlock.blockID, 3, 550, TContent.moltenCopperFluid, true),
|
||||
Copper(TRepo.metalBlock.blockID, 3, 550, TRepo.moltenCopperFluid, true),
|
||||
/** Aluminum Smelting **/
|
||||
Aluminum(TContent.metalBlock.blockID, 6, 350, TContent.moltenAluminumFluid, false),
|
||||
Aluminum(TRepo.metalBlock.blockID, 6, 350, TRepo.moltenAluminumFluid, false),
|
||||
/** Natural Aluminum Smelting **/
|
||||
NaturalAluminum(TContent.oreSlag.blockID, 6, 350, TContent.moltenAluminumFluid, false),
|
||||
NaturalAluminum(TRepo.oreSlag.blockID, 6, 350, TRepo.moltenAluminumFluid, false),
|
||||
/** Cobalt Smelting **/
|
||||
Cobalt(TContent.metalBlock.blockID, 0, 650, TContent.moltenCobaltFluid, true),
|
||||
Cobalt(TRepo.metalBlock.blockID, 0, 650, TRepo.moltenCobaltFluid, true),
|
||||
/** Ardite Smelting **/
|
||||
Ardite(TContent.metalBlock.blockID, 1, 650, TContent.moltenArditeFluid, true),
|
||||
Ardite(TRepo.metalBlock.blockID, 1, 650, TRepo.moltenArditeFluid, true),
|
||||
/** AluminumBrass Smelting **/
|
||||
AluminumBrass(TContent.metalBlock.blockID, 7, 350, TContent.moltenAlubrassFluid, false),
|
||||
AluminumBrass(TRepo.metalBlock.blockID, 7, 350, TRepo.moltenAlubrassFluid, false),
|
||||
/** Alumite Smelting **/
|
||||
Alumite(TContent.metalBlock.blockID, 8, 800, TContent.moltenAlumiteFluid, true),
|
||||
Alumite(TRepo.metalBlock.blockID, 8, 800, TRepo.moltenAlumiteFluid, true),
|
||||
/** Manyullyn Smelting **/
|
||||
Manyullyn(TContent.metalBlock.blockID, 2, 750, TContent.moltenManyullynFluid, true),
|
||||
Manyullyn(TRepo.metalBlock.blockID, 2, 750, TRepo.moltenManyullynFluid, true),
|
||||
/** Bronze Smelting **/
|
||||
Bronze(TContent.metalBlock.blockID, 4, 500, TContent.moltenBronzeFluid, true),
|
||||
Bronze(TRepo.metalBlock.blockID, 4, 500, TRepo.moltenBronzeFluid, true),
|
||||
/** Steel Smelting **/
|
||||
Steel(TContent.metalBlock.blockID, 9, 700, TContent.moltenSteelFluid, true),
|
||||
Steel(TRepo.metalBlock.blockID, 9, 700, TRepo.moltenSteelFluid, true),
|
||||
/** Nickel Smelting **/
|
||||
Nickel(TContent.metalBlock.blockID, 0, 400, TContent.moltenNickelFluid, false),
|
||||
Nickel(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenNickelFluid, false),
|
||||
/** Lead Smelting **/
|
||||
Lead(TContent.metalBlock.blockID, 0, 400, TContent.moltenLeadFluid, false),
|
||||
Lead(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenLeadFluid, false),
|
||||
/** Silver Smelting **/
|
||||
Silver(TContent.metalBlock.blockID, 0, 400, TContent.moltenSilverFluid, false),
|
||||
Silver(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenSilverFluid, false),
|
||||
/** Platinum Smelting **/
|
||||
Platinum(TContent.metalBlock.blockID, 0, 400, TContent.moltenShinyFluid, false),
|
||||
Platinum(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenShinyFluid, false),
|
||||
/** Invar Smelting **/
|
||||
Invar(TContent.metalBlock.blockID, 0, 400, TContent.moltenInvarFluid, false),
|
||||
Invar(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenInvarFluid, false),
|
||||
/** Electrum Smelting **/
|
||||
Electrum(TContent.metalBlock.blockID, 0, 400, TContent.moltenElectrumFluid, false),
|
||||
Electrum(TRepo.metalBlock.blockID, 0, 400, TRepo.moltenElectrumFluid, false),
|
||||
/** Obsidian Smelting **/
|
||||
Obsidian(Block.obsidian.blockID, 0, 750, TContent.moltenObsidianFluid, true),
|
||||
Obsidian(Block.obsidian.blockID, 0, 750, TRepo.moltenObsidianFluid, true),
|
||||
/** Ender Smelting **/
|
||||
Ender(TContent.metalBlock.blockID, 10, 500, TContent.moltenEnderFluid, false),
|
||||
Ender(TRepo.metalBlock.blockID, 10, 500, TRepo.moltenEnderFluid, false),
|
||||
/** Glass Smelting **/
|
||||
Glass(Block.sand.blockID, 0, 625, TContent.moltenGlassFluid, false),
|
||||
Glass(Block.sand.blockID, 0, 625, TRepo.moltenGlassFluid, false),
|
||||
/** Stone Smelting **/
|
||||
Stone(Block.stone.blockID, 0, 800, TContent.moltenStoneFluid, true),
|
||||
Stone(Block.stone.blockID, 0, 800, TRepo.moltenStoneFluid, true),
|
||||
/** Emerald Smelting **/
|
||||
Emerald(Block.oreEmerald.blockID, 0, 575, TContent.moltenEmeraldFluid, false),
|
||||
Emerald(Block.oreEmerald.blockID, 0, 575, TRepo.moltenEmeraldFluid, false),
|
||||
/** Slime Smelting **/
|
||||
Slime(TContent.slimeGel.blockID, 0, 250, TContent.blueSlimeFluid, false),
|
||||
Slime(TRepo.slimeGel.blockID, 0, 250, TRepo.blueSlimeFluid, false),
|
||||
/** Pigiron Smelting **/
|
||||
PigIron(TContent.meatBlock.blockID, 0, 610, TContent.pigIronFluid, true),
|
||||
PigIron(TRepo.meatBlock.blockID, 0, 610, TRepo.pigIronFluid, true),
|
||||
/** Glue Smelting **/
|
||||
Glue(TContent.glueBlock.blockID, 0, 125, TContent.glueFluid, false);
|
||||
Glue(TRepo.glueBlock.blockID, 0, 125, TRepo.glueFluid, false);
|
||||
|
||||
public final int renderBlockID;
|
||||
public final int renderMeta;
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.ActiveToolMod;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
@@ -55,7 +55,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
{
|
||||
if (entity instanceof EntityPlayer && ((EntityPlayer) entity).capabilities.isCreativeMode)
|
||||
return false;
|
||||
TContent.modL.midStreamModify(stack, tool);
|
||||
TRepo.modL.midStreamModify(stack, tool);
|
||||
|
||||
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
|
||||
World world = entity.worldObj;
|
||||
@@ -151,7 +151,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
@Override
|
||||
public int baseAttackDamage (int earlyModDamage, int damage, ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
|
||||
{
|
||||
TContent.modL.midStreamModify(stack, tool);
|
||||
TRepo.modL.midStreamModify(stack, tool);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
EnumCreatureAttribute attribute = ((EntityLivingBase) entity).getCreatureAttribute();
|
||||
if (attribute == EnumCreatureAttribute.UNDEAD)
|
||||
{
|
||||
if (tool == TContent.hammer)
|
||||
if (tool == TRepo.hammer)
|
||||
{
|
||||
int level = 2;
|
||||
bonus += random.nextInt(level * 2 + 1) + level * 2;
|
||||
@@ -203,7 +203,7 @@ public class TActiveOmniMod extends ActiveToolMod
|
||||
|
||||
public boolean doesCriticalHit (ToolCore tool, NBTTagCompound tags, NBTTagCompound toolTags, ItemStack stack, EntityLivingBase player, Entity entity)
|
||||
{
|
||||
if (tool == TContent.cutlass && random.nextInt(10) == 0)
|
||||
if (tool == TRepo.cutlass && random.nextInt(10) == 0)
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package tconstruct.util;
|
||||
import tconstruct.achievements.TAchievements;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.util.player.TPlayerStats;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -21,7 +21,7 @@ public class TCraftingHandler implements ICraftingHandler
|
||||
int itemID = item.getItem().itemID;
|
||||
if (!player.worldObj.isRemote)
|
||||
{
|
||||
if (itemID == TContent.toolStationWood.blockID)
|
||||
if (itemID == TRepo.toolStationWood.blockID)
|
||||
{
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
|
||||
NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct");
|
||||
@@ -29,10 +29,10 @@ public class TCraftingHandler implements ICraftingHandler
|
||||
{
|
||||
stats.materialManual = true;
|
||||
tags.setBoolean("materialManual", true);
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.manualBook, 1, 1));
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.manualBook, 1, 1));
|
||||
}
|
||||
}
|
||||
if (itemID == TContent.smeltery.blockID || itemID == TContent.lavaTank.blockID)
|
||||
if (itemID == TRepo.smeltery.blockID || itemID == TRepo.lavaTank.blockID)
|
||||
{
|
||||
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username);
|
||||
NBTTagCompound tags = player.getEntityData().getCompoundTag("TConstruct");
|
||||
@@ -40,7 +40,7 @@ public class TCraftingHandler implements ICraftingHandler
|
||||
{
|
||||
stats.smelteryManual = true;
|
||||
tags.setBoolean("smelteryManual", true);
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TContent.manualBook, 1, 2));
|
||||
AbilityHelper.spawnItemAtPlayer(player, new ItemStack(TRepo.manualBook, 1, 2));
|
||||
}
|
||||
player.addStat(TAchievements.achievements.get("tconstruct.smelteryMaker"), 1);
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ import tconstruct.TConstruct;
|
||||
import tconstruct.achievements.TAchievements;
|
||||
import tconstruct.blocks.LiquidMetalFinite;
|
||||
import tconstruct.blocks.TankAirBlock;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.items.tools.FryingPan;
|
||||
import tconstruct.library.TConstructRegistry;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
@@ -70,7 +70,7 @@ public class TEventHandler
|
||||
public void craftTool (ToolCraftEvent.NormalTool event)
|
||||
{
|
||||
NBTTagCompound toolTag = event.toolTag.getCompoundTag("InfiTool");
|
||||
if (PHConstruct.denyMattock && event.tool == TContent.mattock)
|
||||
if (PHConstruct.denyMattock && event.tool == TRepo.mattock)
|
||||
{
|
||||
int head = toolTag.getInteger("Head");
|
||||
int handle = toolTag.getInteger("Handle");
|
||||
@@ -106,7 +106,7 @@ public class TEventHandler
|
||||
toolTag.setInteger("Modifiers", modifiers);
|
||||
}
|
||||
|
||||
if (event.tool == TContent.shortbow)
|
||||
if (event.tool == TRepo.shortbow)
|
||||
{
|
||||
BowMaterial top = TConstructRegistry.getBowMaterial(toolTag.getInteger("Head"));
|
||||
BowMaterial bottom = TConstructRegistry.getBowMaterial(toolTag.getInteger("Accessory"));
|
||||
@@ -134,7 +134,7 @@ public class TEventHandler
|
||||
}
|
||||
}
|
||||
|
||||
if (event.tool == TContent.arrow)
|
||||
if (event.tool == TRepo.arrow)
|
||||
{
|
||||
ArrowMaterial head = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Head"));
|
||||
ArrowMaterial shaft = TConstructRegistry.getArrowMaterial(toolTag.getInteger("Handle"));
|
||||
@@ -172,7 +172,7 @@ public class TEventHandler
|
||||
@ForgeSubscribe
|
||||
public void craftPart (PartBuilderEvent.NormalPart event)
|
||||
{
|
||||
if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 23)
|
||||
if (event.pattern.getItem() == TRepo.woodPattern && event.pattern.getItemDamage() == 23)
|
||||
{
|
||||
ItemStack result = craftBowString(event.material);
|
||||
if (result != null)
|
||||
@@ -181,7 +181,7 @@ public class TEventHandler
|
||||
}
|
||||
}
|
||||
|
||||
if (event.pattern.getItem() == TContent.woodPattern && event.pattern.getItemDamage() == 24)
|
||||
if (event.pattern.getItem() == TRepo.woodPattern && event.pattern.getItemDamage() == 24)
|
||||
{
|
||||
ItemStack result = craftFletching(event.material);
|
||||
if (result != null)
|
||||
@@ -239,7 +239,7 @@ public class TEventHandler
|
||||
EntityPlayer player = (EntityPlayer) event.entityLiving;
|
||||
//Cutlass
|
||||
ItemStack stack = player.getCurrentEquippedItem();
|
||||
if (stack != null && stack.getItem() == TContent.cutlass && player.isUsingItem())
|
||||
if (stack != null && stack.getItem() == TRepo.cutlass && player.isUsingItem())
|
||||
{
|
||||
player.addPotionEffect(new PotionEffect(Potion.moveSpeed.id, 3 * 20, 1));
|
||||
}
|
||||
@@ -277,7 +277,7 @@ public class TEventHandler
|
||||
|
||||
if (random.nextInt(500) == 0 && event.entityLiving instanceof IMob && event.entityLiving.dimension == 0)
|
||||
{
|
||||
ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1);
|
||||
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
|
||||
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
event.drops.add(entityitem);
|
||||
@@ -285,7 +285,7 @@ public class TEventHandler
|
||||
|
||||
if (event.entityLiving instanceof EntityWither && random.nextInt(5) == 0)
|
||||
{
|
||||
ItemStack dropStack = new ItemStack(TContent.heartCanister, 1, 1);
|
||||
ItemStack dropStack = new ItemStack(TRepo.heartCanister, 1, 1);
|
||||
EntityItem entityitem = new EntityItem(event.entityLiving.worldObj, event.entityLiving.posX, event.entityLiving.posY, event.entityLiving.posZ, dropStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
event.drops.add(entityitem);
|
||||
@@ -329,7 +329,7 @@ public class TEventHandler
|
||||
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
|
||||
{
|
||||
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
|
||||
if (stack.getItem() == TContent.cleaver)
|
||||
if (stack.getItem() == TRepo.cleaver)
|
||||
beheading += 2;
|
||||
if (beheading > 0 && random.nextInt(100) < beheading * 10)
|
||||
{
|
||||
@@ -339,7 +339,7 @@ public class TEventHandler
|
||||
}
|
||||
if (enemy.getSkeletonType() == 1 && random.nextInt(Math.max(1, 5 - event.lootingLevel)) == 0)
|
||||
{
|
||||
addDrops(event, new ItemStack(TContent.materials, 1, 8));
|
||||
addDrops(event, new ItemStack(TRepo.materials, 1, 8));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -355,14 +355,14 @@ public class TEventHandler
|
||||
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
|
||||
{
|
||||
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
|
||||
if (stack.getItem() == TContent.cleaver)
|
||||
if (stack.getItem() == TRepo.cleaver)
|
||||
beheading += 2;
|
||||
if (beheading > 0 && random.nextInt(100) < beheading * 10)
|
||||
{
|
||||
addDrops(event, new ItemStack(Item.skull.itemID, 1, 2));
|
||||
}
|
||||
}
|
||||
/*if (stack.getItem() == TContent.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading
|
||||
/*if (stack.getItem() == TRepo.breakerBlade && random.nextInt(100) < 10) //Swap out for real beheading
|
||||
{
|
||||
addDrops(event, new ItemStack(Item.skull.itemID, 1, 2));
|
||||
}*/
|
||||
@@ -380,7 +380,7 @@ public class TEventHandler
|
||||
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
|
||||
{
|
||||
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
|
||||
if (stack.getItem() == TContent.cleaver)
|
||||
if (stack.getItem() == TRepo.cleaver)
|
||||
beheading += 2;
|
||||
if (beheading > 0 && random.nextInt(100) < beheading * 5)
|
||||
{
|
||||
@@ -429,7 +429,7 @@ public class TEventHandler
|
||||
if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore)
|
||||
{
|
||||
int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading");
|
||||
if (stack.getItem() == TContent.cleaver)
|
||||
if (stack.getItem() == TRepo.cleaver)
|
||||
beheading += 2;
|
||||
if (beheading > 0 && random.nextInt(100) < beheading * 50)
|
||||
{
|
||||
@@ -520,9 +520,9 @@ public class TEventHandler
|
||||
{
|
||||
if (!event.world.isRemote)
|
||||
{
|
||||
if (event.ID == TContent.slimeSapling.blockID)
|
||||
if (event.ID == TRepo.slimeSapling.blockID)
|
||||
{
|
||||
if (TContent.slimeSapling.boneFertilize(event.world, event.X, event.Y, event.Z, event.world.rand, event.entityPlayer))
|
||||
if (TRepo.slimeSapling.boneFertilize(event.world, event.X, event.Y, event.Z, event.world.rand, event.entityPlayer))
|
||||
event.setResult(Event.Result.ALLOW);
|
||||
}
|
||||
}
|
||||
@@ -559,9 +559,9 @@ public class TEventHandler
|
||||
}
|
||||
|
||||
int bID = evt.world.getBlockId(hitX, hitY, hitZ);
|
||||
for (int id = 0; id < TContent.fluidBlocks.length; id++)
|
||||
for (int id = 0; id < TRepo.fluidBlocks.length; id++)
|
||||
{
|
||||
if (bID == TContent.fluidBlocks[id].blockID)
|
||||
if (bID == TRepo.fluidBlocks[id].blockID)
|
||||
{
|
||||
if (evt.entityPlayer.capabilities.isCreativeMode)
|
||||
{
|
||||
@@ -569,7 +569,7 @@ public class TEventHandler
|
||||
}
|
||||
else
|
||||
{
|
||||
if (TContent.fluidBlocks[id] instanceof LiquidMetalFinite)
|
||||
if (TRepo.fluidBlocks[id] instanceof LiquidMetalFinite)
|
||||
{
|
||||
evt.world.setBlockToAir(hitX, hitY, hitZ);
|
||||
/*int quanta = 0;
|
||||
@@ -614,7 +614,7 @@ public class TEventHandler
|
||||
}
|
||||
|
||||
evt.setResult(Result.ALLOW);
|
||||
evt.result = new ItemStack(TContent.buckets, 1, id);
|
||||
evt.result = new ItemStack(TRepo.buckets, 1, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,22 +0,0 @@
|
||||
package tconstruct.util.config;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
|
||||
public class AEImcHandler
|
||||
{
|
||||
private static List<String> spatialIOLogics = Arrays.asList("AdaptiveSmelteryLogic", "AdvancedDrawbridgeLogic", "AqueductLogic", "CastingBasinLogic", "CastingChannelLogic", "CastingTableLogic",
|
||||
"CraftingStationLogic", "DrawbridgeLogic", "DryingRackLogic", "EssenceExtractorLogic", "FaucetLogic", "FirestarterLogic", "FrypanLogic", "GolemPedestalLogic", "LavaTankLogic",
|
||||
"PartBuilderLogic", "PatternChestLogic", "RedwireLogic", "SmelteryDrainLogic", "SmelteryLogic", "StencilTableLogic", "TankAirLogic", "TileEntityLandmine", "ToolForgeLogic",
|
||||
"ToolStationLogic", "TowerFurnaceLogic", "MultiServantLogic");
|
||||
|
||||
public static void registerForSpatialIO ()
|
||||
{
|
||||
for (String s : spatialIOLogics)
|
||||
{
|
||||
FMLInterModComms.sendMessage("AppliedEnergistics", "movabletile", "tconstruct.blocks.logic." + s);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,53 +0,0 @@
|
||||
package tconstruct.util.config;
|
||||
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import tconstruct.common.TContent;
|
||||
|
||||
public class BCImcHandler
|
||||
{
|
||||
public static void registerFacades ()
|
||||
{
|
||||
// Smeltery Blocks
|
||||
addFacade(TContent.smeltery.blockID, 2);
|
||||
for (int sc = 4; sc < 11; sc++)
|
||||
{
|
||||
addFacade(TContent.smeltery.blockID, sc);
|
||||
}
|
||||
// Multi Brick + Fancy
|
||||
for (int sc = 0; sc < 13; sc++)
|
||||
{
|
||||
addFacade(TContent.multiBrick.blockID, sc);
|
||||
}
|
||||
for (int sc = 0; sc < 16; sc++)
|
||||
{
|
||||
addFacade(TContent.multiBrickFancy.blockID, sc);
|
||||
}
|
||||
// Special Soil
|
||||
for (int sc = 0; sc < 6; sc++)
|
||||
{
|
||||
addFacade(TContent.craftedSoil.blockID, sc);
|
||||
}
|
||||
// Metal Storage
|
||||
for (int sc = 0; sc < 11; sc++)
|
||||
{
|
||||
addFacade(TContent.metalBlock.blockID, sc);
|
||||
}
|
||||
// Speed Block
|
||||
for (int sc = 0; sc < 7; sc++)
|
||||
{
|
||||
addFacade(TContent.speedBlock.blockID, sc);
|
||||
}
|
||||
// Hambone
|
||||
addFacade(TContent.meatBlock.blockID, 4);
|
||||
addFacade(TContent.meatBlock.blockID, 8);
|
||||
|
||||
// Slime Gel
|
||||
addFacade(TContent.slimeGel.blockID, 0);
|
||||
addFacade(TContent.slimeGel.blockID, 1);
|
||||
}
|
||||
|
||||
private static void addFacade (int blockId, int meta)
|
||||
{
|
||||
FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade", String.format("%d@%d", blockId, meta));
|
||||
}
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
package tconstruct.util.config;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
import cpw.mods.fml.common.event.FMLInterModComms;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import tconstruct.common.TContent;
|
||||
|
||||
public class MystImcHandler
|
||||
{
|
||||
private static String[] FluidBlackList = new String[] { "invar.molten", "electrum.molten", "bronze.molten", "aluminumbrass.molten", "manyullyn.molten", "alumite.molten", "cobalt.molten",
|
||||
"moltenArdite", "ender", "steel.molten", "platinum.molten" };// = new String[]();
|
||||
private static ArrayList<String> additionalFluids = new ArrayList<String>();
|
||||
|
||||
public static void addFluidToBlacklist (String fluidName)
|
||||
{
|
||||
additionalFluids.add(fluidName);
|
||||
}
|
||||
|
||||
public static void blacklistFluids ()
|
||||
{
|
||||
for (String nm : additionalFluids)
|
||||
{
|
||||
// check if exists??
|
||||
SendFluidIMCBLMsg(nm);
|
||||
}
|
||||
for (String nm : FluidBlackList)
|
||||
{
|
||||
// check if exists??
|
||||
SendFluidIMCBLMsg(nm);
|
||||
}
|
||||
}
|
||||
|
||||
public static void SendFluidIMCBLMsg (String FluidName)
|
||||
{
|
||||
NBTTagCompound NBTMsg = new NBTTagCompound();
|
||||
NBTMsg.setCompoundTag("fluidsymbol", new NBTTagCompound());
|
||||
NBTMsg.getCompoundTag("fluidsymbol").setFloat("rarity", 0.0F);
|
||||
NBTMsg.getCompoundTag("fluidsymbol").setFloat("grammarweight", 0.0F);
|
||||
NBTMsg.getCompoundTag("fluidsymbol").setFloat("instabilityPerBlock", 10000F);// renders creative symbol useless
|
||||
NBTMsg.getCompoundTag("fluidsymbol").setString("fluidname", FluidName);
|
||||
FMLInterModComms.sendMessage("Mystcraft", "fluidsymbol", NBTMsg);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -13,7 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
|
||||
@@ -128,7 +128,7 @@ public class ArmorExtended implements IInventory
|
||||
|
||||
/*public void recalculateSkills(EntityPlayer player, TPlayerStats stats)
|
||||
{
|
||||
if (inventory[1] != null && inventory[1].getItem() == TContent.glove)
|
||||
if (inventory[1] != null && inventory[1].getItem() == TRepo.glove)
|
||||
{
|
||||
if (stats.skillList.size() < 1)
|
||||
{
|
||||
@@ -155,7 +155,7 @@ public class ArmorExtended implements IInventory
|
||||
{
|
||||
Side side = FMLCommonHandler.instance().getEffectiveSide();
|
||||
|
||||
if (inventory[6] != null && inventory[6].getItem() == TContent.heartCanister)
|
||||
if (inventory[6] != null && inventory[6].getItem() == TRepo.heartCanister)
|
||||
{
|
||||
ItemStack stack = inventory[6];
|
||||
int meta = stack.getItemDamage();
|
||||
|
||||
@@ -17,7 +17,7 @@ import net.minecraft.network.packet.Packet250CustomPayload;
|
||||
import net.minecraftforge.event.ForgeSubscribe;
|
||||
import net.minecraftforge.event.entity.living.LivingFallEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
@@ -67,7 +67,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
tags.getCompoundTag("TConstruct").setBoolean("beginnerManual", true);
|
||||
if (PHConstruct.beginnerBook)
|
||||
{
|
||||
ItemStack diary = new ItemStack(TContent.manualBook);
|
||||
ItemStack diary = new ItemStack(TRepo.manualBook);
|
||||
if (!entityplayer.inventory.addItemStackToInventory(diary))
|
||||
{
|
||||
AbilityHelper.spawnItemAtPlayer(entityplayer, diary);
|
||||
@@ -76,7 +76,7 @@ public class TPlayerHandler implements IPlayerTracker
|
||||
|
||||
if (entityplayer.username.toLowerCase().equals("fudgy_fetus"))
|
||||
{
|
||||
ItemStack pattern = new ItemStack(TContent.woodPattern, 1, 22);
|
||||
ItemStack pattern = new ItemStack(TRepo.woodPattern, 1, 22);
|
||||
|
||||
NBTTagCompound compound = new NBTTagCompound();
|
||||
compound.setCompoundTag("display", new NBTTagCompound());
|
||||
|
||||
@@ -11,7 +11,7 @@ import net.minecraft.world.WorldType;
|
||||
import net.minecraft.world.chunk.IChunkProvider;
|
||||
import net.minecraft.world.gen.ChunkProviderFlat;
|
||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.util.config.DimensionBlacklist;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.IWorldGenerator;
|
||||
@@ -22,8 +22,8 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator
|
||||
private int gelMeta;
|
||||
int randomness = 2;
|
||||
Random random = new Random();
|
||||
int baseID = TContent.craftedSoil.blockID;//Block.dirt.blockID;
|
||||
int topID = TContent.slimeGrass.blockID;
|
||||
int baseID = TRepo.craftedSoil.blockID;//Block.dirt.blockID;
|
||||
int topID = TRepo.slimeGrass.blockID;
|
||||
SlimeTreeGen trees = new SlimeTreeGen(false, 5, 4, 1, 0);
|
||||
|
||||
public SlimeIslandGen(int id, int meta)
|
||||
@@ -145,7 +145,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator
|
||||
{
|
||||
generateSlimePool(world, rand, xChunk + xRange / 2, yCenter + initialHeight, zChunk + zRange / 2);
|
||||
}
|
||||
PlantGen tallGrass = new PlantGen(TContent.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false);
|
||||
PlantGen tallGrass = new PlantGen(TRepo.slimeTallGrass.blockID, 0, 128, xRange, 1, zRange, false);
|
||||
tallGrass.generate(world, rand, xChunk, yCenter + initialHeight + 1, zChunk);
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
@@ -287,7 +287,7 @@ public class SlimeIslandGen extends WorldGenerator implements IWorldGenerator
|
||||
if (var33 && (yPos < 4 || rand.nextInt(2) != 0) && world.getBlockMaterial(x + xPos, y + yPos, z + zPos).isSolid()
|
||||
&& world.getBlockMaterial(x + xPos, y + yPos + 1, z + zPos) != Material.water)
|
||||
{
|
||||
world.setBlock(x + xPos, y + yPos, z + zPos, TContent.slimeGel.blockID, gelMeta, 2);
|
||||
world.setBlock(x + xPos, y + yPos, z + zPos, TRepo.slimeGel.blockID, gelMeta, 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.gen.feature.WorldGenerator;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
public class SlimeTreeGen extends WorldGenerator
|
||||
{
|
||||
@@ -42,7 +42,7 @@ public class SlimeTreeGen extends WorldGenerator
|
||||
if (yPos >= 1 && yPos + height + 1 <= 256)
|
||||
{
|
||||
Block soil = Block.blocksList[world.getBlockId(xPos, yPos - 1, zPos)];
|
||||
boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TContent.slimeSapling));
|
||||
boolean isSoil = (soil != null && soil.canSustainPlant(world, xPos, yPos - 1, zPos, ForgeDirection.UP, TRepo.slimeSapling));
|
||||
|
||||
if (isSoil)
|
||||
{
|
||||
@@ -75,7 +75,7 @@ public class SlimeTreeGen extends WorldGenerator
|
||||
{
|
||||
int blockID = world.getBlockId(x + xPos, y + yPos, z + zPos);
|
||||
Block block = Block.blocksList[blockID];
|
||||
if (block != null && blockID != TContent.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos))
|
||||
if (block != null && blockID != TRepo.slimeSapling.blockID && !block.isLeaves(world, x + xPos, y + yPos, z + zPos))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -90,7 +90,7 @@ public class SlimeTreeGen extends WorldGenerator
|
||||
do
|
||||
{
|
||||
int heightID = world.getBlockId(x, height, z);
|
||||
if ((heightID == TContent.craftedSoil.blockID || heightID == TContent.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)])
|
||||
if ((heightID == TRepo.craftedSoil.blockID || heightID == TRepo.slimeGrass.blockID) && !Block.opaqueCubeLookup[world.getBlockId(x, height + 1, z)])
|
||||
{
|
||||
ret = height + 1;
|
||||
break;
|
||||
@@ -117,23 +117,23 @@ public class SlimeTreeGen extends WorldGenerator
|
||||
this.setBlockAndMetadata(world, xPos - 1, yPos + height - 3, zPos - 1, 0, 0);
|
||||
|
||||
//Drippers
|
||||
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 4, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 4, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 4, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
|
||||
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 3, yPos + height - 5, zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos - 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + height - 5, zPos + 3, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos + 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos + 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, xPos - 2, yPos + height - 5, zPos - 2, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
}
|
||||
|
||||
void placeDiamondLayer (World world, int xPos, int yPos, int zPos, int range)
|
||||
@@ -144,7 +144,7 @@ public class SlimeTreeGen extends WorldGenerator
|
||||
{
|
||||
if (Math.abs(x) + Math.abs(z) <= range)
|
||||
{
|
||||
this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TContent.slimeLeaves.blockID, this.metaLeaves);
|
||||
this.setBlockAndMetadata(world, x + xPos, yPos, z + zPos, TRepo.slimeLeaves.blockID, this.metaLeaves);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -160,7 +160,7 @@ public class SlimeTreeGen extends WorldGenerator
|
||||
|
||||
if (blockID == 0 || block == null || block.isLeaves(world, xPos, yPos + localHeight, zPos))
|
||||
{
|
||||
this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TContent.slimeGel.blockID, this.metaWood);
|
||||
this.setBlockAndMetadata(world, xPos, yPos + localHeight, zPos, TRepo.slimeGel.blockID, this.metaWood);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldType;
|
||||
import net.minecraft.world.chunk.IChunkProvider;
|
||||
import net.minecraft.world.gen.feature.WorldGenMinable;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
import cpw.mods.fml.common.IWorldGenerator;
|
||||
|
||||
@@ -16,19 +16,19 @@ public class TBaseWorldGenerator implements IWorldGenerator
|
||||
{
|
||||
public TBaseWorldGenerator()
|
||||
{
|
||||
copper = new WorldGenMinable(TContent.oreSlag.blockID, 3, 8, Block.stone.blockID);
|
||||
tin = new WorldGenMinable(TContent.oreSlag.blockID, 4, 8, Block.stone.blockID);
|
||||
aluminum = new WorldGenMinable(TContent.oreSlag.blockID, 5, 6, Block.stone.blockID);
|
||||
copper = new WorldGenMinable(TRepo.oreSlag.blockID, 3, 8, Block.stone.blockID);
|
||||
tin = new WorldGenMinable(TRepo.oreSlag.blockID, 4, 8, Block.stone.blockID);
|
||||
aluminum = new WorldGenMinable(TRepo.oreSlag.blockID, 5, 6, Block.stone.blockID);
|
||||
|
||||
cobalt = new WorldGenMinable(TContent.oreSlag.blockID, 1, 3, Block.netherrack.blockID);
|
||||
ardite = new WorldGenMinable(TContent.oreSlag.blockID, 2, 3, Block.netherrack.blockID);
|
||||
cobalt = new WorldGenMinable(TRepo.oreSlag.blockID, 1, 3, Block.netherrack.blockID);
|
||||
ardite = new WorldGenMinable(TRepo.oreSlag.blockID, 2, 3, Block.netherrack.blockID);
|
||||
|
||||
ironBush = new OreberryBushGen(TContent.oreBerry.blockID, 12, 12);
|
||||
goldBush = new OreberryBushGen(TContent.oreBerry.blockID, 13, 6);
|
||||
copperBush = new OreberryBushGen(TContent.oreBerry.blockID, 14, 12);
|
||||
tinBush = new OreberryBushGen(TContent.oreBerry.blockID, 15, 12);
|
||||
aluminumBush = new OreberryBushGen(TContent.oreBerrySecond.blockID, 12, 14);
|
||||
silverBush = new OreberryBushGen(TContent.oreBerrySecond.blockID, 13, 8);
|
||||
ironBush = new OreberryBushGen(TRepo.oreBerry.blockID, 12, 12);
|
||||
goldBush = new OreberryBushGen(TRepo.oreBerry.blockID, 13, 6);
|
||||
copperBush = new OreberryBushGen(TRepo.oreBerry.blockID, 14, 12);
|
||||
tinBush = new OreberryBushGen(TRepo.oreBerry.blockID, 15, 12);
|
||||
aluminumBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 12, 14);
|
||||
silverBush = new OreberryBushGen(TRepo.oreBerrySecond.blockID, 13, 8);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,7 +6,7 @@ import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.Ev
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import tconstruct.util.config.PHConstruct;
|
||||
|
||||
import net.minecraft.world.World;
|
||||
@@ -19,12 +19,12 @@ import com.google.common.collect.ImmutableList;
|
||||
|
||||
public class TerrainGenEventHandler
|
||||
{
|
||||
private final SurfaceOreGen ironSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 0, 12, true);
|
||||
private final SurfaceOreGen goldSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 1, 20, true);
|
||||
private final SurfaceOreGen copperSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 2, 12, true);
|
||||
private final SurfaceOreGen tinSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 3, 12, true);
|
||||
private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 4, 12, true);
|
||||
private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TContent.oreGravel.blockID, 5, 30, true);
|
||||
private final SurfaceOreGen ironSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 0, 12, true);
|
||||
private final SurfaceOreGen goldSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 1, 20, true);
|
||||
private final SurfaceOreGen copperSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 2, 12, true);
|
||||
private final SurfaceOreGen tinSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 3, 12, true);
|
||||
private final SurfaceOreGen aluminumSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 4, 12, true);
|
||||
private final SurfaceOreGen cobaltSurface = new SurfaceOreGen(TRepo.oreGravel.blockID, 5, 30, true);
|
||||
|
||||
private static ImmutableCollection<BiomeGenBase> EXTRA_ORE_BIOMES = ImmutableList.of(extremeHills, extremeHillsEdge);
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import tconstruct.TConstruct;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.world.World;
|
||||
@@ -64,13 +64,13 @@ public class ComponentSmeltery extends ComponentVillage
|
||||
this.fillWithBlocks(world, sbb, 8, 0, 1, 8, 0, 5, Block.stoneBrick.blockID, Block.stoneBrick.blockID, false);
|
||||
this.fillWithBlocks(world, sbb, 0, 1, 0, 9, 3, 7, 0, 0, false);
|
||||
|
||||
this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TContent.smeltery.blockID, 2, TContent.smeltery.blockID, 2, false); //Basin
|
||||
this.fillWithMetaBlocks(world, sbb, 2, 0, 1, 6, 2, 5, TRepo.smeltery.blockID, 2, TRepo.smeltery.blockID, 2, false); //Basin
|
||||
this.fillWithBlocks(world, sbb, 3, 1, 2, 5, 2, 4, 0, 0, false);
|
||||
|
||||
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 0, 1, 1, 2, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 2, 1, 1, 4, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 0, 7, 1, 2, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TContent.searedBlock.blockID, 2, 7, 1, 4, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 0, 1, 1, 2, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 2, 1, 1, 4, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 0, 7, 1, 2, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.searedBlock.blockID, 2, 7, 1, 4, sbb);
|
||||
|
||||
for (int l = 1; l < 6; ++l)
|
||||
{
|
||||
|
||||
@@ -4,7 +4,7 @@ import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import tconstruct.blocks.logic.PatternChestLogic;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.util.WeightedRandomChestContent;
|
||||
@@ -121,16 +121,16 @@ public class ComponentToolWorkshop extends ComponentVillage
|
||||
this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 3, 5, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, Block.ladder.blockID, i, 3, 4, 5, sbb);
|
||||
|
||||
this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside
|
||||
this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TContent.tinkerHousePatterns.getItems(random), TContent.tinkerHousePatterns.getCount(random));
|
||||
//this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 5, 1, 1, 2, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 1, 1, 1, 3, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 0, 1, 1, 1, sbb); //Inside
|
||||
this.generateStructurePatternChestContents(world, sbb, random, 1, 1, 2, TRepo.tinkerHousePatterns.getItems(random), TRepo.tinkerHousePatterns.getCount(random));
|
||||
//this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 5, 1, 1, 2, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 1, 1, 1, 3, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, Block.workbench.blockID, 0, 1, 1, 4, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TContent.toolStationWood.blockID, 10, 1, 1, 5, sbb);
|
||||
this.placeBlockAtCurrentPosition(world, TRepo.toolStationWood.blockID, 10, 1, 1, 5, sbb);
|
||||
|
||||
//ChestGenHooks info = ChestGenHooks.getInfo("TinkerHouse");
|
||||
|
||||
this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TContent.tinkerHouseChest.getItems(random), TContent.tinkerHouseChest.getCount(random));
|
||||
this.generateStructureChestContents(world, sbb, random, 4, 1, 5, TRepo.tinkerHouseChest.getItems(random), TRepo.tinkerHouseChest.getCount(random));
|
||||
//this.placeBlockAtCurrentPosition(world, Block.chest.blockID, i, 4, 1, 5, sbb);
|
||||
i = this.getMetadataWithOffset(Block.pistonBase.blockID, 3);
|
||||
this.placeBlockAtCurrentPosition(world, Block.pistonBase.blockID, i, 5, 1, 5, sbb);
|
||||
@@ -157,7 +157,7 @@ public class ComponentToolWorkshop extends ComponentVillage
|
||||
|
||||
if (par2StructureBoundingBox.isVecInside(posX, posY, posZ) && world.getBlockId(posX, posY, posZ) != Block.chest.blockID)
|
||||
{
|
||||
world.setBlock(posX, posY, posZ, TContent.toolStationWood.blockID, 5, 2);
|
||||
world.setBlock(posX, posY, posZ, TRepo.toolStationWood.blockID, 5, 2);
|
||||
PatternChestLogic logic = (PatternChestLogic) world.getBlockTileEntity(posX, posY, posZ);
|
||||
|
||||
if (logic != null)
|
||||
|
||||
@@ -9,7 +9,7 @@ import net.minecraft.entity.passive.EntityVillager;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.village.MerchantRecipe;
|
||||
import net.minecraft.village.MerchantRecipeList;
|
||||
import tconstruct.common.TContent;
|
||||
import tconstruct.common.TRepo;
|
||||
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;
|
||||
|
||||
public class TVillageTrades implements IVillageTradeHandler
|
||||
@@ -28,18 +28,18 @@ public class TVillageTrades implements IVillageTradeHandler
|
||||
allowedIngredients.add(new ItemStack(Block.pistonStickyBase, 64));
|
||||
|
||||
// tconstruct blocks
|
||||
allowedIngredients.add(new ItemStack(TContent.barricadeBirch, 64));
|
||||
allowedIngredients.add(new ItemStack(TContent.barricadeJungle, 64));
|
||||
allowedIngredients.add(new ItemStack(TContent.barricadeOak, 64));
|
||||
allowedIngredients.add(new ItemStack(TContent.barricadeSpruce, 64));
|
||||
allowedIngredients.add(new ItemStack(TContent.punji, 64));
|
||||
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 0));
|
||||
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 1));
|
||||
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 5));
|
||||
allowedIngredients.add(new ItemStack(TContent.toolStationWood, 3, 10));
|
||||
allowedIngredients.add(new ItemStack(TRepo.barricadeBirch, 64));
|
||||
allowedIngredients.add(new ItemStack(TRepo.barricadeJungle, 64));
|
||||
allowedIngredients.add(new ItemStack(TRepo.barricadeOak, 64));
|
||||
allowedIngredients.add(new ItemStack(TRepo.barricadeSpruce, 64));
|
||||
allowedIngredients.add(new ItemStack(TRepo.punji, 64));
|
||||
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 0));
|
||||
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 1));
|
||||
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 5));
|
||||
allowedIngredients.add(new ItemStack(TRepo.toolStationWood, 3, 10));
|
||||
for (int sc = 0; sc < 4; sc++)
|
||||
{
|
||||
allowedIngredients.add(new ItemStack(TContent.landmine, 64, sc));
|
||||
allowedIngredients.add(new ItemStack(TRepo.landmine, 64, sc));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -65,14 +65,14 @@ public class TVillageTrades implements IVillageTradeHandler
|
||||
{
|
||||
ingredient2 = null;
|
||||
}
|
||||
result = new ItemStack(TContent.oreBerry, calcStackSize(ingredient, ingredient2), sc);
|
||||
result = new ItemStack(TRepo.oreBerry, calcStackSize(ingredient, ingredient2), sc);
|
||||
// adds iron, gold, copper & tin orebushes to the recipe list
|
||||
recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result));
|
||||
|
||||
if (sc == 8)
|
||||
{
|
||||
// adds alumine orebush to the recipe list
|
||||
result = new ItemStack(TContent.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc);
|
||||
result = new ItemStack(TRepo.oreBerrySecond, calcStackSize(ingredient, ingredient2), sc);
|
||||
recipeList.addToListWithCheck(new MerchantRecipe(ingredient, ingredient2, result));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user