1.6.14: Fixed server crash.

This commit is contained in:
raoulvdberge
2019-03-23 18:46:50 +01:00
parent 5b539c1eb0
commit 214bb4ed7f
4 changed files with 8 additions and 5 deletions

View File

@@ -1,5 +1,8 @@
# Refined Storage Changelog # Refined Storage Changelog
### 1.6.14
- Fixed server crash (raoulvdberge)
### 1.6.13 ### 1.6.13
- Fixed Interface with Crafting Upgrade being stuck if an earlier item configuration has missing items or fluids (raoulvdberge) - Fixed Interface with Crafting Upgrade being stuck if an earlier item configuration has missing items or fluids (raoulvdberge)
- Added keybindings to open wireless items. The default one set to open a Wireless Crafting Grid from Refined Storage Addons is CTRL + G (raoulvdberge) - Added keybindings to open wireless items. The default one set to open a Wireless Crafting Grid from Refined Storage Addons is CTRL + G (raoulvdberge)

View File

@@ -16,7 +16,7 @@ apply plugin: 'maven'
apply plugin: 'maven-publish' apply plugin: 'maven-publish'
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
version = "1.6.13" version = "1.6.14"
def env = System.getenv() def env = System.getenv()
if (env.BUILD_NUMBER) { if (env.BUILD_NUMBER) {
version = version + "-" + "${env.BUILD_NUMBER}" version = version + "-" + "${env.BUILD_NUMBER}"

View File

@@ -11,11 +11,9 @@ import com.raoulvdberge.refinedstorage.item.info.ItemInfo;
import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.render.IModelRegistration;
import com.raoulvdberge.refinedstorage.render.color.ItemColorPattern; import com.raoulvdberge.refinedstorage.render.color.ItemColorPattern;
import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelPattern; import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelPattern;
import com.raoulvdberge.refinedstorage.render.teisr.TileEntityItemStackRendererPattern;
import com.raoulvdberge.refinedstorage.util.RenderUtils; import com.raoulvdberge.refinedstorage.util.RenderUtils;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.tileentity.TileEntityItemStackRenderer;
import net.minecraft.client.resources.I18n; import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag; import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
@@ -51,8 +49,6 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider {
public ItemPattern() { public ItemPattern() {
super(new ItemInfo(RS.ID, "pattern")); super(new ItemInfo(RS.ID, "pattern"));
setTileEntityItemStackRenderer(new TileEntityItemStackRendererPattern());
} }
@Override @Override

View File

@@ -1,11 +1,13 @@
package com.raoulvdberge.refinedstorage.proxy; package com.raoulvdberge.refinedstorage.proxy;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.RSKeyBindings; import com.raoulvdberge.refinedstorage.RSKeyBindings;
import com.raoulvdberge.refinedstorage.block.BlockBase; import com.raoulvdberge.refinedstorage.block.BlockBase;
import com.raoulvdberge.refinedstorage.gui.KeyInputListener; import com.raoulvdberge.refinedstorage.gui.KeyInputListener;
import com.raoulvdberge.refinedstorage.item.ItemBase; import com.raoulvdberge.refinedstorage.item.ItemBase;
import com.raoulvdberge.refinedstorage.render.IModelRegistration; import com.raoulvdberge.refinedstorage.render.IModelRegistration;
import com.raoulvdberge.refinedstorage.render.collision.BlockHighlightListener; import com.raoulvdberge.refinedstorage.render.collision.BlockHighlightListener;
import com.raoulvdberge.refinedstorage.render.teisr.TileEntityItemStackRendererPattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemMeshDefinition;
@@ -47,6 +49,8 @@ public class ProxyClient extends ProxyCommon implements IModelRegistration {
MinecraftForge.EVENT_BUS.register(new BlockHighlightListener()); MinecraftForge.EVENT_BUS.register(new BlockHighlightListener());
MinecraftForge.EVENT_BUS.register(new KeyInputListener()); MinecraftForge.EVENT_BUS.register(new KeyInputListener());
RSItems.PATTERN.setTileEntityItemStackRenderer(new TileEntityItemStackRendererPattern());
} }
@Override @Override