From 2ad4518f5afdd7d54988b3d06e6652bf11e1fcab Mon Sep 17 00:00:00 2001 From: Trygve Nerland Date: Mon, 18 Mar 2019 17:57:37 +0100 Subject: [PATCH 1/3] Updated repository links --- build.gradle | 8 ++++++- src/main/resources/META-INF/MANIFEST.MF | 28 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/META-INF/MANIFEST.MF diff --git a/build.gradle b/build.gradle index 6181c47..7d3addd 100644 --- a/build.gradle +++ b/build.gradle @@ -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" diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..19c6a14 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Class-Path: guava-21.0.jar jinput-platform-2.0.5-natives-windows.jar c + odecjorbis-20101023.jar netty-all-4.1.9.Final.jar scala-xml_2.11-1.0. + 2.jar scala-continuations-plugin_2.11.1-1.0.2.jar scala-actors-migrat + ion_2.11-1.1.0.jar jline-2.13.jar jinput-platform-2.0.5-natives-linux + .jar commons-codec-1.10.jar jsr305-3.0.1.jar authlib-1.5.25.jar trove + 4j-3.0.3.jar icu4j-core-mojang-51.2.jar realms-1.10.22.jar jei_1.12.2 + -4.8.5.133.jar vecmath-1.5.2.jar forgeSrc-1.12.2-14.23.3.2655.jar htt + pclient-4.3.3.jar scala-library-2.11.1.jar akka-actor_2.11-2.3.3.jar + scala-reflect-2.11.1.jar oshi-core-1.1.jar httpcore-4.3.2.jar jansi-1 + .11.jar lzma-0.0.1.jar fastutil-7.1.0.jar compileDummy.jar lwjgl-plat + form-2.9.4-nightly-20150209-natives-osx.jar albedo-0.1.3.jar scala-sw + ing_2.11-1.0.1.jar librarylwjglopenal-20100824.jar jopt-simple-5.0.3. + jar commons-logging-1.1.3.jar jna-4.4.0.jar libraryjavasound-20101123 + .jar scala-parser-combinators_2.11-1.0.1.jar jinput-2.0.5.jar jinput- + platform-2.0.5-natives-osx.jar commons-io-2.5.jar launchwrapper-1.12. + jar soundsystem-20120107.jar lwjgl-platform-2.9.4-nightly-20150209-na + tives-linux.jar patchy-1.1.jar scala-continuations-library_2.11-1.0.2 + .jar text2speech-1.10.3.jar codecwav-20101023.jar scala-actors-2.11.0 + .jar asm-debug-all-5.2.jar commons-compress-1.8.1.jar commons-lang3-3 + .5.jar gson-2.8.0.jar lwjgl_util-2.9.4-nightly-20150209.jar java-objc + -bridge-1.0.0.jar config-1.2.1.jar providedDummy.jar scala-compiler-2 + .11.1.jar log4j-api-2.8.1.jar lwjgl-2.9.4-nightly-20150209.jar jutils + -1.0.0.jar platform-3.4.0.jar ImmersiveEngineering-0.12-90-521.jar lw + jgl-platform-2.9.4-nightly-20150209-natives-windows.jar log4j-core-2. + 8.1.jar +Main-Class: + From 6f6bdb568220873800ca3c6a1ddc688c797d4baa Mon Sep 17 00:00:00 2001 From: Trygve Nerland Date: Mon, 18 Mar 2019 18:33:23 +0100 Subject: [PATCH 2/3] Added active NBT tag to steam boiler. --- build.gradle | 2 +- .../blocks/metal/tileentities/TileEntityBoiler.java | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 7d3addd..51c67e3 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.3.9" +version = "1.3.10" group = "ferro2000.immersivetech" archivesBaseName = "immersivetech" diff --git a/src/main/java/ferro2000/immersivetech/common/blocks/metal/tileentities/TileEntityBoiler.java b/src/main/java/ferro2000/immersivetech/common/blocks/metal/tileentities/TileEntityBoiler.java index 28e8ae9..294629a 100644 --- a/src/main/java/ferro2000/immersivetech/common/blocks/metal/tileentities/TileEntityBoiler.java +++ b/src/main/java/ferro2000/immersivetech/common/blocks/metal/tileentities/TileEntityBoiler.java @@ -42,6 +42,8 @@ public TileEntityBoiler() { public FluidTank[] tanks = new FluidTank[] {new FluidTank(12000), new FluidTank(24000), new FluidTank(24000)}; public NonNullList inventory = NonNullList.withSize(6, ItemStack.EMPTY); + public boolean active = false; + @Override public void readCustomNBT(NBTTagCompound nbt, boolean descPacket) { @@ -49,6 +51,7 @@ public void readCustomNBT(NBTTagCompound nbt, boolean 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); } @@ -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)); } @@ -73,6 +77,7 @@ public void update() { boolean update = false; if(processQueue.size()0) From 1f0095630c076b8cff0f750262ce5bc57e074de1 Mon Sep 17 00:00:00 2001 From: Trygve Nerland Date: Mon, 18 Mar 2019 18:38:30 +0100 Subject: [PATCH 3/3] Manifest cleanup --- src/main/resources/META-INF/MANIFEST.MF | 28 ------------------------- 1 file changed, 28 deletions(-) delete mode 100644 src/main/resources/META-INF/MANIFEST.MF diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 19c6a14..0000000 --- a/src/main/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,28 +0,0 @@ -Manifest-Version: 1.0 -Class-Path: guava-21.0.jar jinput-platform-2.0.5-natives-windows.jar c - odecjorbis-20101023.jar netty-all-4.1.9.Final.jar scala-xml_2.11-1.0. - 2.jar scala-continuations-plugin_2.11.1-1.0.2.jar scala-actors-migrat - ion_2.11-1.1.0.jar jline-2.13.jar jinput-platform-2.0.5-natives-linux - .jar commons-codec-1.10.jar jsr305-3.0.1.jar authlib-1.5.25.jar trove - 4j-3.0.3.jar icu4j-core-mojang-51.2.jar realms-1.10.22.jar jei_1.12.2 - -4.8.5.133.jar vecmath-1.5.2.jar forgeSrc-1.12.2-14.23.3.2655.jar htt - pclient-4.3.3.jar scala-library-2.11.1.jar akka-actor_2.11-2.3.3.jar - scala-reflect-2.11.1.jar oshi-core-1.1.jar httpcore-4.3.2.jar jansi-1 - .11.jar lzma-0.0.1.jar fastutil-7.1.0.jar compileDummy.jar lwjgl-plat - form-2.9.4-nightly-20150209-natives-osx.jar albedo-0.1.3.jar scala-sw - ing_2.11-1.0.1.jar librarylwjglopenal-20100824.jar jopt-simple-5.0.3. - jar commons-logging-1.1.3.jar jna-4.4.0.jar libraryjavasound-20101123 - .jar scala-parser-combinators_2.11-1.0.1.jar jinput-2.0.5.jar jinput- - platform-2.0.5-natives-osx.jar commons-io-2.5.jar launchwrapper-1.12. - jar soundsystem-20120107.jar lwjgl-platform-2.9.4-nightly-20150209-na - tives-linux.jar patchy-1.1.jar scala-continuations-library_2.11-1.0.2 - .jar text2speech-1.10.3.jar codecwav-20101023.jar scala-actors-2.11.0 - .jar asm-debug-all-5.2.jar commons-compress-1.8.1.jar commons-lang3-3 - .5.jar gson-2.8.0.jar lwjgl_util-2.9.4-nightly-20150209.jar java-objc - -bridge-1.0.0.jar config-1.2.1.jar providedDummy.jar scala-compiler-2 - .11.1.jar log4j-api-2.8.1.jar lwjgl-2.9.4-nightly-20150209.jar jutils - -1.0.0.jar platform-3.4.0.jar ImmersiveEngineering-0.12-90-521.jar lw - jgl-platform-2.9.4-nightly-20150209-natives-windows.jar log4j-core-2. - 8.1.jar -Main-Class: -