dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed disk textures not working on latest Forge, fixes #881

Browse Source
This commit is contained in:
raoulvdberge
2017-01-28 18:32:34 +01:00
parent 74a98ff024
commit 310f94fd36
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -30,6 +30,7 @@
- Increased size of Detector textbox (way2muchnoise) - Increased size of Detector textbox (way2muchnoise)
- Fixed stack upgrades not working in exporter when stack size is 16 (way2muchnoise) - Fixed stack upgrades not working in exporter when stack size is 16 (way2muchnoise)
- Fixed crash when rotating External Storage (raoulvdberge) - Fixed crash when rotating External Storage (raoulvdberge)
- Fixed disk textures not working on latest Forge (raoulvdberge)
### 1.3.5 ### 1.3.5
- Fixed TPS lag on very large crafting tasks (way2muchnoise) - Fixed TPS lag on very large crafting tasks (way2muchnoise)

12
src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java
View File

@@ -10,8 +10,10 @@ import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.common.model.IModelState; import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.model.TRSRTransformation;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
public class ModelDiskDrive implements IModel { public class ModelDiskDrive implements IModel {
private static final ResourceLocation MODEL_BASE = new ResourceLocation("refinedstorage:block/disk_drive"); private static final ResourceLocation MODEL_BASE = new ResourceLocation("refinedstorage:block/disk_drive");
@@ -22,7 +24,15 @@ public class ModelDiskDrive implements IModel {
@Override @Override
public Collection<ResourceLocation> getDependencies() { public Collection<ResourceLocation> getDependencies() {
return Collections.singletonList(MODEL_BASE); List<ResourceLocation> 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 @Override

14
src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java
View File

@@ -1,7 +1,6 @@
package com.raoulvdberge.refinedstorage.render; package com.raoulvdberge.refinedstorage.render;
import com.google.common.base.Function; 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.block.model.IBakedModel;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat; 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.IModelState;
import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.common.model.TRSRTransformation;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
public class ModelDiskManipulator implements IModel { 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");
@@ -24,7 +25,16 @@ public class ModelDiskManipulator implements IModel {
@Override @Override
public Collection<ResourceLocation> getDependencies() { public Collection<ResourceLocation> getDependencies() {
return Lists.newArrayList(MODEL_BASE_CONNECTED, MODEL_BASE_DISCONNECTED); List<ResourceLocation> 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 @Override