From e952e1373491607e44c8974f9ec380b87866befd Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Mon, 26 Sep 2016 19:37:21 +0200 Subject: [PATCH] Fix solderer model --- .../refinedstorage/block/BlockSolderer.java | 6 - .../refinedstorage/blockstates/solderer.json | 5 +- .../refinedstorage/models/block/solderer.json | 280 +----------------- .../textures/blocks/solderer_glass.png | Bin 1068 -> 0 bytes 4 files changed, 4 insertions(+), 287 deletions(-) delete mode 100755 src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png diff --git a/src/main/java/refinedstorage/block/BlockSolderer.java b/src/main/java/refinedstorage/block/BlockSolderer.java index 3d2c803ad..848add815 100755 --- a/src/main/java/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/refinedstorage/block/BlockSolderer.java @@ -5,7 +5,6 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; @@ -59,11 +58,6 @@ public class BlockSolderer extends BlockNode { return false; } - @Override - public BlockRenderLayer getBlockLayer() { - return BlockRenderLayer.TRANSLUCENT; - } - @Override public EnumPlacementType getPlacementType() { return EnumPlacementType.HORIZONTAL; diff --git a/src/main/resources/assets/refinedstorage/blockstates/solderer.json b/src/main/resources/assets/refinedstorage/blockstates/solderer.json index 27d066cd3..950752060 100755 --- a/src/main/resources/assets/refinedstorage/blockstates/solderer.json +++ b/src/main/resources/assets/refinedstorage/blockstates/solderer.json @@ -3,8 +3,9 @@ "defaults": { "model": "refinedstorage:solderer", "textures": { - "particle": "refinedstorage:blocks/solderer_side" - } + "particle": "refinedstorage:blocks/solderer_top" + }, + "uvlock": false }, "variants": { "inventory": [ diff --git a/src/main/resources/assets/refinedstorage/models/block/solderer.json b/src/main/resources/assets/refinedstorage/models/block/solderer.json index c2883a841..3d88548fa 100755 --- a/src/main/resources/assets/refinedstorage/models/block/solderer.json +++ b/src/main/resources/assets/refinedstorage/models/block/solderer.json @@ -6,9 +6,7 @@ "2": "refinedstorage:blocks/solderer_bottom", "3": "refinedstorage:blocks/solderer_middle", "4": "refinedstorage:blocks/solderer_roof", - "5": "refinedstorage:blocks/solderer_elements", - "6": "refinedstorage:blocks/solderer_glass", - "-1": "refinedstorage:blocks/solderer_glass" + "5": "refinedstorage:blocks/solderer_elements" }, "elements": [ { @@ -976,282 +974,6 @@ ] } } - }, - { - "name": "Window1", - "from": [ - 2.0, - 7.0, - 14.0 - ], - "to": [ - 14.0, - 13.0, - 15.0 - ], - "faces": { - "north": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "south": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 12.0, - 1.0 - ] - }, - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 12.0, - 1.0 - ] - } - } - }, - { - "name": "Window2", - "from": [ - 2.0, - 7.0, - 1.0 - ], - "to": [ - 14.0, - 13.0, - 2.0 - ], - "faces": { - "north": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "east": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "south": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "west": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 12.0, - 1.0 - ] - }, - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 12.0, - 1.0 - ] - } - } - }, - { - "name": "Window3", - "from": [ - 14.0, - 7.0, - 2.0 - ], - "to": [ - 15.0, - 13.0, - 14.0 - ], - "faces": { - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "east": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "west": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 12.0 - ] - }, - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 12.0 - ] - } - } - }, - { - "name": "Window4", - "from": [ - 1.0, - 7.0, - 2.0 - ], - "to": [ - 2.0, - 13.0, - 14.0 - ], - "faces": { - "north": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "east": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "south": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 6.0 - ] - }, - "west": { - "texture": "#6", - "uv": [ - 2.0, - 5.0, - 14.0, - 11.0 - ] - }, - "up": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 12.0 - ] - }, - "down": { - "texture": "#-1", - "uv": [ - 0.0, - 0.0, - 1.0, - 12.0 - ] - } - } } ] } \ No newline at end of file diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png b/src/main/resources/assets/refinedstorage/textures/blocks/solderer_glass.png deleted file mode 100755 index 0ff7c19c6ef3173d709cf61d7ab28a44368d356d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1068 zcmaJ=O-K|`93K!PWGyd2dg(EWB(?LkjyjW@>CUQKuGl)DMUdmnQ-^itjWbVol>&)^ zf-ZTe4uYo+T{?K_OG%5&4%H!~G6F#`vOvp2c&Xm3u6Ae}c=JB^{eJ(C_j}jcTAK2en zxv6&I&UlNgBa6{|43oAT!ltO&y0oL|Nr*u=>^1E$z4rJC4NN0UcZhK=?nGdp**xOH z_K{XqA4%$xLDwAzwP~3MSP*L7T#(~so|6R*Y=1O~<{CY6LTTKNMRsAj4`WAW*;FdU zq(TgGds$wRB$g9cK?o8=&>Oa~mJZrpX;wjjp6;3sHjxc{MXehR;xJ7z-73Lyc4TdD zyG^8FY+7?zp5gqGvcP!!|4_@?L3=m>ck}(Hu%`|?kWD}j4Z1qHxSmo!lp{x6sA1%) z2=!;X*w%+I^7@biB9Tnjz~K(lHc-l|$Z+CuIc9rUvvn9#!ZcA~Ow*9LDxo0~tqRqI zB$4N%RSkk9D%H{I5GRU!sGiGm6{HVZ(8gJ=vCFN@$@T4EIV7?IU2_N;jV`i4rfk{F zoeQ5+Z<}l6&PB+{Wl1uuf4P5McJ_!k$Y1VQmuz;-4{hRjmsne_nXVzvVmzkQtLepW zW2g2#0|8~zeyG0rbPN_3O{|_NxqEt2?^qbSGQ0e}Ydsmfug_YG`-{r*UkpqoPBNF5 z&L)TEMyG$SydQu2{9ur|GsPCD=aSQ-1Ksm#?c9SSGp{!)fin6fa68OP^Xnf2BWpLQ z>t9>mbshMy94M1M_n){Co4g7xUdSJN#Da=Vro1Wd)zj5q=Z7bjN@u8BYR?ZGSXlAj NZ!FrX+-vB%^aoFtVBY`$