maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to minecraft version 1.9.4

Browse source
This commit is contained in:
modmuss50 2016-05-18 16:53:54 +01:00
parent 7d95dea783
commit 74d500a2fd
47 changed files with 176 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -11,7 +11,7 @@ buildscript {
}
}
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()
if (ENV.BUILD_NUMBER) {
@ -59,8 +59,8 @@ if (ENV.BUILD_NUMBER) {
}
minecraft {
version = "1.9-12.16.1.1887"
mappings = "snapshot_20160506"
version = "1.9.4-12.16.1.1908-1.9.4"
mappings = "snapshot_20160518"
replace "@MODVERSION@", project.version
// makeObfSourceJar = false
useDepAts = true
@ -83,9 +83,9 @@ dependencies {
if(!f.exists()){
f.mkdir()
}
compile 'RebornCore:RebornCore-1.9:+:dev'
compile 'RebornCore:RebornCore-1.9.4:+:dev'
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"
deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132"
deobfCompile "slimeknights:TConstruct:1.9-2.3.0.jenkins193"

3
src/main/java/techreborn/blocks/generator/BlockSolarPanel.java
View file

@ -57,7 +57,8 @@ public class BlockSolarPanel extends BaseTileBlock implements ITexturedBlock
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()
&& worldIn.isDaytime()){

14
src/main/java/techreborn/client/container/ContainerAESU.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -42,22 +42,22 @@ public class ContainerAESU extends RebornContainer {
public void detectAndSendChanges() {
super.detectAndSendChanges();
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()) {
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
IContainerListener.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
}
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) {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting) {
super.onCraftGuiOpened(crafting);
public void addListener(IContainerListener crafting) {
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());

8
src/main/java/techreborn/client/container/ContainerAlloyFurnace.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraft.inventory.SlotFurnaceFuel;
import reborncore.client.gui.SlotOutput;
@ -53,9 +53,9 @@ public class ContainerAlloyFurnace extends RebornContainer
}
@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, 1, tile.burnTime);
crafting.sendProgressBarUpdate(this, 2, tile.cookTime);
@ -66,7 +66,7 @@ public class ContainerAlloyFurnace extends RebornContainer
{
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)
{
crafting.sendProgressBarUpdate(this, 0, tile.currentItemBurnTime);

10
src/main/java/techreborn/client/container/ContainerBatbox.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -56,18 +56,18 @@ public class ContainerBatbox extends RebornContainer
super.detectAndSendChanges();
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())
{
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}

10
src/main/java/techreborn/client/container/ContainerBlastFurnace.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
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.SlotOutput;
import techreborn.tiles.TileBlastFurnace;
@ -59,18 +59,18 @@ public class ContainerBlastFurnace extends ContainerCrafting
super.detectAndSendChanges();
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())
{
icrafting.sendProgressBarUpdate(this, 10, tile.getHeat());
IContainerListener.sendProgressBarUpdate(this, 10, tile.getHeat());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 10, tile.getHeat());
}

14
src/main/java/techreborn/client/container/ContainerCrafting.java
View file

@ -1,6 +1,6 @@
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.SideOnly;
import reborncore.api.tile.IContainerLayout;
@ -36,26 +36,26 @@ public abstract class ContainerCrafting extends RebornContainer
super.detectAndSendChanges();
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)
{
icrafting.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
IContainerListener.sendProgressBarUpdate(this, 0, crafter.currentTickTime);
}
if (this.currentNeededTicks != crafter.currentNeededTicks)
{
icrafting.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
IContainerListener.sendProgressBarUpdate(this, 1, crafter.currentNeededTicks);
}
if (this.energy != (int) crafter.energy.getEnergy())
{
icrafting.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());
IContainerListener.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());
}
}
}
@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, 1, crafter.currentNeededTicks);
crafting.sendProgressBarUpdate(this, 2, (int) crafter.energy.getEnergy());

12
src/main/java/techreborn/client/container/ContainerDieselGenerator.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -55,22 +55,22 @@ public class ContainerDieselGenerator extends RebornContainer
super.detectAndSendChanges();
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())
{
icrafting.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());
IContainerListener.sendProgressBarUpdate(this, 0, (int) tiledieselGenerator.getEnergy());
}
if (this.fluid != tiledieselGenerator.tank.getFluidAmount())
{
icrafting.sendProgressBarUpdate(this, 1, tiledieselGenerator.tank.getFluidAmount());
IContainerListener.sendProgressBarUpdate(this, 1, tiledieselGenerator.tank.getFluidAmount());
}
}
}
@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, 1, tiledieselGenerator.tank.getFluidAmount());
}

4
src/main/java/techreborn/client/container/ContainerExtractor.java
View file

@ -52,8 +52,8 @@ public class ContainerExtractor extends ContainerCrafting
}
// @Override
// public void onCraftGuiOpened(ICrafting crafting) {
// super.onCraftGuiOpened(crafting);
// public void addListener(IContainerListener crafting) {
// super.addListener(crafting);
// crafting.sendProgressBarUpdate(this, 0, (int) tile.getProgressScaled(0));
// crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
// }

18
src/main/java/techreborn/client/container/ContainerFusionReactor.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -58,34 +58,34 @@ public class ContainerFusionReactor extends RebornContainer
super.detectAndSendChanges();
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)
{
icrafting.sendProgressBarUpdate(this, 0, fusionController.coilStatus);
IContainerListener.sendProgressBarUpdate(this, 0, fusionController.coilStatus);
}
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)
{
icrafting.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);
IContainerListener.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);
}
if (this.finalTickTime != fusionController.finalTickTime)
{
icrafting.sendProgressBarUpdate(this, 3, fusionController.finalTickTime);
IContainerListener.sendProgressBarUpdate(this, 3, fusionController.finalTickTime);
}
if (this.neededEU != fusionController.neededPower)
{
icrafting.sendProgressBarUpdate(this, 4, fusionController.neededPower);
IContainerListener.sendProgressBarUpdate(this, 4, fusionController.neededPower);
}
}
}
@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, 1, (int) fusionController.getEnergy());
crafting.sendProgressBarUpdate(this, 2, fusionController.crafingTickTime);

14
src/main/java/techreborn/client/container/ContainerGenerator.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraft.inventory.SlotFurnaceFuel;
import net.minecraftforge.fml.relauncher.Side;
@ -59,26 +59,26 @@ public class ContainerGenerator extends RebornContainer
super.detectAndSendChanges();
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)
{
icrafting.sendProgressBarUpdate(this, 0, tile.burnTime);
IContainerListener.sendProgressBarUpdate(this, 0, tile.burnTime);
}
if (this.totalBurnTime != tile.totalBurnTime)
{
icrafting.sendProgressBarUpdate(this, 1, tile.totalBurnTime);
IContainerListener.sendProgressBarUpdate(this, 1, tile.totalBurnTime);
}
if (this.energy != (int) tile.getEnergy())
{
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}
}
}
@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, 1, tile.totalBurnTime);
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());

14
src/main/java/techreborn/client/container/ContainerIDSU.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -43,22 +43,22 @@ public class ContainerIDSU extends RebornContainer {
public void detectAndSendChanges() {
super.detectAndSendChanges();
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) {
icrafting.sendProgressBarUpdate(this, 0, tile.output);
IContainerListener.sendProgressBarUpdate(this, 0, tile.output);
}
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) {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting) {
super.onCraftGuiOpened(crafting);
public void addListener(IContainerListener crafting) {
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 0, tile.output);
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());

10
src/main/java/techreborn/client/container/ContainerImplosionCompressor.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -57,18 +57,18 @@ public class ContainerImplosionCompressor extends ContainerCrafting
super.detectAndSendChanges();
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())
{
icrafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
IContainerListener.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 3, getMultIBlockStateint());
}

10
src/main/java/techreborn/client/container/ContainerIndustrialGrinder.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -59,18 +59,18 @@ public class ContainerIndustrialGrinder extends ContainerCrafting
super.detectAndSendChanges();
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)
{
icrafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);
IContainerListener.sendProgressBarUpdate(this, 10, tile.connectionStatus);
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 10, tile.connectionStatus);
}

16
src/main/java/techreborn/client/container/ContainerLESU.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -49,25 +49,25 @@ public class ContainerLESU extends RebornContainer {
public void detectAndSendChanges() {
super.detectAndSendChanges();
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()) {
icrafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
IContainerListener.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
}
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) {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
}
if (this.connectedBlocks != tile.connectedBlocks) {
icrafting.sendProgressBarUpdate(this, 3, tile.connectedBlocks);
IContainerListener.sendProgressBarUpdate(this, 3, tile.connectedBlocks);
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting) {
super.onCraftGuiOpened(crafting);
public void addListener(IContainerListener crafting) {
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 0, (int) tile.getMaxOutput());
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());

10
src/main/java/techreborn/client/container/ContainerMFE.java
View file

@ -6,7 +6,7 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
@ -76,18 +76,18 @@ public class ContainerMFE extends RebornContainer
super.detectAndSendChanges();
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())
{
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}

10
src/main/java/techreborn/client/container/ContainerMFSU.java
View file

@ -2,7 +2,7 @@ package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side;
@ -71,18 +71,18 @@ public class ContainerMFSU extends RebornContainer
super.detectAndSendChanges();
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())
{
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
}

10
src/main/java/techreborn/client/container/ContainerMatterFabricator.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -60,18 +60,18 @@ public class ContainerMatterFabricator extends RebornContainer
super.detectAndSendChanges();
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)
{
icrafting.sendProgressBarUpdate(this, 0, tile.progresstime);
IContainerListener.sendProgressBarUpdate(this, 0, tile.progresstime);
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 0, tile.progresstime);
}

8
src/main/java/techreborn/client/container/ContainerRollingMachine.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import net.minecraft.inventory.IInventory;
import reborncore.client.gui.BaseSlot;
import net.minecraft.item.ItemStack;
@ -68,9 +68,9 @@ public class ContainerRollingMachine extends RebornContainer
}
@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, 1, tile.tickTime);
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++)
{
ICrafting crafting = this.listeners.get(i);
IContainerListener crafting = this.listeners.get(i);
if (this.currentItemBurnTime != tile.runTime)
{
crafting.sendProgressBarUpdate(this, 0, tile.runTime);

10
src/main/java/techreborn/client/container/ContainerVacuumFreezer.java
View file

@ -1,7 +1,7 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.IContainerListener;
import reborncore.client.gui.BaseSlot;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -54,18 +54,18 @@ public class ContainerVacuumFreezer extends ContainerCrafting
super.detectAndSendChanges();
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)
{
icrafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
IContainerListener.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
}
}
}
@Override
public void onCraftGuiOpened(ICrafting crafting)
public void addListener(IContainerListener crafting)
{
super.onCraftGuiOpened(crafting);
super.addListener(crafting);
crafting.sendProgressBarUpdate(this, 3, tile.multiBlockStatus);
}

7
src/main/java/techreborn/init/ModLoot.java
View file

@ -1,6 +1,5 @@
package techreborn.init;
import net.minecraft.util.WeightedRandomChestContent;
//TODO 1.9 nope
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 :
// Arrays.asList(ChestGenHooks.VILLAGE_BLACKSMITH,
// ChestGenHooks.MINESHAFT_CORRIDOR, ChestGenHooks.PYRAMID_DESERT_CHEST,
@ -45,5 +44,5 @@ public class ModLoot
// ChestGenHooks.DUNGEON_CHEST)) {
// ChestGenHooks.addItem(category, chestContent);
// }
}
// }
}

3
src/main/java/techreborn/parts/fluidPipes/MultipartFluidPipe.java
View file

@ -415,9 +415,10 @@ public abstract class MultipartFluidPipe extends Multipart implements INormallyO
}
@Override
public void writeToNBT(NBTTagCompound tag) {
public NBTTagCompound writeToNBT(NBTTagCompound tag) {
super.writeToNBT(tag);
tank.writeToNBT(tag);
return tag;
}
@Override

3
src/main/java/techreborn/tiles/TileAesu.java
View file

@ -131,13 +131,14 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable
return dropStack;
}
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tagCompound.setDouble("euChange", euChange);
tagCompound.setDouble("euLastTick", euLastTick);
tagCompound.setInteger("output", OUTPUT);
inventory.writeToNBT(tagCompound);
return tagCompound;
}
public void readFromNBT(NBTTagCompound nbttagcompound)

3
src/main/java/techreborn/tiles/TileAlloySmelter.java
View file

@ -91,10 +91,11 @@ public class TileAlloySmelter extends TilePowerAcceptor implements IWrenchable,I
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// @Override

3
src/main/java/techreborn/tiles/TileBlastFurnace.java
View file

@ -155,10 +155,11 @@ public class TileBlastFurnace extends TilePowerAcceptor implements IWrenchable,I
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeUpdateToNBT(tagCompound);
return tagCompound;
}
public void writeUpdateToNBT(NBTTagCompound tagCompound)

3
src/main/java/techreborn/tiles/TileCentrifuge.java
View file

@ -115,10 +115,11 @@ public class TileCentrifuge extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
@Override

3
src/main/java/techreborn/tiles/TileChemicalReactor.java
View file

@ -85,10 +85,11 @@ public class TileChemicalReactor extends TilePowerAcceptor implements IWrenchabl
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// ISidedInventory

6
src/main/java/techreborn/tiles/TileDigitalChest.java
View file

@ -127,13 +127,14 @@ public class TileDigitalChest extends TileMachineBase implements IInventoryProvi
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
if (storedItem != null)
{
@ -141,6 +142,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventoryProvi
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
} else
tagCompound.setInteger("storedQuantity", 0);
return tagCompound;
}
@Override

3
src/main/java/techreborn/tiles/TileImplosionCompressor.java
View file

@ -118,10 +118,11 @@ public class TileImplosionCompressor extends TilePowerAcceptor implements IWrenc
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// @Override

3
src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java
View file

@ -88,10 +88,11 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor implements IWr
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// @Override

3
src/main/java/techreborn/tiles/TileIndustrialGrinder.java
View file

@ -128,11 +128,12 @@ public class TileIndustrialGrinder extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
@Override

3
src/main/java/techreborn/tiles/TileIndustrialSawmill.java
View file

@ -135,11 +135,12 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
/* IFluidHandler */

3
src/main/java/techreborn/tiles/TilePlayerDectector.java
View file

@ -118,9 +118,10 @@ public class TilePlayerDectector extends TilePowerAcceptor
}
@Override
public void writeToNBT(NBTTagCompound tag)
public NBTTagCompound writeToNBT(NBTTagCompound tag)
{
super.writeToNBT(tag);
tag.setString("ownerID", owenerUdid);
return tag;
}
}

6
src/main/java/techreborn/tiles/TilePump.java
View file

@ -121,15 +121,17 @@ public class TilePump extends TilePowerAcceptor implements IFluidHandler {
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
tank.writeToNBT(tagCompound);
return tagCompound;
}
// IFluidHandler

10
src/main/java/techreborn/tiles/TileQuantumChest.java
View file

@ -129,20 +129,24 @@ public class TileQuantumChest extends TileMachineBase
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
if (storedItem != null)
{
tagCompound.setTag("storedStack", storedItem.writeToNBT(new NBTTagCompound()));
tagCompound.setInteger("storedQuantity", storedItem.stackSize);
} else
} else{
tagCompound.setInteger("storedQuantity", 0);
}
return tagCompound;
}
@Override

6
src/main/java/techreborn/tiles/TileQuantumTank.java
View file

@ -42,15 +42,17 @@ public class TileQuantumTank extends TileMachineBase
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
writeToNBTWithoutCoords(tagCompound);
return tagCompound;
}
public void writeToNBTWithoutCoords(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBTWithoutCoords(NBTTagCompound tagCompound)
{
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

3
src/main/java/techreborn/tiles/TileRollingMachine.java
View file

@ -183,11 +183,12 @@ public class TileRollingMachine extends TilePowerAcceptor implements IWrenchable
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
ItemUtils.writeInvToNBT(craftMatrix, "Crafting", tagCompound);
writeUpdateToNBT(tagCompound);
return tagCompound;
}
public void writeUpdateToNBT(NBTTagCompound tagCompound)

3
src/main/java/techreborn/tiles/TileVacuumFreezer.java
View file

@ -130,10 +130,11 @@ public class TileVacuumFreezer extends TilePowerAcceptor implements IWrenchable,
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
public int getProgressScaled(int scale)

3
src/main/java/techreborn/tiles/fusionReactor/TileEntityFusionController.java
View file

@ -90,7 +90,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
@ -110,6 +110,7 @@ public class TileEntityFusionController extends TilePowerAcceptor implements IIn
tagCompound.setInteger("finalTickTime", finalTickTime);
tagCompound.setInteger("neededPower", neededPower);
tagCompound.setBoolean("hasStartedCrafting", hasStartedCrafting);
return tagCompound;
}

3
src/main/java/techreborn/tiles/generator/TileDieselGenerator.java
View file

@ -115,10 +115,11 @@ public class TileDieselGenerator extends TilePowerAcceptor implements IWrenchabl
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

3
src/main/java/techreborn/tiles/generator/TileGasTurbine.java
View file

@ -128,10 +128,11 @@ public class TileGasTurbine extends TilePowerAcceptor implements IWrenchable, IF
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

3
src/main/java/techreborn/tiles/generator/TileSemifluidGenerator.java
View file

@ -134,10 +134,11 @@ public class TileSemifluidGenerator extends TilePowerAcceptor implements IWrench
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

3
src/main/java/techreborn/tiles/generator/TileThermalGenerator.java
View file

@ -120,10 +120,11 @@ public class TileThermalGenerator extends TilePowerAcceptor implements IWrenchab
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
tank.writeToNBT(tagCompound);
return tagCompound;
}
public Packet getDescriptionPacket()

11
src/main/java/techreborn/tiles/idsu/TileIDSU.java
View file

@ -61,12 +61,6 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable
}
@Override
public void writeToNBTWithoutCoords(NBTTagCompound tag)
{
}
@Override
public double getMaxPower()
{
@ -120,14 +114,15 @@ public class TileIDSU extends TilePowerAcceptor implements IWrenchable
this.ownerUdid = nbttagcompound.getString("ownerUdid");
}
public void writeToNBT(NBTTagCompound nbttagcompound)
public NBTTagCompound writeToNBT(NBTTagCompound nbttagcompound)
{
super.writeToNBT(nbttagcompound);
if (ownerUdid == null && StringUtils.isBlank(ownerUdid) || StringUtils.isEmpty(ownerUdid))
{
return;
return nbttagcompound;
}
nbttagcompound.setString("ownerUdid", this.ownerUdid);
return nbttagcompound;
}
public void updateEntity()

3
src/main/java/techreborn/tiles/teir1/TileExtractor.java
View file

@ -84,10 +84,11 @@ public class TileExtractor extends TilePowerAcceptor implements IWrenchable,IInv
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
// ISidedInventory

3
src/main/java/techreborn/tiles/teir1/TileGrinder.java
View file

@ -92,10 +92,11 @@ public class TileGrinder extends TilePowerAcceptor implements IWrenchable,IInven
}
@Override
public void writeToNBT(NBTTagCompound tagCompound)
public NBTTagCompound writeToNBT(NBTTagCompound tagCompound)
{
super.writeToNBT(tagCompound);
crafter.writeToNBT(tagCompound);
return tagCompound;
}
public int getProgressScaled(int scale)

4
src/main/java/techreborn/world/TechRebornWorldGen.java
View file

@ -9,7 +9,7 @@ import net.minecraft.block.state.pattern.BlockMatcher;
import net.minecraft.init.Blocks;
import net.minecraft.util.math.BlockPos;
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.IChunkProvider;
import net.minecraft.world.gen.feature.WorldGenMinable;
@ -236,7 +236,7 @@ public class TechRebornWorldGen implements IWorldGenerator
{
int chance = config.rubberTreeConfig.chance;
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))
{
// TODO check the config file for bounds on this, might cause