From 1a3e66cc72b005bf2f9496c83e2fd0ca9801267d Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sun, 6 Aug 2017 19:46:51 +0200 Subject: [PATCH] Added CTM integration for Disk Manipulator, remove Processing Pattern Encoder GUI texture, fixes #1406 --- CHANGELOG.md | 3 + .../refinedstorage/render/ModelDiskDrive.java | 1 + .../render/ModelDiskManipulator.java | 12 ++- .../disk_manipulator_connected_glow.json | 69 ++++++++++++++++++ .../disk_manipulator_connected_glow.png | Bin 0 -> 255 bytes ...disk_manipulator_connected_glow.png.mcmeta | 9 +++ .../gui/processing_pattern_encoder.png | Bin 2575 -> 0 bytes 7 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected_glow.json create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png create mode 100644 src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png.mcmeta delete mode 100755 src/main/resources/assets/refinedstorage/textures/gui/processing_pattern_encoder.png diff --git a/CHANGELOG.md b/CHANGELOG.md index adaab269c..ae7daef99 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Refined Storage Changelog +### 1.5.15 +- Added CTM integration for Disk Manipulator (raoulvdberge) + ### 1.5.14 - Updated Forge to 2426 (raoulvdberge) - Updated French translation (cylek56) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java index 7ab2ddd98..13e232c29 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java @@ -15,6 +15,7 @@ import java.util.function.Function; public class ModelDiskDrive implements IModel { private static final ResourceLocation MODEL_BASE = new ResourceLocation("refinedstorage:block/disk_drive"); + private static final ResourceLocation MODEL_DISK = new ResourceLocation("refinedstorage:block/disk"); private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation("refinedstorage:block/disk_near_capacity"); private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation("refinedstorage:block/disk_full"); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java index 00588732f..18fa8c53f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java @@ -7,20 +7,25 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModel; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.fml.common.Loader; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.function.Function; public class ModelDiskManipulator implements IModel { - private static final ResourceLocation MODEL_BASE_CONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_connected"); + private static final ResourceLocation MODEL_BASE_CONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_connected" + (Loader.isModLoaded("ctm") ? "_glow" : "")); private static final ResourceLocation MODEL_BASE_DISCONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_disconnected"); + private static final ResourceLocation MODEL_DISK = new ResourceLocation("refinedstorage:block/disk"); private static final ResourceLocation MODEL_DISK_NEAR_CAPACITY = new ResourceLocation("refinedstorage:block/disk_near_capacity"); private static final ResourceLocation MODEL_DISK_FULL = new ResourceLocation("refinedstorage:block/disk_full"); private static final ResourceLocation MODEL_DISK_DISCONNECTED = new ResourceLocation("refinedstorage:block/disk_disconnected"); + private static final ResourceLocation TEXTURE_BASE_CONNECTED_GLOW = new ResourceLocation("refinedstorage:blocks/disk_manipulator_connected_glow"); + @Override public Collection getDependencies() { List dependencies = new ArrayList<>(); @@ -35,6 +40,11 @@ public class ModelDiskManipulator implements IModel { return dependencies; } + @Override + public Collection getTextures() { + return Collections.singletonList(TEXTURE_BASE_CONNECTED_GLOW); + } + @Override public IBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { IModel baseModelConnected, baseModelDisconnected; diff --git a/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected_glow.json b/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected_glow.json new file mode 100644 index 000000000..13c2a94fb --- /dev/null +++ b/src/main/resources/assets/refinedstorage/models/block/disk_manipulator_connected_glow.json @@ -0,0 +1,69 @@ +{ + "parent": "block/block", + "textures": { + "particle": "refinedstorage:blocks/disk_manipulator_connected", + "front": "refinedstorage:blocks/disk_manipulator_connected", + "glow": "refinedstorage:blocks/disk_manipulator_connected_glow", + "bottom": "refinedstorage:blocks/side", + "top": "refinedstorage:blocks/side", + "side": "refinedstorage:blocks/side" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "texture": "#top", + "cullface": "up" + }, + "north": { + "texture": "#front", + "cullface": "north" + }, + "south": { + "texture": "#side", + "cullface": "south" + }, + "west": { + "texture": "#side", + "cullface": "west" + }, + "east": { + "texture": "#side", + "cullface": "east" + } + } + }, + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "north": { + "texture": "#glow", + "cullface": "north" + } + } + } + ] +} diff --git a/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png b/src/main/resources/assets/refinedstorage/textures/blocks/disk_manipulator_connected_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..5558434a49cecd8889288e0089e9623adeac39f9 GIT binary patch literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJwr2>%=KS^it;^O978Ppm!7fZb8wJod1yQ9kZFd=xdj4xPZw+bqE;Y$1q!&a645kpf`NsEk6=SkjFLz`Aebxx^5Q{7 z5D<5dU~2?)C7PhXTI54QLKSEcgQtpCKtx!JEE3R&5uv`D*!CR%?C<^2y=Ug!nLBr$ zdG4LLXO2hHD9h}f?EwJGBEomZ005bX5WrZO6|XLVZdU01+jngTps{SpVv02YRvFInvUmy?&g+h@?l$n_+7K^j8vLq5oZf7+Pe@>F)0C>_yCC z&c^@c50!xt&BdjbLJ`N%Vl6M=4=fPUOz zk62X5IC927FF7>T_ON<7Nlt z5rZ2;>X&(u?6H|vqw73kn7k+4-LimMH92ov|E;c5@J0OR!kNkW<92X7`SRm9l&z!Y zD)CP?+mVi;>853XJ%>WW{QfPI*7-wg+w_ej_{o5NX3hbgdZS&WkA3odPWxj8JoRTo zwL6xiwNc^jPPghEV;~!Q-IgsP*K%MLoE=Y(@2vK~vZcwn$jynFH@8@*ck}9p@ZWBr zpmVLI-(2&10_J}4=)WdhQP1nFcB`m5 zVyJ0TtCh~{1_S)^;=-a@V6`q z4w*J}yxYPa>*t)iMP&!AsmcppQ%0j)5PZ4PH$S;&e62h?aGQ%lQQET-ig|h_^#rg+ zOV7(@-CU!%!K>KL9sTvnGF0_yMt!i?v6MQ^`R~anrE|@ztLtE-XeMLBRyFd& zVi6TS*3`DLlIBvvnVUU*8F$iW3RlB;`*n*Z{)B|2`HP)|bdkA08r?YCG_tUc)D-7E zv4lNMJaC|E=Sv=G97A*yfJV5+;Ztvj+w|pE(EWimQZE5WGE8xp{#fA5MJTwR1-5nQ zrB^C3fU;}umxqtj0y8iG+Tpc{c?11AUR`x$Tb}PRP;NmXgXO#d?rWcDLD0zCA-8S2 zu0JeFDgvdw&yoZc70*_ZmZY*oR4l1!_xsrkrrXbE$4d|`_}$HtiaNL+;#`APoPUrq)_lc2BufW-D6w`Xwct~qs}9}u+XH-i_2EkZ#! zN|(=g>W+2;kZ`1XJ%BJI_>TPP)LBFAnkPOS5zt%Xiqvf->VPW+nu;|j|)K1 z&0MAYwnqQqAdA-uFp-Y8z*!*7WDaTva}*T3)o2IxY?q8!DI($;m%)nby<;5xp@QGM zK4S4<8+(RUdfELnBz&?_Kc>O;wJ1t|veD6!_K5=a6T?2R{W#)Z4GogddhTOygRVjg zs(vVe3WjAR*Q9dC0KU@wIyB3_);s3Hy#C*)0+}Rp7p`$>^a*nuk3hN?*r?&B5SCYO zYdD1Ud<5>^sNPKeES<1~y4nlHE-C?)d)z_oPZ-!E=zlc*wrebTKy!*zRNZT`eA^LZ L+Rm$C?8E;7N{s|}