diff --git a/changelog b/changelog index 58f5291f8..53b14aebf 100644 --- a/changelog +++ b/changelog @@ -9,7 +9,7 @@ * Reduced steam demand of the rotary furnace's hotter fuels by a bit * The acidizer now has a sound loop (chemplant sound at 75% pitch) * Updated some bomb part recipes, mainly to make use of the new neutron reflectors and some more modern materials (why did ivy mike coolers still use iron?) -* Updated the fat man igniter icon +* Updated the fat man igniter and gadget wiring icons * The cape items, which haven't actually been used by anyone ever, are now deprecated. Existing capes will still work, but the items are now unobtainable * Some long deprecated melee weapons have now been properly removed diff --git a/gradle.properties b/gradle.properties index 0d9971fd7..7d124d5c0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=5685 +mod_build_number=5687 credits=HbMinecraft,\ \ rodolphito (explosion algorithms),\ diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 17c8762d6..fbac100cb 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (5685)"; + public static final String VERSION = "1.0.27 BETA (5687)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCargoElevator.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCargoElevator.java index b2915be0d..2c4f35911 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCargoElevator.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCargoElevator.java @@ -9,6 +9,7 @@ import com.hbm.tileentity.TileEntityLoadedBase; import io.netty.buffer.ByteBuf; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; @@ -116,6 +117,24 @@ public class TileEntityCargoElevator extends TileEntityLoadedBase { this.sync = 3; } } + + @Override + public void readFromNBT(NBTTagCompound nbt) { + super.readFromNBT(nbt); + + this.extension = nbt.getDouble("extension"); + this.isExtending = nbt.getBoolean("isExtending"); + this.height = nbt.getInteger("height"); + } + + @Override + public void writeToNBT(NBTTagCompound nbt) { + super.writeToNBT(nbt); + + nbt.setDouble("extension", extension); + nbt.setBoolean("isExtending", isExtending); + nbt.setInteger("height", height); + } AxisAlignedBB bb = null; diff --git a/src/main/resources/assets/hbm/textures/gui/weapon/gadgetSchematic.png b/src/main/resources/assets/hbm/textures/gui/weapon/gadgetSchematic.png index 940e0b62b..1f49bc39f 100644 Binary files a/src/main/resources/assets/hbm/textures/gui/weapon/gadgetSchematic.png and b/src/main/resources/assets/hbm/textures/gui/weapon/gadgetSchematic.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_advanced_alloy2.png b/src/main/resources/assets/hbm/textures/items/coil_advanced_alloy2.png new file mode 100644 index 000000000..e30b5bc13 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/coil_advanced_alloy2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_copper2.png b/src/main/resources/assets/hbm/textures/items/coil_copper2.png new file mode 100644 index 000000000..3d80b2b2a Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/coil_copper2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_gold2.png b/src/main/resources/assets/hbm/textures/items/coil_gold2.png new file mode 100644 index 000000000..d6fc926ff Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/coil_gold2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_magnetized_tungsten2.png b/src/main/resources/assets/hbm/textures/items/coil_magnetized_tungsten2.png new file mode 100644 index 000000000..131f3920b Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/coil_magnetized_tungsten2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_magnetized_tungsten_torus.png b/src/main/resources/assets/hbm/textures/items/coil_magnetized_tungsten_torus.png deleted file mode 100644 index 1a221c6e5..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coil_magnetized_tungsten_torus.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coil_tungsten2.png b/src/main/resources/assets/hbm/textures/items/coil_tungsten2.png new file mode 100644 index 000000000..371c14e84 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/coil_tungsten2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_buff.png b/src/main/resources/assets/hbm/textures/items/coin_siege_buff.png deleted file mode 100644 index 8ebc69b28..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_buff.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_clay.png b/src/main/resources/assets/hbm/textures/items/coin_siege_clay.png deleted file mode 100644 index 947858aa4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_clay.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_desh.png b/src/main/resources/assets/hbm/textures/items/coin_siege_desh.png deleted file mode 100644 index 9cddb3eaa..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_desh.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_dnt.png b/src/main/resources/assets/hbm/textures/items/coin_siege_dnt.png deleted file mode 100644 index 5bbc20d27..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_dnt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_gold.png b/src/main/resources/assets/hbm/textures/items/coin_siege_gold.png deleted file mode 100644 index 29e2905a5..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_gold.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_iron.png b/src/main/resources/assets/hbm/textures/items/coin_siege_iron.png deleted file mode 100644 index fab5f15b4..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_iron.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_schrab.png b/src/main/resources/assets/hbm/textures/items/coin_siege_schrab.png deleted file mode 100644 index fa704bb05..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_schrab.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_silver.png b/src/main/resources/assets/hbm/textures/items/coin_siege_silver.png deleted file mode 100644 index 06f76a95d..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_silver.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/coin_siege_stone.png b/src/main/resources/assets/hbm/textures/items/coin_siege_stone.png deleted file mode 100644 index 0c0d3544c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/coin_siege_stone.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gadget_explosive.png b/src/main/resources/assets/hbm/textures/items/gadget_explosive.png deleted file mode 100644 index 90e56db3c..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/gadget_explosive.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/gadget_wireing.png b/src/main/resources/assets/hbm/textures/items/gadget_wireing.png index e0702c51f..d75d41e0c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/gadget_wireing.png and b/src/main/resources/assets/hbm/textures/items/gadget_wireing.png differ diff --git a/src/main/resources/assets/hbm/textures/items/man_core_alt.png b/src/main/resources/assets/hbm/textures/items/man_core_alt.png deleted file mode 100644 index b33396451..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/man_core_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/man_explosive.png b/src/main/resources/assets/hbm/textures/items/man_explosive.png deleted file mode 100644 index 0c1d73ade..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/man_explosive.png and /dev/null differ