Auto update mappings

This commit is contained in:
modmuss50 2016-05-06 22:13:24 +01:00
parent 595c9575b1
commit 4095a0b52d
79 changed files with 704 additions and 644 deletions

View file

@ -60,7 +60,7 @@ if (ENV.BUILD_NUMBER) {
minecraft { minecraft {
version = "1.9-12.16.0.1865-1.9" version = "1.9-12.16.0.1865-1.9"
mappings = "snapshot_20160316" mappings = "snapshot_20160506"
replace "@MODVERSION@", project.version replace "@MODVERSION@", project.version
// makeObfSourceJar = false // makeObfSourceJar = false
useDepAts = true useDepAts = true
@ -211,3 +211,40 @@ task wrapper(type: Wrapper) {
//To update the wrapper change the version bellow then run: gradle wrapper //To update the wrapper change the version bellow then run: gradle wrapper
gradleVersion = '2.9' gradleVersion = '2.9'
} }
//Thanks Matthew from #ForgeGradle https://gist.github.com/matthewprenger/108265e3efc83181bd2cc2d2fc31a853
task updateMappings(dependsOn: sourceJar) {
def remapped = file('src_remapped/main/java')
def methods = file('methods.csv')
def fields = file('fields.csv')
doLast {
Map<String, String> map = new HashMap<>()
methods.eachLine {line ->
String[] pts = line.split(",")
map.put(pts[0], pts[1])
}
fields.eachLine {line ->
String[] pts = line.split(",")
map.put(pts[0], pts[1])
}
copy {
from zipTree(sourceJar.archivePath)
into remapped
include '**/*.java'
filter { javaLine ->
map.entrySet().each { entry ->
javaLine = javaLine.replace(entry.getKey(), entry.getValue())
}
return javaLine
}
includeEmptyDirs = false
eachFile { println "Processing: $it.name" }
}
}
}

View file

@ -148,7 +148,7 @@ public class Core
// Scrapbox // Scrapbox
if (config.ScrapboxDispenser) if (config.ScrapboxDispenser)
{ {
BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox()); BlockDispenser.DISPENSE_BEHAVIOR_REGISTRY.putObject(ModItems.scrapBox, new BehaviorDispenseScrapbox());
} }
logHelper.info("Initialization Complete"); logHelper.info("Initialization Complete");
} }

View file

@ -5,6 +5,8 @@ import net.minecraft.item.ItemArmor.ArmorMaterial;
import net.minecraft.util.text.translation.I18n; import net.minecraft.util.text.translation.I18n;
import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.common.util.EnumHelper;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemArmor.ArmorMaterial;
/** /**
* This contains some static stuff used in recipes and other things * This contains some static stuff used in recipes and other things
*/ */

View file

@ -39,9 +39,9 @@ public class BlockFusionControlComputer extends BlockMachineBase implements IAdv
} }
@Override @Override
public void onEntityCollidedWithBlock(World worldIn, BlockPos pos, Entity entityIn) public void onEntityWalk(World worldIn, BlockPos pos, Entity entityIn)
{ {
super.onEntityCollidedWithBlock(worldIn, pos, entityIn); super.onEntityWalk(worldIn, pos, entityIn);
if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController) if (worldIn.getTileEntity(pos) instanceof TileEntityFusionController)
{ {
if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0 if (((TileEntityFusionController) worldIn.getTileEntity(pos)).crafingTickTime != 0

View file

@ -10,7 +10,7 @@ public class BlockIronFence extends BlockFence
public BlockIronFence() public BlockIronFence()
{ {
super(Material.iron, BlockPlanks.EnumType.OAK.getMapColor()); super(Material.IRON, BlockPlanks.EnumType.OAK.getMapColor());
setUnlocalizedName("techreborn.ironfence"); setUnlocalizedName("techreborn.ironfence");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setHardness(2.0F); setHardness(2.0F);

View file

@ -30,7 +30,7 @@ public class BlockNuke extends BaseBlock implements ITexturedBlock
public BlockNuke() public BlockNuke()
{ {
super(Material.tnt); super(Material.TNT);
setUnlocalizedName("techreborn.nuke"); setUnlocalizedName("techreborn.nuke");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);

View file

@ -133,7 +133,7 @@ public class BlockOre extends BaseBlock implements ITexturedBlock, IOreNameProvi
{ {
OreDrop cinnabar = new OreDrop(ItemDusts.getDustByName("cinnabar"), OreDrop cinnabar = new OreDrop(ItemDusts.getDustByName("cinnabar"),
ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel); ConfigTechReborn.FortuneSecondaryOreMultiplierPerLevel);
OreDrop redstone = new OreDrop(new ItemStack(Items.redstone), 0.25); OreDrop redstone = new OreDrop(new ItemStack(Items.REDSTONE), 0.25);
OreDropSet set = new OreDropSet(cinnabar, redstone); OreDropSet set = new OreDropSet(cinnabar, redstone);
return set.drop(fortune, random); return set.drop(fortune, random);
} }

View file

@ -35,7 +35,7 @@ public class BlockRubberLog extends Block implements ITexturedBlock
public BlockRubberLog() public BlockRubberLog()
{ {
super(Material.wood); super(Material.WOOD);
setUnlocalizedName("techreborn.rubberlog"); setUnlocalizedName("techreborn.rubberlog");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
this.setHardness(2.0F); this.setHardness(2.0F);

View file

@ -16,7 +16,7 @@ public class BlockRubberPlank extends Block implements ITexturedBlock
public BlockRubberPlank() public BlockRubberPlank()
{ {
super(Material.wood); super(Material.WOOD);
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);
setUnlocalizedName("techreborn.rubberplank"); setUnlocalizedName("techreborn.rubberplank");
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);

View file

@ -26,7 +26,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
public BlockSolarPanel() public BlockSolarPanel()
{ {
super(Material.iron); super(Material.IRON);
setUnlocalizedName("techreborn.solarpanel"); setUnlocalizedName("techreborn.solarpanel");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false)); this.setDefaultState(this.getDefaultState().withProperty(ACTIVE, false));

View file

@ -21,7 +21,7 @@ public class BlockWaterMill extends BaseTileBlock implements ITexturedBlock
public BlockWaterMill() public BlockWaterMill()
{ {
super(Material.iron); super(Material.IRON);
setUnlocalizedName("techreborn.watermill"); setUnlocalizedName("techreborn.watermill");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F); setHardness(2.0F);

View file

@ -21,7 +21,7 @@ public class BlockWindMill extends BaseTileBlock implements ITexturedBlock
public BlockWindMill() public BlockWindMill()
{ {
super(Material.iron); super(Material.IRON);
setUnlocalizedName("techreborn.windmill"); setUnlocalizedName("techreborn.windmill");
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);
setHardness(2.0F); setHardness(2.0F);

View file

@ -45,7 +45,7 @@ public abstract class BlockEnergyStorage extends BaseTileBlock implements IRotat
public BlockEnergyStorage(String name, int guiID) public BlockEnergyStorage(String name, int guiID)
{ {
super(Material.rock); super(Material.ROCK);
setHardness(2f); setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase()); setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -40,7 +40,7 @@ public abstract class BlockTransformer extends BaseTileBlock implements IRotatio
public BlockTransformer(String name) public BlockTransformer(String name)
{ {
super(Material.rock); super(Material.ROCK);
setHardness(2f); setHardness(2f);
setUnlocalizedName("techreborn." + name.toLowerCase()); setUnlocalizedName("techreborn." + name.toLowerCase());
setCreativeTab(TechRebornCreativeTab.instance); setCreativeTab(TechRebornCreativeTab.instance);

View file

@ -62,7 +62,7 @@ public class StackToolTipEvent
{ {
Block block = Block.getBlockFromItem(event.getItemStack().getItem()); Block block = Block.getBlockFromItem(event.getItemStack().getItem());
if (block != null && (block instanceof BlockContainer || block instanceof ITileEntityProvider) if (block != null && (block instanceof BlockContainer || block instanceof ITileEntityProvider)
&& Block.blockRegistry.getNameForObject(block).getResourceDomain().contains("techreborn")) && Block.REGISTRY.getNameForObject(block).getResourceDomain().contains("techreborn"))
{ {
TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld, TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld,
block.getDefaultState()); block.getDefaultState());

View file

@ -41,8 +41,8 @@ public class ContainerAESU extends RebornContainer {
@Override @Override
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) { for (int i = 0; i < this.listeners.size(); i++) {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.euOut != tile.getMaxOutput()) { if (this.euOut != tile.getMaxOutput()) {
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
} }

View file

@ -64,9 +64,9 @@ public class ContainerAlloyFurnace extends RebornContainer
@Override @Override
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting crafting = this.crafters.get(i); ICrafting crafting = this.listeners.get(i);
if (this.currentItemBurnTime != tile.currentItemBurnTime) if (this.currentItemBurnTime != tile.currentItemBurnTime)
{ {
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime); crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);

View file

@ -54,9 +54,9 @@ public class ContainerBatbox extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.energy != (int) tile.getEnergy()) if (this.energy != (int) tile.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

View file

@ -57,9 +57,9 @@ public class ContainerBlastFurnace extends ContainerCrafting
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.heat != tile.getHeat()) if (this.heat != tile.getHeat())
{ {
icrafting.sendProgressBarUpdate(this, 10, tile.getHeat()); icrafting.sendProgressBarUpdate(this, 10, tile.getHeat());

View file

@ -34,9 +34,9 @@ public abstract class ContainerCrafting extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1) if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1)
{ {
icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime); icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);

View file

@ -53,9 +53,9 @@ public class ContainerDieselGenerator extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.energy != (int) tiledieselGenerator.getEnergy()) if (this.energy != (int) tiledieselGenerator.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy()); icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());

View file

@ -56,9 +56,9 @@ public class ContainerFusionReactor extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.coilStatus != fusionController.coilStatus) if (this.coilStatus != fusionController.coilStatus)
{ {
icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus); icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus);

View file

@ -57,9 +57,9 @@ public class ContainerGenerator extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.burnTime != tile.burnTime) if (this.burnTime != tile.burnTime)
{ {
icrafting.sendProgressBarUpdate(this, 0, tile.burnTime); icrafting.sendProgressBarUpdate(this, 0, tile.burnTime);

View file

@ -42,8 +42,8 @@ public class ContainerIDSU extends RebornContainer {
@Override @Override
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) { for (int i = 0; i < this.listeners.size(); i++) {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.euOut != tile.output) { if (this.euOut != tile.output) {
icrafting.sendProgressBarUpdate(this, 0, tile.output); icrafting.sendProgressBarUpdate(this, 0, tile.output);
} }

View file

@ -55,9 +55,9 @@ public class ContainerImplosionCompressor extends ContainerCrafting
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.multIBlockState != getMultIBlockStateint()) if (this.multIBlockState != getMultIBlockStateint())
{ {
icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint()); icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());

View file

@ -57,9 +57,9 @@ public class ContainerIndustrialGrinder extends ContainerCrafting
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.connectionStatus != tile.connectionStatus) if (this.connectionStatus != tile.connectionStatus)
{ {
icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus); icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);

View file

@ -48,8 +48,8 @@ public class ContainerLESU extends RebornContainer {
@Override @Override
public void detectAndSendChanges() { public void detectAndSendChanges() {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) { for (int i = 0; i < this.listeners.size(); i++) {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.euOut != tile.getMaxOutput()) { if (this.euOut != tile.getMaxOutput()) {
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput()); icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
} }

View file

@ -74,9 +74,9 @@ public class ContainerMFE extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.energy != (int) tile.getEnergy()) if (this.energy != (int) tile.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

View file

@ -69,9 +69,9 @@ public class ContainerMFSU extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.energy != (int) tile.getEnergy()) if (this.energy != (int) tile.getEnergy())
{ {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

View file

@ -58,9 +58,9 @@ public class ContainerMatterFabricator extends RebornContainer
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.progressTime != tile.progresstime) if (this.progressTime != tile.progresstime)
{ {
icrafting.sendProgressBarUpdate(this, 0, tile.progresstime); icrafting.sendProgressBarUpdate(this, 0, tile.progresstime);

View file

@ -79,9 +79,9 @@ public class ContainerRollingMachine extends RebornContainer
@Override @Override
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting crafting = this.crafters.get(i); ICrafting crafting = this.listeners.get(i);
if (this.currentItemBurnTime != tile.runTime) if (this.currentItemBurnTime != tile.runTime)
{ {
crafting.sendProgressBarUpdate(this, 0, tile.runTime); crafting.sendProgressBarUpdate(this, 0, tile.runTime);

View file

@ -52,9 +52,9 @@ public class ContainerVacuumFreezer extends ContainerCrafting
public void detectAndSendChanges() public void detectAndSendChanges()
{ {
super.detectAndSendChanges(); super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) for (int i = 0; i < this.listeners.size(); i++)
{ {
ICrafting icrafting = this.crafters.get(i); ICrafting icrafting = this.listeners.get(i);
if (this.machineStatus != tile.multiBlockStatus) if (this.machineStatus != tile.multiBlockStatus)
{ {
icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus); icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);

View file

@ -68,6 +68,6 @@ public class RenderNukePrimed extends Render<EntityNukePrimed>
@Override @Override
protected ResourceLocation getEntityTexture(EntityNukePrimed entity) protected ResourceLocation getEntityTexture(EntityNukePrimed entity)
{ {
return TextureMap.locationBlocksTexture; return TextureMap.LOCATION_BLOCKS_TEXTURE;
} }
} }

View file

@ -74,9 +74,9 @@ public class TechRebornDevCommand extends CommandBase
{ {
EntityPlayerMP playerMP = (EntityPlayerMP) sender; EntityPlayerMP playerMP = (EntityPlayerMP) sender;
List<Block> blocksToRemove = new ArrayList<>(); List<Block> blocksToRemove = new ArrayList<>();
blocksToRemove.add(Blocks.grass); blocksToRemove.add(Blocks.GRASS);
blocksToRemove.add(Blocks.dirt); blocksToRemove.add(Blocks.DIRT);
blocksToRemove.add(Blocks.stone); blocksToRemove.add(Blocks.STONE);
for (int x = 0; x < 25; x++) for (int x = 0; x < 25; x++)
{ {
for (int z = 0; z < 25; z++) for (int z = 0; z < 25; z++)
@ -86,7 +86,7 @@ public class TechRebornDevCommand extends CommandBase
BlockPos pos = new BlockPos(playerMP.posX + x, y, playerMP.posZ + z); BlockPos pos = new BlockPos(playerMP.posX + x, y, playerMP.posZ + z);
if (blocksToRemove.contains(playerMP.worldObj.getBlockState(pos).getBlock())) if (blocksToRemove.contains(playerMP.worldObj.getBlockState(pos).getBlock()))
{ {
playerMP.worldObj.setBlockState(pos, Blocks.air.getDefaultState(), 2); playerMP.worldObj.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
} }
} }
} }
@ -98,7 +98,7 @@ public class TechRebornDevCommand extends CommandBase
sender.addChatMessage(new TextComponentString(GameData.getItemRegistry().getNameForObject(player.getHeldItem(EnumHand.MAIN_HAND).getItem()) + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage())); sender.addChatMessage(new TextComponentString(GameData.getItemRegistry().getNameForObject(player.getHeldItem(EnumHand.MAIN_HAND).getItem()) + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage()));
} else { } else {
Block block = Block.getBlockFromItem(player.getHeldItem(EnumHand.MAIN_HAND).getItem()); Block block = Block.getBlockFromItem(player.getHeldItem(EnumHand.MAIN_HAND).getItem());
if (block != null && block != Blocks.air) { if (block != null && block != Blocks.AIR) {
sender.addChatMessage(new TextComponentString(GameData.getBlockRegistry().getNameForObject(block) + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage())); sender.addChatMessage(new TextComponentString(GameData.getBlockRegistry().getNameForObject(block) + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage()));
} }
} }

View file

@ -63,8 +63,8 @@ import java.util.List;
{ {
private static void addDebugRecipes(IModRegistry registry) private static void addDebugRecipes(IModRegistry registry)
{ {
ItemStack diamondBlock = new ItemStack(Blocks.diamond_block); ItemStack diamondBlock = new ItemStack(Blocks.DIAMOND_BLOCK);
ItemStack dirtBlock = new ItemStack(Blocks.dirt); ItemStack dirtBlock = new ItemStack(Blocks.DIRT);
List<Object> debugRecipes = new ArrayList<>(); List<Object> debugRecipes = new ArrayList<>();
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
{ {

View file

@ -24,7 +24,7 @@ public class TRTickHandler
? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null; ? player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).getItem() : null;
if (previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible() if (previouslyWearing != chestslot && previouslyWearing == ModItems.cloakingDevice && player.isInvisible()
&& !player.isPotionActive(MobEffects.invisibility)) && !player.isPotionActive(MobEffects.INVISIBILITY))
{ {
player.setInvisible(false); player.setInvisible(false);
} }

View file

@ -236,35 +236,35 @@ public class ModBlocks
GameRegistry.registerBlock(centrifuge, "techreborn.centrifuge"); GameRegistry.registerBlock(centrifuge, "techreborn.centrifuge");
GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR"); GameRegistry.registerTileEntity(TileCentrifuge.class, "TileCentrifugeTR");
RollingMachine = new BlockRollingMachine(Material.rock); RollingMachine = new BlockRollingMachine(Material.ROCK);
GameRegistry.registerBlock(RollingMachine, "rollingmachine"); GameRegistry.registerBlock(RollingMachine, "rollingmachine");
GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR"); GameRegistry.registerTileEntity(TileRollingMachine.class, "TileRollingMachineTR");
BlastFurnace = new BlockBlastFurnace(Material.rock); BlastFurnace = new BlockBlastFurnace(Material.ROCK);
GameRegistry.registerBlock(BlastFurnace, "blastFurnace"); GameRegistry.registerBlock(BlastFurnace, "blastFurnace");
GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR"); GameRegistry.registerTileEntity(TileBlastFurnace.class, "TileBlastFurnaceTR");
AlloySmelter = new BlockAlloySmelter(Material.rock); AlloySmelter = new BlockAlloySmelter(Material.ROCK);
GameRegistry.registerBlock(AlloySmelter, "alloySmelter"); GameRegistry.registerBlock(AlloySmelter, "alloySmelter");
GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR"); GameRegistry.registerTileEntity(TileAlloySmelter.class, "TileAlloySmalterTR");
IndustrialGrinder = new BlockIndustrialGrinder(Material.rock); IndustrialGrinder = new BlockIndustrialGrinder(Material.ROCK);
GameRegistry.registerBlock(IndustrialGrinder, "grinder"); GameRegistry.registerBlock(IndustrialGrinder, "grinder");
GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR"); GameRegistry.registerTileEntity(TileIndustrialGrinder.class, "TileIndustrialGrinderTR");
ImplosionCompressor = new BlockImplosionCompressor(Material.rock); ImplosionCompressor = new BlockImplosionCompressor(Material.ROCK);
GameRegistry.registerBlock(ImplosionCompressor, "implosioncompressor"); GameRegistry.registerBlock(ImplosionCompressor, "implosioncompressor");
GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR"); GameRegistry.registerTileEntity(TileImplosionCompressor.class, "TileImplosionCompressorTR");
MatterFabricator = new BlockMatterFabricator(Material.rock); MatterFabricator = new BlockMatterFabricator(Material.ROCK);
GameRegistry.registerBlock(MatterFabricator, "matterfabricator"); GameRegistry.registerBlock(MatterFabricator, "matterfabricator");
GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR"); GameRegistry.registerTileEntity(TileMatterFabricator.class, "TileMatterFabricatorTR");
ChunkLoader = new BlockChunkLoader(Material.rock); ChunkLoader = new BlockChunkLoader(Material.ROCK);
GameRegistry.registerBlock(ChunkLoader, "chunkloader"); GameRegistry.registerBlock(ChunkLoader, "chunkloader");
GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR"); GameRegistry.registerTileEntity(TileChunkLoader.class, "TileChunkLoaderTR");
chargeBench = new BlockChargeBench(Material.rock); chargeBench = new BlockChargeBench(Material.ROCK);
GameRegistry.registerBlock(chargeBench, "chargebench"); GameRegistry.registerBlock(chargeBench, "chargebench");
GameRegistry.registerTileEntity(TileChargeBench.class, "TileChargeBench"); GameRegistry.registerTileEntity(TileChargeBench.class, "TileChargeBench");
@ -272,57 +272,57 @@ public class ModBlocks
GameRegistry.registerBlock(playerDetector, ItemBlockPlayerDetector.class, "playerDetector"); GameRegistry.registerBlock(playerDetector, ItemBlockPlayerDetector.class, "playerDetector");
GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR"); GameRegistry.registerTileEntity(TilePlayerDectector.class, "TilePlayerDectectorTR");
MachineCasing = new BlockMachineCasing(Material.rock); MachineCasing = new BlockMachineCasing(Material.ROCK);
GameRegistry.registerBlock(MachineCasing, ItemBlockMachineCasing.class, "machinecasing"); GameRegistry.registerBlock(MachineCasing, ItemBlockMachineCasing.class, "machinecasing");
GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR"); GameRegistry.registerTileEntity(TileMachineCasing.class, "TileMachineCasingTR");
ore = new BlockOre(Material.rock); ore = new BlockOre(Material.ROCK);
GameRegistry.registerBlock(ore, ItemBlockOre.class, "techreborn.ore"); GameRegistry.registerBlock(ore, ItemBlockOre.class, "techreborn.ore");
ore2 = new BlockOre2(Material.rock); ore2 = new BlockOre2(Material.ROCK);
GameRegistry.registerBlock(ore2, ItemBlockOre2.class, "techreborn.ore2"); GameRegistry.registerBlock(ore2, ItemBlockOre2.class, "techreborn.ore2");
storage = new BlockStorage(Material.iron); storage = new BlockStorage(Material.IRON);
GameRegistry.registerBlock(storage, ItemBlockStorage.class, "techreborn.storage"); GameRegistry.registerBlock(storage, ItemBlockStorage.class, "techreborn.storage");
storage2 = new BlockStorage2(Material.iron); storage2 = new BlockStorage2(Material.IRON);
GameRegistry.registerBlock(storage2, ItemBlockStorage2.class, "techreborn.storage2"); GameRegistry.registerBlock(storage2, ItemBlockStorage2.class, "techreborn.storage2");
Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.rock); Dragoneggenergysiphoner = new BlockDragonEggSiphoner(Material.ROCK);
GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon"); GameRegistry.registerBlock(Dragoneggenergysiphoner, "dragoneggenergsiphon");
GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR"); GameRegistry.registerTileEntity(TileDragonEggSiphoner.class, "TileDragonEggSiphonerTR");
Magicenergeyconverter = new BlockMagicEnergyConverter(Material.rock); Magicenergeyconverter = new BlockMagicEnergyConverter(Material.ROCK);
GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter"); GameRegistry.registerBlock(Magicenergeyconverter, "magicenergyconverter");
AssemblyMachine = new BlockAssemblingMachine(Material.rock); AssemblyMachine = new BlockAssemblingMachine(Material.ROCK);
GameRegistry.registerBlock(AssemblyMachine, "assemblymachine"); GameRegistry.registerBlock(AssemblyMachine, "assemblymachine");
GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR"); GameRegistry.registerTileEntity(TileAssemblingMachine.class, "TileAssemblyMachineTR");
DieselGenerator = new BlockDieselGenerator(Material.rock); DieselGenerator = new BlockDieselGenerator(Material.ROCK);
GameRegistry.registerBlock(DieselGenerator, "dieselgenerator"); GameRegistry.registerBlock(DieselGenerator, "dieselgenerator");
GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR"); GameRegistry.registerTileEntity(TileDieselGenerator.class, "TileDieselGeneratorTR");
IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.rock); IndustrialElectrolyzer = new BlockIndustrialElectrolyzer(Material.ROCK);
GameRegistry.registerBlock(IndustrialElectrolyzer, "industrialelectrolyzer"); GameRegistry.registerBlock(IndustrialElectrolyzer, "industrialelectrolyzer");
GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR"); GameRegistry.registerTileEntity(TileIndustrialElectrolyzer.class, "TileIndustrialElectrolyzerTR");
MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.rock); MagicalAbsorber = new BlockMagicEnergyAbsorber(Material.ROCK);
GameRegistry.registerBlock(MagicalAbsorber, "magicrnergyabsorber"); GameRegistry.registerBlock(MagicalAbsorber, "magicrnergyabsorber");
Semifluidgenerator = new BlockSemiFluidGenerator(Material.rock); Semifluidgenerator = new BlockSemiFluidGenerator(Material.ROCK);
GameRegistry.registerBlock(Semifluidgenerator, "semifluidgenerator"); GameRegistry.registerBlock(Semifluidgenerator, "semifluidgenerator");
GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR"); GameRegistry.registerTileEntity(TileSemifluidGenerator.class, "TileSemifluidGeneratorTR");
Gasturbine = new BlockGasTurbine(Material.rock); Gasturbine = new BlockGasTurbine(Material.ROCK);
GameRegistry.registerBlock(Gasturbine, "gasturbine"); GameRegistry.registerBlock(Gasturbine, "gasturbine");
GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR"); GameRegistry.registerTileEntity(TileGasTurbine.class, "TileGassTurbineTR");
AlloyFurnace = new BlockAlloyFurnace(Material.rock); AlloyFurnace = new BlockAlloyFurnace(Material.ROCK);
GameRegistry.registerBlock(AlloyFurnace, "alloyfurnace"); GameRegistry.registerBlock(AlloyFurnace, "alloyfurnace");
GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR"); GameRegistry.registerTileEntity(TileAlloyFurnace.class, "TileAlloyFurnaceTR");
ChemicalReactor = new BlockChemicalReactor(Material.rock); ChemicalReactor = new BlockChemicalReactor(Material.ROCK);
GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor"); GameRegistry.registerBlock(ChemicalReactor, "chemicalreactor");
GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR"); GameRegistry.registerTileEntity(TileChemicalReactor.class, "TileChemicalReactorTR");
@ -338,51 +338,51 @@ public class ModBlocks
GameRegistry.registerBlock(Lesu, "lesu"); GameRegistry.registerBlock(Lesu, "lesu");
GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR"); GameRegistry.registerTileEntity(TileLesu.class, "TileLesuTR");
Supercondensator = new BlockSupercondensator(Material.rock); Supercondensator = new BlockSupercondensator(Material.ROCK);
GameRegistry.registerBlock(Supercondensator, "supercondensator"); GameRegistry.registerBlock(Supercondensator, "supercondensator");
LesuStorage = new BlockLESUStorage(Material.rock); LesuStorage = new BlockLESUStorage(Material.ROCK);
GameRegistry.registerBlock(LesuStorage, "lesustorage"); GameRegistry.registerBlock(LesuStorage, "lesustorage");
GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR"); GameRegistry.registerTileEntity(TileLesuStorage.class, "TileLesuStorageTR");
Distillationtower = new BlockDistillationTower(Material.rock); Distillationtower = new BlockDistillationTower(Material.ROCK);
GameRegistry.registerBlock(Distillationtower, "distillationtower"); GameRegistry.registerBlock(Distillationtower, "distillationtower");
ElectricCraftingTable = new BlockElectricCraftingTable(Material.rock); ElectricCraftingTable = new BlockElectricCraftingTable(Material.ROCK);
GameRegistry.registerBlock(ElectricCraftingTable, "electriccraftingtable"); GameRegistry.registerBlock(ElectricCraftingTable, "electriccraftingtable");
VacuumFreezer = new BlockVacuumFreezer(Material.rock); VacuumFreezer = new BlockVacuumFreezer(Material.ROCK);
GameRegistry.registerBlock(VacuumFreezer, "vacuumfreezer"); GameRegistry.registerBlock(VacuumFreezer, "vacuumfreezer");
GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR"); GameRegistry.registerTileEntity(TileVacuumFreezer.class, "TileVacuumFreezerTR");
PlasmaGenerator = new BlockPlasmaGenerator(Material.rock); PlasmaGenerator = new BlockPlasmaGenerator(Material.ROCK);
GameRegistry.registerBlock(PlasmaGenerator, "plasmagenerator"); GameRegistry.registerBlock(PlasmaGenerator, "plasmagenerator");
ComputerCube = new BlockComputerCube(Material.rock); ComputerCube = new BlockComputerCube(Material.ROCK);
GameRegistry.registerBlock(ComputerCube, "computercube"); GameRegistry.registerBlock(ComputerCube, "computercube");
FusionControlComputer = new BlockFusionControlComputer(Material.rock); FusionControlComputer = new BlockFusionControlComputer(Material.ROCK);
GameRegistry.registerBlock(FusionControlComputer, "fusioncontrolcomputer"); GameRegistry.registerBlock(FusionControlComputer, "fusioncontrolcomputer");
GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR"); GameRegistry.registerTileEntity(TileEntityFusionController.class, "TileEntityFustionControllerTR");
FusionCoil = new BlockFusionCoil(Material.rock); FusionCoil = new BlockFusionCoil(Material.ROCK);
GameRegistry.registerBlock(FusionCoil, "fusioncoil"); GameRegistry.registerBlock(FusionCoil, "fusioncoil");
LightningRod = new BlockLightningRod(Material.rock); LightningRod = new BlockLightningRod(Material.ROCK);
GameRegistry.registerBlock(LightningRod, "lightningrod"); GameRegistry.registerBlock(LightningRod, "lightningrod");
heatGenerator = new BlockHeatGenerator(Material.rock); heatGenerator = new BlockHeatGenerator(Material.ROCK);
GameRegistry.registerBlock(heatGenerator, "heatgenerator"); GameRegistry.registerBlock(heatGenerator, "heatgenerator");
GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR"); GameRegistry.registerTileEntity(TileHeatGenerator.class, "TileHeatGeneratorTR");
industrialSawmill = new BlockIndustrialSawmill(Material.rock); industrialSawmill = new BlockIndustrialSawmill(Material.ROCK);
GameRegistry.registerBlock(industrialSawmill, "industrialSawmill"); GameRegistry.registerBlock(industrialSawmill, "industrialSawmill");
GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR"); GameRegistry.registerTileEntity(TileIndustrialSawmill.class, "TileIndustrialSawmillTR");
machineframe = new BlockMachineFrame(Material.iron); machineframe = new BlockMachineFrame(Material.IRON);
GameRegistry.registerBlock(machineframe, ItemBlockMachineFrame.class, "techreborn.machineFrame"); GameRegistry.registerBlock(machineframe, ItemBlockMachineFrame.class, "techreborn.machineFrame");
Grinder = new BlockGrinder(Material.iron); Grinder = new BlockGrinder(Material.IRON);
GameRegistry.registerBlock(Grinder, "techreborn.grinder"); GameRegistry.registerBlock(Grinder, "techreborn.grinder");
GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR"); GameRegistry.registerTileEntity(TileGrinder.class, "TileGrinderTR");
@ -390,15 +390,15 @@ public class ModBlocks
GameRegistry.registerBlock(Generator, "techreborn.generator"); GameRegistry.registerBlock(Generator, "techreborn.generator");
GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR"); GameRegistry.registerTileEntity(TileGenerator.class, "TileGeneratorTR");
Extractor = new BlockExtractor(Material.iron); Extractor = new BlockExtractor(Material.IRON);
GameRegistry.registerBlock(Extractor, "techreborn.extractor"); GameRegistry.registerBlock(Extractor, "techreborn.extractor");
GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR"); GameRegistry.registerTileEntity(TileExtractor.class, "TileExtractorTR");
Compressor = new BlockCompressor(Material.iron); Compressor = new BlockCompressor(Material.IRON);
GameRegistry.registerBlock(Compressor, "techreborn.compressor"); GameRegistry.registerBlock(Compressor, "techreborn.compressor");
GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR"); GameRegistry.registerTileEntity(TileCompressor.class, "TileCompressorTR");
ElectricFurnace = new BlockElectricFurnace(Material.iron); ElectricFurnace = new BlockElectricFurnace(Material.IRON);
GameRegistry.registerBlock(ElectricFurnace, "techreborn.electricfurnace"); GameRegistry.registerBlock(ElectricFurnace, "techreborn.electricfurnace");
GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR"); GameRegistry.registerTileEntity(TileElectricFurnace.class, "TileElectricFurnaceTR");
@ -431,10 +431,10 @@ public class ModBlocks
ironFence = new BlockIronFence(); ironFence = new BlockIronFence();
GameRegistry.registerBlock(ironFence, "ironFence"); GameRegistry.registerBlock(ironFence, "ironFence");
reinforcedglass = new BlockReinforcedGlass(Material.glass); reinforcedglass = new BlockReinforcedGlass(Material.GLASS);
GameRegistry.registerBlock(reinforcedglass, "reinforcedglass"); GameRegistry.registerBlock(reinforcedglass, "reinforcedglass");
recycler = new BlockRecycler(Material.iron); recycler = new BlockRecycler(Material.IRON);
GameRegistry.registerBlock(recycler, "recycler"); GameRegistry.registerBlock(recycler, "recycler");
GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR"); GameRegistry.registerTileEntity(TileRecycler.class, "TileRecyclerTR");
@ -469,7 +469,7 @@ public class ModBlocks
nuke = new BlockNuke(); nuke = new BlockNuke();
GameRegistry.registerBlock(nuke, "nuke"); GameRegistry.registerBlock(nuke, "nuke");
scrapboxinator = new BlockScrapboxinator(Material.iron); scrapboxinator = new BlockScrapboxinator(Material.IRON);
GameRegistry.registerBlock(scrapboxinator, "scrapboxinator"); GameRegistry.registerBlock(scrapboxinator, "scrapboxinator");
GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR"); GameRegistry.registerTileEntity(TileScrapboxinator.class, "TileScrapboxinatorTR");
@ -526,9 +526,9 @@ public class ModBlocks
OreDictionary.registerOre("blockYellowGarnet", new ItemStack(storage2, 1, 8)); OreDictionary.registerOre("blockYellowGarnet", new ItemStack(storage2, 1, 8));
OreDictionary.registerOre("blockRedGarnet", new ItemStack(storage2, 1, 9)); OreDictionary.registerOre("blockRedGarnet", new ItemStack(storage2, 1, 9));
OreDictionary.registerOre("craftingPiston", Blocks.piston); OreDictionary.registerOre("craftingPiston", Blocks.PISTON);
OreDictionary.registerOre("craftingPiston", Blocks.sticky_piston); OreDictionary.registerOre("craftingPiston", Blocks.STICKY_PISTON);
OreDictionary.registerOre("crafterWood", Blocks.crafting_table); OreDictionary.registerOre("crafterWood", Blocks.CRAFTING_TABLE);
OreDictionary.registerOre("machineBasic", new ItemStack(machineframe, 1)); OreDictionary.registerOre("machineBasic", new ItemStack(machineframe, 1));
OreDictionary.registerOre("treeSapling", rubberSapling); OreDictionary.registerOre("treeSapling", rubberSapling);

View file

@ -85,86 +85,86 @@ public class ModFluids
public static void init() public static void init()
{ {
FluidRegistry.registerFluid(fluidberylium); FluidRegistry.registerFluid(fluidberylium);
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.water, "techreborn.berylium"); BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.WATER, "techreborn.berylium");
GameRegistry.registerBlock(BlockFluidBerylium, GameRegistry.registerBlock(BlockFluidBerylium,
ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
fluidberylium.setUnlocalizedName(BlockFluidBerylium.getUnlocalizedName()); fluidberylium.setUnlocalizedName(BlockFluidBerylium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidcalcium); FluidRegistry.registerFluid(fluidcalcium);
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.water, "techreborn.calcium"); BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.WATER, "techreborn.calcium");
GameRegistry.registerBlock(BlockFluidCalcium, GameRegistry.registerBlock(BlockFluidCalcium,
ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
fluidcalcium.setUnlocalizedName(BlockFluidCalcium.getUnlocalizedName()); fluidcalcium.setUnlocalizedName(BlockFluidCalcium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidcalciumcarbonate); FluidRegistry.registerFluid(fluidcalciumcarbonate);
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.water, BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.WATER,
"techreborn.calciumcarbonate"); "techreborn.calciumcarbonate");
GameRegistry.registerBlock(BlockFluidCalciumCarbonate, GameRegistry.registerBlock(BlockFluidCalciumCarbonate,
ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
fluidcalcium.setUnlocalizedName(BlockFluidCalciumCarbonate.getUnlocalizedName()); fluidcalcium.setUnlocalizedName(BlockFluidCalciumCarbonate.getUnlocalizedName());
FluidRegistry.registerFluid(fluidChlorite); FluidRegistry.registerFluid(fluidChlorite);
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.water, "techreborn.chlorite"); BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.WATER, "techreborn.chlorite");
GameRegistry.registerBlock(BlockFluidChlorite, GameRegistry.registerBlock(BlockFluidChlorite,
ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
fluidChlorite.setUnlocalizedName(BlockFluidChlorite.getUnlocalizedName()); fluidChlorite.setUnlocalizedName(BlockFluidChlorite.getUnlocalizedName());
FluidRegistry.registerFluid(fluidDeuterium); FluidRegistry.registerFluid(fluidDeuterium);
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.water, "techreborn.deuterium"); BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.WATER, "techreborn.deuterium");
GameRegistry.registerBlock(BlockFluidDeuterium, GameRegistry.registerBlock(BlockFluidDeuterium,
ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
fluidDeuterium.setUnlocalizedName(BlockFluidDeuterium.getUnlocalizedName()); fluidDeuterium.setUnlocalizedName(BlockFluidDeuterium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidGlyceryl); FluidRegistry.registerFluid(fluidGlyceryl);
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.water, "techreborn.glyceryl"); BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.WATER, "techreborn.glyceryl");
GameRegistry.registerBlock(BlockFluidGlyceryl, GameRegistry.registerBlock(BlockFluidGlyceryl,
ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
fluidGlyceryl.setUnlocalizedName(BlockFluidGlyceryl.getUnlocalizedName()); fluidGlyceryl.setUnlocalizedName(BlockFluidGlyceryl.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHelium); FluidRegistry.registerFluid(fluidHelium);
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.water, "techreborn.helium"); BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.WATER, "techreborn.helium");
GameRegistry.registerBlock(BlockFluidHelium, GameRegistry.registerBlock(BlockFluidHelium,
ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
fluidHelium.setUnlocalizedName(BlockFluidHelium.getUnlocalizedName()); fluidHelium.setUnlocalizedName(BlockFluidHelium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHelium3); FluidRegistry.registerFluid(fluidHelium3);
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.water, "techreborn.helium3"); BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.WATER, "techreborn.helium3");
GameRegistry.registerBlock(BlockFluidHelium3, GameRegistry.registerBlock(BlockFluidHelium3,
ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
fluidHelium3.setUnlocalizedName(BlockFluidHelium3.getUnlocalizedName()); fluidHelium3.setUnlocalizedName(BlockFluidHelium3.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHeliumplasma); FluidRegistry.registerFluid(fluidHeliumplasma);
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.water, "techreborn.heliumplasma"); BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.WATER, "techreborn.heliumplasma");
GameRegistry.registerBlock(BlockFluidHeliumplasma, GameRegistry.registerBlock(BlockFluidHeliumplasma,
ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
fluidHeliumplasma.setUnlocalizedName(fluidHeliumplasma.getUnlocalizedName()); fluidHeliumplasma.setUnlocalizedName(fluidHeliumplasma.getUnlocalizedName());
FluidRegistry.registerFluid(fluidHydrogen); FluidRegistry.registerFluid(fluidHydrogen);
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.water, "techreborn.hydrogen"); BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.WATER, "techreborn.hydrogen");
GameRegistry.registerBlock(BlockFluidHydrogen, GameRegistry.registerBlock(BlockFluidHydrogen,
ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
fluidHydrogen.setUnlocalizedName(fluidHydrogen.getUnlocalizedName()); fluidHydrogen.setUnlocalizedName(fluidHydrogen.getUnlocalizedName());
FluidRegistry.registerFluid(fluidLithium); FluidRegistry.registerFluid(fluidLithium);
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.water, "techreborn.lithium"); BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium");
GameRegistry.registerBlock(BlockFluidLithium, GameRegistry.registerBlock(BlockFluidLithium,
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
fluidLithium.setUnlocalizedName(fluidLithium.getUnlocalizedName()); fluidLithium.setUnlocalizedName(fluidLithium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidMercury); FluidRegistry.registerFluid(fluidMercury);
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.water, "techreborn.mercury"); BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury");
GameRegistry.registerBlock(BlockFluidMercury, GameRegistry.registerBlock(BlockFluidMercury,
ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
fluidMercury.setUnlocalizedName(fluidMercury.getUnlocalizedName()); fluidMercury.setUnlocalizedName(fluidMercury.getUnlocalizedName());
FluidRegistry.registerFluid(fluidMethane); FluidRegistry.registerFluid(fluidMethane);
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.water, "techreborn.methane"); BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.WATER, "techreborn.methane");
GameRegistry.registerBlock(BlockFluidMethane, GameRegistry.registerBlock(BlockFluidMethane,
ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
fluidMethane.setUnlocalizedName(fluidMethane.getUnlocalizedName()); fluidMethane.setUnlocalizedName(fluidMethane.getUnlocalizedName());
FluidRegistry.registerFluid(fluidNitrocoalfuel); FluidRegistry.registerFluid(fluidNitrocoalfuel);
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.water, BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.WATER,
"techreborn.nitrocoalfuel"); "techreborn.nitrocoalfuel");
GameRegistry.registerBlock(BlockFluidNitrocoalfuel, GameRegistry.registerBlock(BlockFluidNitrocoalfuel,
ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
@ -172,57 +172,57 @@ public class ModFluids
FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0); FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0);
FluidRegistry.registerFluid(fluidNitrofuel); FluidRegistry.registerFluid(fluidNitrofuel);
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.water, "techreborn.nitrofuel"); BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.WATER, "techreborn.nitrofuel");
GameRegistry.registerBlock(BlockFluidNitrofuel, GameRegistry.registerBlock(BlockFluidNitrofuel,
ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
fluidNitrofuel.setUnlocalizedName(fluidNitrofuel.getUnlocalizedName()); fluidNitrofuel.setUnlocalizedName(fluidNitrofuel.getUnlocalizedName());
FluidRegistry.registerFluid(fluidNitrogen); FluidRegistry.registerFluid(fluidNitrogen);
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.water, "techreborn.nitrogen"); BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.WATER, "techreborn.nitrogen");
GameRegistry.registerBlock(BlockFluidNitrogen, GameRegistry.registerBlock(BlockFluidNitrogen,
ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
fluidNitrogen.setUnlocalizedName(fluidNitrogen.getUnlocalizedName()); fluidNitrogen.setUnlocalizedName(fluidNitrogen.getUnlocalizedName());
FluidRegistry.registerFluid(fluidNitrogendioxide); FluidRegistry.registerFluid(fluidNitrogendioxide);
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.water, BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.WATER,
"techreborn.nitrogendioxide"); "techreborn.nitrogendioxide");
GameRegistry.registerBlock(BlockFluidNitrogendioxide, GameRegistry.registerBlock(BlockFluidNitrogendioxide,
ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
fluidNitrogendioxide.setUnlocalizedName(fluidNitrogendioxide.getUnlocalizedName()); fluidNitrogendioxide.setUnlocalizedName(fluidNitrogendioxide.getUnlocalizedName());
FluidRegistry.registerFluid(fluidPotassium); FluidRegistry.registerFluid(fluidPotassium);
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.water, "techreborn.potassium"); BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.WATER, "techreborn.potassium");
GameRegistry.registerBlock(BlockFluidPotassium, GameRegistry.registerBlock(BlockFluidPotassium,
ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
fluidPotassium.setUnlocalizedName(fluidPotassium.getUnlocalizedName()); fluidPotassium.setUnlocalizedName(fluidPotassium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidSilicon); FluidRegistry.registerFluid(fluidSilicon);
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.water, "techreborn.silicon"); BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.WATER, "techreborn.silicon");
GameRegistry.registerBlock(BlockFluidSilicon, GameRegistry.registerBlock(BlockFluidSilicon,
ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
fluidSilicon.setUnlocalizedName(fluidSilicon.getUnlocalizedName()); fluidSilicon.setUnlocalizedName(fluidSilicon.getUnlocalizedName());
FluidRegistry.registerFluid(fluidSodium); FluidRegistry.registerFluid(fluidSodium);
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.water, "techreborn.sodium"); BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.WATER, "techreborn.sodium");
GameRegistry.registerBlock(BlockFluidSodium, GameRegistry.registerBlock(BlockFluidSodium,
ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
fluidSodium.setUnlocalizedName(fluidSodium.getUnlocalizedName()); fluidSodium.setUnlocalizedName(fluidSodium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidSodiumpersulfate); FluidRegistry.registerFluid(fluidSodiumpersulfate);
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.water, BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.WATER,
"techreborn.sodiumpersulfate"); "techreborn.sodiumpersulfate");
GameRegistry.registerBlock(BlockFluidSodiumpersulfate, GameRegistry.registerBlock(BlockFluidSodiumpersulfate,
ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
fluidSodiumpersulfate.setUnlocalizedName(fluidSodiumpersulfate.getUnlocalizedName()); fluidSodiumpersulfate.setUnlocalizedName(fluidSodiumpersulfate.getUnlocalizedName());
FluidRegistry.registerFluid(fluidTritium); FluidRegistry.registerFluid(fluidTritium);
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.water, "techreborn.tritium"); BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.WATER, "techreborn.tritium");
GameRegistry.registerBlock(BlockFluidTritium, GameRegistry.registerBlock(BlockFluidTritium,
ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
fluidTritium.setUnlocalizedName(fluidTritium.getUnlocalizedName()); fluidTritium.setUnlocalizedName(fluidTritium.getUnlocalizedName());
FluidRegistry.registerFluid(fluidWolframium); FluidRegistry.registerFluid(fluidWolframium);
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.water, "techreborn.wolframium"); BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.WATER, "techreborn.wolframium");
GameRegistry.registerBlock(BlockFluidWolframium, GameRegistry.registerBlock(BlockFluidWolframium,
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5)); ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
fluidWolframium.setUnlocalizedName(fluidWolframium.getUnlocalizedName()); fluidWolframium.setUnlocalizedName(fluidWolframium.getUnlocalizedName());

View file

@ -331,190 +331,190 @@ public class ModItems
// buckets // buckets
bucketBerylium = new ItemFluidbucket(ModFluids.BlockFluidBerylium); bucketBerylium = new ItemFluidbucket(ModFluids.BlockFluidBerylium);
bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.bucket); bucketBerylium.setUnlocalizedName("bucketberylium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketBerylium, "bucketberylium"); GameRegistry.registerItem(bucketBerylium, "bucketberylium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidberylium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketBerylium), new ItemStack(Items.bucket)); new ItemStack(bucketBerylium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium.getFluid(), bucketBerylium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidBerylium.getFluid(), bucketBerylium);
bucketcalcium = new ItemFluidbucket(ModFluids.BlockFluidCalcium); bucketcalcium = new ItemFluidbucket(ModFluids.BlockFluidCalcium);
bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.bucket); bucketcalcium.setUnlocalizedName("bucketcalcium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketcalcium, "bucketcalcium"); GameRegistry.registerItem(bucketcalcium, "bucketcalcium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidcalcium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidcalcium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketcalcium), new ItemStack(Items.bucket)); new ItemStack(bucketcalcium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium.getFluid(), bucketcalcium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalcium.getFluid(), bucketcalcium);
bucketcalciumcarbonate = new ItemFluidbucket(ModFluids.BlockFluidCalciumCarbonate); bucketcalciumcarbonate = new ItemFluidbucket(ModFluids.BlockFluidCalciumCarbonate);
bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.bucket); bucketcalciumcarbonate.setUnlocalizedName("bucketcalciumcarbonate").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketcalciumcarbonate, "bucketcalciumcarbonate"); GameRegistry.registerItem(bucketcalciumcarbonate, "bucketcalciumcarbonate");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidcalciumcarbonate", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidcalciumcarbonate", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalciumCarbonate.getFluid(), BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidCalciumCarbonate.getFluid(),
bucketcalciumcarbonate); bucketcalciumcarbonate);
bucketChlorite = new ItemFluidbucket(ModFluids.BlockFluidChlorite); bucketChlorite = new ItemFluidbucket(ModFluids.BlockFluidChlorite);
bucketChlorite.setUnlocalizedName("bucketchlorite").setContainerItem(Items.bucket); bucketChlorite.setUnlocalizedName("bucketchlorite").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketChlorite, "bucketcalchlorite"); GameRegistry.registerItem(bucketChlorite, "bucketcalchlorite");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidchlorite", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidchlorite", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.bucket)); new ItemStack(bucketcalciumcarbonate), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite.getFluid(), bucketChlorite); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidChlorite.getFluid(), bucketChlorite);
bucketDeuterium = new ItemFluidbucket(ModFluids.BlockFluidDeuterium); bucketDeuterium = new ItemFluidbucket(ModFluids.BlockFluidDeuterium);
bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.bucket); bucketDeuterium.setUnlocalizedName("bucketdeuterium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketDeuterium, "bucketdeuterium"); GameRegistry.registerItem(bucketDeuterium, "bucketdeuterium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluiddeuterium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluiddeuterium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketDeuterium), new ItemStack(Items.bucket)); new ItemStack(bucketDeuterium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium.getFluid(), bucketDeuterium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidDeuterium.getFluid(), bucketDeuterium);
bucketGlyceryl = new ItemFluidbucket(ModFluids.BlockFluidGlyceryl); bucketGlyceryl = new ItemFluidbucket(ModFluids.BlockFluidGlyceryl);
bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.bucket); bucketGlyceryl.setUnlocalizedName("bucketglyceryl").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketGlyceryl, "bucketglyceryl"); GameRegistry.registerItem(bucketGlyceryl, "bucketglyceryl");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidglyceryl", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidglyceryl", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketGlyceryl), new ItemStack(Items.bucket)); new ItemStack(bucketGlyceryl), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl.getFluid(), bucketGlyceryl); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidGlyceryl.getFluid(), bucketGlyceryl);
bucketHelium = new ItemFluidbucket(ModFluids.BlockFluidHelium); bucketHelium = new ItemFluidbucket(ModFluids.BlockFluidHelium);
bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.bucket); bucketHelium.setUnlocalizedName("buckethelium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHelium, "buckethelium"); GameRegistry.registerItem(bucketHelium, "buckethelium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidhelium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidhelium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHelium), new ItemStack(Items.bucket)); new ItemStack(bucketHelium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium.getFluid(), bucketHelium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium.getFluid(), bucketHelium);
bucketHelium3 = new ItemFluidbucket(ModFluids.BlockFluidHelium3); bucketHelium3 = new ItemFluidbucket(ModFluids.BlockFluidHelium3);
bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.bucket); bucketHelium3.setUnlocalizedName("buckethelium3").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHelium3, "buckethelium3"); GameRegistry.registerItem(bucketHelium3, "buckethelium3");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidhelium3", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidhelium3", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHelium3), new ItemStack(Items.bucket)); new ItemStack(bucketHelium3), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3.getFluid(), bucketHelium3); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHelium3.getFluid(), bucketHelium3);
bucketHeliumplasma = new ItemFluidbucket(ModFluids.BlockFluidHeliumplasma); bucketHeliumplasma = new ItemFluidbucket(ModFluids.BlockFluidHeliumplasma);
bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.bucket); bucketHeliumplasma.setUnlocalizedName("bucketheliumplasma").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHeliumplasma, "bucketheliumplasma"); GameRegistry.registerItem(bucketHeliumplasma, "bucketheliumplasma");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidheliumplasma", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidheliumplasma", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHeliumplasma), new ItemStack(Items.bucket)); new ItemStack(bucketHeliumplasma), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma.getFluid(), bucketHeliumplasma); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHeliumplasma.getFluid(), bucketHeliumplasma);
bucketHydrogen = new ItemFluidbucket(ModFluids.BlockFluidHydrogen); bucketHydrogen = new ItemFluidbucket(ModFluids.BlockFluidHydrogen);
bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.bucket); bucketHydrogen.setUnlocalizedName("buckethydrogen").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketHydrogen, "buckethydrogen"); GameRegistry.registerItem(bucketHydrogen, "buckethydrogen");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidhydrogen", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidhydrogen", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketHydrogen), new ItemStack(Items.bucket)); new ItemStack(bucketHydrogen), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen.getFluid(), bucketHydrogen); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidHydrogen.getFluid(), bucketHydrogen);
bucketLithium = new ItemFluidbucket(ModFluids.BlockFluidLithium); bucketLithium = new ItemFluidbucket(ModFluids.BlockFluidLithium);
bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.bucket); bucketLithium.setUnlocalizedName("bucketlithium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketLithium, "bucketlithium"); GameRegistry.registerItem(bucketLithium, "bucketlithium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidlithium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidlithium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketLithium), new ItemStack(Items.bucket)); new ItemStack(bucketLithium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium.getFluid(), bucketLithium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidLithium.getFluid(), bucketLithium);
bucketMercury = new ItemFluidbucket(ModFluids.BlockFluidMercury); bucketMercury = new ItemFluidbucket(ModFluids.BlockFluidMercury);
bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.bucket); bucketMercury.setUnlocalizedName("bucketmercury").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketMercury, "bucketmercury"); GameRegistry.registerItem(bucketMercury, "bucketmercury");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidmercury", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidmercury", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketMercury), new ItemStack(Items.bucket)); new ItemStack(bucketMercury), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury.getFluid(), bucketMercury); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMercury.getFluid(), bucketMercury);
bucketMethane = new ItemFluidbucket(ModFluids.BlockFluidMethane); bucketMethane = new ItemFluidbucket(ModFluids.BlockFluidMethane);
bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.bucket); bucketMethane.setUnlocalizedName("bucketmethane").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketMethane, "bucketmethane"); GameRegistry.registerItem(bucketMethane, "bucketmethane");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidmethane", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidmethane", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketMethane), new ItemStack(Items.bucket)); new ItemStack(bucketMethane), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane.getFluid(), bucketMethane); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidMethane.getFluid(), bucketMethane);
bucketNitrocoalfuel = new ItemFluidbucket(ModFluids.BlockFluidNitrocoalfuel); bucketNitrocoalfuel = new ItemFluidbucket(ModFluids.BlockFluidNitrocoalfuel);
bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.bucket); bucketNitrocoalfuel.setUnlocalizedName("bucketnitrocoalfuel").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrocoalfuel, "bucketnitrocoalfuel"); GameRegistry.registerItem(bucketNitrocoalfuel, "bucketnitrocoalfuel");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrocoalfuel", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidnitrocoalfuel", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.bucket)); new ItemStack(bucketNitrocoalfuel), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel.getFluid(), bucketNitrocoalfuel); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrocoalfuel.getFluid(), bucketNitrocoalfuel);
bucketNitrofuel = new ItemFluidbucket(ModFluids.BlockFluidNitrofuel); bucketNitrofuel = new ItemFluidbucket(ModFluids.BlockFluidNitrofuel);
bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.bucket); bucketNitrofuel.setUnlocalizedName("bucketnitrofuel").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrofuel, "bucketnitrofuel"); GameRegistry.registerItem(bucketNitrofuel, "bucketnitrofuel");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrofuel", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidnitrofuel", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrofuel), new ItemStack(Items.bucket)); new ItemStack(bucketNitrofuel), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel.getFluid(), bucketNitrofuel); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrofuel.getFluid(), bucketNitrofuel);
bucketNitrogen = new ItemFluidbucket(ModFluids.BlockFluidNitrogen); bucketNitrogen = new ItemFluidbucket(ModFluids.BlockFluidNitrogen);
bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.bucket); bucketNitrogen.setUnlocalizedName("bucketnitrogen").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrogen, "bucketnitrogen"); GameRegistry.registerItem(bucketNitrogen, "bucketnitrogen");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrogen", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidnitrogen", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrogen), new ItemStack(Items.bucket)); new ItemStack(bucketNitrogen), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen.getFluid(), bucketNitrogen); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogen.getFluid(), bucketNitrogen);
bucketNitrogendioxide = new ItemFluidbucket(ModFluids.BlockFluidNitrogendioxide); bucketNitrogendioxide = new ItemFluidbucket(ModFluids.BlockFluidNitrogendioxide);
bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.bucket); bucketNitrogendioxide.setUnlocalizedName("bucketnitrogendioxide").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketNitrogendioxide, "bucketnitrogendioxide"); GameRegistry.registerItem(bucketNitrogendioxide, "bucketnitrogendioxide");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidnitrogendioxide", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidnitrogendioxide", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketNitrogendioxide), new ItemStack(Items.bucket)); new ItemStack(bucketNitrogendioxide), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide.getFluid(), BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidNitrogendioxide.getFluid(),
bucketNitrogendioxide); bucketNitrogendioxide);
bucketPotassium = new ItemFluidbucket(ModFluids.BlockFluidPotassium); bucketPotassium = new ItemFluidbucket(ModFluids.BlockFluidPotassium);
bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.bucket); bucketPotassium.setUnlocalizedName("bucketpotassium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketPotassium, "bucketpotassium"); GameRegistry.registerItem(bucketPotassium, "bucketpotassium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidpotassium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidpotassium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketPotassium), new ItemStack(Items.bucket)); new ItemStack(bucketPotassium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium.getFluid(), bucketPotassium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidPotassium.getFluid(), bucketPotassium);
bucketSilicon = new ItemFluidbucket(ModFluids.BlockFluidSilicon); bucketSilicon = new ItemFluidbucket(ModFluids.BlockFluidSilicon);
bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.bucket); bucketSilicon.setUnlocalizedName("bucketsilicon").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketSilicon, "bucketsilicon"); GameRegistry.registerItem(bucketSilicon, "bucketsilicon");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidsilicon", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidsilicon", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketSilicon), new ItemStack(Items.bucket)); new ItemStack(bucketSilicon), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon.getFluid(), bucketSilicon); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSilicon.getFluid(), bucketSilicon);
bucketSodium = new ItemFluidbucket(ModFluids.BlockFluidSodium); bucketSodium = new ItemFluidbucket(ModFluids.BlockFluidSodium);
bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.bucket); bucketSodium.setUnlocalizedName("bucketsodium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketSodium, "bucketsodium"); GameRegistry.registerItem(bucketSodium, "bucketsodium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidsodium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidsodium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketSodium), new ItemStack(Items.bucket)); new ItemStack(bucketSodium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium.getFluid(), bucketSodium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodium.getFluid(), bucketSodium);
bucketSodiumpersulfate = new ItemFluidbucket(ModFluids.BlockFluidSodiumpersulfate); bucketSodiumpersulfate = new ItemFluidbucket(ModFluids.BlockFluidSodiumpersulfate);
bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.bucket); bucketSodiumpersulfate.setUnlocalizedName("bucketsodiumpersulfate").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketSodiumpersulfate, "bucketsodiumpersulfate"); GameRegistry.registerItem(bucketSodiumpersulfate, "bucketsodiumpersulfate");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidsodiumpersulfate", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidsodiumpersulfate", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.bucket)); new ItemStack(bucketSodiumpersulfate), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate.getFluid(), BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidSodiumpersulfate.getFluid(),
bucketSodiumpersulfate); bucketSodiumpersulfate);
bucketTritium = new ItemFluidbucket(ModFluids.BlockFluidTritium); bucketTritium = new ItemFluidbucket(ModFluids.BlockFluidTritium);
bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.bucket); bucketTritium.setUnlocalizedName("buckettritium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketTritium, "buckettritium"); GameRegistry.registerItem(bucketTritium, "buckettritium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidtritium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidtritium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketTritium), new ItemStack(Items.bucket)); new ItemStack(bucketTritium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium.getFluid(), bucketTritium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidTritium.getFluid(), bucketTritium);
bucketWolframium = new ItemFluidbucket(ModFluids.BlockFluidWolframium); bucketWolframium = new ItemFluidbucket(ModFluids.BlockFluidWolframium);
bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.bucket); bucketWolframium.setUnlocalizedName("bucketwolframium").setContainerItem(Items.BUCKET);
GameRegistry.registerItem(bucketWolframium, "bucketwolframium"); GameRegistry.registerItem(bucketWolframium, "bucketwolframium");
FluidContainerRegistry.registerFluidContainer( FluidContainerRegistry.registerFluidContainer(
FluidRegistry.getFluidStack("fluidwolframium", FluidContainerRegistry.BUCKET_VOLUME), FluidRegistry.getFluidStack("fluidwolframium", FluidContainerRegistry.BUCKET_VOLUME),
new ItemStack(bucketWolframium), new ItemStack(Items.bucket)); new ItemStack(bucketWolframium), new ItemStack(Items.BUCKET));
BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium.getFluid(), bucketWolframium); BucketHandler.INSTANCE.buckets.put(ModFluids.BlockFluidWolframium.getFluid(), bucketWolframium);
missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe"); missingRecipe = new ItemMissingRecipe().setUnlocalizedName("missingRecipe");
@ -761,7 +761,7 @@ public class ModItems
OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc")); OreUnifier.registerOre("plateZinc", ItemPlates.getPlateByName("zinc"));
OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond")); OreUnifier.registerOre("diamondTR", ItemDusts.getDustByName("Diamond"));
OreUnifier.registerOre("diamondTR", Items.diamond); OreUnifier.registerOre("diamondTR", Items.DIAMOND);
OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead")); OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("diamondGrindingHead"));
OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("wolframiumGrindingHead")); OreUnifier.registerOre("craftingGrinder", ItemParts.getPartByName("wolframiumGrindingHead"));
@ -772,7 +772,7 @@ public class ModItems
OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk")); OreUnifier.registerOre("blockLapis", ItemParts.getPartByName("lazuriteChunk"));
OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water")); OreUnifier.registerOre("containerWater", ItemCells.getCellByName("water"));
OreUnifier.registerOre("containerWater", Items.water_bucket); OreUnifier.registerOre("containerWater", Items.WATER_BUCKET);
OreUnifier.registerOre("materialResin", ItemParts.getPartByName("rubberSap")); OreUnifier.registerOre("materialResin", ItemParts.getPartByName("rubberSap"));
OreUnifier.registerOre("materialRubber", ItemParts.getPartByName("rubber")); OreUnifier.registerOre("materialRubber", ItemParts.getPartByName("rubber"));

File diff suppressed because it is too large Load diff

View file

@ -18,7 +18,7 @@ public class ModSounds
private static SoundEvent getSound(String str) private static SoundEvent getSound(String str)
{ {
SoundEvent soundEvent = SoundEvent.soundEventRegistry.getObject(new ResourceLocation("techreborn" + str)); SoundEvent soundEvent = SoundEvent.REGISTRY.getObject(new ResourceLocation("techreborn" + str));
return soundEvent; return soundEvent;
} }

View file

@ -26,8 +26,8 @@ public class RecipeCompact implements IRecipeCompact
public void init() public void init()
{ {
recipes.put("industrialDiamond", new ItemStack(Items.diamond)); recipes.put("industrialDiamond", new ItemStack(Items.DIAMOND));
recipes.put("industrialTnt", new ItemStack(Blocks.tnt)); recipes.put("industrialTnt", new ItemStack(Blocks.TNT));
recipes.put("copperIngot", ItemIngots.getIngotByName("copper")); recipes.put("copperIngot", ItemIngots.getIngotByName("copper"));
recipes.put("tinIngot", ItemIngots.getIngotByName("tin")); recipes.put("tinIngot", ItemIngots.getIngotByName("tin"));
recipes.put("bronzeIngot", ItemIngots.getIngotByName("bronze")); recipes.put("bronzeIngot", ItemIngots.getIngotByName("bronze"));
@ -66,7 +66,7 @@ public class RecipeCompact implements IRecipeCompact
recipes.put("reinforcedGlass", new ItemStack(ModBlocks.reinforcedglass)); recipes.put("reinforcedGlass", new ItemStack(ModBlocks.reinforcedglass));
recipes.put("compressor", new ItemStack(ModBlocks.Compressor)); recipes.put("compressor", new ItemStack(ModBlocks.Compressor));
recipes.put("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold")); recipes.put("insulatedGoldCableItem", ItemStandaloneCables.getCableByName("insulatedgold"));
recipes.put("fertilizer", new ItemStack(Items.dye)); recipes.put("fertilizer", new ItemStack(Items.DYE));
inited = false; inited = false;
} }

View file

@ -41,15 +41,15 @@ public class ItemDusts extends ItemTextureBase
if (name.equalsIgnoreCase("glowstone")) if (name.equalsIgnoreCase("glowstone"))
{ {
return new ItemStack(Items.glowstone_dust, count); return new ItemStack(Items.GLOWSTONE_DUST, count);
} }
if (name.equalsIgnoreCase("redstone")) if (name.equalsIgnoreCase("redstone"))
{ {
return new ItemStack(Items.redstone, count); return new ItemStack(Items.REDSTONE, count);
} }
if (name.equalsIgnoreCase("gunpowder")) if (name.equalsIgnoreCase("gunpowder"))
{ {
return new ItemStack(Items.gunpowder, count); return new ItemStack(Items.GUNPOWDER, count);
} }
throw new InvalidParameterException("The dust " + name + " could not be found."); throw new InvalidParameterException("The dust " + name + " could not be found.");
} }

View file

@ -12,6 +12,7 @@ import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.ItemArmor.ArmorMaterial;
/** /**
* Created by modmuss50 on 26/02/2016. * Created by modmuss50 on 26/02/2016.
*/ */

View file

@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemAdvancedChainsaw extends ItemChainsaw public class ItemAdvancedChainsaw extends ItemChainsaw
{ {
@ -22,7 +23,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw
@Override @Override
public boolean canHarvestBlock(IBlockState blockIn) public boolean canHarvestBlock(IBlockState blockIn)
{ {
return Items.diamond_axe.canHarvestBlock(blockIn); return Items.DIAMOND_AXE.canHarvestBlock(blockIn);
} }
@Override @Override

View file

@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TextFormatting;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemAdvancedDrill extends ItemDrill public class ItemAdvancedDrill extends ItemDrill
{ {
@ -22,7 +23,7 @@ public class ItemAdvancedDrill extends ItemDrill
@Override @Override
public boolean canHarvestBlock(IBlockState blockIn) public boolean canHarvestBlock(IBlockState blockIn)
{ {
return Items.diamond_pickaxe.canHarvestBlock(blockIn) || Items.diamond_shovel.canHarvestBlock(blockIn); return Items.DIAMOND_PICKAXE.canHarvestBlock(blockIn) || Items.DIAMOND_SHOVEL.canHarvestBlock(blockIn);
} }
@Override @Override

View file

@ -25,6 +25,7 @@ import reborncore.common.util.TorchHelper;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem , IHandHeld public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedItem , IHandHeld
{ {

View file

@ -41,7 +41,7 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
player.setInvisible(true); player.setInvisible(true);
} else } else
{ {
if (!player.isPotionActive(MobEffects.invisibility)) if (!player.isPotionActive(MobEffects.INVISIBILITY))
{ {
player.setInvisible(false); player.setInvisible(false);
} }

View file

@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemDiamondChainsaw extends ItemChainsaw public class ItemDiamondChainsaw extends ItemChainsaw
{ {
@ -17,7 +18,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw
@Override @Override
public boolean canHarvestBlock(IBlockState blockIn) public boolean canHarvestBlock(IBlockState blockIn)
{ {
return Items.diamond_axe.canHarvestBlock(blockIn); return Items.DIAMOND_AXE.canHarvestBlock(blockIn);
} }
@Override @Override

View file

@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemDiamondDrill extends ItemDrill public class ItemDiamondDrill extends ItemDrill
{ {
@ -17,7 +18,7 @@ public class ItemDiamondDrill extends ItemDrill
@Override @Override
public boolean canHarvestBlock(IBlockState state) public boolean canHarvestBlock(IBlockState state)
{ {
return Items.diamond_pickaxe.canHarvestBlock(state) || Items.diamond_shovel.canHarvestBlock(state); return Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state);
} }
@Override @Override

View file

@ -2,6 +2,7 @@ package techreborn.items.tools;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemDiamondJackhammer extends ItemJackhammer public class ItemDiamondJackhammer extends ItemJackhammer
{ {

View file

@ -30,6 +30,7 @@ import techreborn.lib.ModInfo;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.item.Item.ToolMaterial;
public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld
{ {
@ -70,8 +71,8 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured
{ {
return unpoweredSpeed; return unpoweredSpeed;
} }
if (Items.wooden_pickaxe.getStrVsBlock(stack, state) > 1.0F if (Items.WOODEN_PICKAXE.getStrVsBlock(stack, state) > 1.0F
|| Items.wooden_shovel.getStrVsBlock(stack, state) > 1.0F) || Items.WOODEN_SHOVEL.getStrVsBlock(stack, state) > 1.0F)
{ {
return efficiencyOnProperMaterial; return efficiencyOnProperMaterial;
} else } else

View file

@ -20,7 +20,7 @@ public class ItemFluidbucket extends ItemBucket implements ITexturedItem
public ItemFluidbucket(BlockFluidBase block) public ItemFluidbucket(BlockFluidBase block)
{ {
super(block); super(block);
setContainerItem(Items.bucket); setContainerItem(Items.BUCKET);
setCreativeTab(TechRebornCreativeTabMisc.instance); setCreativeTab(TechRebornCreativeTabMisc.instance);
setUnlocalizedName("techreborn.fluidbucket"); setUnlocalizedName("techreborn.fluidbucket");
RebornCore.jsonDestroyer.registerObject(this); RebornCore.jsonDestroyer.registerObject(this);

View file

@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemIronChainsaw extends ItemChainsaw public class ItemIronChainsaw extends ItemChainsaw
{ {
@ -17,7 +18,7 @@ public class ItemIronChainsaw extends ItemChainsaw
@Override @Override
public boolean canHarvestBlock(IBlockState state) public boolean canHarvestBlock(IBlockState state)
{ {
return Items.iron_axe.canHarvestBlock(state); return Items.IRON_AXE.canHarvestBlock(state);
} }
@Override @Override

View file

@ -4,6 +4,7 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemIronDrill extends ItemDrill public class ItemIronDrill extends ItemDrill
{ {
@ -17,7 +18,7 @@ public class ItemIronDrill extends ItemDrill
@Override @Override
public boolean canHarvestBlock(IBlockState state) public boolean canHarvestBlock(IBlockState state)
{ {
return Items.iron_pickaxe.canHarvestBlock(state) || Items.iron_shovel.canHarvestBlock(state); return Items.IRON_PICKAXE.canHarvestBlock(state) || Items.IRON_SHOVEL.canHarvestBlock(state);
} }
@Override @Override

View file

@ -2,6 +2,7 @@ package techreborn.items.tools;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemIronJackhammer extends ItemJackhammer public class ItemIronJackhammer extends ItemJackhammer
{ {

View file

@ -30,6 +30,7 @@ import techreborn.utils.OreDictUtils;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import net.minecraft.item.Item.ToolMaterial;
public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem , IHandHeld
{ {

View file

@ -24,6 +24,7 @@ import reborncore.common.util.ItemNBTHelper;
import techreborn.client.TechRebornCreativeTab; import techreborn.client.TechRebornCreativeTab;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITexturedItem public class ItemNanosaber extends ItemSword implements IEnergyItemInfo, ITexturedItem
{ {

View file

@ -29,6 +29,7 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem
{ {
@ -59,9 +60,9 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
@Override @Override
public boolean canHarvestBlock(IBlockState state) public boolean canHarvestBlock(IBlockState state)
{ {
return Items.diamond_axe.canHarvestBlock(state) || Items.diamond_sword.canHarvestBlock(state) return Items.DIAMOND_AXE.canHarvestBlock(state) || Items.DIAMOND_SWORD.canHarvestBlock(state)
|| Items.diamond_pickaxe.canHarvestBlock(state) || Items.diamond_shovel.canHarvestBlock(state) || Items.DIAMOND_PICKAXE.canHarvestBlock(state) || Items.DIAMOND_SHOVEL.canHarvestBlock(state)
|| Items.shears.canHarvestBlock(state); || Items.SHEARS.canHarvestBlock(state);
} }
// @Override // @Override

View file

@ -22,6 +22,7 @@ import techreborn.client.TechRebornCreativeTab;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITexturedItem
{ {
@ -58,7 +59,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo, ITex
@Override @Override
public boolean canHarvestBlock(IBlockState state) public boolean canHarvestBlock(IBlockState state)
{ {
if (Items.diamond_pickaxe.canHarvestBlock(state)) if (Items.DIAMOND_PICKAXE.canHarvestBlock(state))
{ {
// if (PoweredItem.canUseEnergy(cost, stack)) { // if (PoweredItem.canUseEnergy(cost, stack)) {
// PoweredItem.useEnergy(cost, stack); // PoweredItem.useEnergy(cost, stack);

View file

@ -2,6 +2,7 @@ package techreborn.items.tools;
import techreborn.config.ConfigTechReborn; import techreborn.config.ConfigTechReborn;
import net.minecraft.item.Item.ToolMaterial;
public class ItemSteelJackhammer extends ItemJackhammer public class ItemSteelJackhammer extends ItemJackhammer
{ {

View file

@ -20,12 +20,13 @@ import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld { public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld {
private ToolMaterial material = ToolMaterial.WOOD; private ToolMaterial material = ToolMaterial.WOOD;
private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, private static final Set<Block> EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.PLANKS, Blocks.BOOKSHELF,
Blocks.log, Blocks.log2, Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.LOG, Blocks.LOG2, Blocks.CHEST, Blocks.PUMPKIN, Blocks.LIT_PUMPKIN, Blocks.MELON_BLOCK,
Blocks.ladder, Blocks.wooden_button, Blocks.wooden_pressure_plate }); Blocks.LADDER, Blocks.WOODEN_BUTTON, Blocks.WOODEN_PRESSURE_PLATE });
public ItemTRAxe(ToolMaterial material) { public ItemTRAxe(ToolMaterial material) {
super(material, EFFECTIVE_ON); super(material, EFFECTIVE_ON);
@ -39,7 +40,7 @@ public class ItemTRAxe extends ItemTool implements ITexturedItem , IHandHeld {
public float getStrVsBlock(ItemStack stack, IBlockState state) { public float getStrVsBlock(ItemStack stack, IBlockState state) {
Material material = state.getMaterial(); Material material = state.getMaterial();
return material != Material.wood && material != Material.plants && material != Material.vine return material != Material.WOOD && material != Material.PLANTS && material != Material.VINE
? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial; ? super.getStrVsBlock(stack, state) : this.efficiencyOnProperMaterial;
} }

View file

@ -12,6 +12,7 @@ import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemTRHoe extends ItemHoe implements ITexturedItem, IHandHeld public class ItemTRHoe extends ItemHoe implements ITexturedItem, IHandHeld
{ {
private ToolMaterial material = ToolMaterial.WOOD; private ToolMaterial material = ToolMaterial.WOOD;

View file

@ -12,6 +12,7 @@ import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemTRPickaxe extends ItemPickaxe implements ITexturedItem , IHandHeld public class ItemTRPickaxe extends ItemPickaxe implements ITexturedItem , IHandHeld
{ {
private ToolMaterial material = ToolMaterial.WOOD; private ToolMaterial material = ToolMaterial.WOOD;

View file

@ -12,6 +12,7 @@ import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemTRSpade extends ItemSpade implements ITexturedItem , IHandHeld public class ItemTRSpade extends ItemSpade implements ITexturedItem , IHandHeld
{ {
private ToolMaterial material = ToolMaterial.WOOD; private ToolMaterial material = ToolMaterial.WOOD;

View file

@ -12,6 +12,7 @@ import reborncore.RebornCore;
import techreborn.client.TechRebornCreativeTabMisc; import techreborn.client.TechRebornCreativeTabMisc;
import techreborn.lib.ModInfo; import techreborn.lib.ModInfo;
import net.minecraft.item.Item.ToolMaterial;
public class ItemTRSword extends ItemSword implements ITexturedItem , IHandHeld public class ItemTRSword extends ItemSword implements ITexturedItem , IHandHeld
{ {
private ToolMaterial material = ToolMaterial.WOOD; private ToolMaterial material = ToolMaterial.WOOD;

View file

@ -158,7 +158,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem
// 0.8F, 1F); // 0.8F, 1F);
if (!world.isRemote) if (!world.isRemote)
{ {
world.setBlockState(pos, Blocks.air.getDefaultState(), 2); world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
} }
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }

View file

@ -21,7 +21,7 @@ public class GuiButtonAHeight extends GuiButton
if (this.visible) if (this.visible)
{ {
FontRenderer fontrenderer = minecraft.fontRendererObj; FontRenderer fontrenderer = minecraft.fontRendererObj;
minecraft.getTextureManager().bindTexture(buttonTextures); minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.yPosition + this.height;

View file

@ -48,7 +48,7 @@ public class GuiButtonCustomTexture extends GuiButtonExt
{ {
boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.yPosition + this.height;
mc.getTextureManager().bindTexture(buttonTextures); mc.getTextureManager().bindTexture(BUTTON_TEXTURES);
int u = textureU; int u = textureU;
int v = textureV; int v = textureV;

View file

@ -35,7 +35,7 @@ public class GuiButtonItemTexture extends GuiButtonExt
{ {
boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width boolean flag = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.yPosition + this.height;
mc.getTextureManager().bindTexture(buttonTextures); mc.getTextureManager().bindTexture(BUTTON_TEXTURES);
int u = textureU; int u = textureU;
int v = textureV; int v = textureV;
if (flag) if (flag)

View file

@ -29,7 +29,7 @@ public class GuiButtonTextOnly extends GuiButton
if (this.visible) if (this.visible)
{ {
FontRenderer fontrenderer = minecraft.fontRendererObj; FontRenderer fontrenderer = minecraft.fontRendererObj;
minecraft.getTextureManager().bindTexture(buttonTextures); minecraft.getTextureManager().bindTexture(BUTTON_TEXTURES);
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width this.hovered = mouseX >= this.xPosition && mouseY >= this.yPosition && mouseX < this.xPosition + this.width
&& mouseY < this.yPosition + this.height; && mouseY < this.yPosition + this.height;

View file

@ -292,7 +292,7 @@ public abstract class CableMultipart extends Multipart
} }
public Material getMaterial() { public Material getMaterial() {
return Material.cloth; return Material.CLOTH;
} }
@Override @Override

View file

@ -49,21 +49,21 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
{ {
Item item = stack.getItem(); Item item = stack.getItem();
if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.air) if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.AIR)
{ {
Block block = Block.getBlockFromItem(item); Block block = Block.getBlockFromItem(item);
if (block == Blocks.wooden_slab) if (block == Blocks.WOODEN_SLAB)
{ {
return 150; return 150;
} }
if (block.getMaterial(block.getDefaultState()) == Material.wood) if (block.getMaterial(block.getDefaultState()) == Material.WOOD)
{ {
return 300; return 300;
} }
if (block == Blocks.coal_block) if (block == Blocks.COAL_BLOCK)
{ {
return 16000; return 16000;
} }
@ -75,15 +75,15 @@ public class TileAlloyFurnace extends TileMachineBase implements IWrenchable, II
return 200; return 200;
// if (item instanceof ItemHoe && ((ItemHoe) // if (item instanceof ItemHoe && ((ItemHoe)
// item).getToolMaterialName().equals("WOOD")) return 200; // item).getToolMaterialName().equals("WOOD")) return 200;
if (item == Items.stick) if (item == Items.STICK)
return 100; return 100;
if (item == Items.coal) if (item == Items.COAL)
return 1600; return 1600;
if (item == Items.lava_bucket) if (item == Items.LAVA_BUCKET)
return 20000; return 20000;
if (item == Item.getItemFromBlock(Blocks.sapling)) if (item == Item.getItemFromBlock(Blocks.SAPLING))
return 100; return 100;
if (item == Items.blaze_rod) if (item == Items.BLAZE_ROD)
return 2400; return 2400;
return GameRegistry.getFuelValue(stack); return GameRegistry.getFuelValue(stack);
} }

View file

@ -40,22 +40,22 @@ public class TileIronFurnace extends TileMachineBase implements IInventoryProvid
{ {
Block block = Block.getBlockFromItem(item); Block block = Block.getBlockFromItem(item);
if (block == Blocks.wooden_slab) if (block == Blocks.WOODEN_SLAB)
{ {
return 150; return 150;
} }
if (block == Blocks.log) if (block == Blocks.LOG)
{ {
return 1200; return 1200;
} }
if (block.getMaterial(block.getDefaultState()) == Material.wood) if (block.getMaterial(block.getDefaultState()) == Material.WOOD)
{ {
return 300; return 300;
} }
if (block == Blocks.coal_block) if (block == Blocks.COAL_BLOCK)
{ {
return 16000; return 16000;
} }
@ -67,15 +67,15 @@ public class TileIronFurnace extends TileMachineBase implements IInventoryProvid
return 200; return 200;
if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD")) if (item instanceof ItemHoe && ((ItemHoe) item).getMaterialName().equals("WOOD"))
return 200; return 200;
if (item == Items.stick) if (item == Items.STICK)
return 100; return 100;
if (item == Items.coal) if (item == Items.COAL)
return 1600; return 1600;
if (item == Items.lava_bucket) if (item == Items.LAVA_BUCKET)
return 20000; return 20000;
if (item == new ItemStack(Blocks.sapling).getItem()) if (item == new ItemStack(Blocks.SAPLING).getItem())
return 100; return 100;
if (item == Items.blaze_rod) if (item == Items.BLAZE_ROD)
return 2400; return 2400;
return GameRegistry.getFuelValue(stack); return GameRegistry.getFuelValue(stack);
} }

View file

@ -32,7 +32,7 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
if (!worldObj.isRemote) if (!worldObj.isRemote)
{ {
if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ())) if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ()))
.getBlock() == Blocks.dragon_egg) .getBlock() == Blocks.DRAGON_EGG)
{ {
addEnergy(euTick); addEnergy(euTick);
} }

View file

@ -29,23 +29,23 @@ public class TileHeatGenerator extends TilePowerAcceptor implements IWrenchable
if (!worldObj.isRemote) if (!worldObj.isRemote)
{ {
if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ())) if (worldObj.getBlockState(new BlockPos(getPos().getX() + 1, getPos().getY(), getPos().getZ()))
.getBlock() == Blocks.lava) .getBlock() == Blocks.LAVA)
{ {
addEnergy(euTick); addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1)) } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() + 1))
.getBlock() == Blocks.lava) .getBlock() == Blocks.LAVA)
{ {
addEnergy(euTick); addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1)) } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY(), getPos().getZ() - 1))
.getBlock() == Blocks.lava) .getBlock() == Blocks.LAVA)
{ {
addEnergy(euTick); addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ())) } else if (worldObj.getBlockState(new BlockPos(getPos().getX() - 1, getPos().getY(), getPos().getZ()))
.getBlock() == Blocks.lava) .getBlock() == Blocks.LAVA)
{ {
addEnergy(euTick); addEnergy(euTick);
} else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ())) } else if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() - 1, getPos().getZ()))
.getBlock() == Blocks.lava) .getBlock() == Blocks.LAVA)
{ {
addEnergy(euTick); addEnergy(euTick);
} }

View file

@ -153,7 +153,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
{ {
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ())) getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ()))
.getBlock() == Blocks.lava) .getBlock() == Blocks.LAVA)
{ {
addEnergy(1); addEnergy(1);
} }
@ -167,7 +167,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
{ {
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(), if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(), getPos().getY() + direction.getFrontOffsetY(),
getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.lava) getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA)
{ {
didFindLava = true; didFindLava = true;
} }

View file

@ -37,7 +37,7 @@ public class TileWaterMill extends TilePowerAcceptor
waterblocks = 0; waterblocks = 0;
for (EnumFacing facing : EnumFacing.HORIZONTALS) for (EnumFacing facing : EnumFacing.HORIZONTALS)
{ {
if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.water) if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER)
{ {
waterblocks++; waterblocks++;
} }

View file

@ -37,7 +37,7 @@ public class StackWIPHandler
} }
private void addHead(String name){ private void addHead(String name){
ItemStack head = new ItemStack(Items.skull, 1, 3); ItemStack head = new ItemStack(Items.SKULL, 1, 3);
head.setTagCompound(new NBTTagCompound()); head.setTagCompound(new NBTTagCompound());
head.getTagCompound().setTag("SkullOwner", new NBTTagString(name)); head.getTagCompound().setTag("SkullOwner", new NBTTagString(name));
devHeads.add(head); devHeads.add(head);