Update to minecraft version 1.9.4
This commit is contained in:
parent
7d95dea783
commit
74d500a2fd
47 changed files with 176 additions and 151 deletions
12
build.gradle
12
build.gradle
|
@ -11,7 +11,7 @@ buildscript {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
|
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ configurations {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
version = "1.1.1"
|
version = "1.2.0"
|
||||||
|
|
||||||
def ENV = System.getenv()
|
def ENV = System.getenv()
|
||||||
if (ENV.BUILD_NUMBER) {
|
if (ENV.BUILD_NUMBER) {
|
||||||
|
@ -59,8 +59,8 @@ if (ENV.BUILD_NUMBER) {
|
||||||
}
|
}
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "1.9-12.16.1.1887"
|
version = "1.9.4-12.16.1.1908-1.9.4"
|
||||||
mappings = "snapshot_20160506"
|
mappings = "snapshot_20160518"
|
||||||
replace "@MODVERSION@", project.version
|
replace "@MODVERSION@", project.version
|
||||||
// makeObfSourceJar = false
|
// makeObfSourceJar = false
|
||||||
useDepAts = true
|
useDepAts = true
|
||||||
|
@ -83,9 +83,9 @@ dependencies {
|
||||||
if(!f.exists()){
|
if(!f.exists()){
|
||||||
f.mkdir()
|
f.mkdir()
|
||||||
}
|
}
|
||||||
compile 'RebornCore:RebornCore-1.9:+:dev'
|
compile 'RebornCore:RebornCore-1.9.4:+:dev'
|
||||||
deobfCompile "mezz.jei:jei_1.9:+"
|
deobfCompile "mezz.jei:jei_1.9:+"
|
||||||
deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.2.0_60:universal'
|
deobfCompile 'MCMultiPart:MCMultiPart-experimental:1.2.0_66:universal'
|
||||||
compile "net.darkhax.tesla:Tesla:1.9-1.0.2.23:deobf"
|
compile "net.darkhax.tesla:Tesla:1.9-1.0.2.23:deobf"
|
||||||
deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132"
|
deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132"
|
||||||
deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193"
|
deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193"
|
||||||
|
|
|
@ -57,7 +57,8 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
|
||||||
return new TileSolarPanel();
|
return new TileSolarPanel();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override public void onNeighborBlockChange(World worldIn, BlockPos pos, IBlockState state, Block neighborBlock)
|
|
||||||
|
@Override public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block neighborBlock)
|
||||||
{
|
{
|
||||||
if(worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering()
|
if(worldIn.canBlockSeeSky(pos.up()) && !worldIn.isRaining() && !worldIn.isThundering()
|
||||||
&& worldIn.isDaytime()){
|
&& worldIn.isDaytime()){
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -42,22 +42,22 @@ public class ContainerAESU extends RebornContainer {
|
||||||
public void detectAndSendChanges() {
|
public void detectAndSendChanges() {
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++) {
|
for (int i = 0; i < this.listeners.size(); i++) {
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.euOut != tile.getMaxOutput()) {
|
if (this.euOut != tile.getMaxOutput()) {
|
||||||
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
IContainerListener.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
||||||
}
|
}
|
||||||
if (this.storedEu != tile.getEnergy()) {
|
if (this.storedEu != tile.getEnergy()) {
|
||||||
icrafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
|
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting) {
|
public void addListener(IContainerListener crafting) {
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
||||||
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraft.inventory.SlotFurnaceFuel;
|
import net.minecraft.inventory.SlotFurnaceFuel;
|
||||||
import reborncore.client.gui.SlotOutput;
|
import reborncore.client.gui.SlotOutput;
|
||||||
|
@ -53,9 +53,9 @@ public class ContainerAlloyFurnace extends RebornContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);
|
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);
|
||||||
crafting.sendProgressBarUpdate(this, 1, tile.burnTime);
|
crafting.sendProgressBarUpdate(this, 1, tile.burnTime);
|
||||||
crafting.sendProgressBarUpdate(this, 2, tile.cookTime);
|
crafting.sendProgressBarUpdate(this, 2, tile.cookTime);
|
||||||
|
@ -66,7 +66,7 @@ public class ContainerAlloyFurnace extends RebornContainer
|
||||||
{
|
{
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting crafting = this.listeners.get(i);
|
IContainerListener crafting = this.listeners.get(i);
|
||||||
if (this.currentItemBurnTime != tile.currentItemBurnTime)
|
if (this.currentItemBurnTime != tile.currentItemBurnTime)
|
||||||
{
|
{
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);
|
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -56,18 +56,18 @@ public class ContainerBatbox extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.energy != (int) tile.getEnergy())
|
if (this.energy != (int) tile.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import reborncore.client.gui.SlotOutput;
|
import reborncore.client.gui.SlotOutput;
|
||||||
import techreborn.tiles.TileBlastFurnace;
|
import techreborn.tiles.TileBlastFurnace;
|
||||||
|
@ -59,18 +59,18 @@ public class ContainerBlastFurnace extends ContainerCrafting
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.heat != tile.getHeat())
|
if (this.heat != tile.getHeat())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 10, tile.getHeat());
|
IContainerListener.sendProgressBarUpdate(this, 10, tile.getHeat());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 10, tile.getHeat());
|
crafting.sendProgressBarUpdate(this, 10, tile.getHeat());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
import reborncore.api.tile.IContainerLayout;
|
import reborncore.api.tile.IContainerLayout;
|
||||||
|
@ -36,26 +36,26 @@ public abstract class ContainerCrafting extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1)
|
if (this.currentTickTime != crafter.currentTickTime || crafter.currentTickTime == -1)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
|
IContainerListener.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
|
||||||
}
|
}
|
||||||
if (this.currentNeededTicks != crafter.currentNeededTicks)
|
if (this.currentNeededTicks != crafter.currentNeededTicks)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
|
IContainerListener.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
|
||||||
}
|
}
|
||||||
if (this.energy != (int) crafter.energy.getEnergy())
|
if (this.energy != (int) crafter.energy.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
|
crafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
|
||||||
crafting.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
|
crafting.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());
|
crafting.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -55,22 +55,22 @@ public class ContainerDieselGenerator extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.energy != (int) tiledieselGenerator.getEnergy())
|
if (this.energy != (int) tiledieselGenerator.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());
|
||||||
}
|
}
|
||||||
if (this.fluid != tiledieselGenerator.tank.getFluidAmount())
|
if (this.fluid != tiledieselGenerator.tank.getFluidAmount())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 1, tiledieselGenerator.tank.getFluidAmount());
|
IContainerListener.sendProgressBarUpdate(this, 1, tiledieselGenerator.tank.getFluidAmount());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());
|
crafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());
|
||||||
crafting.sendProgressBarUpdate(this, 1, tiledieselGenerator.tank.getFluidAmount());
|
crafting.sendProgressBarUpdate(this, 1, tiledieselGenerator.tank.getFluidAmount());
|
||||||
}
|
}
|
||||||
|
|
|
@ -52,8 +52,8 @@ public class ContainerExtractor extends ContainerCrafting
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Override
|
// @Override
|
||||||
// public void onCraftGuiOpened(ICrafting crafting) {
|
// public void addListener(IContainerListener crafting) {
|
||||||
// super.onCraftGuiOpened(crafting);
|
// super.addListener(crafting);
|
||||||
// crafting.sendProgressBarUpdate(this, 0, (int) tile.getProgressScaled(0));
|
// crafting.sendProgressBarUpdate(this, 0, (int) tile.getProgressScaled(0));
|
||||||
// crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
// crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
// }
|
// }
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -58,34 +58,34 @@ public class ContainerFusionReactor extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.coilStatus != fusionController.coilStatus)
|
if (this.coilStatus != fusionController.coilStatus)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus);
|
IContainerListener.sendProgressBarUpdate(this, 0, fusionController.coilStatus);
|
||||||
}
|
}
|
||||||
if (this.energy != (int) fusionController.getEnergy())
|
if (this.energy != (int) fusionController.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 1, (int) fusionController.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 1, (int) fusionController.getEnergy());
|
||||||
}
|
}
|
||||||
if (this.tickTime != fusionController.crafingTickTime)
|
if (this.tickTime != fusionController.crafingTickTime)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);
|
IContainerListener.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);
|
||||||
}
|
}
|
||||||
if (this.finalTickTime != fusionController.finalTickTime)
|
if (this.finalTickTime != fusionController.finalTickTime)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 3, fusionController.finalTickTime);
|
IContainerListener.sendProgressBarUpdate(this, 3, fusionController.finalTickTime);
|
||||||
}
|
}
|
||||||
if (this.neededEU != fusionController.neededPower)
|
if (this.neededEU != fusionController.neededPower)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 4, fusionController.neededPower);
|
IContainerListener.sendProgressBarUpdate(this, 4, fusionController.neededPower);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus);
|
crafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus);
|
||||||
crafting.sendProgressBarUpdate(this, 1, (int) fusionController.getEnergy());
|
crafting.sendProgressBarUpdate(this, 1, (int) fusionController.getEnergy());
|
||||||
crafting.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);
|
crafting.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraft.inventory.SlotFurnaceFuel;
|
import net.minecraft.inventory.SlotFurnaceFuel;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
@ -59,26 +59,26 @@ public class ContainerGenerator extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.burnTime != tile.burnTime)
|
if (this.burnTime != tile.burnTime)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 0, tile.burnTime);
|
IContainerListener.sendProgressBarUpdate(this, 0, tile.burnTime);
|
||||||
}
|
}
|
||||||
if (this.totalBurnTime != tile.totalBurnTime)
|
if (this.totalBurnTime != tile.totalBurnTime)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 1, tile.totalBurnTime);
|
IContainerListener.sendProgressBarUpdate(this, 1, tile.totalBurnTime);
|
||||||
}
|
}
|
||||||
if (this.energy != (int) tile.getEnergy())
|
if (this.energy != (int) tile.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.burnTime);
|
crafting.sendProgressBarUpdate(this, 0, tile.burnTime);
|
||||||
crafting.sendProgressBarUpdate(this, 1, tile.totalBurnTime);
|
crafting.sendProgressBarUpdate(this, 1, tile.totalBurnTime);
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -43,22 +43,22 @@ public class ContainerIDSU extends RebornContainer {
|
||||||
public void detectAndSendChanges() {
|
public void detectAndSendChanges() {
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++) {
|
for (int i = 0; i < this.listeners.size(); i++) {
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.euOut != tile.output) {
|
if (this.euOut != tile.output) {
|
||||||
icrafting.sendProgressBarUpdate(this, 0, tile.output);
|
IContainerListener.sendProgressBarUpdate(this, 0, tile.output);
|
||||||
}
|
}
|
||||||
if (this.storedEu != (int) tile.getEnergy()) {
|
if (this.storedEu != (int) tile.getEnergy()) {
|
||||||
icrafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
|
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting) {
|
public void addListener(IContainerListener crafting) {
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.output);
|
crafting.sendProgressBarUpdate(this, 0, tile.output);
|
||||||
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -57,18 +57,18 @@ public class ContainerImplosionCompressor extends ContainerCrafting
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.multIBlockState != getMultIBlockStateint())
|
if (this.multIBlockState != getMultIBlockStateint())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
|
IContainerListener.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
|
crafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -59,18 +59,18 @@ public class ContainerIndustrialGrinder extends ContainerCrafting
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.connectionStatus != tile.connectionStatus)
|
if (this.connectionStatus != tile.connectionStatus)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);
|
IContainerListener.sendProgressBarUpdate(this, 10, tile.connectionStatus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);
|
crafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -49,25 +49,25 @@ public class ContainerLESU extends RebornContainer {
|
||||||
public void detectAndSendChanges() {
|
public void detectAndSendChanges() {
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++) {
|
for (int i = 0; i < this.listeners.size(); i++) {
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.euOut != tile.getMaxOutput()) {
|
if (this.euOut != tile.getMaxOutput()) {
|
||||||
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
IContainerListener.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
||||||
}
|
}
|
||||||
if (this.storedEu != tile.getEnergy()) {
|
if (this.storedEu != tile.getEnergy()) {
|
||||||
icrafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
|
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
||||||
}
|
}
|
||||||
if (this.connectedBlocks != tile.connectedBlocks) {
|
if (this.connectedBlocks != tile.connectedBlocks) {
|
||||||
icrafting.sendProgressBarUpdate(this, 3, tile.connectedBlocks);
|
IContainerListener.sendProgressBarUpdate(this, 3, tile.connectedBlocks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting) {
|
public void addListener(IContainerListener crafting) {
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
|
||||||
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
|
||||||
|
|
|
@ -6,7 +6,7 @@ package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
@ -76,18 +76,18 @@ public class ContainerMFE extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.energy != (int) tile.getEnergy())
|
if (this.energy != (int) tile.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@ package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
|
@ -71,18 +71,18 @@ public class ContainerMFSU extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.energy != (int) tile.getEnergy())
|
if (this.energy != (int) tile.getEnergy())
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -60,18 +60,18 @@ public class ContainerMatterFabricator extends RebornContainer
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.progressTime != tile.progresstime)
|
if (this.progressTime != tile.progresstime)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 0, tile.progresstime);
|
IContainerListener.sendProgressBarUpdate(this, 0, tile.progresstime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.progresstime);
|
crafting.sendProgressBarUpdate(this, 0, tile.progresstime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import net.minecraft.inventory.IInventory;
|
import net.minecraft.inventory.IInventory;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
@ -68,9 +68,9 @@ public class ContainerRollingMachine extends RebornContainer
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.runTime);
|
crafting.sendProgressBarUpdate(this, 0, tile.runTime);
|
||||||
crafting.sendProgressBarUpdate(this, 1, tile.tickTime);
|
crafting.sendProgressBarUpdate(this, 1, tile.tickTime);
|
||||||
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
||||||
|
@ -81,7 +81,7 @@ public class ContainerRollingMachine extends RebornContainer
|
||||||
{
|
{
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting crafting = this.listeners.get(i);
|
IContainerListener crafting = this.listeners.get(i);
|
||||||
if (this.currentItemBurnTime != tile.runTime)
|
if (this.currentItemBurnTime != tile.runTime)
|
||||||
{
|
{
|
||||||
crafting.sendProgressBarUpdate(this, 0, tile.runTime);
|
crafting.sendProgressBarUpdate(this, 0, tile.runTime);
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package techreborn.client.container;
|
package techreborn.client.container;
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
import net.minecraft.inventory.ICrafting;
|
import net.minecraft.inventory.IContainerListener;
|
||||||
import reborncore.client.gui.BaseSlot;
|
import reborncore.client.gui.BaseSlot;
|
||||||
import net.minecraftforge.fml.relauncher.Side;
|
import net.minecraftforge.fml.relauncher.Side;
|
||||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||||
|
@ -54,18 +54,18 @@ public class ContainerVacuumFreezer extends ContainerCrafting
|
||||||
super.detectAndSendChanges();
|
super.detectAndSendChanges();
|
||||||
for (int i = 0; i < this.listeners.size(); i++)
|
for (int i = 0; i < this.listeners.size(); i++)
|
||||||
{
|
{
|
||||||
ICrafting icrafting = this.listeners.get(i);
|
IContainerListener IContainerListener = this.listeners.get(i);
|
||||||
if (this.machineStatus != tile.multiBlockStatus)
|
if (this.machineStatus != tile.multiBlockStatus)
|
||||||
{
|
{
|
||||||
icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
|
IContainerListener.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCraftGuiOpened(ICrafting crafting)
|
public void addListener(IContainerListener crafting)
|
||||||
{
|
{
|
||||||
super.onCraftGuiOpened(crafting);
|
super.addListener(crafting);
|
||||||
crafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
|
crafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package techreborn.init;
|
package techreborn.init;
|
||||||
|
|
||||||
import net.minecraft.util.WeightedRandomChestContent;
|
|
||||||
|
|
||||||
//TODO 1.9 nope
|
//TODO 1.9 nope
|
||||||
public class ModLoot
|
public class ModLoot
|
||||||
|
@ -33,8 +32,8 @@ public class ModLoot
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void generate(WeightedRandomChestContent chestContent)
|
// public static void generate(WeightedRandomChestContent chestContent)
|
||||||
{
|
// {
|
||||||
// for (String category :
|
// for (String category :
|
||||||
// Arrays.asList(ChestGenHooks.VILLAGE_BLACKSMITH,
|
// Arrays.asList(ChestGenHooks.VILLAGE_BLACKSMITH,
|
||||||
// ChestGenHooks.MINESHAFT_CORRIDOR, ChestGenHooks.PYRAMID_DESERT_CHEST,
|
// ChestGenHooks.MINESHAFT_CORRIDOR, ChestGenHooks.PYRAMID_DESERT_CHEST,
|
||||||
|
@ -45,5 +44,5 @@ public class ModLoot
|
||||||
// ChestGenHooks.DUNGEON_CHEST)) {
|
// ChestGenHooks.DUNGEON_CHEST)) {
|
||||||
// ChestGenHooks.addItem(category, chestContent);
|
// ChestGenHooks.addItem(category, chestContent);
|
||||||
// }
|
// }
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
|
@ -415,9 +415,10 @@ public abstract class MultipartFluidPipe extends Multipart implements INormallyO
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tag) {
|
public NBTTagCompound writeToNBT(NBTTagCompound tag) {
|
||||||
super.writeToNBT(tag);
|
super.writeToNBT(tag);
|
||||||
tank.writeToNBT(tag);
|
tank.writeToNBT(tag);
|
||||||
|
return tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -131,13 +131,14 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable
|
||||||
return dropStack;
|
return dropStack;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tagCompound.setDouble("euChange", euChange);
|
tagCompound.setDouble("euChange", euChange);
|
||||||
tagCompound.setDouble("euLastTick", euLastTick);
|
tagCompound.setDouble("euLastTick", euLastTick);
|
||||||
tagCompound.setInteger("output", OUTPUT);
|
tagCompound.setInteger("output", OUTPUT);
|
||||||
inventory.writeToNBT(tagCompound);
|
inventory.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void readFromNBT(NBTTagCompound nbttagcompound)
|
public void readFromNBT(NBTTagCompound nbttagcompound)
|
||||||
|
|
|
@ -91,10 +91,11 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,I
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Override
|
// @Override
|
||||||
|
|
|
@ -155,10 +155,11 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,I
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
writeUpdateToNBT(tagCompound);
|
writeUpdateToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeUpdateToNBT(NBTTagCompound tagCompound)
|
public void writeUpdateToNBT(NBTTagCompound tagCompound)
|
||||||
|
|
|
@ -115,10 +115,11 @@ public class TileCentrifuge extends TilePowerAcceptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -85,10 +85,11 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ISidedInventory
|
// ISidedInventory
|
||||||
|
|
|
@ -127,13 +127,14 @@ public class TileDigitalChest extends TileMachineBase implements IInventoryProvi
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
writeToNBTWithoutCoords(tagCompound);
|
writeToNBTWithoutCoords(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
if (storedItem != null)
|
if (storedItem != null)
|
||||||
{
|
{
|
||||||
|
@ -141,6 +142,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventoryProvi
|
||||||
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
|
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
|
||||||
} else
|
} else
|
||||||
tagCompound.setInteger("storedQuantity", 0);
|
tagCompound.setInteger("storedQuantity", 0);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -118,10 +118,11 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Override
|
// @Override
|
||||||
|
|
|
@ -88,10 +88,11 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Override
|
// @Override
|
||||||
|
|
|
@ -128,11 +128,12 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -135,11 +135,12 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* IFluidHandler */
|
/* IFluidHandler */
|
||||||
|
|
|
@ -118,9 +118,10 @@ public class TilePlayerDectector extends TilePowerAcceptor
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tag)
|
public NBTTagCompound writeToNBT(NBTTagCompound tag)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tag);
|
super.writeToNBT(tag);
|
||||||
tag.setString("ownerID", owenerUdid);
|
tag.setString("ownerID", owenerUdid);
|
||||||
|
return tag;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,15 +121,17 @@ public class TilePump extends TilePowerAcceptor implements IFluidHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
writeToNBTWithoutCoords(tagCompound);
|
writeToNBTWithoutCoords(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
// IFluidHandler
|
// IFluidHandler
|
||||||
|
|
|
@ -129,20 +129,24 @@ public class TileQuantumChest extends TileMachineBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
writeToNBTWithoutCoords(tagCompound);
|
writeToNBTWithoutCoords(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
if (storedItem != null)
|
if (storedItem != null)
|
||||||
{
|
{
|
||||||
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
|
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
|
||||||
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
|
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
|
||||||
} else
|
} else{
|
||||||
tagCompound.setInteger("storedQuantity", 0);
|
tagCompound.setInteger("storedQuantity", 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -42,15 +42,17 @@ public class TileQuantumTank extends TileMachineBase
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
writeToNBTWithoutCoords(tagCompound);
|
writeToNBTWithoutCoords(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Packet getDescriptionPacket()
|
public Packet getDescriptionPacket()
|
||||||
|
|
|
@ -183,11 +183,12 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
ItemUtils.writeInvToNBT(craftMatrix, "Crafting", tagCompound);
|
ItemUtils.writeInvToNBT(craftMatrix, "Crafting", tagCompound);
|
||||||
writeUpdateToNBT(tagCompound);
|
writeUpdateToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeUpdateToNBT(NBTTagCompound tagCompound)
|
public void writeUpdateToNBT(NBTTagCompound tagCompound)
|
||||||
|
|
|
@ -130,10 +130,11 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getProgressScaled(int scale)
|
public int getProgressScaled(int scale)
|
||||||
|
|
|
@ -90,7 +90,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
|
|
||||||
|
@ -110,6 +110,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
|
||||||
tagCompound.setInteger("finalTickTime", finalTickTime);
|
tagCompound.setInteger("finalTickTime", finalTickTime);
|
||||||
tagCompound.setInteger("neededPower", neededPower);
|
tagCompound.setInteger("neededPower", neededPower);
|
||||||
tagCompound.setBoolean("hasStartedCrafting", hasStartedCrafting);
|
tagCompound.setBoolean("hasStartedCrafting", hasStartedCrafting);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -115,10 +115,11 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Packet getDescriptionPacket()
|
public Packet getDescriptionPacket()
|
||||||
|
|
|
@ -128,10 +128,11 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Packet getDescriptionPacket()
|
public Packet getDescriptionPacket()
|
||||||
|
|
|
@ -134,10 +134,11 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Packet getDescriptionPacket()
|
public Packet getDescriptionPacket()
|
||||||
|
|
|
@ -120,10 +120,11 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
tank.writeToNBT(tagCompound);
|
tank.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Packet getDescriptionPacket()
|
public Packet getDescriptionPacket()
|
||||||
|
|
|
@ -61,12 +61,6 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeToNBTWithoutCoords(NBTTagCompound tag)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public double getMaxPower()
|
public double getMaxPower()
|
||||||
{
|
{
|
||||||
|
@ -120,14 +114,15 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable
|
||||||
this.ownerUdid = nbttagcompound.getString("ownerUdid");
|
this.ownerUdid = nbttagcompound.getString("ownerUdid");
|
||||||
}
|
}
|
||||||
|
|
||||||
public void writeToNBT(NBTTagCompound nbttagcompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(nbttagcompound);
|
super.writeToNBT(nbttagcompound);
|
||||||
if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid))
|
if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid))
|
||||||
{
|
{
|
||||||
return;
|
return nbttagcompound;
|
||||||
}
|
}
|
||||||
nbttagcompound.setString("ownerUdid", this.ownerUdid);
|
nbttagcompound.setString("ownerUdid", this.ownerUdid);
|
||||||
|
return nbttagcompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateEntity()
|
public void updateEntity()
|
||||||
|
|
|
@ -84,10 +84,11 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInv
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ISidedInventory
|
// ISidedInventory
|
||||||
|
|
|
@ -92,10 +92,11 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInven
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeToNBT(NBTTagCompound tagCompound)
|
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
|
||||||
{
|
{
|
||||||
super.writeToNBT(tagCompound);
|
super.writeToNBT(tagCompound);
|
||||||
crafter.writeToNBT(tagCompound);
|
crafter.writeToNBT(tagCompound);
|
||||||
|
return tagCompound;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getProgressScaled(int scale)
|
public int getProgressScaled(int scale)
|
||||||
|
|
|
@ -9,7 +9,7 @@ import net.minecraft.block.state.pattern.BlockMatcher;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraft.world.biome.BiomeGenBase;
|
import net.minecraft.world.biome.Biome;
|
||||||
import net.minecraft.world.chunk.IChunkGenerator;
|
import net.minecraft.world.chunk.IChunkGenerator;
|
||||||
import net.minecraft.world.chunk.IChunkProvider;
|
import net.minecraft.world.chunk.IChunkProvider;
|
||||||
import net.minecraft.world.gen.feature.WorldGenMinable;
|
import net.minecraft.world.gen.feature.WorldGenMinable;
|
||||||
|
@ -236,7 +236,7 @@ public class TechRebornWorldGen implements IWorldGenerator
|
||||||
{
|
{
|
||||||
int chance = config.rubberTreeConfig.chance;
|
int chance = config.rubberTreeConfig.chance;
|
||||||
boolean isValidSpawn = false;
|
boolean isValidSpawn = false;
|
||||||
BiomeGenBase biomeGenBase = world.getBiomeGenForCoords(new BlockPos(chunkX * 16, 72, chunkZ * 16));
|
Biome biomeGenBase = world.getBiomeGenForCoords(new BlockPos(chunkX * 16, 72, chunkZ * 16));
|
||||||
if (BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.SWAMP))
|
if (BiomeDictionary.isBiomeOfType(biomeGenBase, BiomeDictionary.Type.SWAMP))
|
||||||
{
|
{
|
||||||
// TODO check the config file for bounds on this, might cause
|
// TODO check the config file for bounds on this, might cause
|
||||||
|
|
Loading…
Reference in a new issue