From a01562eefe4a91cea02f913c91c245702cf34ba9 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Tue, 17 May 2016 12:32:35 -0400 Subject: [PATCH] Fixed config sync, fixed all generator rendering, fixed generator GUI issue --- .../common/network/PacketConfigSync.java | 2 +- .../client/GeneratorsClientProxy.java | 3 +++ .../client/gui/GuiBioGenerator.java | 4 ++-- .../client/gui/GuiGasGenerator.java | 4 ++-- .../client/gui/GuiHeatGenerator.java | 4 ++-- .../client/gui/GuiSolarGenerator.java | 4 ++-- .../client/gui/GuiWindGenerator.java | 4 ++-- .../render/item/BakedGeneratorItemModel.java | 19 +++---------------- .../blockstates/advanced_solar_generator.json | 4 ---- .../blockstates/bio_generator.json | 4 ---- .../blockstates/gas_generator.json | 4 ---- .../blockstates/heat_generator.json | 4 ---- .../blockstates/solar_generator.json | 4 ---- .../blockstates/wind_generator.json | 4 ---- 14 files changed, 17 insertions(+), 51 deletions(-) diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 53be4f315..8b162c2cb 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -189,7 +189,7 @@ public class PacketConfigSync implements IMessageHandler getFaceQuads(EnumFacing facing) { - List faceQuads = new LinkedList(); - - /*if(Block.getBlockFromItem(stack.getItem()) != null) - { - MachineType machineType = MachineType.get(stack); - - if(machineType != MachineType.QUANTUM_ENTANGLOPORTER && machineType != MachineType.RESISTIVE_HEATER) - { - if(!(stack.getItem() instanceof ItemBlockEnergyCube)) - { - faceQuads.addAll(baseModel.getFaceQuads(facing)); - } - } - }*/ - - return faceQuads; + return new LinkedList(); } @Override diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/advanced_solar_generator.json b/src/main/resources/assets/mekanismgenerators/blockstates/advanced_solar_generator.json index 591d119c5..b27ef28bf 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/advanced_solar_generator.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/advanced_solar_generator.json @@ -10,10 +10,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/bio_generator.json b/src/main/resources/assets/mekanismgenerators/blockstates/bio_generator.json index 591d119c5..b27ef28bf 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/bio_generator.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/bio_generator.json @@ -10,10 +10,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/gas_generator.json b/src/main/resources/assets/mekanismgenerators/blockstates/gas_generator.json index 591d119c5..b27ef28bf 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/gas_generator.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/gas_generator.json @@ -10,10 +10,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/heat_generator.json b/src/main/resources/assets/mekanismgenerators/blockstates/heat_generator.json index 591d119c5..b27ef28bf 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/heat_generator.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/heat_generator.json @@ -10,10 +10,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/solar_generator.json b/src/main/resources/assets/mekanismgenerators/blockstates/solar_generator.json index 591d119c5..b27ef28bf 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/solar_generator.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/solar_generator.json @@ -10,10 +10,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanismgenerators/blockstates/wind_generator.json b/src/main/resources/assets/mekanismgenerators/blockstates/wind_generator.json index 591d119c5..b27ef28bf 100644 --- a/src/main/resources/assets/mekanismgenerators/blockstates/wind_generator.json +++ b/src/main/resources/assets/mekanismgenerators/blockstates/wind_generator.json @@ -10,10 +10,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } }