Skip to content

Commit 071b12f

Browse files
GoryMoonGoryMoon
committed
Cleaned up block model registration
Update README.md
1 parent 983da9c commit 071b12f

5 files changed

Lines changed: 53 additions & 82 deletions

File tree

‎README.md‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,10 @@ If you don't have [Gradle][1] installed on your computer you can use `gradlew` o
1414

1515
For help setting up a ForgeGradle workspace, go to this [forum page][2].
1616

17-
##### Installing for Intellij IDEA
18-
```sh
19-
gradle setupDecompWorkspace idea
20-
```
17+
How to install it is a bit different depending on what IDE you are using.
2118

22-
##### Installing for Eclipse
23-
```sh
24-
gradle setupDecompWorkspace eclipse
25-
```
19+
Instructions on how to install is in [README.txt][3]
2620

2721
[1]:http://www.gradle.org/
2822
[2]:http://www.minecraftforge.net/forum/index.php/topic,14048.0.html
23+
[3]:README.txt

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ archivesBaseName = "StevesFactoryManager"
3838

3939
minecraft {
4040
version = "1.8.9-11.15.0.1708"
41-
runDir = "eclipse/assets"
41+
runDir = "run"
4242

4343
// the mappings can be changed at any time, and must be in the following format.
4444
// snapshot_YYYYMMDD snapshot are built nightly.

‎src/main/java/vswe/stevesfactory/StevesFactoryManager.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public void preInit(FMLPreInitializationEvent event) {
4545

4646
@Mod.EventHandler
4747
public void init(FMLInitializationEvent event) {
48-
proxy.init();
49-
5048
packetHandler.register(new PacketEventHandler());
5149

5250
ModBlocks.addRecipes();

‎src/main/java/vswe/stevesfactory/proxy/ClientProxy.java‎

Lines changed: 49 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package vswe.stevesfactory.proxy;
22

33

4-
import net.minecraft.client.Minecraft;
5-
import net.minecraft.client.renderer.ItemModelMesher;
4+
import net.minecraft.block.Block;
65
import net.minecraft.client.resources.model.ModelBakery;
76
import net.minecraft.client.resources.model.ModelResourceLocation;
87
import net.minecraft.item.Item;
98
import net.minecraft.util.ResourceLocation;
109
import net.minecraftforge.client.model.ModelLoaderRegistry;
11-
import net.minecraftforge.fml.common.registry.GameRegistry;
1210
import vswe.stevesfactory.StevesFactoryManager;
1311
import vswe.stevesfactory.blocks.ModBlocks;
1412
import vswe.stevesfactory.blocks.client.ModelLoader;
@@ -18,80 +16,64 @@ public class ClientProxy extends CommonProxy {
1816

1917
@Override
2018
public void preInit() {
19+
Settings.load();
2120
ModelLoaderRegistry.registerLoader(new ModelLoader());
2221

23-
String MODID = StevesFactoryManager.MODID.toLowerCase();
24-
Item itemRelay = GameRegistry.findItem(MODID, ModBlocks.CABLE_RELAY_NAME_TAG);
25-
Item itemValve = GameRegistry.findItem(MODID, ModBlocks.CABLE_INTAKE_NAME_TAG);
26-
Item itemCluster = GameRegistry.findItem(MODID, ModBlocks.CABLE_CLUSTER_NAME_TAG);
27-
Item itemCamouflage = GameRegistry.findItem(MODID, ModBlocks.CABLE_CAMOUFLAGE_NAME_TAG);
28-
29-
ModelBakery.registerItemVariants(itemRelay, new ResourceLocation(MODID, "cable_relay"), new ResourceLocation(MODID, "cable_relay_advanced"));
30-
ModelBakery.registerItemVariants(itemValve, new ResourceLocation(MODID, "cable_valve"), new ResourceLocation(MODID, "cable_valve_instant"));
31-
ModelBakery.registerItemVariants(itemCluster, new ResourceLocation(MODID, "cable_cluster"), new ResourceLocation(MODID, "cable_cluster_advanced"));
32-
ModelBakery.registerItemVariants(itemCamouflage, new ResourceLocation(MODID, "cable_camouflage"), new ResourceLocation(MODID, "cable_camouflage_inside"), new ResourceLocation(MODID, "cable_camouflage_transform"));
22+
addVariantNames(ModBlocks.blockCableRelay, "cable_relay", "cable_relay_advanced");
23+
addVariantNames(ModBlocks.blockCableIntake, "cable_valve", "cable_valve_instant");
24+
addVariantNames(ModBlocks.blockCableCluster, "cable_cluster", "cable_cluster_advanced");
25+
addVariantNames(ModBlocks.blockCableCamouflage, "cable_camouflage", "cable_camouflage_inside", "cable_camouflage_transform");
26+
27+
registerBlockModel(ModBlocks.blockManager);
28+
registerBlockModel(ModBlocks.blockCable);
29+
registerBlockModel(ModBlocks.blockCableOutput);
30+
registerBlockModel(ModBlocks.blockCableInput);
31+
registerBlockModel(ModBlocks.blockCableCreative);
32+
registerBlockModel(ModBlocks.blockCableBUD);
33+
registerBlockModel(ModBlocks.blockCableBreaker);
34+
registerBlockModel(ModBlocks.blockCableSign);
35+
registerBlockModelForVariant(ModBlocks.blockCableRelay, 0, "cable_relay");
36+
registerBlockModelForVariant(ModBlocks.blockCableRelay, 8, "cable_relay_advanced");
37+
registerBlockModelForVariant(ModBlocks.blockCableIntake, 0, "cable_valve");
38+
registerBlockModelForVariant(ModBlocks.blockCableIntake, 8, "cable_valve_instant");
39+
registerBlockModelForVariant(ModBlocks.blockCableCluster, 0, "cable_cluster");
40+
registerBlockModelForVariant(ModBlocks.blockCableCluster, 8, "cable_cluster_advanced");
41+
registerBlockModelForVariant(ModBlocks.blockCableCamouflage, 0, "cable_camouflage");
42+
registerBlockModelForVariant(ModBlocks.blockCableCamouflage, 1, "cable_camouflage_inside");
43+
registerBlockModelForVariant(ModBlocks.blockCableCamouflage, 2, "cable_camouflage_transform");
3344
}
3445

35-
@Override
36-
public void init() {
37-
/*RenderCamouflage camouflage = new RenderCamouflage();
38-
ModBlocks.CAMOUFLAGE_RENDER_ID = camouflage.getRenderId();
39-
RenderingRegistry.registerBlockHandler(camouflage);*/
40-
Settings.load();
41-
42-
43-
String MODID = StevesFactoryManager.MODID.toLowerCase();
44-
Item[] items = new Item[10];
45-
46-
items[0] = GameRegistry.findItem(MODID, ModBlocks.MANAGER_NAME_TAG);
47-
items[1] = GameRegistry.findItem(MODID, ModBlocks.CABLE_NAME_TAG);
48-
items[2] = GameRegistry.findItem(MODID, ModBlocks.CABLE_OUTPUT_NAME_TAG);
49-
items[3] = GameRegistry.findItem(MODID, ModBlocks.CABLE_INPUT_NAME_TAG);
50-
items[4] = GameRegistry.findItem(MODID, ModBlocks.CABLE_CREATIVE_NAME_TAG);
51-
items[5] = GameRegistry.findItem(MODID, ModBlocks.CABLE_BUD_NAME_TAG);
52-
items[6] = GameRegistry.findItem(MODID, ModBlocks.CABLE_BREAKER_NAME_TAG);
53-
items[7] = GameRegistry.findItem(MODID, ModBlocks.CABLE_SIGN_NAME_TAG);
46+
private static void addVariantNames(Block block, String... names) {
47+
ResourceLocation[] locations = new ResourceLocation[names.length];
48+
for (int i = 0; i < names.length; i++)
49+
{
50+
locations[i] = new ResourceLocation(getResource(names[i]));
51+
}
5452

55-
Item itemRelay = GameRegistry.findItem(MODID, ModBlocks.CABLE_RELAY_NAME_TAG);
56-
Item itemValve = GameRegistry.findItem(MODID, ModBlocks.CABLE_INTAKE_NAME_TAG);
57-
Item itemCluster = GameRegistry.findItem(MODID, ModBlocks.CABLE_CLUSTER_NAME_TAG);
58-
Item itemCamouflage = GameRegistry.findItem(MODID, ModBlocks.CABLE_CAMOUFLAGE_NAME_TAG);
53+
if(block != null)
54+
ModelBakery.registerItemVariants(Item.getItemFromBlock(block), locations);
55+
}
5956

60-
ModelResourceLocation[] models = new ModelResourceLocation[10];
61-
models[0] = new ModelResourceLocation(MODID + ":" + ModBlocks.MANAGER_NAME_TAG, "inventory");
62-
models[1] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_NAME_TAG, "inventory");
63-
models[2] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_OUTPUT_NAME_TAG, "inventory");
64-
models[3] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_INPUT_NAME_TAG, "inventory");
65-
models[4] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_CREATIVE_NAME_TAG, "inventory");
66-
models[5] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_BUD_NAME_TAG, "inventory");
67-
models[6] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_BREAKER_NAME_TAG, "inventory");
68-
models[7] = new ModelResourceLocation(MODID + ":" + ModBlocks.CABLE_SIGN_NAME_TAG, "inventory");
57+
private static void registerBlockModelForVariant(Block base, int meta, String variant) {
58+
registerBlockModel(base, meta, getResource(variant));
59+
}
6960

70-
ModelResourceLocation cableRelay = new ModelResourceLocation(MODID + ":cable_relay", "inventory");
71-
ModelResourceLocation cableRelayAdv = new ModelResourceLocation(MODID + ":cable_relay_advanced", "inventory");
72-
ModelResourceLocation cableValve = new ModelResourceLocation(MODID + ":cable_valve", "inventory");
73-
ModelResourceLocation cableValveInst = new ModelResourceLocation(MODID + ":cable_valve_instant", "inventory");
74-
ModelResourceLocation cableCluster = new ModelResourceLocation(MODID + ":cable_cluster", "inventory");
75-
ModelResourceLocation cableClusterAdv = new ModelResourceLocation(MODID + ":cable_cluster_advanced", "inventory");
76-
ModelResourceLocation cableCamouflage = new ModelResourceLocation(MODID + ":cable_camouflage", "inventory");
77-
ModelResourceLocation cableCamouflageInside = new ModelResourceLocation(MODID + ":cable_camouflage_inside", "inventory");
78-
ModelResourceLocation cableCamouflageTransform = new ModelResourceLocation(MODID + ":cable_camouflage_transform", "inventory");
61+
private static void registerBlockModel(Block block) {
62+
ResourceLocation resourceLocation = Block.blockRegistry.getNameForObject(block);
7963

80-
ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher();
64+
registerBlockModel(block, 0, resourceLocation.toString());
65+
}
8166

82-
for (int i = 0; i < items.length; i++) {
83-
mesher.register(items[i], 0, models[i]);
84-
}
67+
private static void registerBlockModel(Block block, int meta, String modelName) {
68+
registerItemModel(Item.getItemFromBlock(block), meta, modelName);
69+
}
8570

86-
mesher.register(itemRelay, 0, cableRelay);
87-
mesher.register(itemRelay, 8, cableRelayAdv);
88-
mesher.register(itemValve, 0, cableValve);
89-
mesher.register(itemValve, 8, cableValveInst);
90-
mesher.register(itemCluster, 0, cableCluster);
91-
mesher.register(itemCluster, 8, cableClusterAdv);
92-
mesher.register(itemCamouflage, 0, cableCamouflage);
93-
mesher.register(itemCamouflage, 1, cableCamouflageInside);
94-
mesher.register(itemCamouflage, 2, cableCamouflageTransform);
71+
private static void registerItemModel(Item item, int meta, String resourcePath) {
72+
ModelResourceLocation modelResourceLocation = new ModelResourceLocation(resourcePath, "inventory");
73+
net.minecraftforge.client.model.ModelLoader.setCustomModelResourceLocation(item, meta, modelResourceLocation);
74+
}
9575

76+
public static String getResource(String resource) {
77+
return (StevesFactoryManager.MODID.toLowerCase() + ":") + resource;
9678
}
9779
}

‎src/main/java/vswe/stevesfactory/proxy/CommonProxy.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,4 @@ public class CommonProxy {
66
public void preInit() {
77

88
}
9-
10-
public void init() {
11-
12-
}
139
}

0 commit comments

Comments
 (0)