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

Added CTM integration for Grids

Browse Source
This commit is contained in:
raoulvdberge
2017-07-30 15:44:21 +02:00
parent 68bc1f8278
commit a0d3c5669b
12 changed files with 234 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,6 @@ import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.client.renderer.block.statemap.StateMapperBase;
import net.minecraft.client.renderer.color.ItemColors;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;
@@ -41,8 +40,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraftforge.client.event.DrawBlockHighlightEvent;
import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.ICustomModelLoader;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.fml.client.registry.ClientRegistry;
@@ -60,7 +57,6 @@ public class ProxyClient extends ProxyCommon {
public void preInit(FMLPreInitializationEvent e) {
super.preInit(e);
// TESRs
ClientRegistry.bindTileEntitySpecialRenderer(TileStorageMonitor.class, new TileEntitySpecialRendererStorageMonitor());
}
@@ -83,13 +79,12 @@ public class ProxyClient extends ProxyCommon {
}
}
return 0xFFFFFF; // Full white, no need to apply color
return 0xFFFFFF;
}, RSItems.PATTERN);
}
@SubscribeEvent
public void registerModels(ModelRegistryEvent e) {
// Item Variants
ModelBakery.registerItemVariants(RSItems.STORAGE_DISK,
new ResourceLocation("refinedstorage:1k_storage_disk"),
new ResourceLocation("refinedstorage:4k_storage_disk"),
@@ -145,7 +140,6 @@ public class ProxyClient extends ProxyCommon {
new ResourceLocation("refinedstorage:fortune_upgrade")
);
// Items
ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_1K, new ModelResourceLocation("refinedstorage:1k_storage_disk", "inventory"));
ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_4K, new ModelResourceLocation("refinedstorage:4k_storage_disk", "inventory"));
ModelLoader.setCustomModelResourceLocation(RSItems.STORAGE_DISK, ItemStorageDisk.TYPE_16K, new ModelResourceLocation("refinedstorage:16k_storage_disk", "inventory"));
@@ -201,12 +195,7 @@ public class ProxyClient extends ProxyCommon {
ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_SILK_TOUCH, new ModelResourceLocation("refinedstorage:silk_touch_upgrade", "inventory"));
ModelLoader.setCustomModelResourceLocation(RSItems.UPGRADE, ItemUpgrade.TYPE_FORTUNE, new ModelResourceLocation("refinedstorage:fortune_upgrade", "inventory"));
// Blocks
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.CABLE), 0, new ModelResourceLocation("refinedstorage:cable", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=normal"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=crafting"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=pattern"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=fluid"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.MACHINE_CASING), 0, new ModelResourceLocation("refinedstorage:machine_casing", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.DISK_DRIVE), 0, new ModelResourceLocation("refinedstorage:disk_drive", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.EXPORTER), 0, new ModelResourceLocation("refinedstorage:exporter", "inventory"));
@@ -241,54 +230,32 @@ public class ProxyClient extends ProxyCommon {
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.QUARTZ_ENRICHED_IRON), 0, new ModelResourceLocation("refinedstorage:quartz_enriched_iron_block", "inventory"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.STORAGE_MONITOR), 0, new ModelResourceLocation("refinedstorage:storage_monitor", "connected=false,direction=north"));
// Disk Drive
ModelLoaderRegistry.registerLoader(new ICustomModelLoader() {
@Override
public boolean accepts(ResourceLocation modelLocation) {
return modelLocation.getResourceDomain().equals(RS.ID) && modelLocation.getResourcePath().equals("disk_drive");
}
ModelLoaderRegistry.registerLoader(new CustomModelLoaderDefault(new ResourceLocation(RS.ID, "disk_drive"), ModelDiskDrive::new));
ModelLoaderRegistry.registerLoader(new CustomModelLoaderDefault(new ResourceLocation(RS.ID, "disk_manipulator"), ModelDiskManipulator::new));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.NORMAL.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=normal"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.CRAFTING.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=crafting"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.PATTERN.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=pattern"));
ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RSBlocks.GRID), GridType.FLUID.getId(), new ModelResourceLocation("refinedstorage:grid", "connected=false,direction=north,type=fluid"));
ModelLoader.setCustomStateMapper(RSBlocks.GRID, new StateMapperBase() {
@Override
public IModel loadModel(ResourceLocation modelLocation) throws Exception {
return new ModelDiskDrive();
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation("refinedstorage:grid" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "connected=" + state.getValue(BlockGrid.CONNECTED) + ",direction=" + state.getValue(RSBlocks.GRID.getDirection().getProperty()) + ",type=" + state.getValue(BlockGrid.TYPE));
}
});
// Disk Manipulator
ModelLoaderRegistry.registerLoader(new ICustomModelLoader() {
@Override
public boolean accepts(ResourceLocation modelLocation) {
return modelLocation.getResourceDomain().equals(RS.ID) && modelLocation.getResourcePath().equals("disk_manipulator");
}
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));
@Override
public IModel loadModel(ResourceLocation modelLocation) throws Exception {
return new ModelDiskManipulator();
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
}
return new ModelResourceLocation("refinedstorage:controller" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "energy_type=" + energyType);
});
// Controller
ModelLoader.setCustomStateMapper(RSBlocks.CONTROLLER, new StateMapperBase() {
@Override
protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
return new ModelResourceLocation("refinedstorage:controller" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "energy_type=" + state.getValue(BlockController.ENERGY_TYPE));
}
});
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.CONTROLLER), stack -> {
ControllerEnergyType energyType = stack.getItemDamage() == ControllerType.CREATIVE.getId() ? ControllerEnergyType.ON : TileController.getEnergyType(ItemBlockController.getEnergyStored(stack), ItemBlockController.getEnergyCapacity(stack));
return new ModelResourceLocation("refinedstorage:controller" + (Loader.isModLoaded("ctm") ? "_glow" : ""), "energy_type=" + energyType);
});
// Portable Grid
ModelLoader.setCustomStateMapper(RSBlocks.PORTABLE_GRID, new StateMap.Builder().ignore(BlockPortableGrid.TYPE).build());
ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(RSBlocks.PORTABLE_GRID), stack -> {
PortableGrid portableGrid = new PortableGrid(null, stack);

33
src/main/java/com/raoulvdberge/refinedstorage/render/CustomModelLoaderDefault.java Normal file
View File

@@ -0,0 +1,33 @@
package com.raoulvdberge.refinedstorage.render;
import net.minecraft.client.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ICustomModelLoader;
import net.minecraftforge.client.model.IModel;
import java.util.function.Supplier;
public class CustomModelLoaderDefault implements ICustomModelLoader {
private ResourceLocation modelLocation;
private Supplier<IModel> model;
public CustomModelLoaderDefault(ResourceLocation modelLocation, Supplier<IModel> model) {
this.modelLocation = modelLocation;
this.model = model;
}
@Override
public boolean accepts(ResourceLocation modelLocation) {
return this.modelLocation.equals(modelLocation);
}
@Override
public IModel loadModel(ResourceLocation modelLocation) throws Exception {
return model.get();
}
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
// NO OP
}
}

89
src/main/resources/assets/refinedstorage/blockstates/grid_glow.json Normal file
View File

@@ -0,0 +1,89 @@
{
"forge_marker": 1,
"defaults": {
"model": "refinedstorage:cube_glow",
"textures": {
"particle": "refinedstorage:blocks/side",
"north": "refinedstorage:blocks/grid_disconnected",
"east": "refinedstorage:blocks/grid_left",
"south": "refinedstorage:blocks/grid_back",
"west": "refinedstorage:blocks/grid_right",
"up": "refinedstorage:blocks/grid_top",
"down": "refinedstorage:blocks/bottom",
"glow": "refinedstorage:blocks/none"
}
},
"variants": {
"connected": {
"true": {
"textures": {
"north_normal": "refinedstorage:blocks/grid_front_connected",
"north_normal_glow": "refinedstorage:blocks/grid_front_connected_glow",
"north_crafting": "refinedstorage:blocks/grid_crafting_front_connected",
"north_crafting_glow": "refinedstorage:blocks/grid_crafting_front_connected_glow",
"north_pattern": "refinedstorage:blocks/grid_pattern_front_connected",
"north_pattern_glow": "refinedstorage:blocks/grid_pattern_front_connected_glow",
"north_fluid": "refinedstorage:blocks/grid_fluid_front_connected",
"north_fluid_glow": "refinedstorage:blocks/grid_fluid_front_connected_glow"
}
},
"false": {
"textures": {
"north_normal": "refinedstorage:blocks/grid_front",
"north_normal_glow": "refinedstorage:blocks/none",
"north_crafting": "refinedstorage:blocks/grid_crafting_front",
"north_crafting_glow": "refinedstorage:blocks/none",
"north_pattern": "refinedstorage:blocks/grid_pattern_front",
"north_pattern_glow": "refinedstorage:blocks/none",
"north_fluid": "refinedstorage:blocks/grid_fluid_front",
"north_fluid_glow": "refinedstorage:blocks/none"
}
}
},
"type": {
"normal": {
"textures": {
"north": "#north_normal",
"glow": "#north_normal_glow"
}
},
"crafting": {
"textures": {
"north": "#north_crafting",
"glow": "#north_crafting_glow"
}
},
"pattern": {
"textures": {
"north": "#north_pattern",
"glow": "#north_pattern_glow"
}
},
"fluid": {
"textures": {
"north": "#north_fluid",
"glow": "#north_fluid_glow",
"east": "refinedstorage:blocks/grid_fluid_left",
"south": "refinedstorage:blocks/grid_fluid_back",
"west": "refinedstorage:blocks/grid_fluid_right",
"up": "refinedstorage:blocks/grid_fluid_top",
"down": "refinedstorage:blocks/bottom"
}
}
},
"direction": {
"north": {
"y": 0
},
"east": {
"y": 90
},
"south": {
"y": 180
},
"west": {
"y": 270
}
}
}
}

63
src/main/resources/assets/refinedstorage/models/block/cube_glow.json Normal file
View File

@@ -0,0 +1,63 @@
{
"parent": "block/cube",
"ambientocclusion": false,
"elements": [
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"faces": {
"down": {
"texture": "#down",
"cullface": "down"
},
"up": {
"texture": "#up",
"cullface": "up"
},
"north": {
"texture": "#north",
"cullface": "north"
},
"south": {
"texture": "#south",
"cullface": "south"
},
"west": {
"texture": "#west",
"cullface": "west"
},
"east": {
"texture": "#east",
"cullface": "east"
}
}
},
{
"from": [
0,
0,
0
],
"to": [
16,
16,
16
],
"shade": false,
"faces": {
"north": {
"texture": "#glow",
"cullface": "north"
}
}
}
]
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 555 B

9
src/main/resources/assets/refinedstorage/textures/blocks/grid_crafting_front_connected_glow.png.mcmeta Normal file
View File

@@ -0,0 +1,9 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 513 B

9
src/main/resources/assets/refinedstorage/textures/blocks/grid_fluid_front_connected_glow.png.mcmeta Normal file
View File

@@ -0,0 +1,9 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 553 B

9
src/main/resources/assets/refinedstorage/textures/blocks/grid_front_connected_glow.png.mcmeta Normal file
View File

@@ -0,0 +1,9 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}

BIN
src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected_glow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 551 B

9
src/main/resources/assets/refinedstorage/textures/blocks/grid_pattern_front_connected_glow.png.mcmeta Normal file
View File

@@ -0,0 +1,9 @@
{
"ctm": {
"ctm_version": 1,
"layer": "CUTOUT",
"extra": {
"light": 15
}
}
}