Skip to content

Updated MAVEN repositories and added active NBT tag to steam boiler #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
trygve55 wants to merge 3 commits into
base: Latest
Choose a base branch
from
Open

Updated MAVEN repositories and added active NBT tag to steam boiler #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ad4518
Updated repository links
trygve55 Mar 18, 2019
6f6bdb5
Added active NBT tag to steam boiler.
trygve55 Mar 18, 2019
1f00956
Manifest cleanup
trygve55 Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "1.3.9"
version = "1.3.10"
group = "ferro2000.immersivetech"
archivesBaseName = "immersivetech"

Expand Down Expand Up @@ -63,12 +63,18 @@ repositories {
name 'CoFH Maven'
url "http://maven.covers1624.net/"
}
repositories {//Curseforge maven, in case some other maven goes offline
maven {
name = "CurseForge"
url = "https://minecraft.curseforge.com/api/maven/"
}
}
}

dependencies {
deobfCompile "blusunrize:ImmersiveEngineering:0.12-+"
deobfCompile "mezz.jei:jei_1.12.2:4.8.5.133"
deobfCompile "elucent:albedo:2.0-SNAPSHOT"
deobfCompile "albedo:albedo:0.1.3"
compileOnly "mcjty.theoneprobe:TheOneProbe-1.12:1.12-1.+"//1.1x-1.4.4-55
compileOnly "mcp.mobius.waila:Hwyla:1.8.20-B35_1.12"
compileOnly "cofh:RedstoneFlux:1.12-2.+:deobf"
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/ferro2000/immersivetech/common/blocks/metal/tileentities/TileEntityBoiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,16 @@ public TileEntityBoiler() {
public FluidTank[] tanks = new FluidTank[] {new FluidTank(12000), new FluidTank(24000), new FluidTank(24000)};
public NonNullList<ItemStack> inventory = NonNullList.withSize(6, ItemStack.EMPTY);

public boolean active = false;

@Override
public void readCustomNBT(NBTTagCompound nbt, boolean descPacket)
{
super.readCustomNBT(nbt, descPacket);
tanks[0].readFromNBT(nbt.getCompoundTag("tank0"));
tanks[1].readFromNBT(nbt.getCompoundTag("tank1"));
tanks[2].readFromNBT(nbt.getCompoundTag("tank2"));
active = nbt.getBoolean("active");
if(!descPacket)
inventory = Utils.readInventory(nbt.getTagList("inventory", 10), 6);
}
Expand All @@ -60,6 +63,7 @@ public void writeCustomNBT(NBTTagCompound nbt, boolean descPacket)
nbt.setTag("tank0", tanks[0].writeToNBT(new NBTTagCompound()));
nbt.setTag("tank1", tanks[1].writeToNBT(new NBTTagCompound()));
nbt.setTag("tank2", tanks[2].writeToNBT(new NBTTagCompound()));
nbt.setBoolean("active", active);
if(!descPacket)
nbt.setTag("inventory", Utils.writeInventory(inventory));
}
Expand All @@ -73,6 +77,7 @@ public void update() {
boolean update = false;
if(processQueue.size()<this.getProcessQueueMaxLength())
{
active = false;
if(!isRSDisabled() && tanks[0].getFluid()!=null && tanks[0].getFluid().getFluid()!=null) {

int burnTime = DieselHandler.getBurnTime(tanks[0].getFluid().getFluid());
Expand All @@ -94,13 +99,15 @@ public void update() {
this.addProcessToQueue(process, false);
tanks[0].drain(fluidConsumed, true);
update = true;

active = true;
}
}
}
}
}
}
} else {
active = true;
}

if(this.tanks[2].getFluidAmount()>0)
Expand Down