From bb007b5a438fa2352ff1c16895222987b598ef14 Mon Sep 17 00:00:00 2001 From: InfectedGriffon <79546684+InfectedGriffon@users.noreply.github.com> Date: Thu, 27 Jul 2023 21:02:09 -0400 Subject: [PATCH] Vinneli's transportalizer textures (#494) * vinneli's transportalizer textures * pretty sure this is how the changelog works? --- CHANGELOG.md | 8 +++ .../mraof/minestuck/block/MSBlockShapes.java | 2 +- .../models/block/trans_portalizer.json | 59 +++++++++--------- .../models/block/transportalizer.json | 58 ++++++++--------- .../textures/block/trans_portalizer.png | Bin 324 -> 745 bytes .../textures/block/transportalizer.png | Bin 240 -> 495 bytes 6 files changed, 67 insertions(+), 60 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c757da9d0b..83d1d3ec85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/). ## [Unreleased] +### Changed + +- New textures and slightly shorter models for transportalizers + +### Contributors for this release + +- Vinnelli, hadean + ## [1.19.2-1.11.0.0] - 2023-07-22 ### Added diff --git a/src/main/java/com/mraof/minestuck/block/MSBlockShapes.java b/src/main/java/com/mraof/minestuck/block/MSBlockShapes.java index 251c357fc3..142284214a 100644 --- a/src/main/java/com/mraof/minestuck/block/MSBlockShapes.java +++ b/src/main/java/com/mraof/minestuck/block/MSBlockShapes.java @@ -101,7 +101,7 @@ public class MSBlockShapes //Misc Machines public static CustomVoxelShape INTELLIBEAM_LASERSTATION = new CustomVoxelShape(new double[]{1,6,0,6,12,4}, new double[]{1,0,1,6,7,6}, new double[]{4,0,12,11,7,16}, new double[]{0,0,6,8,8,12}, new double[]{8,0,4,15,8,12}, new double[]{-1,7,7,16,10,11}, new double[]{6,7,12,11,16,16}, new double[]{6,15,11,11,21,15}, new double[]{4,20,8,14,26,14}, new double[]{-1,20,7,4,27,15}, new double[]{5,19,5,12,22,10}, new double[]{6,22,6,11,24,8}); - public static CustomVoxelShape TRANSPORTALIZER = new CustomVoxelShape(new double[]{0,0,0,16,6,16}, new double[]{1,6,1,15,8,15}); + public static CustomVoxelShape TRANSPORTALIZER = new CustomVoxelShape(new double[]{0,0,0,16,5,16}, new double[]{1,5,1,15,7,15}); public static CustomVoxelShape SENDIFICATOR = new CustomVoxelShape(new double[]{0,0,0,16,1,16},new double[]{0,16,0,16,15,16},new double[]{0,1,0,1,15,16},new double[]{16,1,0,15,15,16},new double[]{1,1,15,15,15,16}); public static CustomVoxelShape GRIST_WIDGET = new CustomVoxelShape(new double[]{6,0,5,10,1.5,11.7}, new double[]{2.5,1,5.3,13.5,2.1,11.15}, new double[]{10,0,5,14,1.75,12}, new double[]{11,0.3,11.2,13,1.3,12.2}, new double[]{2,0,5,6,1.75,11}, new double[]{6,0,5,4,1.75,7}).rotate(Direction.SOUTH); public static CustomVoxelShape ANTHVIL = new CustomVoxelShape(new double[]{2,0,6,14,4,10},new double[]{4,4,7,12,7,9},new double[]{0,7,4,16,14,12}); diff --git a/src/main/resources/assets/minestuck/models/block/trans_portalizer.json b/src/main/resources/assets/minestuck/models/block/trans_portalizer.json index c7a5920829..f540e87416 100644 --- a/src/main/resources/assets/minestuck/models/block/trans_portalizer.json +++ b/src/main/resources/assets/minestuck/models/block/trans_portalizer.json @@ -1,32 +1,31 @@ { - "textures": { - "particle": "minestuck:item/trans_portalizer", - "texture": "minestuck:block/trans_portalizer" - }, - "elements": [ - { - "from": [0, 0, 0], - "to": [16, 6, 16], - "faces": { - "north": {"uv": [8, 9, 16, 12], "texture": "#texture", "cullface": "north"}, - "east": {"uv": [8, 13, 16, 16], "texture": "#texture", "cullface": "east"}, - "south": {"uv": [8, 9, 16, 12], "texture": "#texture", "cullface": "south"}, - "west": {"uv": [8, 13, 16, 16], "texture": "#texture", "cullface": "west"}, - "up": {"uv": [0, 0, 8, 8], "texture": "#texture"}, - "down": {"uv": [0, 8, 8, 16], "texture": "#texture", "cullface": "down"} - } - }, - { - "from": [1, 6, 1], - "to": [15, 8, 15], - "faces": { - "north": {"uv": [0.5, 15, 7.5, 16], "texture": "#texture"}, - "east": {"uv": [7.5, 4, 15.5, 5], "texture": "#texture"}, - "south": {"uv": [0.5, 15, 7.5, 16], "texture": "#texture"}, - "west": {"uv": [8, 8, 16, 9], "texture": "#texture"}, - "up": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#texture"}, - "down": {"uv": [0, 0, 0, 0], "texture": "#texture"} - } - } - ] + "credit": "Made with Blockbench", + "textures": { + "particle": "minestuck:block/trans_portalizer" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 9, 16, 11.5], "texture": "#particle", "cullface": "north"}, + "east": {"uv": [8, 5, 16, 7.5], "texture": "#particle", "cullface": "east"}, + "south": {"uv": [8, 1, 16, 3.5], "texture": "#particle", "cullface": "south"}, + "west": {"uv": [8, 13, 16, 15.5], "texture": "#particle", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#particle"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#particle", "cullface": "down"} + } + }, + { + "from": [1, 5, 1], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [8.5, 8, 15.5, 9], "texture": "#particle"}, + "east": {"uv": [8.5, 4, 15.5, 5], "texture": "#particle"}, + "south": {"uv": [8.5, 0, 15.5, 1], "texture": "#particle"}, + "west": {"uv": [8.5, 12, 15.5, 13], "texture": "#particle"}, + "up": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#particle"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minestuck/models/block/transportalizer.json b/src/main/resources/assets/minestuck/models/block/transportalizer.json index aa27ec6935..90b4a826f3 100644 --- a/src/main/resources/assets/minestuck/models/block/transportalizer.json +++ b/src/main/resources/assets/minestuck/models/block/transportalizer.json @@ -1,31 +1,31 @@ { - "textures": { - "particle": "minestuck:item/transportalizer", - "texture": "minestuck:block/transportalizer" - }, - "elements": [ - { - "from": [ 0, 0, 0 ], - "to": [ 16, 6, 16 ], - "faces": { - "down": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" }, - "south": { "uv": [ 8, 1, 16, 4 ], "texture": "#texture", "cullface": "south" }, - "east": { "uv": [ 8, 5, 16, 8 ], "texture": "#texture", "cullface": "east" }, - "north": { "uv": [ 8, 9, 16, 12 ], "texture": "#texture", "cullface": "north" }, - "west": { "uv": [ 8, 13, 16, 16 ], "texture": "#texture", "cullface": "west" } - } - }, - { - "from": [ 1, 6, 1 ], - "to": [ 15, 8, 15 ], - "faces": { - "up": { "uv": [ 0.5, 0.5, 7.5, 7.5 ], "texture": "#texture" }, - "south": { "uv": [ 7.5, 0, 15.5, 1 ], "texture": "#texture" }, - "east": { "uv": [ 7.5, 4, 15.5, 5 ], "texture": "#texture" }, - "north": { "uv": [ 7.5, 8, 15.5, 9 ], "texture": "#texture" }, - "west": { "uv": [ 7.5, 12, 15.5, 13 ], "texture": "#texture" } - } - } - ] + "credit": "Made with Blockbench", + "textures": { + "particle": "minestuck:block/transportalizer" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 5, 16], + "faces": { + "north": {"uv": [8, 9, 16, 11.5], "texture": "#particle", "cullface": "north"}, + "east": {"uv": [8, 5, 16, 7.5], "texture": "#particle", "cullface": "east"}, + "south": {"uv": [8, 1, 16, 3.5], "texture": "#particle", "cullface": "south"}, + "west": {"uv": [8, 13, 16, 15.5], "texture": "#particle", "cullface": "west"}, + "up": {"uv": [0, 0, 8, 8], "texture": "#particle"}, + "down": {"uv": [0, 8, 8, 16], "texture": "#particle", "cullface": "down"} + } + }, + { + "from": [1, 5, 1], + "to": [15, 7, 15], + "faces": { + "north": {"uv": [8.5, 8, 15.5, 9], "texture": "#particle"}, + "east": {"uv": [8.5, 4, 15.5, 5], "texture": "#particle"}, + "south": {"uv": [8.5, 0, 15.5, 1], "texture": "#particle"}, + "west": {"uv": [8.5, 12, 15.5, 13], "texture": "#particle"}, + "up": {"uv": [0.5, 0.5, 7.5, 7.5], "texture": "#particle"} + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/minestuck/textures/block/trans_portalizer.png b/src/main/resources/assets/minestuck/textures/block/trans_portalizer.png index 61a08693e13971f100aff871766d3c87dc808f2d..864fe4e260fb35ca3461bc5f6e99aaf82de53f58 100644 GIT binary patch delta 722 zcmV;@0xkW-0_g>iBYy&xNklNGE~7C9ycs!@_|6 z4K_lGJ1sRy9S&l!(f`6i54MQ3aV(A0`24I^7C^HF6Zycy;p6{iZ=-x2?KcukHXau!dEvQzL?1-W$Xti2Fv)R01 z?&Ov9oCfTb-!POkgAz*dSGAS}OfZaSB50qVfa-NerrSup_F_T`{1^QAmSEJ8&HfQYICzR&U1kCrN0 zE<@FUsks&FV|3dCd3%@VTm>Nr{60Gl`UXZ*m{>E1O)l4gKJeF7`YaO!wx9fR0UFDj92|{4G)2358fh=&6AqncSuIKq) zUPku=^?E(-bUIpIsZ{ho*KKQ1!usd$y}5yxI8+2H^rArYXt=gE=FPJdugGXRhXOpTec53cc2 zz!l(W;PRt7q5_ih6IcYRfV@C^p!_sM59B6*wLIP&4H@YJ2^STY1p5G)kQ2a|RM6&o z$|Bl`cqQ<|ag(2wAup+~J)q1(v=yg#AZs7cJVu1k`eOBCR0t@&H^Nq@U{?e*CeErr wAy5?9M1kGB1tZ#ikhKgoBnp9|z~&0P0P<>rJkgMg^Z)<=07*qoM6N<$g1Ih$B=u8~}Yj5})D zN^pXbCXVA8-uu3P#&LYrT*q;wZP6Uu`~Li2c&JH$J!;E zB+db>0nd8an+1T**b#uN>sr)ZG)MyAeAu;rju!b9{{?`QDt`tP-PAzo{0WBRl?<@B zWgs^O3pC0MawY(tW~*)_rUq18w0p}!0)T=jLiJna`!&WQQLR31K424(YFmW&mTr!x zn-5q9kX-qI6{sCa)WoC@cv`LKyeMsKRCqrACPEbD?Cp``z0yZF05(y?h`RVdjh`#S zin4L}KqCcSvG&se>*h~nVB%0{01*eW4zSv*uRpwF&a$6CmoRv` L`njxgN@xNAL+@46