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

Proxy package

Browse Source
This commit is contained in:
raoulvdberge
2019-09-12 16:50:37 +02:00
parent 133bb3cba0
commit 46c99de1ca
7 changed files with 67 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/raoulvdberge/refinedstorage/RS.java
View File

@@ -1,50 +1,28 @@
package com.raoulvdberge.refinedstorage; package com.raoulvdberge.refinedstorage;
import com.raoulvdberge.refinedstorage.command.CommandCreateDisk;
import com.raoulvdberge.refinedstorage.item.ItemCover; import com.raoulvdberge.refinedstorage.item.ItemCover;
import com.raoulvdberge.refinedstorage.proxy.ProxyCommon; import com.raoulvdberge.refinedstorage.proxy.ProxyCommon;
import net.minecraft.creativetab.CreativeTabs; import net.minecraft.block.Blocks;
import net.minecraft.init.Blocks; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.FMLLog;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.Mod.Instance;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.*;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.network.NetworkHooks;
@Mod(modid = RS.ID, version = RS.VERSION, acceptedMinecraftVersions = "[1.12.2,1.13)", guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON, certificateFingerprint = RS.FINGERPRINT, dependencies = RS.DEPENDENCIES) @Mod(RS.ID)
public final class RS { public final class RS {
static {
FluidRegistry.enableUniversalBucket();
}
public static final String ID = "refinedstorage"; public static final String ID = "refinedstorage";
public static final String VERSION = "@version@";
public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory";
public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update";
public static final String FINGERPRINT = "57893d5b90a7336e8c63fe1c1e1ce472c3d59578";
public static final String DEPENDENCIES = "after:forge@[14.23.3.2694,);";
@SidedProxy(clientSide = "com.raoulvdberge.refinedstorage.proxy.ProxyClient", serverSide = "com.raoulvdberge.refinedstorage.proxy.ProxyCommon")
public static ProxyCommon PROXY; public static ProxyCommon PROXY;
@Instance
public static RS INSTANCE; public static RS INSTANCE;
public RSConfig config; public RSConfig config;
public final SimpleNetworkWrapper network = NetworkRegistry.INSTANCE.newSimpleChannel(ID); public final ItemGroup tab = new ItemGroup(ID) {
public final CreativeTabs tab = new CreativeTabs(ID) {
@Override @Override
public ItemStack createIcon() { public ItemStack createIcon() {
return new ItemStack(RSItems.STORAGE_HOUSING); return new ItemStack(RSItems.STORAGE_HOUSING);
} }
}; };
public final CreativeTabs coversTab = new CreativeTabs(ID + ".covers") { public final ItemGroup coversTab = new ItemGroup(ID + ".covers") {
@Override @Override
public ItemStack createIcon() { public ItemStack createIcon() {
ItemStack stack = new ItemStack(RSItems.COVER); ItemStack stack = new ItemStack(RSItems.COVER);
@@ -55,6 +33,7 @@ public final class RS {
} }
}; };
/* TODO
@EventHandler @EventHandler
public void preInit(FMLPreInitializationEvent e) { public void preInit(FMLPreInitializationEvent e) {
config = new RSConfig(null, e.getSuggestedConfigurationFile()); config = new RSConfig(null, e.getSuggestedConfigurationFile());
@@ -82,5 +61,5 @@ public final class RS {
@EventHandler @EventHandler
public void onFingerprintViolation(FMLFingerprintViolationEvent e) { public void onFingerprintViolation(FMLFingerprintViolationEvent e) {
FMLLog.bigWarning("Invalid fingerprint detected for the Refined Storage jar file! The file " + e.getSource().getName() + " may have been tampered with. This version will NOT be supported!"); FMLLog.bigWarning("Invalid fingerprint detected for the Refined Storage jar file! The file " + e.getSource().getName() + " may have been tampered with. This version will NOT be supported!");
} }*/
} }

52
src/main/java/com/raoulvdberge/refinedstorage/RSConfig.java
View File

@@ -1,19 +1,12 @@
package com.raoulvdberge.refinedstorage; package com.raoulvdberge.refinedstorage;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.ConfigElement;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fml.client.config.IConfigElement;
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List;
public class RSConfig { public class RSConfig {
private Configuration config; // private Configuration config;
private RSConfig originalClientVersion; private RSConfig originalClientVersion;
//region Energy //region Energy
@@ -137,34 +130,35 @@ public class RSConfig {
//endregion //endregion
public RSConfig(@Nullable RSConfig originalClientVersion, File configFile) { public RSConfig(@Nullable RSConfig originalClientVersion, File configFile) {
this(originalClientVersion, new Configuration(configFile)); this(originalClientVersion/*, new Configuration(configFile)*/);
} }
public RSConfig(@Nullable RSConfig originalClientVersion, Configuration config) { public RSConfig(@Nullable RSConfig originalClientVersion/*, Configuration config*/) {
this.originalClientVersion = originalClientVersion; this.originalClientVersion = originalClientVersion;
this.config = config; // this.config = config;
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
this.loadConfig(); // this.loadConfig();
} }
public Configuration getConfig() { /*public Configuration getConfig() {
return config; return config;
} }*/
@Nullable @Nullable
public RSConfig getOriginalClientVersion() { public RSConfig getOriginalClientVersion() {
return originalClientVersion; return originalClientVersion;
} }
@SubscribeEvent /*@SubscribeEvent
public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) { public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event) {
if (event.getModID().equalsIgnoreCase(RS.ID)) { if (event.getModID().equalsIgnoreCase(RS.ID)) {
loadConfig(); loadConfig();
} }
} }*/
/*
private void loadConfig() { private void loadConfig() {
//region Energy //region Energy
controllerBaseUsage = config.getInt("controllerBase", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by the Controller"); controllerBaseUsage = config.getInt("controllerBase", ENERGY, 0, 0, Integer.MAX_VALUE, "The base energy used by the Controller");
@@ -270,29 +264,5 @@ public class RSConfig {
//region Autocrafting //region Autocrafting
calculationTimeoutMs = config.getInt("calculationTimeoutMs", AUTOCRAFTING, 5000, 5000, Integer.MAX_VALUE, "The autocrafting calculation timeout in milliseconds, tasks taking longer than this to calculate (NOT execute) are cancelled to avoid server strain"); calculationTimeoutMs = config.getInt("calculationTimeoutMs", AUTOCRAFTING, 5000, 5000, Integer.MAX_VALUE, "The autocrafting calculation timeout in milliseconds, tasks taking longer than this to calculate (NOT execute) are cancelled to avoid server strain");
//endregion //endregion
}*/
if (config.hasChanged()) {
config.save();
}
}
@SuppressWarnings("unchecked")
public List<IConfigElement> getConfigElements() {
List<IConfigElement> list = new ArrayList<>();
list.add(new ConfigElement(config.getCategory(ENERGY)));
list.add(new ConfigElement(config.getCategory(CONTROLLER)));
list.add(new ConfigElement(config.getCategory(UPGRADES)));
list.add(new ConfigElement(config.getCategory(WIRELESS_TRANSMITTER)));
list.add(new ConfigElement(config.getCategory(GRID)));
list.add(new ConfigElement(config.getCategory(WIRELESS_GRID)));
list.add(new ConfigElement(config.getCategory(WIRELESS_FLUID_GRID)));
list.add(new ConfigElement(config.getCategory(WIRELESS_CRAFTING_MONITOR)));
list.add(new ConfigElement(config.getCategory(PORTABLE_GRID)));
list.add(new ConfigElement(config.getCategory(READER_WRITER)));
list.add(new ConfigElement(config.getCategory(COVERS)));
list.add(new ConfigElement(config.getCategory(AUTOCRAFTING)));
return list;
}
} }

11
src/main/java/com/raoulvdberge/refinedstorage/RSKeyBindings.java
View File

@@ -1,13 +1,7 @@
package com.raoulvdberge.refinedstorage; package com.raoulvdberge.refinedstorage;
import net.minecraft.client.settings.KeyBinding;
import net.minecraftforge.client.settings.KeyConflictContext;
import net.minecraftforge.client.settings.KeyModifier;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import org.lwjgl.input.Keyboard;
public final class RSKeyBindings { public final class RSKeyBindings {
public static final KeyBinding FOCUS_SEARCH_BAR = new KeyBinding("key.refinedstorage.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, "Refined Storage"); /*public static final KeyBinding FOCUS_SEARCH_BAR = new KeyBinding("key.refinedstorage.focusSearchBar", KeyConflictContext.GUI, Keyboard.KEY_TAB, "Refined Storage");
public static final KeyBinding CLEAR_GRID_CRAFTING_MATRIX = new KeyBinding("key.refinedstorage.clearGridCraftingMatrix", KeyConflictContext.GUI, KeyModifier.CONTROL, Keyboard.KEY_X, "Refined Storage"); public static final KeyBinding CLEAR_GRID_CRAFTING_MATRIX = new KeyBinding("key.refinedstorage.clearGridCraftingMatrix", KeyConflictContext.GUI, KeyModifier.CONTROL, Keyboard.KEY_X, "Refined Storage");
public static final KeyBinding OPEN_WIRELESS_GRID = new KeyBinding("key.refinedstorage.openWirelessGrid", KeyConflictContext.IN_GAME, 0, "Refined Storage"); public static final KeyBinding OPEN_WIRELESS_GRID = new KeyBinding("key.refinedstorage.openWirelessGrid", KeyConflictContext.IN_GAME, 0, "Refined Storage");
public static final KeyBinding OPEN_WIRELESS_FLUID_GRID = new KeyBinding("key.refinedstorage.openWirelessFluidGrid", KeyConflictContext.IN_GAME, 0, "Refined Storage"); public static final KeyBinding OPEN_WIRELESS_FLUID_GRID = new KeyBinding("key.refinedstorage.openWirelessFluidGrid", KeyConflictContext.IN_GAME, 0, "Refined Storage");
@@ -21,5 +15,8 @@ public final class RSKeyBindings {
ClientRegistry.registerKeyBinding(OPEN_WIRELESS_FLUID_GRID); ClientRegistry.registerKeyBinding(OPEN_WIRELESS_FLUID_GRID);
ClientRegistry.registerKeyBinding(OPEN_PORTABLE_GRID); ClientRegistry.registerKeyBinding(OPEN_PORTABLE_GRID);
ClientRegistry.registerKeyBinding(OPEN_WIRELESS_CRAFTING_MONITOR); ClientRegistry.registerKeyBinding(OPEN_WIRELESS_CRAFTING_MONITOR);
}*/
public static void init() {
// TODO
} }
} }

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

@@ -1,45 +1,55 @@
package com.raoulvdberge.refinedstorage.proxy; package com.raoulvdberge.refinedstorage.proxy;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.RSKeyBindings;
import com.raoulvdberge.refinedstorage.block.BlockBase;
import com.raoulvdberge.refinedstorage.gui.KeyInputListener;
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.teisr.TileEntityItemStackRendererPattern;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.IStateMapper;
import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ModelResourceLocation;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ICustomModelLoader; import net.minecraftforge.client.model.ICustomModelLoader;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import org.apache.commons.lang3.tuple.Pair;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import java.util.function.Supplier; import java.util.function.Supplier;
public class ProxyClient extends ProxyCommon implements IModelRegistration { public class ProxyClient extends ProxyCommon implements IModelRegistration {
@Override
public void addBakedModelOverride(ResourceLocation resource, Function<IBakedModel, IBakedModel> override) {
}
@Override
public void setModel(Block block, int meta, ModelResourceLocation resource) {
}
@Override
public void setModel(Item item, int meta, ModelResourceLocation resource) {
}
@Override
public void setModelVariants(Item item, ResourceLocation... variants) {
}
@Override
public void addModelLoader(Supplier<ICustomModelLoader> modelLoader) {
}
@Override
public <T extends TileEntity> void setTesr(Class<T> tile, TileEntityRenderer<T> tesr) {
}
@Override
public void addItemColor(Item item, IItemColor itemColor) {
}
/*
private Map<ResourceLocation, Function<IBakedModel, IBakedModel>> bakedModelOverrides = new HashMap<>(); private Map<ResourceLocation, Function<IBakedModel, IBakedModel>> bakedModelOverrides = new HashMap<>();
private List<Pair<Item, IItemColor>> itemColors = new LinkedList<>(); private List<Pair<Item, IItemColor>> itemColors = new LinkedList<>();
@@ -130,4 +140,6 @@ public class ProxyClient extends ProxyCommon implements IModelRegistration {
public void addItemColor(Item item, IItemColor itemColor) { public void addItemColor(Item item, IItemColor itemColor) {
itemColors.add(Pair.of(item, itemColor)); // ItemColors is only available in init. itemColors.add(Pair.of(item, itemColor)); // ItemColors is only available in init.
} }
*/
} }

83
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
View File

@@ -1,86 +1,7 @@
package com.raoulvdberge.refinedstorage.proxy; package com.raoulvdberge.refinedstorage.proxy;
import com.raoulvdberge.refinedstorage.RS;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.api.storage.StorageType;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementError;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementFluidRender;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.craftingmonitor.CraftingMonitorElementItemRender;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementError;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementFluidStack;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.preview.CraftingPreviewElementItemStack;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.registry.CraftingTaskFactory;
import com.raoulvdberge.refinedstorage.apiimpl.network.NetworkNodeListener;
import com.raoulvdberge.refinedstorage.apiimpl.network.grid.*;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeGrid;
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerFluids;
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerItems;
import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerRedstone;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryFluid;
import com.raoulvdberge.refinedstorage.apiimpl.storage.disk.StorageDiskFactoryItem;
import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.ExternalStorageProviderFluid;
import com.raoulvdberge.refinedstorage.apiimpl.storage.externalstorage.ExternalStorageProviderItem;
import com.raoulvdberge.refinedstorage.apiimpl.util.OneSixMigrationHelper;
import com.raoulvdberge.refinedstorage.block.BlockBase;
import com.raoulvdberge.refinedstorage.block.info.IBlockInfo;
import com.raoulvdberge.refinedstorage.capability.CapabilityNetworkNodeProxy;
import com.raoulvdberge.refinedstorage.container.ContainerCrafter;
import com.raoulvdberge.refinedstorage.container.ContainerCrafterManager;
import com.raoulvdberge.refinedstorage.container.slot.SlotCrafterManager;
import com.raoulvdberge.refinedstorage.gui.GuiBase;
import com.raoulvdberge.refinedstorage.gui.GuiHandler;
import com.raoulvdberge.refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks;
import com.raoulvdberge.refinedstorage.integration.forgeenergy.ReaderWriterHandlerForgeEnergy;
import com.raoulvdberge.refinedstorage.integration.funkylocomotion.IntegrationFunkyLocomotion;
import com.raoulvdberge.refinedstorage.integration.funkylocomotion.MoveFactoryRegisterer;
import com.raoulvdberge.refinedstorage.integration.inventorysorter.IntegrationInventorySorter;
import com.raoulvdberge.refinedstorage.integration.oc.DriverNetwork;
import com.raoulvdberge.refinedstorage.integration.oc.IntegrationOC;
import com.raoulvdberge.refinedstorage.item.ItemProcessor;
import com.raoulvdberge.refinedstorage.item.ItemUpgrade;
import com.raoulvdberge.refinedstorage.network.*;
import com.raoulvdberge.refinedstorage.recipe.RecipeCover;
import com.raoulvdberge.refinedstorage.recipe.RecipeHollowCover;
import com.raoulvdberge.refinedstorage.recipe.RecipeUpgradeWithEnchantedBook;
import com.raoulvdberge.refinedstorage.tile.TileBase;
import com.raoulvdberge.refinedstorage.tile.TileNode;
import com.raoulvdberge.refinedstorage.tile.data.TileDataManager;
import com.raoulvdberge.refinedstorage.tile.grid.WirelessFluidGrid;
import com.raoulvdberge.refinedstorage.tile.grid.WirelessGrid;
import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid;
import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.init.Items;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.event.world.WorldEvent;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.common.network.ByteBufUtils;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.oredict.OreDictionary;
import java.util.LinkedList;
import java.util.List;
public class ProxyCommon { public class ProxyCommon {
/* TODO
protected List<Item> itemsToRegister = new LinkedList<>(); protected List<Item> itemsToRegister = new LinkedList<>();
protected List<BlockBase> blocksToRegister = new LinkedList<>(); protected List<BlockBase> blocksToRegister = new LinkedList<>();
@@ -378,5 +299,5 @@ public class ProxyCommon {
} catch (InstantiationException | IllegalAccessException e) { } catch (InstantiationException | IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }*/
} }

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

@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.render.color;
import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern;
import com.raoulvdberge.refinedstorage.item.ItemPattern; import com.raoulvdberge.refinedstorage.item.ItemPattern;
import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelPattern;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.color.IItemColor; import net.minecraft.client.renderer.color.IItemColor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@@ -12,7 +11,7 @@ public class ItemColorPattern implements IItemColor {
public int getColor(ItemStack stack, int tintIndex) { public int getColor(ItemStack stack, int tintIndex) {
CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getInstance().world, stack); CraftingPattern pattern = ItemPattern.getPatternFromCache(Minecraft.getInstance().world, stack);
if (BakedModelPattern.canDisplayOutput(stack, pattern)) { if (/*TODO BakedModelPattern.canDisplayOutput(stack, pattern)*/false) {
int color = Minecraft.getInstance().getItemColors().getColor(pattern.getOutputs().get(0), tintIndex); int color = Minecraft.getInstance().getItemColors().getColor(pattern.getOutputs().get(0), tintIndex);
if (color != -1) { if (color != -1) {

4
src/main/java/com/raoulvdberge/refinedstorage/render/model/ModelCover.java
View File

@@ -1,7 +1,6 @@
package com.raoulvdberge.refinedstorage.render.model; package com.raoulvdberge.refinedstorage.render.model;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverType; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverType;
import com.raoulvdberge.refinedstorage.render.model.baked.BakedModelCover;
import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IUnbakedModel; import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.model.ModelBakery;
@@ -25,7 +24,8 @@ public class ModelCover implements IUnbakedModel {
@Nullable @Nullable
@Override @Override
public IBakedModel bake(ModelBakery bakery, Function spriteGetter, ISprite sprite, VertexFormat format) { public IBakedModel bake(ModelBakery bakery, Function spriteGetter, ISprite sprite, VertexFormat format) {
return new BakedModelCover(null, coverType); return null;
//return new BakedModelCover(null, coverType);
} }
@Override @Override