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

Fix crash on servers.

Browse Source
This commit is contained in:
raoulvdberge
2018-07-09 21:57:27 +02:00
parent f55faf3517
commit fa7dbe1bad
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskDrive.java
View File

@@ -36,7 +36,7 @@ public class BlockDiskDrive extends BlockNode {
public void registerModels(IModelRegistration modelRegistration) { public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
modelRegistration.addModelLoader(new CustomModelLoaderDefault(info.getId(), ModelDiskDrive::new)); modelRegistration.addModelLoader(() -> new CustomModelLoaderDefault(info.getId(), ModelDiskDrive::new));
} }
@Override @Override

2
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
View File

@@ -36,7 +36,7 @@ public class BlockDiskManipulator extends BlockNode {
public void registerModels(IModelRegistration modelRegistration) { public void registerModels(IModelRegistration modelRegistration) {
modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory")); modelRegistration.setModel(this, 0, new ModelResourceLocation(info.getId(), "inventory"));
modelRegistration.addModelLoader(new CustomModelLoaderDefault(info.getId(), ModelDiskManipulator::new)); modelRegistration.addModelLoader(() -> new CustomModelLoaderDefault(info.getId(), ModelDiskManipulator::new));
} }
@Override @Override

5
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java
View File

@@ -41,6 +41,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
public class ProxyClient extends ProxyCommon implements IModelRegistration { public class ProxyClient extends ProxyCommon implements IModelRegistration {
private Map<ResourceLocation, Function<IBakedModel, IBakedModel>> bakedModelOverrides = new HashMap<>(); private Map<ResourceLocation, Function<IBakedModel, IBakedModel>> bakedModelOverrides = new HashMap<>();
@@ -252,8 +253,8 @@ public class ProxyClient extends ProxyCommon implements IModelRegistration {
} }
@Override @Override
public void addModelLoader(ICustomModelLoader modelLoader) { public void addModelLoader(Supplier<ICustomModelLoader> modelLoader) {
ModelLoaderRegistry.registerLoader(modelLoader); ModelLoaderRegistry.registerLoader(modelLoader.get());
} }
@Override @Override

3
src/main/java/com/raoulvdberge/refinedstorage/render/IModelRegistration.java
View File

@@ -9,6 +9,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.ICustomModelLoader;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier;
public interface IModelRegistration { public interface IModelRegistration {
void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override); void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override);
@@ -17,7 +18,7 @@ public interface IModelRegistration {
void setModelMeshDefinition(Block block, ItemMeshDefinition meshDefinition); void setModelMeshDefinition(Block block, ItemMeshDefinition meshDefinition);
void addModelLoader(ICustomModelLoader modelLoader); void addModelLoader(Supplier<ICustomModelLoader> modelLoader);
void setStateMapper(Block block, IStateMapper stateMapper); void setStateMapper(Block block, IStateMapper stateMapper);
} }