diff --git a/build.gradle b/build.gradle index ff7f4ba..4e896ce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ def mainVersion = "1.2" -def buildNumber = "5" +def buildNumber = "6" // For those who want the bleeding edge buildscript { diff --git a/changelog.md b/changelog.md index a87d17b..98767f1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,9 @@ +#####Version 1.2-6 + - reduced the discrepancies between IC2 cables and Industrial Wires + - machines don't explode when they shouldn't except in some corner cases + - potentially fixed missing textures on the mechanical converters + - added Chinese translations (thanks SihenZhang) + #####Version 1.2-5 (10,000 download celebratory release) - added mechanical converters and the rotational motor - they convert between IE rotational energy (windmill, dynamo etc) and IC2 kinetic energy diff --git a/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java b/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java index 5f64399..6d3a407 100644 --- a/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java +++ b/src/main/java/malte0811/industrialWires/blocks/wire/TileEntityIC2ConnectorTin.java @@ -252,6 +252,16 @@ public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable im relay = nbt.getBoolean("relay"); inBuffer = nbt.getDouble("inBuffer"); outBuffer = nbt.getDouble("outBuffer"); + if (nbt.hasKey("maxToNet")) { + maxToNet = nbt.getDouble("maxToNet"); + } else { + maxToNet = inBuffer; + } + if (nbt.hasKey("maxToMachine")) { + maxToMachine = nbt.getDouble("maxToMachine"); + } else { + maxToMachine = outBuffer; + } } @Override @@ -261,6 +271,8 @@ public class TileEntityIC2ConnectorTin extends TileEntityImmersiveConnectable im nbt.setBoolean("relay", relay); nbt.setDouble("inBuffer", inBuffer); nbt.setDouble("outBuffer", outBuffer); + nbt.setDouble("maxToNet", maxToNet); + nbt.setDouble("maxToMachine", maxToMachine); } @Override diff --git a/src/main/resources/assets/industrialwires/blockstates/mechanical_converter.json b/src/main/resources/assets/industrialwires/blockstates/mechanical_converter.json index b32b344..2a7b316 100644 --- a/src/main/resources/assets/industrialwires/blockstates/mechanical_converter.json +++ b/src/main/resources/assets/industrialwires/blockstates/mechanical_converter.json @@ -2,7 +2,7 @@ "forge_marker": 1, "defaults": { "transform": "forge:default-block", - "model": "immersiveengineering:ieSixSides", + "model": "industrialwires:iwSixSides", "textures": { }, diff --git a/src/main/resources/assets/industrialwires/models/block/iwSixSides.json b/src/main/resources/assets/industrialwires/models/block/iwSixSides.json new file mode 100644 index 0000000..aca4a24 --- /dev/null +++ b/src/main/resources/assets/industrialwires/models/block/iwSixSides.json @@ -0,0 +1,18 @@ +{ + "elements": [{ + "from": [ 0,0,0 ], + "to": [ 16,16,16 ], + "faces": { + "down": { "texture": "#bottom", "uv": [0,0,16,16] }, + "up": { "texture": "#top", "uv": [0,0,16,16] }, + "north": { "texture": "#north", "uv": [0,0,16,16] }, + "south": { "texture": "#south", "uv": [0,0,16,16] }, + "west": { "texture": "#west", "uv": [0,0,16,16] }, + "east": { "texture": "#east", "uv": [0,0,16,16] } + } + }], + "textures": + { + "particle": "#top" + } +} \ No newline at end of file