Bump to 1.5.5, update Forge to 2363

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.5.5
+- Updated Forge to 2363 (raoulvdberge)
+
 ### 1.5.4
 - Fixed External Storage crashing (raoulvdberge)
 - Fixed crash when node data mismatches between world and dat file (raoulvdberge)

build.gradle

@@ -20,7 +20,7 @@ apply plugin: 'maven'
 apply plugin: 'maven-publish'
 apply plugin: 'net.minecraftforge.gradle.forge'
 
-version = "1.5.4"
+version = "1.5.5"
 group = "refinedstorage"
 archivesBaseName = "refinedstorage"
 
@@ -28,7 +28,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 minecraft {
-    version = "1.12-14.21.0.2359"
+    version = "1.12-14.21.0.2363"
     runDir = "run"
     useDepAts = true
     mappings = "snapshot_20170624"

src/main/java/com/raoulvdberge/refinedstorage/RS.java

@@ -21,8 +21,8 @@ public final class RS {
     }
 
     public static final String ID = "refinedstorage";
-    public static final String VERSION = "1.5.4";
+    public static final String VERSION = "1.5.5";
-    public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2359,);after:mcmultipart@[2.2.1,);";
+    public static final String DEPENDENCIES = "required-after:forge@[14.21.0.2363,);after:mcmultipart@[2.2.1,);";
     public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
     public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";
 

src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPattern.java

@@ -15,7 +15,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.common.model.TRSRTransformation;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -23,7 +22,7 @@ import javax.annotation.Nullable;
 import javax.vecmath.Matrix4f;
 import java.util.List;
 
-public class BakedModelPattern implements IBakedModel, IPerspectiveAwareModel {
+public class BakedModelPattern implements IBakedModel {
     private IBakedModel base;
 
     public BakedModelPattern(IBakedModel base) {

src/main/java/com/raoulvdberge/refinedstorage/render/BakedModelPortableGrid.java

@@ -8,7 +8,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.model.ItemOverrideList;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.EnumFacing;
-import net.minecraftforge.client.model.IPerspectiveAwareModel;
 import net.minecraftforge.common.model.TRSRTransformation;
 import org.apache.commons.lang3.tuple.Pair;
 
@@ -16,7 +15,7 @@ import javax.annotation.Nullable;
 import javax.vecmath.Matrix4f;
 import java.util.List;
 
-public class BakedModelPortableGrid implements IPerspectiveAwareModel {
+public class BakedModelPortableGrid implements IBakedModel {
     private IBakedModel base;
 
     public BakedModelPortableGrid(IBakedModel base) {

src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskDrive.java

@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.render;
 
-import com.google.common.base.Function;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
@@ -8,12 +7,11 @@ 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.common.model.TRSRTransformation;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
+import java.util.function.Function;
 
 public class ModelDiskDrive implements IModel {
     private static final ResourceLocation MODEL_BASE = new ResourceLocation("refinedstorage:block/disk_drive");
@@ -35,11 +33,6 @@ public class ModelDiskDrive implements IModel {
         return dependencies;
     }
 
-    @Override
-    public Collection<ResourceLocation> getTextures() {
-        return Collections.emptyList();
-    }
-
     @Override
     public IBakedModel bake(IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
         IModel baseModel;
@@ -66,9 +59,4 @@ public class ModelDiskDrive implements IModel {
             diskModelDisconnected.bake(state, format, bakedTextureGetter)
         );
     }
-
-    @Override
-    public IModelState getDefaultState() {
-        return TRSRTransformation.identity();
-    }
 }

src/main/java/com/raoulvdberge/refinedstorage/render/ModelDiskManipulator.java

@@ -1,6 +1,5 @@
 package com.raoulvdberge.refinedstorage.render;
 
-import com.google.common.base.Function;
 import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.VertexFormat;
@@ -8,12 +7,11 @@ 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.common.model.TRSRTransformation;
 
 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");
@@ -37,11 +35,6 @@ public class ModelDiskManipulator implements IModel {
         return dependencies;
     }
 
-    @Override
-    public Collection<ResourceLocation> getTextures() {
-        return Collections.emptyList();
-    }
-
     @Override
     public IBakedModel bake(IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter) {
         IModel baseModelConnected, baseModelDisconnected;
@@ -70,9 +63,4 @@ public class ModelDiskManipulator implements IModel {
             diskModelDisconnected.bake(state, format, bakedTextureGetter)
         );
     }
-
-    @Override
-    public IModelState getDefaultState() {
-        return TRSRTransformation.identity();
-    }
 }

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
       "modid": "refinedstorage",
       "name": "Refined Storage",
       "description": "An elegant solution to your hoarding problem",
-      "version": "1.5.4",
+      "version": "1.5.5",
       "mcversion": "1.12",
       "url": "https://refinedstorage.raoulvdberge.com",
       "updateUrl": "",