Start on the update

This commit is contained in:
modmuss50 2016-11-19 12:50:08 +00:00
parent c8d8ce0241
commit a0e6a2dc34
No known key found for this signature in database
GPG key ID: 773D17BE8BF49C82
112 changed files with 522 additions and 503 deletions

View file

@ -70,8 +70,8 @@ if (ENV.BUILD_NUMBER) {
}
minecraft {
version = "1.10.2-12.18.2.2121"
mappings = "snapshot_20161105"
version = "1.11-13.19.0.2152"
mappings = "snapshot_20161118"
replace "@MODVERSION@", project.version
// makeObfSourceJar = false
useDepAts = true
@ -94,13 +94,15 @@ dependencies {
if(!f.exists()){
f.mkdir()
}
deobfCompile 'RebornCore:RebornCore-1.10.2:+:universal'
deobfCompile "mezz.jei:jei_1.10.2:+"
// compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf"
deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384"
deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.9.4-1.0.4-14"
deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:dev'
deobfCompile 'RebornCore:RebornCore-1.11:+:universal'
deobfCompile "mezz.jei:jei_1.11:+"
//1.11 updates
// compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24:deobf"
// deobfCompile "slimeknights:TConstruct:1.10.2-2.5.3.jenkins384"
// deobfCompile "slimeknights.mantle:Mantle:1.10.2-1.0.0.jenkins170"
deobfCompile "mcjty.theoneprobe:TheOneProbe:1.11-1.3.3-46"
//Only API untill
deobfCompile 'net.industrial-craft:industrialcraft-2:2.6.58-ex110:api'
}

View file

@ -2,7 +2,7 @@ package techreborn.api.gui;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import techreborn.utils.upgrade.IMachineUpgrade;
public class SlotUpgrade extends BaseSlot {

View file

@ -55,7 +55,7 @@ public class RecipeConfigManager {
ConfigItem newItem = new ConfigItem();
newItem.setItemName(stack.getItem().getUnlocalizedName());
newItem.setMeta(stack.getItemDamage());
newItem.setStackSize(stack.stackSize);
newItem.setStackSize(stack.getCount());
newItem.setLocalName(stack.getDisplayName());
return newItem;
}

View file

@ -52,7 +52,7 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock {
}
@Override
public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock) {
public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock, BlockPos p_189540_5_) {
if (worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering()
&& worldIn.isDaytime()) {
worldIn.setBlockState(pos,

View file

@ -53,7 +53,7 @@ public class StackToolTipEvent {
Block block = Block.getBlockFromItem(event.getItemStack().getItem());
if (block != null && (block instanceof BlockContainer || block instanceof ITileEntityProvider)
&& block.getRegistryName().getResourceDomain().contains("techreborn")) {
TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().theWorld,
TileEntity tile = block.createTileEntity(Minecraft.getMinecraft().world,
block.getDefaultState());
if (tile instanceof IListInfoProvider) {
((IListInfoProvider) tile).addInfo(event.getToolTip(), false);

View file

@ -2,6 +2,7 @@ package techreborn.client;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import techreborn.init.ModBlocks;
public class TechRebornCreativeTab extends CreativeTabs {
@ -13,7 +14,7 @@ public class TechRebornCreativeTab extends CreativeTabs {
}
@Override
public Item getTabIconItem() {
return Item.getItemFromBlock(ModBlocks.thermalGenerator);
public ItemStack getTabIconItem() {
return new ItemStack(ModBlocks.thermalGenerator);
}
}

View file

@ -2,6 +2,7 @@ package techreborn.client;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import techreborn.init.ModItems;
public class TechRebornCreativeTabMisc extends CreativeTabs {
@ -13,8 +14,8 @@ public class TechRebornCreativeTabMisc extends CreativeTabs {
}
@Override
public Item getTabIconItem() {
return ModItems.dynamicCell;
public ItemStack getTabIconItem() {
return new ItemStack(ModItems.dynamicCell);
}
}

View file

@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileAesu;

View file

@ -3,8 +3,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.SlotFurnaceFuel;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileAlloyFurnace;

View file

@ -3,10 +3,10 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import reborncore.api.tile.IContainerLayout;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotCharge;
import reborncore.client.gui.SlotInput;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotCharge;
import reborncore.client.gui.slots.SlotInput;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.TileAlloySmelter;

View file

@ -3,8 +3,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import reborncore.api.tile.IContainerLayout;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.TileAssemblingMachine;

View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotCharge;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotCharge;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.storage.TileBatBox;

View file

@ -2,8 +2,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.tiles.multiblock.TileBlastFurnace;
public class ContainerBlastFurnace extends ContainerCrafting {

View file

@ -3,8 +3,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import reborncore.api.tile.IContainerLayout;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.TileCentrifuge;

View file

@ -1,11 +1,11 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileChargeBench;
//import reborncore.client.gui.BaseSlot;
//import reborncore.client.gui.slots.BaseSlot;
public class ContainerChargeBench extends RebornContainer {

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.TileChemicalReactor;

View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileChunkLoader;

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileCompressor;

View file

@ -2,8 +2,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFilteredVoid;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFilteredVoid;
import reborncore.common.container.RebornContainer;
import reborncore.common.util.Inventory;
import techreborn.init.ModItems;

View file

@ -4,9 +4,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.generator.TileDieselGenerator;

View file

@ -1,9 +1,9 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileDigitalChest;

View file

@ -3,8 +3,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileElectricFurnace;

View file

@ -3,9 +3,9 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import reborncore.api.tile.IContainerLayout;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotInput;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotInput;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileExtractor;

View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.fusionReactor.TileEntityFusionController;

View file

@ -1,9 +1,9 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.generator.TileGasTurbine;

View file

@ -5,8 +5,8 @@ import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.SlotFurnaceFuel;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotCharge;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotCharge;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.generator.TileGenerator;

View file

@ -3,9 +3,9 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.EnumFacing;
import reborncore.api.tile.IContainerLayout;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotInput;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotInput;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.recipes.RecipeCrafter;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileGrinder;

View file

@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.idsu.TileIDSU;

View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.tiles.multiblock.TileImplosionCompressor;
public class ContainerImplosionCompressor extends ContainerCrafting {

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.tiles.TileIndustrialElectrolyzer;
public class ContainerIndustrialElectrolyzer extends ContainerCrafting {

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.tiles.multiblock.TileIndustrialGrinder;
public class ContainerIndustrialGrinder extends ContainerCrafting {

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.multiblock.TileIndustrialSawmill;

View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.SlotFurnaceFuel;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileIronFurnace;

View file

@ -4,7 +4,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.common.container.RebornContainer;
import techreborn.config.ConfigTechReborn;
import techreborn.tiles.lesu.TileLesu;

View file

@ -10,8 +10,8 @@ import net.minecraft.inventory.IContainerListener;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotCharge;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotCharge;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.storage.TileMFE;

View file

@ -6,8 +6,8 @@ import net.minecraft.inventory.IContainerListener;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotCharge;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotCharge;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.storage.TileMFSU;

View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileMatterFabricator;

View file

@ -1,9 +1,9 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileQuantumChest;

View file

@ -1,10 +1,10 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotFluid;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotFluid;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileQuantumTank;

View file

@ -3,8 +3,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.teir1.TileRecycler;

View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.api.RollingMachineRecipe;
import techreborn.tiles.TileRollingMachine;

View file

@ -3,8 +3,8 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.api.gui.SlotUpgrade;
import techreborn.tiles.TileScrapboxinator;

View file

@ -1,9 +1,9 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.generator.TileSemifluidGenerator;

View file

@ -1,10 +1,10 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotFake;
import reborncore.client.gui.SlotFluid;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotFake;
import reborncore.client.gui.slots.SlotFluid;
import reborncore.client.gui.slots.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.generator.TileThermalGenerator;

View file

@ -1,8 +1,8 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.SlotOutput;
import reborncore.client.gui.slots.BaseSlot;
import reborncore.client.gui.slots.SlotOutput;
import techreborn.tiles.multiblock.TileVacuumFreezer;
public class ContainerVacuumFreezer extends ContainerCrafting {

View file

@ -2,7 +2,7 @@ package techreborn.client.container;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import reborncore.client.gui.BaseSlot;
import reborncore.client.gui.slots.BaseSlot;
import techreborn.init.ModItems;
public class SlotScrapbox extends BaseSlot {

View file

@ -39,9 +39,9 @@ public class GuiDigitalChest extends GuiContainer {
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Amount", 10, 20, 16448255);
if (tile.storedItem != null && tile.getStackInSlot(1) != null)
this.fontRendererObj.drawString(tile.storedItem.stackSize + tile.getStackInSlot(1).stackSize + "", 10, 30,
this.fontRendererObj.drawString(tile.storedItem.getCount() + tile.getStackInSlot(1).getCount() + "", 10, 30,
16448255);
if (tile.storedItem == null && tile.getStackInSlot(1) != null)
this.fontRendererObj.drawString(tile.getStackInSlot(1).stackSize + "", 10, 30, 16448255);
this.fontRendererObj.drawString(tile.getStackInSlot(1).getCount() + "", 10, 30, 16448255);
}
}

View file

@ -39,9 +39,9 @@ public class GuiQuantumChest extends GuiContainer {
this.ySize - 96 + 2, 4210752);
this.fontRendererObj.drawString("Amount", 10, 20, 16448255);
if (tile.storedItem != null && tile.getStackInSlot(1) != null)
this.fontRendererObj.drawString(tile.storedItem.stackSize + tile.getStackInSlot(1).stackSize + "", 10, 30,
this.fontRendererObj.drawString(tile.storedItem.getCount() + tile.getStackInSlot(1).getCount() + "", 10, 30,
16448255);
if (tile.storedItem == null && tile.getStackInSlot(1) != null)
this.fontRendererObj.drawString(tile.getStackInSlot(1).stackSize + "", 10, 30, 16448255);
this.fontRendererObj.drawString(tile.getStackInSlot(1).getCount() + "", 10, 30, 16448255);
}
}

View file

@ -43,10 +43,10 @@ public class ChargeHud {
}
public void drawChargeHud(ScaledResolution res) {
EntityPlayer player = mc.thePlayer;
EntityPlayer player = mc.player;
ItemStack armorstack = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
ItemStack offHandstack = player.getItemStackFromSlot(EntityEquipmentSlot.OFFHAND);
ItemStack stack = mc.thePlayer.inventory.getCurrentItem();
ItemStack stack = mc.player.inventory.getCurrentItem();
int y = 5;

View file

@ -29,7 +29,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
GlStateManager.translate((float) x, (float) y + 0.5F, (float) z);
if ((float) entity.fuse - partialTicks + 1.0F < 10.0F) {
float f = 1.0F - ((float) entity.fuse - partialTicks + 1.0F) / 10.0F;
f = MathHelper.clamp_float(f, 0.0F, 1.0F);
f = MathHelper.clamp(f, 0.0F, 1.0F);
f = f * f;
f = f * f;
float f1 = 1.0F + f * 0.3F;

View file

@ -23,12 +23,12 @@ import java.util.List;
public class TechRebornDevCommand extends CommandBase {
@Override
public String getCommandName() {
public String getName() {
return "trdev";
}
@Override
public String getCommandUsage(ICommandSender icommandsender) {
public String getUsage(ICommandSender icommandsender) {
return "commands.forge.usage";
}
@ -40,20 +40,20 @@ public class TechRebornDevCommand extends CommandBase {
@Override
public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
if (args.length == 0) {
sender.addChatMessage(new TextComponentString("You need to use arguments, see /trdev help"));
sender.sendMessage(new TextComponentString("You need to use arguments, see /trdev help"));
} else if ("help".equals(args[0])) {
sender.addChatMessage(new TextComponentString("recipes - Shows size of the recipe array"));
sender.addChatMessage(new TextComponentString("fluid - Lists the fluid power values"));
sender.sendMessage(new TextComponentString("recipes - Shows size of the recipe array"));
sender.sendMessage(new TextComponentString("fluid - Lists the fluid power values"));
} else if ("recipes".equals(args[0])) {
sender.addChatMessage(new TextComponentString(RecipeHandler.recipeList.size() + " recipes loaded"));
sender.sendMessage(new TextComponentString(RecipeHandler.recipeList.size() + " recipes loaded"));
} else if ("fluid".equals(args[0])) {
for (Object object : FluidPowerManager.fluidPowerValues.keySet().toArray()) {
if (object instanceof Fluid) {
Fluid fluid = (Fluid) object;
sender.addChatMessage(new TextComponentString(
sender.sendMessage(new TextComponentString(
fluid.getUnlocalizedName() + " : " + FluidPowerManager.fluidPowerValues.get(fluid)));
} else {
sender.addChatMessage(new TextComponentString("Found invalid fluid entry"));
sender.sendMessage(new TextComponentString("Found invalid fluid entry"));
}
}
} else if ("clear".equals(args[0])) {
@ -66,8 +66,8 @@ public class TechRebornDevCommand extends CommandBase {
for (int z = 0; z < 25; z++) {
for (int y = 0; y < playerMP.posY; y++) {
BlockPos pos = new BlockPos(playerMP.posX + x, y, playerMP.posZ + z);
if (blocksToRemove.contains(playerMP.worldObj.getBlockState(pos).getBlock())) {
playerMP.worldObj.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
if (blocksToRemove.contains(playerMP.world.getBlockState(pos).getBlock())) {
playerMP.world.setBlockState(pos, Blocks.AIR.getDefaultState(), 2);
}
}
}
@ -75,16 +75,16 @@ public class TechRebornDevCommand extends CommandBase {
} else if ("getname".equals(args[0])) {
EntityPlayer player = (EntityPlayer) sender;
if (player.getHeldItem(EnumHand.MAIN_HAND) != null) {
sender.addChatMessage(new TextComponentString(player.getHeldItem(EnumHand.MAIN_HAND).getItem().getRegistryName() + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage()));
sender.sendMessage(new TextComponentString(player.getHeldItem(EnumHand.MAIN_HAND).getItem().getRegistryName() + ":" + player.getHeldItem(EnumHand.MAIN_HAND).getItemDamage()));
} else {
((EntityPlayer) sender).addChatComponentMessage(new TextComponentString("hold an item!"));
sender.sendMessage(new TextComponentString("hold an item!"));
}
} else if ("gen".equals(args[0])) {
try {
new JsonGenerator().generate();
} catch (IOException e) {
e.printStackTrace();
sender.addChatMessage(new TextComponentString(e.getLocalizedMessage()));
sender.sendMessage(new TextComponentString(e.getLocalizedMessage()));
}
}
}

View file

@ -47,7 +47,7 @@ public class AlloySmelterRecipeCategory extends BlankRecipeCategory<AlloySmelter
}
@Override
public void drawAnimations(
public void drawExtras(
@Nonnull
Minecraft minecraft) {
electricity.draw(minecraft, 10, 20);

View file

@ -47,7 +47,7 @@ public class AssemblingMachineRecipeCategory extends BlankRecipeCategory<Assembl
}
@Override
public void drawAnimations(
public void drawExtras(
@Nonnull
Minecraft minecraft) {
electricity.draw(minecraft, 10, 20);

View file

@ -17,7 +17,7 @@ public class CompatModuleTinkers implements ICompatModule {
@Override
public void preInit(FMLPreInitializationEvent event) {
TinkersFluids.init();
// TinkersFluids.init();
}
@Override

View file

@ -1,71 +1,71 @@
package techreborn.compat.tinkers;
import net.minecraft.item.EnumRarity;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.event.FMLInterModComms;
import slimeknights.tconstruct.library.fluid.FluidMolten;
/**
* @author Prospector on 08/05/16
*/
public class TinkersFluids {
private static ResourceLocation moltenMetal = new ResourceLocation("tconstruct:blocks/fluids/molten_metal");
private static ResourceLocation moltenMetalFlowing = new ResourceLocation(
"tconstruct:blocks/fluids/molten_metal_flow");
public static FluidMolten moltenChrome = new FluidMolten("chrome", 0x90C9C9, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenInvar = new FluidMolten("invar", 0x7F907F, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenIridium = new FluidMolten("iridium", 0xFFFFFF, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenPlatinum = new FluidMolten("platinum", 0x34BFBF, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenTitanium = new FluidMolten("titanium", 0x3C372F, moltenMetal, moltenMetalFlowing);
public static FluidMolten moltenTungsten = new FluidMolten("tungsten", 0x3A464F, moltenMetal, moltenMetalFlowing);
public static void init() {
addFluidStuff(moltenChrome, "Chrome");
moltenChrome.setTemperature(800);
addFluidStuff(moltenInvar, "Invar");
moltenInvar.setTemperature(580);
addFluidStuff(moltenIridium, "Iridium");
moltenIridium.setTemperature(4000);
moltenIridium.setRarity(EnumRarity.EPIC);
addFluidStuff(moltenPlatinum, "Platinum");
moltenPlatinum.setTemperature(900);
addFluidStuff(moltenTitanium, "Titanium");
moltenTitanium.setTemperature(1000);
addFluidStuff(moltenTungsten, "Tungsten");
moltenTungsten.setTemperature(1200);
//Invar Alloying
NBTTagList tagList = new NBTTagList();
NBTTagCompound fluid = new NBTTagCompound();
fluid.setString("FluidName", "invar");
fluid.setInteger("Amount", 144);
tagList.appendTag(fluid);
fluid = new NBTTagCompound();
fluid.setString("FluidName", "iron");
fluid.setInteger("Amount", 96);
tagList.appendTag(fluid);
fluid = new NBTTagCompound();
fluid.setString("FluidName", "nickel");
fluid.setInteger("Amount", 48);
tagList.appendTag(fluid);
NBTTagCompound message = new NBTTagCompound();
message.setTag("alloy", tagList);
FMLInterModComms.sendMessage("tconstruct", "alloy", message);
}
public static void addFluidStuff(Fluid fluid, String oreSuffix) {
FluidRegistry.registerFluid(fluid);
FluidRegistry.addBucketForFluid(fluid);
NBTTagCompound tag = new NBTTagCompound();
tag.setString("fluid", fluid.getName());
tag.setString("ore", oreSuffix);
tag.setBoolean("toolforge", true);
FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag);
}
}
//package techreborn.compat.tinkers;
//
//import net.minecraft.item.EnumRarity;
//import net.minecraft.nbt.NBTTagCompound;
//import net.minecraft.nbt.NBTTagList;
//import net.minecraft.util.ResourceLocation;
//import net.minecraftforge.fluids.Fluid;
//import net.minecraftforge.fluids.FluidRegistry;
//import net.minecraftforge.fml.common.event.FMLInterModComms;
//import slimeknights.tconstruct.library.fluid.FluidMolten;
//
///**
// * @author Prospector on 08/05/16
// */
//public class TinkersFluids {
// private static ResourceLocation moltenMetal = new ResourceLocation("tconstruct:blocks/fluids/molten_metal");
// private static ResourceLocation moltenMetalFlowing = new ResourceLocation(
// "tconstruct:blocks/fluids/molten_metal_flow");
//
// public static FluidMolten moltenChrome = new FluidMolten("chrome", 0x90C9C9, moltenMetal, moltenMetalFlowing);
// public static FluidMolten moltenInvar = new FluidMolten("invar", 0x7F907F, moltenMetal, moltenMetalFlowing);
// public static FluidMolten moltenIridium = new FluidMolten("iridium", 0xFFFFFF, moltenMetal, moltenMetalFlowing);
// public static FluidMolten moltenPlatinum = new FluidMolten("platinum", 0x34BFBF, moltenMetal, moltenMetalFlowing);
// public static FluidMolten moltenTitanium = new FluidMolten("titanium", 0x3C372F, moltenMetal, moltenMetalFlowing);
// public static FluidMolten moltenTungsten = new FluidMolten("tungsten", 0x3A464F, moltenMetal, moltenMetalFlowing);
//
// public static void init() {
// addFluidStuff(moltenChrome, "Chrome");
// moltenChrome.setTemperature(800);
// addFluidStuff(moltenInvar, "Invar");
// moltenInvar.setTemperature(580);
// addFluidStuff(moltenIridium, "Iridium");
// moltenIridium.setTemperature(4000);
// moltenIridium.setRarity(EnumRarity.EPIC);
// addFluidStuff(moltenPlatinum, "Platinum");
// moltenPlatinum.setTemperature(900);
// addFluidStuff(moltenTitanium, "Titanium");
// moltenTitanium.setTemperature(1000);
// addFluidStuff(moltenTungsten, "Tungsten");
// moltenTungsten.setTemperature(1200);
//
// //Invar Alloying
// NBTTagList tagList = new NBTTagList();
// NBTTagCompound fluid = new NBTTagCompound();
// fluid.setString("FluidName", "invar");
// fluid.setInteger("Amount", 144);
// tagList.appendTag(fluid);
// fluid = new NBTTagCompound();
// fluid.setString("FluidName", "iron");
// fluid.setInteger("Amount", 96);
// tagList.appendTag(fluid);
// fluid = new NBTTagCompound();
// fluid.setString("FluidName", "nickel");
// fluid.setInteger("Amount", 48);
// tagList.appendTag(fluid);
//
// NBTTagCompound message = new NBTTagCompound();
// message.setTag("alloy", tagList);
// FMLInterModComms.sendMessage("tconstruct", "alloy", message);
// }
//
// public static void addFluidStuff(Fluid fluid, String oreSuffix) {
// FluidRegistry.registerFluid(fluid);
// FluidRegistry.addBucketForFluid(fluid);
// NBTTagCompound tag = new NBTTagCompound();
// tag.setString("fluid", fluid.getName());
// tag.setString("ore", oreSuffix);
// tag.setBoolean("toolforge", true);
// FMLInterModComms.sendMessage("tconstruct", "integrateSmeltery", tag);
// }
//}

View file

@ -1,6 +1,7 @@
package techreborn.entitys;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.MoverType;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
@ -29,7 +30,7 @@ public class EntityNukePrimed extends EntityTNTPrimed {
this.prevPosY = this.posY;
this.prevPosZ = this.posZ;
this.motionY -= 0.03999999910593033D;
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.move(MoverType.SELF, this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.9800000190734863D;
this.motionY *= 0.9800000190734863D;
this.motionZ *= 0.9800000190734863D;
@ -40,18 +41,18 @@ public class EntityNukePrimed extends EntityTNTPrimed {
}
if (this.fuse-- <= 0) {
this.setDead();
if (!this.worldObj.isRemote) {
if (!this.world.isRemote) {
this.explodeNuke();
}
} else {
this.handleWaterMovement();
this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, this.posX, this.posY + 0.5D, this.posZ, 0.0D,
this.world.spawnParticle(EnumParticleTypes.SMOKE_LARGE, this.posX, this.posY + 0.5D, this.posZ, 0.0D,
0.0D, 0.0D, new int[0]);
}
}
public void explodeNuke() {
RebornExplosion nukeExplosion = new RebornExplosion(new BlockPos(this.posX, this.posY, this.posZ), worldObj,
RebornExplosion nukeExplosion = new RebornExplosion(new BlockPos(this.posX, this.posY, this.posZ), world,
40);
nukeExplosion.setLivingBase(getTntPlacedBy());
nukeExplosion.explode();

View file

@ -19,7 +19,7 @@ public class BlockBreakHandler {
if (OreDictUtils.isOre(ore, "gemRuby")) {
EntityItem item = new EntityItem(event.getWorld(), event.getPos().getX(), event.getPos().getY(), event.getPos().getZ(),
ItemGems.getGemByName("redGarnet").copy());
event.getWorld().spawnEntityInWorld(item);
event.getWorld().spawnEntity(item);
}
}
}

View file

@ -31,9 +31,9 @@ public class OreUnifier {
@SubscribeEvent
public void itemTick(TickEvent.PlayerTickEvent event) {
if (ConfigTechReborn.OreUnifer && !event.player.worldObj.isRemote
&& event.player.worldObj.getTotalWorldTime() % 10 == 0) {
if (event.player.getHeldItem(EnumHand.MAIN_HAND) != null) {
if (ConfigTechReborn.OreUnifer && !event.player.world.isRemote
&& event.player.world.getTotalWorldTime() % 10 == 0) {
if (event.player.getHeldItem(EnumHand.MAIN_HAND) != ItemStack.EMPTY) {
int[] oreIds = OreDictionary.getOreIDs(event.player.getHeldItem(EnumHand.MAIN_HAND));
for (int id : oreIds) {
String oreName = OreDictionary.getOreName(id);
@ -43,7 +43,7 @@ public class OreUnifier {
&& !ItemUtils.isItemEqual(event.player.getHeldItem(EnumHand.MAIN_HAND),
oreHash.get(oreName), true, true, false)) {
ItemStack stack = oreHash.get(oreName).copy();
stack.stackSize = event.player.getHeldItem(EnumHand.MAIN_HAND).stackSize;
stack.setCount(event.player.getHeldItem(EnumHand.MAIN_HAND).getCount());
stack.setTagCompound(event.player.getHeldItem(EnumHand.MAIN_HAND).getTagCompound());
event.player.inventory.setInventorySlotContents(event.player.inventory.currentItem, stack);
}

View file

@ -1,6 +1,8 @@
package techreborn.init;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
@ -111,172 +113,178 @@ public class ModFluids {
public static void init() {
FluidRegistry.registerFluid(fluidberylium);
BlockFluidBerylium = new BlockFluidTechReborn(fluidberylium, Material.WATER, "techreborn.berylium");
GameRegistry.registerBlock(BlockFluidBerylium,
registerBlock(BlockFluidBerylium,
ModInfo.MOD_ID + "_" + BlockFluidBerylium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidcalcium);
BlockFluidCalcium = new BlockFluidTechReborn(fluidcalcium, Material.WATER, "techreborn.calcium");
GameRegistry.registerBlock(BlockFluidCalcium,
registerBlock(BlockFluidCalcium,
ModInfo.MOD_ID + "_" + BlockFluidCalcium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidcalciumcarbonate);
BlockFluidCalciumCarbonate = new BlockFluidTechReborn(fluidcalciumcarbonate, Material.WATER,
"techreborn.calciumcarbonate");
GameRegistry.registerBlock(BlockFluidCalciumCarbonate,
registerBlock(BlockFluidCalciumCarbonate,
ModInfo.MOD_ID + "_" + BlockFluidCalciumCarbonate.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidChlorite);
BlockFluidChlorite = new BlockFluidTechReborn(fluidChlorite, Material.WATER, "techreborn.chlorite");
GameRegistry.registerBlock(BlockFluidChlorite,
registerBlock(BlockFluidChlorite,
ModInfo.MOD_ID + "_" + BlockFluidChlorite.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidDeuterium);
BlockFluidDeuterium = new BlockFluidTechReborn(fluidDeuterium, Material.WATER, "techreborn.deuterium");
GameRegistry.registerBlock(BlockFluidDeuterium,
registerBlock(BlockFluidDeuterium,
ModInfo.MOD_ID + "_" + BlockFluidDeuterium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidGlyceryl);
BlockFluidGlyceryl = new BlockFluidTechReborn(fluidGlyceryl, Material.WATER, "techreborn.glyceryl");
GameRegistry.registerBlock(BlockFluidGlyceryl,
registerBlock(BlockFluidGlyceryl,
ModInfo.MOD_ID + "_" + BlockFluidGlyceryl.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidHelium);
BlockFluidHelium = new BlockFluidTechReborn(fluidHelium, Material.WATER, "techreborn.helium");
GameRegistry.registerBlock(BlockFluidHelium,
registerBlock(BlockFluidHelium,
ModInfo.MOD_ID + "_" + BlockFluidHelium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidHelium3);
BlockFluidHelium3 = new BlockFluidTechReborn(fluidHelium3, Material.WATER, "techreborn.helium3");
GameRegistry.registerBlock(BlockFluidHelium3,
registerBlock(BlockFluidHelium3,
ModInfo.MOD_ID + "_" + BlockFluidHelium3.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidHeliumplasma);
BlockFluidHeliumplasma = new BlockFluidTechReborn(fluidHeliumplasma, Material.WATER, "techreborn.heliumplasma");
GameRegistry.registerBlock(BlockFluidHeliumplasma,
registerBlock(BlockFluidHeliumplasma,
ModInfo.MOD_ID + "_" + BlockFluidHeliumplasma.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidHydrogen);
BlockFluidHydrogen = new BlockFluidTechReborn(fluidHydrogen, Material.WATER, "techreborn.hydrogen");
GameRegistry.registerBlock(BlockFluidHydrogen,
registerBlock(BlockFluidHydrogen,
ModInfo.MOD_ID + "_" + BlockFluidHydrogen.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidLithium);
BlockFluidLithium = new BlockFluidTechReborn(fluidLithium, Material.WATER, "techreborn.lithium");
GameRegistry.registerBlock(BlockFluidLithium,
registerBlock(BlockFluidLithium,
ModInfo.MOD_ID + "_" + BlockFluidLithium.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 24.0);
FluidRegistry.registerFluid(fluidMercury);
BlockFluidMercury = new BlockFluidTechReborn(fluidMercury, Material.WATER, "techreborn.mercury");
GameRegistry.registerBlock(BlockFluidMercury,
registerBlock(BlockFluidMercury,
ModInfo.MOD_ID + "_" + BlockFluidMercury.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidMethane);
BlockFluidMethane = new BlockFluidTechReborn(fluidMethane, Material.WATER, "techreborn.methane");
GameRegistry.registerBlock(BlockFluidMethane,
registerBlock(BlockFluidMethane,
ModInfo.MOD_ID + "_" + BlockFluidMethane.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidNitrocoalfuel);
BlockFluidNitrocoalfuel = new BlockFluidTechReborn(fluidNitrocoalfuel, Material.WATER,
"techreborn.nitrocoalfuel");
GameRegistry.registerBlock(BlockFluidNitrocoalfuel,
registerBlock(BlockFluidNitrocoalfuel,
ModInfo.MOD_ID + "_" + BlockFluidNitrocoalfuel.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrocoalfuel, 48.0);
FluidRegistry.registerFluid(fluidNitrofuel);
BlockFluidNitrofuel = new BlockFluidTechReborn(fluidNitrofuel, Material.WATER, "techreborn.nitrofuel");
GameRegistry.registerBlock(BlockFluidNitrofuel,
registerBlock(BlockFluidNitrofuel,
ModInfo.MOD_ID + "_" + BlockFluidNitrofuel.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 42.0);
FluidRegistry.registerFluid(fluidNitrogen);
BlockFluidNitrogen = new BlockFluidTechReborn(fluidNitrogen, Material.WATER, "techreborn.nitrogen");
GameRegistry.registerBlock(BlockFluidNitrogen,
registerBlock(BlockFluidNitrogen,
ModInfo.MOD_ID + "_" + BlockFluidNitrogen.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidNitrogendioxide);
BlockFluidNitrogendioxide = new BlockFluidTechReborn(fluidNitrogendioxide, Material.WATER,
"techreborn.nitrogendioxide");
GameRegistry.registerBlock(BlockFluidNitrogendioxide,
registerBlock(BlockFluidNitrogendioxide,
ModInfo.MOD_ID + "_" + BlockFluidNitrogendioxide.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidPotassium);
BlockFluidPotassium = new BlockFluidTechReborn(fluidPotassium, Material.WATER, "techreborn.potassium");
GameRegistry.registerBlock(BlockFluidPotassium,
registerBlock(BlockFluidPotassium,
ModInfo.MOD_ID + "_" + BlockFluidPotassium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSilicon);
BlockFluidSilicon = new BlockFluidTechReborn(fluidSilicon, Material.WATER, "techreborn.silicon");
GameRegistry.registerBlock(BlockFluidSilicon,
registerBlock(BlockFluidSilicon,
ModInfo.MOD_ID + "_" + BlockFluidSilicon.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSodium);
BlockFluidSodium = new BlockFluidTechReborn(fluidSodium, Material.WATER, "techreborn.sodium");
GameRegistry.registerBlock(BlockFluidSodium,
registerBlock(BlockFluidSodium,
ModInfo.MOD_ID + "_" + BlockFluidSodium.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 22.0);
FluidRegistry.registerFluid(fluidSodiumpersulfate);
BlockFluidSodiumpersulfate = new BlockFluidTechReborn(fluidSodiumpersulfate, Material.WATER,
"techreborn.sodiumpersulfate");
GameRegistry.registerBlock(BlockFluidSodiumpersulfate,
registerBlock(BlockFluidSodiumpersulfate,
ModInfo.MOD_ID + "_" + BlockFluidSodiumpersulfate.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidTritium);
BlockFluidTritium = new BlockFluidTechReborn(fluidTritium, Material.WATER, "techreborn.tritium");
GameRegistry.registerBlock(BlockFluidTritium,
registerBlock(BlockFluidTritium,
ModInfo.MOD_ID + "_" + BlockFluidTritium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidWolframium);
BlockFluidWolframium = new BlockFluidTechReborn(fluidWolframium, Material.WATER, "techreborn.wolframium");
GameRegistry.registerBlock(BlockFluidWolframium,
registerBlock(BlockFluidWolframium,
ModInfo.MOD_ID + "_" + BlockFluidWolframium.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidCarbon);
BlockFluidCarbon = new BlockFluidTechReborn(fluidCarbon, Material.WATER, "techreborn.carbon");
GameRegistry.registerBlock(BlockFluidCarbon,
registerBlock(BlockFluidCarbon,
ModInfo.MOD_ID + "_" + BlockFluidCarbon.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidCarbonFiber);
BlockFluidCarbonFiber = new BlockFluidTechReborn(fluidCarbonFiber, Material.WATER, "techreborn.carbonfiber");
GameRegistry.registerBlock(BlockFluidCarbonFiber,
registerBlock(BlockFluidCarbonFiber,
ModInfo.MOD_ID + "_" + BlockFluidCarbonFiber.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidNitroCarbon);
BlockFluidNitroCarbon = new BlockFluidTechReborn(fluidNitroCarbon, Material.WATER, "techreborn.nitrocarbon");
GameRegistry.registerBlock(BlockFluidNitroCarbon,
registerBlock(BlockFluidNitroCarbon,
ModInfo.MOD_ID + "_" + BlockFluidNitroCarbon.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSulfur);
BlockFluidSulfur = new BlockFluidTechReborn(fluidSulfur, Material.WATER, "techreborn.sulfur");
GameRegistry.registerBlock(BlockFluidSulfur,
registerBlock(BlockFluidSulfur,
ModInfo.MOD_ID + "_" + BlockFluidSulfur.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidSodiumSulfide);
BlockFluidSodiumSulfide = new BlockFluidTechReborn(fluidSodiumSulfide, Material.WATER, "techreborn.sodiumsulfide");
GameRegistry.registerBlock(BlockFluidSodiumSulfide,
registerBlock(BlockFluidSodiumSulfide,
ModInfo.MOD_ID + "_" + BlockFluidSodiumSulfide.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidDiesel);
BlockFluidDiesel = new BlockFluidTechReborn(fluidDiesel, Material.WATER, "techreborn.diesel");
GameRegistry.registerBlock(BlockFluidDiesel,
registerBlock(BlockFluidDiesel,
ModInfo.MOD_ID + "_" + BlockFluidDiesel.getUnlocalizedName().substring(5));
FluidRegistry.registerFluid(fluidNitroDiesel);
BlockFluidNitroDiesel = new BlockFluidTechReborn(fluidNitroDiesel, Material.WATER, "techreborn.nitrodiesel");
GameRegistry.registerBlock(BlockFluidNitroDiesel,
registerBlock(BlockFluidNitroDiesel,
ModInfo.MOD_ID + "_" + BlockFluidNitroDiesel.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 36.0);
FluidRegistry.registerFluid(fluidOil);
BlockFluidOil = new BlockFluidTechReborn(fluidOil, Material.WATER, "techreborn.oil");
GameRegistry.registerBlock(BlockFluidOil,
registerBlock(BlockFluidOil,
ModInfo.MOD_ID + "_" + BlockFluidOil.getUnlocalizedName().substring(5));
FluidPowerManager.fluidPowerValues.put(fluidNitrofuel, 16.0);
FluidRegistry.registerFluid(fluidSulfuricAcid);
BlockFluidSulfuricAcid = new BlockFluidTechReborn(fluidSulfuricAcid, Material.WATER, "techreborn.sulfuricacid");
GameRegistry.registerBlock(BlockFluidSulfuricAcid,
registerBlock(BlockFluidSulfuricAcid,
ModInfo.MOD_ID + "_" + BlockFluidSulfuricAcid.getUnlocalizedName().substring(5));
}
public static void registerBlock(Block block, String name) {
block.setRegistryName(name);
GameRegistry.register(block);
GameRegistry.register(new ItemBlock(block), block.getRegistryName());
}
}

View file

@ -454,7 +454,7 @@ public class ModRecipes {
}
dust = dust.copy();
if(ore){
dust.stackSize = 2;
dust.setCount(2);
}
RecipeHandler.addRecipe(new GrinderRecipe(oreStack, dust, ore ? 270 : 200, ore ? 31 : 22));
}
@ -1116,7 +1116,7 @@ public class ModRecipes {
// Brass
if (OreUtil.doesOreExistAndValid("ingotBrass")) {
ItemStack brassStack = OreDictionary.getOres("ingotBrass").get(0);
brassStack.stackSize = 4;
brassStack.setCount(4);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("zinc", 1),
brassStack, 200, 16));
@ -1134,7 +1134,7 @@ public class ModRecipes {
// Red Alloy
if (OreUtil.doesOreExistAndValid("ingotRedAlloy")) {
ItemStack redAlloyStack = OreDictionary.getOres("ingotRedAlloy").get(0);
redAlloyStack.stackSize = 1;
redAlloyStack.setCount(1);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 4), ItemIngots.getIngotByName("copper", 1),
redAlloyStack, 200, 16));
@ -1146,7 +1146,7 @@ public class ModRecipes {
// Blue Alloy
if (OreUtil.doesOreExistAndValid("ingotBlueAlloy")) {
ItemStack blueAlloyStack = OreDictionary.getOres("ingotBlueAlloy").get(0);
blueAlloyStack.stackSize = 1;
blueAlloyStack.setCount(1);
RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemDusts.getDustByName("teslatite", 4),
ItemIngots.getIngotByName("silver", 1), blueAlloyStack, 200, 16));
}
@ -1154,9 +1154,10 @@ public class ModRecipes {
// Blue Alloy
if (OreUtil.doesOreExistAndValid("ingotPurpleAlloy") && OreUtil.doesOreExistAndValid("dustInfusedTeslatite")) {
ItemStack purpleAlloyStack = OreDictionary.getOres("ingotPurpleAlloy").get(0);
purpleAlloyStack.stackSize = 1;
purpleAlloyStack.setCount(1);
purpleAlloyStack.setCount(1);
ItemStack infusedTeslatiteStack = OreDictionary.getOres("ingotPurpleAlloy").get(0);
infusedTeslatiteStack.stackSize = 8;
infusedTeslatiteStack.setCount(8);
RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("redAlloy", 1),
ItemIngots.getIngotByName("blueAlloy", 1), purpleAlloyStack, 200, 16));
RecipeHandler.addRecipe(
@ -1167,7 +1168,7 @@ public class ModRecipes {
// Aluminum Brass
if (OreUtil.doesOreExistAndValid("ingotAluminumBrass")) {
ItemStack aluminumBrassStack = OreDictionary.getOres("ingotAluminumBrass").get(0);
aluminumBrassStack.stackSize = 4;
aluminumBrassStack.setCount(4);
RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3),
ItemIngots.getIngotByName("aluminum", 1), aluminumBrassStack, 200, 16));
RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3),
@ -1183,11 +1184,11 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("ingotManyullyn") && OreUtil.doesOreExistAndValid("ingotCobalt") && OreUtil
.doesOreExistAndValid("ingotArdite")) {
ItemStack manyullynStack = OreDictionary.getOres("ingotManyullyn").get(0);
manyullynStack.stackSize = 1;
manyullynStack.setCount(1);
ItemStack cobaltStack = OreDictionary.getOres("ingotCobalt").get(0);
cobaltStack.stackSize = 1;
cobaltStack.setCount(1);
ItemStack arditeStack = OreDictionary.getOres("ingotArdite").get(0);
arditeStack.stackSize = 1;
arditeStack.setCount(1);
RecipeHandler.addRecipe(new AlloySmelterRecipe(cobaltStack, arditeStack, manyullynStack, 200, 16));
RecipeHandler.addRecipe(
new AlloySmelterRecipe(cobaltStack, ItemDusts.getDustByName("ardite", 1), manyullynStack, 200, 16));
@ -1201,7 +1202,7 @@ public class ModRecipes {
// Conductive Iron
if (OreUtil.doesOreExistAndValid("ingotConductiveIron")) {
ItemStack conductiveIronStack = OreDictionary.getOres("ingotConductiveIron").get(0);
conductiveIronStack.stackSize = 1;
conductiveIronStack.setCount(1);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 1), new ItemStack(Items.IRON_INGOT, 1),
conductiveIronStack, 200, 16));
@ -1210,9 +1211,9 @@ public class ModRecipes {
// Redstone Alloy
if (OreUtil.doesOreExistAndValid("ingotRedstoneAlloy") && OreUtil.doesOreExistAndValid("itemSilicon")) {
ItemStack redstoneAlloyStack = OreDictionary.getOres("ingotRedstoneAlloy").get(0);
redstoneAlloyStack.stackSize = 1;
redstoneAlloyStack.setCount(1);
ItemStack siliconStack = OreDictionary.getOres("itemSilicon").get(0);
siliconStack.stackSize = 1;
siliconStack.setCount(1);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(new ItemStack(Items.REDSTONE, 1), siliconStack, redstoneAlloyStack, 200,
16));
@ -1221,7 +1222,7 @@ public class ModRecipes {
// Pulsating Iron
if (OreUtil.doesOreExistAndValid("ingotPhasedIron")) {
ItemStack pulsatingIronStack = OreDictionary.getOres("ingotPhasedIron").get(0);
pulsatingIronStack.stackSize = 1;
pulsatingIronStack.setCount(1);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(new ItemStack(Items.IRON_INGOT, 1), new ItemStack(Items.ENDER_PEARL, 1),
pulsatingIronStack, 200, 16));
@ -1233,9 +1234,9 @@ public class ModRecipes {
// Vibrant Alloy
if (OreUtil.doesOreExistAndValid("ingotEnergeticAlloy") && OreUtil.doesOreExistAndValid("ingotPhasedGold")) {
ItemStack energeticAlloyStack = OreDictionary.getOres("ingotEnergeticAlloy").get(0);
energeticAlloyStack.stackSize = 1;
energeticAlloyStack.setCount(1);
ItemStack vibrantAlloyStack = OreDictionary.getOres("ingotPhasedGold").get(0);
vibrantAlloyStack.stackSize = 1;
vibrantAlloyStack.setCount(1);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(energeticAlloyStack, new ItemStack(Items.ENDER_PEARL, 1), vibrantAlloyStack,
200, 16));
@ -1247,7 +1248,7 @@ public class ModRecipes {
// Soularium
if (OreUtil.doesOreExistAndValid("ingotSoularium")) {
ItemStack soulariumStack = OreDictionary.getOres("ingotSoularium").get(0);
soulariumStack.stackSize = 1;
soulariumStack.setCount(1);
RecipeHandler.addRecipe(
new AlloySmelterRecipe(new ItemStack(Blocks.SOUL_SAND, 1), new ItemStack(Items.GOLD_INGOT, 1),
soulariumStack, 200, 16));
@ -1708,7 +1709,7 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0);
gemStack.stackSize = 6;
gemStack.setCount(6);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), null, 100, 120));
@ -1725,7 +1726,7 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("dustNetherQuartz")) {
try {
ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0);
dustStack.stackSize = 4;
dustStack.setCount(4);
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1),
new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.QUARTZ, 2), dustStack,
ItemDustsSmall.getSmallDustByName("Netherrack", 2), null, 100, 120));
@ -1741,7 +1742,7 @@ public class ModRecipes {
ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0);
ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0);
ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0);
dustStack.stackSize = 2;
dustStack.setCount(2);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, null, 100, 120));
@ -1759,7 +1760,7 @@ public class ModRecipes {
ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0);
ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0);
ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0);
dustStack.stackSize = 2;
dustStack.setCount(2);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, null, 100, 120));
@ -1776,9 +1777,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0);
ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemAmethyst").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, null, 100, 120));
@ -1795,9 +1796,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0);
ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemTopaz").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, null, 100, 120));
@ -1814,9 +1815,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemTanzanite").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, null, 100, 120));
@ -1833,9 +1834,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemMalachite").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack,
dustStack, null, null, 100, 120));
@ -2337,7 +2338,7 @@ public class ModRecipes {
// Lava Cell Byproducts
ItemStack lavaCells = ItemCells.getCellByName("lava");
lavaCells.stackSize = 8;
lavaCells.setCount(8);
RecipeHandler.addRecipe(new CentrifugeRecipe(lavaCells, null, ItemNuggets.getNuggetByName("electrum", 4),
ItemIngots.getIngotByName("copper", 2), ItemDustsSmall.getSmallDustByName("Tungsten", 1),
ItemIngots.getIngotByName("tin", 2), 6000, 5));
@ -2511,9 +2512,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreUranium").get(0);
ItemStack uranium238Stack = getOre("uran238");
uranium238Stack.stackSize = 8;
uranium238Stack.setCount(8);
ItemStack uranium235Stack = getOre("smallUran235");
uranium235Stack.stackSize = 2;
uranium235Stack.setCount(2);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
uranium238Stack, uranium235Stack, null, null, 100, 120));
@ -2533,9 +2534,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("orePitchblende").get(0);
ItemStack uranium238Stack = getOre("uran238");
uranium238Stack.stackSize = 8;
uranium238Stack.setCount(8);
ItemStack uranium235Stack = getOre("uran235");
uranium235Stack.stackSize = 2;
uranium235Stack.setCount(2);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
uranium238Stack, uranium235Stack, null, null, 100, 120));
@ -2696,7 +2697,7 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0);
ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0);
dustStack.stackSize = 10;
dustStack.setCount(10);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1),
@ -2741,7 +2742,7 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0);
gemStack.stackSize = 6;
gemStack.setCount(6);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4),
@ -2755,7 +2756,7 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("dustNetherQuartz")) {
try {
ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0);
dustStack.stackSize = 4;
dustStack.setCount(4);
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1),
new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.QUARTZ, 2),
dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), ItemCells.getCellByName("empty"),
@ -2771,7 +2772,7 @@ public class ModRecipes {
ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0);
ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0);
ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0);
dustStack.stackSize = 2;
dustStack.setCount(2);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120));
@ -2786,7 +2787,7 @@ public class ModRecipes {
ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0);
ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0);
ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0);
dustStack.stackSize = 2;
dustStack.setCount(2);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120));
@ -2800,9 +2801,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0);
ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemAmethyst").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000),
gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120));
@ -2816,9 +2817,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0);
ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemTopaz").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack,
new FluidStack(FluidRegistry.WATER, 1000),
@ -2834,9 +2835,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemTanzanite").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(
new IndustrialGrinderRecipe(oreStack,
new FluidStack(FluidRegistry.WATER, 1000),
@ -2852,9 +2853,9 @@ public class ModRecipes {
try {
ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0);
ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0);
gemStack.stackSize = 2;
gemStack.setCount(2);
ItemStack dustStack = OreDictionary.getOres("gemMalachite").get(0);
dustStack.stackSize = 1;
dustStack.setCount(1);
RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack,
new FluidStack(FluidRegistry.WATER, 1000),
@ -3048,13 +3049,13 @@ public class ModRecipes {
new ItemStack(OreDictionary.getOres("fertilizer").get(0).getItem(), 2), 100, 30));
ItemStack waterCells = ItemCells.getCellByName("water").copy();
waterCells.stackSize = 2;
waterCells.setCount(2);
RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("sulfur", 1), waterCells,
ItemCells.getCellByName("sulfuricAcid", 3), 1140, 30));
ItemStack waterCells2 = ItemCells.getCellByName("water").copy();
waterCells2.stackSize = 5;
waterCells2.setCount(5);
RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemCells.getCellByName("hydrogen", 4),
ItemCells.getCellByName("empty"), waterCells2, 10, 30));
@ -3118,7 +3119,7 @@ public class ModRecipes {
ItemCells.getCellByName("empty", 6), 400, 120));
ItemStack sand = new ItemStack(Blocks.SAND);
sand.stackSize = 16;
sand.setCount(16);
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(sand, ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("silicon", 1), ItemCells.getCellByName("empty"), null, null, 1000, 25));
@ -3157,7 +3158,7 @@ public class ModRecipes {
if (OreUtil.doesOreExistAndValid("dustSalt")) {
ItemStack salt = OreDictionary.getOres("dustSalt").get(0);
salt.stackSize = 2;
salt.setCount(2);
RecipeHandler.addRecipe(new IndustrialElectrolyzerRecipe(salt, ItemCells.getCellByName("empty", 2),
ItemCells.getCellByName("sodium"), ItemCells.getCellByName("chlorine"), null, null, 40, 60));
}

View file

@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
@ -58,7 +59,8 @@ public class DynamicCell extends Item {
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World worldIn, EntityPlayer playerIn, EnumHand hand) {
public ActionResult<ItemStack> onItemRightClick(World worldIn, EntityPlayer playerIn, EnumHand hand) {
ItemStack stack = playerIn.getHeldItem(hand);
if (!worldIn.isRemote) {
RayTraceResult result = rayTrace(worldIn, playerIn, true);
@ -99,14 +101,14 @@ public class DynamicCell extends Item {
public boolean tryAddCellToInventory(EntityPlayer player, ItemStack stack, Fluid fluid) {
if (player.inventory.addItemStackToInventory(DynamicCell.getCellWithFluid(fluid))) {
--stack.stackSize;
stack.shrink(1);
return true;
}
return false;
}
@Override
public void getSubItems(Item itemIn, CreativeTabs tab, List<ItemStack> subItems) {
public void getSubItems(Item itemIn, CreativeTabs tab, NonNullList<ItemStack> subItems) {
subItems.add(getEmptyCell(1));
for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) {
subItems.add(getCellWithFluid(fluid));
@ -134,7 +136,7 @@ public class DynamicCell extends Item {
Validate.notNull(fluid);
ItemStack stack = new ItemStack(ModItems.dynamicCell);
getFluidHandler(stack).fill(new FluidStack(fluid, CAPACITY), true);
stack.stackSize = stackSize;
stack.setCount(stackSize);
return stack;
}

View file

@ -21,11 +21,11 @@ public class ItemDestructopack extends ItemTextureBase implements ITexturedItem
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player,
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
player.openGui(Core.INSTANCE, GuiHandler.destructoPackID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
return new ActionResult<>(EnumActionResult.SUCCESS, itemStack);
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
}
@Override

View file

@ -32,8 +32,9 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos,
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
ItemStack stack = player.getHeldItem(hand);
stack.setTagCompound(new NBTTagCompound());
stack.getTagCompound().setInteger("x", pos.getX());
stack.getTagCompound().setInteger("y", pos.getY());
@ -56,8 +57,9 @@ public class ItemFrequencyTransmitter extends ItemTextureBase implements ITextur
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player,
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if (player.isSneaking()) {
stack.setTagCompound(null);
if (!world.isRemote && ConfigTechReborn.FreqTransmitterChat) {

View file

@ -21,8 +21,9 @@ public class ItemScrapBox extends ItemTextureBase implements ITexturedItem {
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStack, World world, EntityPlayer player,
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if (!world.isRemote) {
int random = world.rand.nextInt(ScrapboxList.stacks.size());
ItemStack out = ScrapboxList.stacks.get(random).copy();
@ -33,11 +34,10 @@ public class ItemScrapBox extends ItemTextureBase implements ITexturedItem {
player.getPosition().getY() + yOffset, player.getPosition().getZ() + zOffset, out);
entityitem.setPickupDelay(20);
world.spawnEntityInWorld(entityitem);
itemStack.stackSize--;
world.spawnEntity(entityitem);
stack.shrink(1);
}
return new ActionResult<>(EnumActionResult.SUCCESS, itemStack);
return new ActionResult<>(EnumActionResult.SUCCESS, stack);
}
@Override

View file

@ -83,9 +83,9 @@ public class ItemChainsaw extends ItemAxe implements IEnergyItemInfo, ITexturedI
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos,
public EnumActionResult onItemUse( EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
}
@Override

View file

@ -70,9 +70,9 @@ public class ItemCloakingDevice extends ItemTextureBase implements IEnergyItemIn
public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) {
ItemStack itemstack1 = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST);
if (itemstack1 == null) {
if (itemstack1 == ItemStack.EMPTY) {
player.setItemStackToSlot(EntityEquipmentSlot.CHEST, itemStack.copy());
itemStack.stackSize = 0;
itemStack.setCount(0);
}
return itemStack;

View file

@ -37,12 +37,12 @@ public class ItemDebugTool extends ItemTextureBase implements ITexturedItem {
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos,
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
TileEntity tile = worldIn.getTileEntity(pos);
if (tile instanceof IEnergyInterfaceTile) {
if (!tile.getWorld().isRemote) {
playerIn.addChatComponentMessage(
playerIn.sendMessage(
new TextComponentString(TextFormatting.GREEN + "Power" + TextFormatting.BLUE
+ PowerSystem.getLocaliszedPower(((IEnergyInterfaceTile) tile).getEnergy())));
}

View file

@ -81,9 +81,9 @@ public class ItemDrill extends ItemPickaxe implements IEnergyItemInfo, ITextured
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos,
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
}
@Override

View file

@ -81,9 +81,9 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo, ITex
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos,
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
}
@Override

View file

@ -69,9 +69,9 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
modifier = 9;
if (slot == EntityEquipmentSlot.MAINHAND) {
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(),
multimap.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(),
new AttributeModifier(ATTACK_DAMAGE_MODIFIER, "Weapon modifier", (double) modifier, 0));
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(),
multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(),
new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -2.4000000953674316D, 0));
}
return multimap;
@ -130,8 +130,9 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player,
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
ItemStack stack = player.getHeldItem(hand);
if (player.isSneaking()) {
if (!PoweredItem.canUseEnergy(cost, stack)) {
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(

View file

@ -88,9 +88,9 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo, ITextu
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos,
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
return TorchHelper.placeTorch(stack, playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
return TorchHelper.placeTorch(playerIn.getHeldItem(hand), playerIn, worldIn, pos, facing, hitX, hitY, hitZ, hand);
}
@Override

View file

@ -25,11 +25,11 @@ public class ItemTechManual extends ItemTextureBase implements ITexturedItem {
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World world, EntityPlayer player,
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player,
EnumHand hand) {
player.openGui(Core.INSTANCE, GuiHandler.manuelID, world, (int) player.posX, (int) player.posY,
(int) player.posY);
return new ActionResult<>(EnumActionResult.SUCCESS, itemStackIn);
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
}
@Override

View file

@ -49,13 +49,13 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
}
@Override
public EnumActionResult onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos pos,
public EnumActionResult onItemUseFirst(EntityPlayer player, World world, BlockPos pos,
EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) {
if(!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), side))){
return EnumActionResult.FAIL;
}
if (CompatManager.isIC2Loaded) {
EnumActionResult result = IC2WrenchHelper.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand);
EnumActionResult result = IC2WrenchHelper.onItemUseFirst(player.getHeldItem(hand), player, world, pos, side, hitX, hitY, hitZ, hand);
if (result == EnumActionResult.SUCCESS) {
return result;
}
@ -68,7 +68,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
return EnumActionResult.FAIL;
}
if (!player.isSneaking() && !player.worldObj.isRemote) {
if (!player.isSneaking() && !player.world.isRemote) {
if (tile instanceof TileMachineBase) {
if (side != EnumFacing.DOWN && side != EnumFacing.UP) {
((TileMachineBase) tile).setFacing(side);
@ -76,17 +76,17 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
}
}
}
return super.onItemUseFirst(stack, player, world, pos, side, hitX, hitY, hitZ, hand);
return super.onItemUseFirst(player, world, pos, side, hitX, hitY, hitZ, hand);
}
@Override
public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos,
public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos,
EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
if(!PermissionAPI.hasPermission(player.getGameProfile(), RebornPermissions.WRENCH_BLOCK, new BlockPosContext(player, pos, world.getBlockState(pos), facing))){
return EnumActionResult.FAIL;
}
if (CompatManager.isIC2Loaded) {
EnumActionResult result = IC2WrenchHelper.onItemUse(stack, player, world, pos, hand, facing, hitX, hitY, hitZ);
EnumActionResult result = IC2WrenchHelper.onItemUse(player.getHeldItem(hand), player, world, pos, hand, facing, hitX, hitY, hitZ);
if (result == EnumActionResult.SUCCESS) {
return result;
}
@ -106,8 +106,8 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
for (int i = 0; i < inventory.getSizeInventory(); i++) {
ItemStack itemStack = inventory.getStackInSlot(i);
if (itemStack != null) {
if (itemStack.stackSize > 0) {
if (itemStack != ItemStack.EMPTY) {
if (itemStack.getCount() > 0) {
if (itemStack.getItem() instanceof ItemBlock)
if (!(((ItemBlock) itemStack.getItem()).block instanceof BlockFluidBase) || !(((ItemBlock) itemStack.getItem()).block instanceof BlockStaticLiquid)
@ -147,7 +147,7 @@ public class ItemWrench extends ItemTR implements ITexturedItem {
entityItem.motionY = rand.nextGaussian() * factor + 0.2F;
entityItem.motionZ = rand.nextGaussian() * factor;
if (!world.isRemote) {
world.spawnEntityInWorld(entityItem);
world.spawnEntity(entityItem);
}
}
}

View file

@ -192,7 +192,7 @@ public class CraftingInfoPage extends TitledPage {
FontRenderer font = Objects.firstNonNull(stack.getItem().getFontRenderer(stack), mc.fontRendererObj);
@SuppressWarnings("unchecked")
List<String> list = stack.getTooltip(mc.thePlayer, mc.gameSettings.advancedItemTooltips);
List<String> list = stack.getTooltip(mc.player, mc.gameSettings.advancedItemTooltips);
List<String> colored = Lists.newArrayListWithCapacity(list.size());
colored.add(stack.getRarity().rarityColor + list.get(0));

View file

@ -371,7 +371,7 @@ public abstract class MultipartFluidPipe extends Multipart implements INormallyO
}
@Override
public boolean onActivated(EntityPlayer player, EnumHand hand, ItemStack heldItem, PartMOP hit) {
public boolean onActivated(EntityPlayer player, EnumHand hand, PartMOP hit) {
//TODO make only wrench able to change mode, shift-click with wrench picks up pipe, and click with empty hand displays current mode in chat (doesn't change it)
System.out.println(getWorld().isRemote);

View file

@ -89,7 +89,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
if (this.burnTime > 0) {
--this.burnTime;
}
if (!this.worldObj.isRemote) {
if (!this.world.isRemote) {
if (this.burnTime != 0 || getStackInSlot(input1) != null && getStackInSlot(fuel) != null) {
if (this.burnTime == 0 && this.canSmelt()) {
this.currentItemBurnTime = this.burnTime = getItemBurnTime(getStackInSlot(fuel));
@ -129,7 +129,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
Boolean hasItem = false;
for (int inputslot = 0; inputslot < 2; inputslot++) {
if (ItemUtils.isItemEqual(input, inventory.getStackInSlot(inputslot), true, true,
recipeType.useOreDic()) && inventory.getStackInSlot(inputslot).stackSize >= input.stackSize) {
recipeType.useOreDic()) && inventory.getStackInSlot(inputslot).getCount() >= input.getCount()) {
hasItem = true;
}
}
@ -157,7 +157,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
return true;
if (!this.getStackInSlot(output).isItemEqual(itemstack))
return false;
int result = getStackInSlot(output).stackSize + itemstack.stackSize;
int result = getStackInSlot(output).getCount() + itemstack.getCount();
return result <= getInventoryStackLimit() && result <= this.getStackInSlot(output).getMaxStackSize(); // Forge
// BugFix:
// Make
@ -189,7 +189,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
if (this.getStackInSlot(output) == null) {
setInventorySlotContents(output, itemstack.copy());
} else if (this.getStackInSlot(output).getItem() == itemstack.getItem()) {
decrStackSize(output, -itemstack.stackSize);
decrStackSize(output, -itemstack.getCount());
}
for (IBaseRecipeType recipeType : RecipeHandler.getRecipeClassFromName(Reference.alloySmelteRecipe)) {
@ -204,7 +204,7 @@ public class TileAlloyFurnace extends TileLegacyMachineBase implements IWrenchab
for (int inputSlot = 0; inputSlot < 2; inputSlot++) {
if (ItemUtils.isItemEqual(input, inventory.getStackInSlot(inputSlot), true, true,
recipeType.useOreDic())) {
inventory.decrStackSize(inputSlot, input.stackSize);
inventory.decrStackSize(inputSlot, input.getCount());
break;
}
}

View file

@ -31,14 +31,14 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor
@Override
public void updateEntity() {
if (!worldObj.isRemote) {
if (!world.isRemote) {
if (storedItem != null) {
ItemStack fakeStack = storedItem.copy();
fakeStack.stackSize = 1;
fakeStack.getCount() = 1;
setInventorySlotContents(2, fakeStack);
} else if (storedItem == null && getStackInSlot(1) != null) {
ItemStack fakeStack = getStackInSlot(1).copy();
fakeStack.stackSize = 1;
fakeStack.getCount() = 1;
setInventorySlotContents(2, fakeStack);
} else {
setInventorySlotContents(2, null);
@ -49,25 +49,25 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor
storedItem = getStackInSlot(0);
setInventorySlotContents(0, null);
} else if (ItemUtils.isItemEqual(storedItem, getStackInSlot(0), true, true)) {
if (storedItem.stackSize <= storage - getStackInSlot(0).stackSize) {
storedItem.stackSize += getStackInSlot(0).stackSize;
decrStackSize(0, getStackInSlot(0).stackSize);
if (storedItem.getCount() <= storage - getStackInSlot(0).getCount()) {
storedItem.getCount() += getStackInSlot(0).getCount();
decrStackSize(0, getStackInSlot(0).getCount());
}
}
}
if (storedItem != null && getStackInSlot(1) == null) {
ItemStack itemStack = storedItem.copy();
itemStack.stackSize = itemStack.getMaxStackSize();
itemStack.getCount() = itemStack.getMaxStackSize();
setInventorySlotContents(1, itemStack);
storedItem.stackSize -= itemStack.getMaxStackSize();
storedItem.getCount() -= itemStack.getMaxStackSize();
} else if (ItemUtils.isItemEqual(getStackInSlot(1), storedItem, true, true)) {
int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).stackSize;
if (storedItem.stackSize >= wanted) {
int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).getCount();
if (storedItem.getCount() >= wanted) {
decrStackSize(1, -wanted);
storedItem.stackSize -= wanted;
storedItem.getCount() -= wanted;
} else {
decrStackSize(1, -storedItem.stackSize);
decrStackSize(1, -storedItem.getCount());
storedItem = null;
}
}
@ -76,7 +76,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -96,7 +96,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor
}
if (storedItem != null) {
storedItem.stackSize = tagCompound.getInteger("storedQuantity");
storedItem.getCount() = tagCompound.getInteger("storedQuantity");
}
}
@ -110,7 +110,7 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) {
if (storedItem != null) {
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
tagCompound.setInteger("storedQuantity", storedItem.getCount());
} else
tagCompound.setInteger("storedQuantity", 0);
return tagCompound;
@ -156,11 +156,11 @@ public class TileDigitalChest extends TileLegacyMachineBase implements IInventor
String name = "of nothing";
if (storedItem != null) {
name = storedItem.getDisplayName();
size += storedItem.stackSize;
size += storedItem.getCount();
}
if (getStackInSlot(1) != null) {
name = getStackInSlot(1).getDisplayName();
size += getStackInSlot(1).stackSize;
size += getStackInSlot(1).getCount();
}
info.add(size + " " + name);

View file

@ -20,9 +20,9 @@ public class TileEntityFlare extends TileEntity implements ITickable {
@Override
public void update() {
EnumDyeColor color = worldObj.getBlockState(pos).getValue(BlockFlare.COLOR);
if(worldObj.isRemote && worldObj.isAirBlock(getPos().up())){
ParticleSmoke particleSmokeLarge = new ParticleSmoke(worldObj , pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0);
EnumDyeColor color = world.getBlockState(pos).getValue(BlockFlare.COLOR);
if(world.isRemote && world.isAirBlock(getPos().up())){
ParticleSmoke particleSmokeLarge = new ParticleSmoke(world , pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0.0D, 0);
particleSmokeLarge.setMaxAge(250);
if(color != EnumDyeColor.WHITE){
float[] rgb = EntitySheep.getDyeRgb(color);
@ -32,7 +32,7 @@ public class TileEntityFlare extends TileEntity implements ITickable {
Minecraft.getMinecraft().effectRenderer.addEffect(particleSmokeLarge);
worldObj.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.3, pos.getZ() + 0.5, 0.0D, 0.0D, 0.0D);
world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + 0.5, pos.getY() + 0.3, pos.getZ() + 0.5, 0.0D, 0.0D, 0.0D);
}
}

View file

@ -53,9 +53,9 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
{
setInventorySlotContents(fuelslot,
new ItemStack(getStackInSlot(fuelslot).getItem().getContainerItem()));
} else if (getStackInSlot(fuelslot).stackSize > 1) {
} else if (getStackInSlot(fuelslot).getCount() > 1) {
decrStackSize(fuelslot, 1);
} else if (getStackInSlot(fuelslot).stackSize == 1) {
} else if (getStackInSlot(fuelslot).getCount() == 1) {
setInventorySlotContents(fuelslot, null);
}
updateInventory = true;
@ -86,9 +86,9 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
if (getStackInSlot(output) == null) {
setInventorySlotContents(output, itemstack.copy());
} else if (getStackInSlot(output).isItemEqual(itemstack)) {
getStackInSlot(output).stackSize += itemstack.stackSize;
getStackInSlot(output).getCount() += itemstack.getCount();
}
if (getStackInSlot(input1).stackSize > 1) {
if (getStackInSlot(input1).getCount() > 1) {
this.decrStackSize(input1, 1);
} else {
setInventorySlotContents(input1, null);
@ -107,7 +107,7 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
return true;
if (!getStackInSlot(output).isItemEqual(itemstack))
return false;
int result = getStackInSlot(output).stackSize + itemstack.stackSize;
int result = getStackInSlot(output).getCount() + itemstack.getCount();
return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize());
}
}
@ -125,11 +125,11 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
}
public void updateState() {
IBlockState BlockStateContainer = worldObj.getBlockState(pos);
IBlockState BlockStateContainer = world.getBlockState(pos);
if (BlockStateContainer.getBlock() instanceof BlockMachineBase) {
BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock();
if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != fuel > 0)
blockMachineBase.setActive(fuel > 0, worldObj, pos);
blockMachineBase.setActive(fuel > 0, world, pos);
}
}

View file

@ -19,7 +19,7 @@ public class TileMachineCasing extends RectangularMultiblockTileEntityBase {
@Override
public MultiblockControllerBase createNewMultiblock() {
return new MultiBlockCasing(worldObj);
return new MultiBlockCasing(world);
}
@Override

View file

@ -84,7 +84,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
public void updateEntity() {
super.updateEntity();
if (!super.worldObj.isRemote) {
if (!super.world.isRemote) {
for (int i = 0; i < 6; i++) {
ItemStack stack = inventory.getStackInSlot(i);
if (this.amplifier < 10000 && stack != null) {
@ -122,7 +122,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
private boolean spaceForOutput() {
return inventory.getStackInSlot(6) == null
|| ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)
&& inventory.getStackInSlot(6).stackSize < 64;
&& inventory.getStackInSlot(6).getCount() < 64;
}
private void addOutputProducts() {
@ -130,7 +130,7 @@ public class TileMatterFabricator extends TilePowerAcceptor implements IWrenchab
if (inventory.getStackInSlot(6) == null) {
inventory.setInventorySlotContents(6, new ItemStack(ModItems.uuMatter));
} else if (ItemUtils.isItemEqual(inventory.getStackInSlot(6), new ItemStack(ModItems.uuMatter), true, true)) {
inventory.getStackInSlot(6).stackSize = Math.min(64, 1 + inventory.getStackInSlot(6).stackSize);
inventory.getStackInSlot(6).getCount() = Math.min(64, 1 + inventory.getStackInSlot(6).getCount());
}
}

View file

@ -52,17 +52,17 @@ public class TilePlayerDectector extends TilePowerAcceptor {
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0) {
if (!world.isRemote && world.getWorldTime() % 20 == 0) {
boolean lastRedstone = redstone;
redstone = false;
if (canUseEnergy(10)) {
Iterator tIterator = super.worldObj.playerEntities.iterator();
Iterator tIterator = super.world.playerEntities.iterator();
while (tIterator.hasNext()) {
EntityPlayer player = (EntityPlayer) tIterator.next();
if (player.getDistanceSq((double) super.getPos().getX() + 0.5D,
(double) super.getPos().getY() + 0.5D, (double) super.getPos().getZ() + 0.5D) <= 256.0D) {
BlockMachineBase blockMachineBase = (BlockMachineBase) worldObj.getBlockState(pos).getBlock();
int meta = blockMachineBase.getMetaFromState(worldObj.getBlockState(pos));
BlockMachineBase blockMachineBase = (BlockMachineBase) world.getBlockState(pos).getBlock();
int meta = blockMachineBase.getMetaFromState(world.getBlockState(pos));
if (meta == 0) {// ALL
redstone = true;
} else if (meta == 1) {// Others
@ -80,8 +80,8 @@ public class TilePlayerDectector extends TilePowerAcceptor {
useEnergy(10);
}
if (lastRedstone != redstone) {
WorldUtils.updateBlock(worldObj, getPos());
worldObj.notifyNeighborsOfStateChange(getPos(), worldObj.getBlockState(getPos()).getBlock());
WorldUtils.updateBlock(world, getPos());
world.notifyNeighborsOfStateChange(getPos(), world.getBlockState(getPos()).getBlock());
}
}
}

View file

@ -31,10 +31,10 @@ public class TilePump extends TilePowerAcceptor implements IFluidHandler {
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote && worldObj.getTotalWorldTime() % 10 == 0 && !tank.isFull() && tank.getCapacity() - tank.getFluidAmount() >= 1000 && canUseEnergy(ConfigTechReborn.pumpExtractEU)) {
FluidStack fluidStack = drainBlock(worldObj, pos.down(), false);
if (!world.isRemote && world.getTotalWorldTime() % 10 == 0 && !tank.isFull() && tank.getCapacity() - tank.getFluidAmount() >= 1000 && canUseEnergy(ConfigTechReborn.pumpExtractEU)) {
FluidStack fluidStack = drainBlock(world, pos.down(), false);
if (fluidStack != null) {
tank.fill(drainBlock(worldObj, pos.down(), true), true);
tank.fill(drainBlock(world, pos.down(), true), true);
useEnergy(ConfigTechReborn.pumpExtractEU);
}
tank.compareAndUpdate();

View file

@ -33,14 +33,14 @@ public class TileQuantumChest extends TileLegacyMachineBase
@Override
public void updateEntity() {
if (!worldObj.isRemote) {
if (!world.isRemote) {
if (storedItem != null) {
ItemStack fakeStack = storedItem.copy();
fakeStack.stackSize = 1;
fakeStack.getCount() = 1;
setInventorySlotContents(2, fakeStack);
} else if (storedItem == null && getStackInSlot(1) != null) {
ItemStack fakeStack = getStackInSlot(1).copy();
fakeStack.stackSize = 1;
fakeStack.getCount() = 1;
setInventorySlotContents(2, fakeStack);
} else {
setInventorySlotContents(2, null);
@ -51,25 +51,25 @@ public class TileQuantumChest extends TileLegacyMachineBase
storedItem = getStackInSlot(0);
setInventorySlotContents(0, null);
} else if (ItemUtils.isItemEqual(storedItem, getStackInSlot(0), true, true)) {
if (storedItem.stackSize <= storage - getStackInSlot(0).stackSize) {
storedItem.stackSize += getStackInSlot(0).stackSize;
decrStackSize(0, getStackInSlot(0).stackSize);
if (storedItem.getCount() <= storage - getStackInSlot(0).getCount()) {
storedItem.getCount() += getStackInSlot(0).getCount();
decrStackSize(0, getStackInSlot(0).getCount());
}
}
}
if (storedItem != null && getStackInSlot(1) == null) {
ItemStack itemStack = storedItem.copy();
itemStack.stackSize = itemStack.getMaxStackSize();
itemStack.getCount() = itemStack.getMaxStackSize();
setInventorySlotContents(1, itemStack);
storedItem.stackSize -= itemStack.getMaxStackSize();
storedItem.getCount() -= itemStack.getMaxStackSize();
} else if (ItemUtils.isItemEqual(getStackInSlot(1), storedItem, true, true)) {
int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).stackSize;
if (storedItem.stackSize >= wanted) {
int wanted = getStackInSlot(1).getMaxStackSize() - getStackInSlot(1).getCount();
if (storedItem.getCount() >= wanted) {
decrStackSize(1, -wanted);
storedItem.stackSize -= wanted;
storedItem.getCount() -= wanted;
} else {
decrStackSize(1, -storedItem.stackSize);
decrStackSize(1, -storedItem.getCount());
storedItem = null;
}
}
@ -78,7 +78,7 @@ public class TileQuantumChest extends TileLegacyMachineBase
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -98,7 +98,7 @@ public class TileQuantumChest extends TileLegacyMachineBase
}
if (storedItem != null) {
storedItem.stackSize = tagCompound.getInteger("storedQuantity");
storedItem.getCount() = tagCompound.getInteger("storedQuantity");
}
}
@ -112,7 +112,7 @@ public class TileQuantumChest extends TileLegacyMachineBase
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound) {
if (storedItem != null) {
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
tagCompound.setInteger("storedQuantity", storedItem.getCount());
} else {
tagCompound.setInteger("storedQuantity", 0);
}
@ -161,15 +161,15 @@ public class TileQuantumChest extends TileLegacyMachineBase
@Override
public void setStoredItemCount(int amount) {
this.storedItem.stackSize = 0;
this.storedItem.stackSize += (amount);
this.storedItem.getCount() = 0;
this.storedItem.getCount() += (amount);
this.markDirty();
}
@Override
public void setStoredItemType(ItemStack type, int amount) {
this.storedItem = type;
this.storedItem.stackSize = amount;
this.storedItem.getCount() = amount;
this.markDirty();
}
@ -185,11 +185,11 @@ public class TileQuantumChest extends TileLegacyMachineBase
String name = "of nothing";
if (storedItem != null) {
name = storedItem.getDisplayName();
size += storedItem.stackSize;
size += storedItem.getCount();
}
if (getStackInSlot(1) != null) {
name = getStackInSlot(1).getDisplayName();
size += getStackInSlot(1).stackSize;
size += getStackInSlot(1).getCount();
}
info.add(size + " " + name);
}

View file

@ -52,7 +52,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -60,7 +60,7 @@ public class TileQuantumTank extends TileLegacyMachineBase
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote) {
if (!world.isRemote) {
FluidUtils.drainContainers(this, inventory, 0, 1);
FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType());
if (tank.getFluidType() != null && getStackInSlot(2) == null) {

View file

@ -65,11 +65,11 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
public void updateEntity() {
super.updateEntity();
charge(2);
if (!worldObj.isRemote) {
currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj);
if (!world.isRemote) {
currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world);
if (currentRecipe != null && canMake()) {
if (tickTime >= runTime) {
currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj);
currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world);
if (currentRecipe != null) {
boolean hasCrafted = false;
if (inventory.getStackInSlot(0) == null) {
@ -77,10 +77,10 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
tickTime = -1;
hasCrafted = true;
} else {
if (inventory.getStackInSlot(0).stackSize + currentRecipe.stackSize <= currentRecipe
if (inventory.getStackInSlot(0).getCount() + currentRecipe.getCount() <= currentRecipe
.getMaxStackSize()) {
ItemStack stack = inventory.getStackInSlot(0);
stack.stackSize = stack.stackSize + currentRecipe.stackSize;
stack.getCount() = stack.getCount() + currentRecipe.getCount();
inventory.setInventorySlotContents(0, stack);
tickTime = -1;
hasCrafted = true;
@ -105,7 +105,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
tickTime = -1;
}
} else {
currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj);
currentRecipe = RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world);
if (currentRecipe != null) {
inventory.setInventorySlotContents(1, currentRecipe);
} else {
@ -115,7 +115,7 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
}
public boolean canMake() {
return RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, worldObj) != null;
return RollingMachineRecipe.instance.findMatchingRecipe(craftMatrix, world) != null;
}
@Override

View file

@ -68,7 +68,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
}
public void recycleItems() {
if (this.canOpen() && !worldObj.isRemote) {
if (this.canOpen() && !world.isRemote) {
int random = new Random().nextInt(ScrapboxList.stacks.size());
ItemStack out = ScrapboxList.stacks.get(random).copy();
if (getStackInSlot(output) == null) {
@ -76,7 +76,7 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
setInventorySlotContents(output, out);
}
if (getStackInSlot(input1).stackSize > 1) {
if (getStackInSlot(input1).getCount() > 1) {
useEnergy(cost);
this.decrStackSize(input1, 1);
} else {
@ -95,11 +95,11 @@ public class TileScrapboxinator extends TilePowerAcceptor implements IWrenchable
}
public void updateState() {
IBlockState blockState = worldObj.getBlockState(pos);
IBlockState blockState = world.getBlockState(pos);
if (blockState.getBlock() instanceof BlockMachineBase) {
BlockMachineBase blockMachineBase = (BlockMachineBase) blockState.getBlock();
if (blockState.getValue(BlockMachineBase.ACTIVE) != progress > 0)
blockMachineBase.setActive(progress > 0, worldObj, pos);
blockMachineBase.setActive(progress > 0, world, pos);
}
}

View file

@ -131,7 +131,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
}
private boolean isCoil(int x, int y, int z) {
return worldObj.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FusionCoil;
return world.getBlockState(new BlockPos(x, y, z)).getBlock() == ModBlocks.FusionCoil;
}
@Override
@ -139,11 +139,11 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
super.updateEntity();
// TODO improve this code a lot
if (worldObj.getTotalWorldTime() % 20 == 0) {
if (world.getTotalWorldTime() % 20 == 0) {
checkCoils();
}
if (!worldObj.isRemote) {
if (!world.isRemote) {
if (coilStatus == 1) {
if (currentRecipe == null) {
if (inventory.hasChanged || crafingTickTime != 0) {
@ -205,11 +205,11 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
if (getStackInSlot(outputStackSlot) == null) {
setInventorySlotContents(outputStackSlot, currentRecipe.getOutput().copy());
} else {
decrStackSize(outputStackSlot, -currentRecipe.getOutput().stackSize);
decrStackSize(outputStackSlot, -currentRecipe.getOutput().getCount());
}
decrStackSize(topStackSlot, currentRecipe.getTopInput().stackSize);
decrStackSize(topStackSlot, currentRecipe.getTopInput().getCount());
if (currentRecipe.getBottomInput() != null) {
decrStackSize(bottomStackSlot, currentRecipe.getBottomInput().stackSize);
decrStackSize(bottomStackSlot, currentRecipe.getBottomInput().getCount());
}
resetCrafter();
}
@ -259,7 +259,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
return true;
}
if (ItemUtils.isItemEqual(inventory.getStackInSlot(slot), stack, true, true, oreDic)) {
if (stack.stackSize + inventory.getStackInSlot(slot).stackSize <= stack.getMaxStackSize()) {
if (stack.getCount() + inventory.getStackInSlot(slot).getCount() <= stack.getMaxStackSize()) {
return true;
}
}

View file

@ -107,7 +107,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -115,7 +115,7 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote) {
if (!world.isRemote) {
FluidUtils.drainContainers(this, inventory, 0, 1);
FluidUtils.fillContainers(this, inventory, 0, 1, tank.getFluidType());
if (tank.getFluidType() != null && getStackInSlot(2) == null) {

View file

@ -26,8 +26,8 @@ public class TileDragonEggSiphoner extends TilePowerAcceptor implements IWrencha
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote) {
if (worldObj.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ()))
if (!world.isRemote) {
if (world.getBlockState(new BlockPos(getPos().getX(), getPos().getY() + 1, getPos().getZ()))
.getBlock() == Blocks.DRAGON_EGG) {
addEnergy(euTick);
}

View file

@ -120,7 +120,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -128,7 +128,7 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote) {
if (!world.isRemote) {
FluidUtils.drainContainers(this, inventory, 0, 1);
tank.compareAndUpdate();
}

View file

@ -38,7 +38,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override
public void updateEntity() {
super.updateEntity();
if (worldObj.isRemote) {
if (world.isRemote) {
return;
}
if (getEnergy() < getMaxPower()) {
@ -57,7 +57,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
if (burnTime > 0) {
updateState();
burnItem = getStackInSlot(fuelSlot);
if (getStackInSlot(fuelSlot).stackSize == 1) {
if (getStackInSlot(fuelSlot).getCount() == 1) {
if(getStackInSlot(fuelSlot).getItem() == Items.LAVA_BUCKET || getStackInSlot(fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket){
setInventorySlotContents(fuelSlot, new ItemStack(Items.BUCKET));
} else {
@ -74,11 +74,11 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
}
public void updateState() {
IBlockState BlockStateContainer = worldObj.getBlockState(pos);
IBlockState BlockStateContainer = world.getBlockState(pos);
if (BlockStateContainer.getBlock() instanceof BlockMachineBase) {
BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock();
if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != burnTime > 0)
blockMachineBase.setActive(burnTime > 0, worldObj, pos);
blockMachineBase.setActive(burnTime > 0, world, pos);
}
}

View file

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

View file

@ -28,24 +28,24 @@ public class TileLightningRod extends TilePowerAcceptor {
if (onStatusHoldTicks == 0 || getEnergy() <= 0) {
if (getBlockType() instanceof BlockMachineBase)
((BlockMachineBase) getBlockType()).setActive(false, worldObj, pos);
((BlockMachineBase) getBlockType()).setActive(false, world, pos);
onStatusHoldTicks = -1;
}
float weatherStrength = worldObj.getThunderStrength(1.0F);
float weatherStrength = world.getThunderStrength(1.0F);
if (weatherStrength > 0.2F) {
//lightStrikeChance = (MAX - (CHANCE * WEATHER_STRENGTH)
float lightStrikeChance = ((100F - ConfigTechReborn.LightningRodChance) * 20F);
float totalChance = lightStrikeChance * getLightningStrikeMultiplier() * ((1.1F - weatherStrength));
if (worldObj.rand.nextInt((int) Math.floor(totalChance)) == 0) {
EntityLightningBolt lightningBolt = new EntityLightningBolt(worldObj,
if (world.rand.nextInt((int) Math.floor(totalChance)) == 0) {
EntityLightningBolt lightningBolt = new EntityLightningBolt(world,
pos.getX() + 0.5F,
worldObj.provider.getAverageGroundLevel(),
world.provider.getAverageGroundLevel(),
pos.getZ() + 0.5F, false);
worldObj.addWeatherEffect(lightningBolt);
worldObj.spawnEntityInWorld(lightningBolt);
world.addWeatherEffect(lightningBolt);
world.spawnEntity(lightningBolt);
addEnergy(32768 * (0.3F + weatherStrength));
((BlockMachineBase) getBlockType()).setActive(true, worldObj, pos);
((BlockMachineBase) getBlockType()).setActive(true, world, pos);
onStatusHoldTicks = 400;
}
}
@ -53,8 +53,8 @@ public class TileLightningRod extends TilePowerAcceptor {
}
public float getLightningStrikeMultiplier() {
float actualHeight = worldObj.provider.getActualHeight();
float groundLevel = worldObj.provider.getAverageGroundLevel();
float actualHeight = world.provider.getActualHeight();
float groundLevel = world.provider.getAverageGroundLevel();
for (int i = pos.getY() + 1; i < actualHeight; i++) {
if (!isValidIronFence(i)) {
if (groundLevel >= i)
@ -68,7 +68,7 @@ public class TileLightningRod extends TilePowerAcceptor {
}
public boolean isValidIronFence(int y) {
Item itemBlock = Item.getItemFromBlock(worldObj.getBlockState(new BlockPos(pos.getX(), y, pos.getZ())).getBlock());
Item itemBlock = Item.getItemFromBlock(world.getBlockState(new BlockPos(pos.getX(), y, pos.getZ())).getBlock());
for (ItemStack fence : OreDictionary.getOres("fenceIron")) {
if (fence.getItem() == itemBlock)
return true;

View file

@ -126,7 +126,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -134,7 +134,7 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote)
if (!world.isRemote)
FluidUtils.drainContainers(this, inventory, 0, 1);
if (tank.getFluidAmount() > 0 && getMaxPower() - getEnergy() >= euTick && tank.getFluidType() != null && fluids.containsKey(tank.getFluidType().getName())) {

View file

@ -25,8 +25,8 @@ public class TileSolarPanel extends TilePowerAcceptor implements ITickable {
@Override
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote) {
if (worldObj.getTotalWorldTime() % 60 == 0) {
if (!world.isRemote) {
if (world.getTotalWorldTime() % 60 == 0) {
shouldMakePower = isSunOut();
}
@ -37,8 +37,8 @@ public class TileSolarPanel extends TilePowerAcceptor implements ITickable {
powerToAdd = 0;
}
worldObj.setBlockState(getPos(),
worldObj.getBlockState(this.getPos()).withProperty(BlockSolarPanel.ACTIVE, isSunOut()));
world.setBlockState(getPos(),
world.getBlockState(this.getPos()).withProperty(BlockSolarPanel.ACTIVE, isSunOut()));
}
}
@ -54,8 +54,8 @@ public class TileSolarPanel extends TilePowerAcceptor implements ITickable {
}
public boolean isSunOut() {
return worldObj.canBlockSeeSky(pos.up()) && !worldObj.isRaining() && !worldObj.isThundering()
&& worldObj.isDaytime();
return world.canBlockSeeSky(pos.up()) && !world.isRaining() && !world.isThundering()
&& world.isDaytime();
}
@Override

View file

@ -111,7 +111,7 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
@Override
public void onDataPacket(NetworkManager net, SPacketUpdateTileEntity packet) {
worldObj.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
world.markBlockRangeForRenderUpdate(getPos().getX(), getPos().getY(), getPos().getZ(), getPos().getX(),
getPos().getY(), getPos().getZ());
readFromNBT(packet.getNbtCompound());
}
@ -120,27 +120,27 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
// TODO optimise this code
public void updateEntity() {
super.updateEntity();
if (!worldObj.isRemote) {
if (!world.isRemote) {
FluidUtils.drainContainers(this, inventory, 0, 1);
for (EnumFacing direction : EnumFacing.values()) {
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
if (world.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(), getPos().getZ() + direction.getFrontOffsetZ()))
.getBlock() == Blocks.LAVA) {
addEnergy(1);
}
}
if (worldObj.getTotalWorldTime() % 40 == 0) {
BlockMachineBase bmb = (BlockMachineBase) worldObj.getBlockState(pos).getBlock();
if (world.getTotalWorldTime() % 40 == 0) {
BlockMachineBase bmb = (BlockMachineBase) world.getBlockState(pos).getBlock();
boolean didFindLava = false;
for (EnumFacing direction : EnumFacing.values()) {
if (worldObj.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
if (world.getBlockState(new BlockPos(getPos().getX() + direction.getFrontOffsetX(),
getPos().getY() + direction.getFrontOffsetY(),
getPos().getZ() + direction.getFrontOffsetZ())).getBlock() == Blocks.LAVA) {
didFindLava = true;
}
}
bmb.setActive(didFindLava, worldObj, pos);
bmb.setActive(didFindLava, world, pos);
}
}
if (tank.getFluidAmount() > 0 && getMaxPower() - getEnergy() >= euTick) {

View file

@ -19,7 +19,7 @@ public class TileWaterMill extends TilePowerAcceptor {
@Override
public void updateEntity() {
super.updateEntity();
if (worldObj.getTotalWorldTime() % 20 == 0) {
if (world.getTotalWorldTime() % 20 == 0) {
checkForWater();
}
if (waterblocks > 0) {
@ -30,7 +30,7 @@ public class TileWaterMill extends TilePowerAcceptor {
public void checkForWater() {
waterblocks = 0;
for (EnumFacing facing : EnumFacing.HORIZONTALS) {
if (worldObj.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER) {
if (world.getBlockState(getPos().offset(facing)).getBlock() == Blocks.WATER) {
waterblocks++;
}
}

View file

@ -20,7 +20,7 @@ public class TileWindMill extends TilePowerAcceptor {
super.updateEntity();
if (pos.getY() > 64) {
int actualPower = basePower;
if (worldObj.isThundering()) {
if (world.isThundering()) {
actualPower *= 1.25;
}
addEnergy(actualPower); // Value taken from

View file

@ -37,7 +37,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable {
if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid)) {
return 0.0;
}
return IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, ownerUdid).storedPower;
return IDSUManager.INSTANCE.getSaveDataForWorld(world, ownerUdid).storedPower;
}
@Override
@ -45,7 +45,7 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable {
if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid)) {
return;
}
IDSUManager.INSTANCE.getSaveDataForWorld(worldObj, ownerUdid).storedPower = energy;
IDSUManager.INSTANCE.getSaveDataForWorld(world, ownerUdid).storedPower = energy;
}
@Override

Some files were not shown because too many files have changed in this diff Show more