From 310f94fd36eb77424f08bc426f9fa30ace36555f Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Sat, 28 Jan 2017 18:32:34 +0100 Subject: [PATCH] Fixed disk textures not working on latest Forge, fixes #881 --- CHANGELOG.md | 1 + .../refinedstorage/render/ModelDiskDrive.java | 12 +++++++++++- .../render/ModelDiskManipulator.java | 14 ++++++++++++-- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bf3f9848..123bba2f4 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - Increased size of Detector textbox (way2muchnoise) - Fixed stack upgrades not working in exporter when stack size is 16 (way2muchnoise) - Fixed crash when rotating External Storage (raoulvdberge) +- Fixed disk textures not working on latest Forge (raoulvdberge) ### 1.3.5 - Fixed TPS lag on very large crafting tasks (way2muchnoise) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java index cc1d41ac3..839a9c34e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java @@ -10,8 +10,10 @@ import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.List; public class ModelDiskDrive implements IModel { private static final ResourceLocation MODEL_BASE = new ResourceLocation("refinedstorage:block/disk_drive"); @@ -22,7 +24,15 @@ public class ModelDiskDrive implements IModel { @Override public Collection getDependencies() { - return Collections.singletonList(MODEL_BASE); + List dependencies = new ArrayList<>(); + + dependencies.add(MODEL_BASE); + dependencies.add(MODEL_DISK); + dependencies.add(MODEL_DISK_NEAR_CAPACITY); + dependencies.add(MODEL_DISK_FULL); + dependencies.add(MODEL_DISK_DISCONNECTED); + + return dependencies; } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java index dcf527433..c1d456a3f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java @@ -1,7 +1,6 @@ package com.raoulvdberge.refinedstorage.render; import com.google.common.base.Function; -import com.google.common.collect.Lists; import net.minecraft.client.renderer.block.model.IBakedModel; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; @@ -11,8 +10,10 @@ import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.TRSRTransformation; +import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.List; public class ModelDiskManipulator implements IModel { private static final ResourceLocation MODEL_BASE_CONNECTED = new ResourceLocation("refinedstorage:block/disk_manipulator_connected"); @@ -24,7 +25,16 @@ public class ModelDiskManipulator implements IModel { @Override public Collection getDependencies() { - return Lists.newArrayList(MODEL_BASE_CONNECTED, MODEL_BASE_DISCONNECTED); + List dependencies = new ArrayList<>(); + + dependencies.add(MODEL_BASE_CONNECTED); + dependencies.add(MODEL_BASE_DISCONNECTED); + dependencies.add(MODEL_DISK); + dependencies.add(MODEL_DISK_NEAR_CAPACITY); + dependencies.add(MODEL_DISK_FULL); + dependencies.add(MODEL_DISK_DISCONNECTED); + + return dependencies; } @Override