Skip to content

Commit 3947842

Browse files
dshadowwolfjriwanek
dshadowwolf
authored and
jriwanek
committed
1) Move adding existing items for vanilla stuff to MMDLib (#446)
2) Move adding existing blocks for vanilla stuff to MMDLib 3) Move configuring "vanilla materials" on/off to MMDLib -- This allows for MMDLib to provide for access to existing vanilla stuff without providing anything extra
1 parent f2e2870 commit 3947842

File tree

5 files changed

+7
-153
lines changed

5 files changed

+7
-153
lines changed

‎src/main/java/com/mcmoddev/basemetals/integration/plugins/BMeTinkersConstruct.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ public void registerMiscShit(RegistryEvent.Register<IRecipe> ev) {
8686

8787
@SubscribeEvent
8888
public void postInit(final IntegrationPostInitEvent event){
89-
registerPrismarineFullCasting();
89+
if(Options.isMaterialEnabled(MaterialNames.PRISMARINE) && Options.isFluidEnabled(MaterialNames.PRISMARINE)) {
90+
registerPrismarineFullCasting();
91+
}
9092
}
9193

9294
public static void registerPrismarineFullCasting(){

‎src/main/java/com/mcmoddev/basemetals/util/BMeConfig.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,6 @@ public final class BMeConfig extends Config {
4545
new MaterialConfigOptions(MaterialNames.STEEL, false, true, true, true, true),
4646
new MaterialConfigOptions(MaterialNames.TIN, false, true, true, true, true),
4747
new MaterialConfigOptions(MaterialNames.ZINC, false, true, true, true, true),
48-
new MaterialConfigOptions(MaterialNames.CHARCOAL, true, true, true, true),
49-
new MaterialConfigOptions(MaterialNames.COAL, true, true, true,true),
50-
new MaterialConfigOptions(MaterialNames.DIAMOND,true, true, true, true),
51-
new MaterialConfigOptions(MaterialNames.EMERALD,true, true, true, true),
52-
new MaterialConfigOptions(MaterialNames.GOLD, true,true, true, true),
53-
new MaterialConfigOptions(MaterialNames.IRON, true,true, true, true),
54-
new MaterialConfigOptions(MaterialNames.STONE, true,true, false, false),
55-
new MaterialConfigOptions(MaterialNames.WOOD, true,true, false, false),
56-
new MaterialConfigOptions(MaterialNames.ENDER, true,true, true, true),
57-
new MaterialConfigOptions(MaterialNames.QUARTZ, true,true, true, true),
58-
new MaterialConfigOptions(MaterialNames.OBSIDIAN,true, true, true, true),
59-
new MaterialConfigOptions(MaterialNames.LAPIS, true,true, false, false),
60-
new MaterialConfigOptions(MaterialNames.PRISMARINE,true, true, true, true),
61-
new MaterialConfigOptions(MaterialNames.REDSTONE,true, true, true, true)
6248
};
6349

6450
/**

‎src/main/java/com/mcmoddev/basemetals/util/EventHandler.java

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import javax.annotation.Nonnull;
44

5+
import com.mcmoddev.basemetals.BaseMetals;
56
import com.mcmoddev.basemetals.init.Fluids;
67
import com.mcmoddev.basemetals.properties.AdamantineProperty;
78
import com.mcmoddev.basemetals.properties.AdamantineToolProperty;
@@ -46,7 +47,7 @@
4647
import net.minecraftforge.fml.relauncher.Side;
4748
import net.minecraftforge.fml.relauncher.SideOnly;
4849

49-
@EventBusSubscriber
50+
@EventBusSubscriber(modid=BaseMetals.MODID)
5051
public final class EventHandler {
5152

5253
public EventHandler() {
@@ -184,18 +185,6 @@ public static void mmdlibRegisterMaterials(final MMDLibRegisterMaterials event)
184185
com.mcmoddev.basemetals.init.Materials.initTooltips();
185186
}
186187
}
187-
188-
/*
189-
* @SubscribeEvent public static void mmdlibRegisterBlocks(final
190-
* MMDLibRegisterBlocks event) { Blocks.init(event); }
191-
*
192-
* @SubscribeEvent public static void mmdlibRegisterItems(final
193-
* MMDLibRegisterItems event) { Items.registerItems(event); }
194-
*/
195-
@SubscribeEvent
196-
public static void mmdlibRegisterFluids(final MMDLibRegisterFluids event) {
197-
Fluids.registerEvent(event);
198-
}
199188

200189
@SubscribeEvent
201190
public static void mmdlibRegisterMaterialProperies(final MMDLibRegisterMaterialProperties event) {

‎src/main/java/com/mcmoddev/basemetals/vanillabits/VanillaBlocks.java

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import com.mcmoddev.lib.util.Config.Options;
1414

1515
import net.minecraftforge.fml.common.Mod;
16-
import net.minecraftforge.fml.common.eventhandler.EventPriority;
1716
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1817

1918
@Mod.EventBusSubscriber(modid=BaseMetals.MODID)
@@ -23,53 +22,13 @@ private VanillaBlocks() {
2322
throw new IllegalAccessError("Class cannot be instantiated!");
2423
}
2524

26-
@SubscribeEvent(priority=EventPriority.HIGHEST)
25+
@SubscribeEvent
2726
public static void registerVanilla(MMDLibRegisterBlocks ev) {
2827
// Vanilla Materials get their Ore and Block always
2928
final MMDMaterial charcoal = Materials.getMaterialByName(MaterialNames.CHARCOAL);
30-
final MMDMaterial coal = Materials.getMaterialByName(MaterialNames.COAL);
31-
final MMDMaterial diamond = Materials.getMaterialByName(MaterialNames.DIAMOND);
32-
final MMDMaterial emerald = Materials.getMaterialByName(MaterialNames.EMERALD);
3329
final MMDMaterial gold = Materials.getMaterialByName(MaterialNames.GOLD);
3430
final MMDMaterial iron = Materials.getMaterialByName(MaterialNames.IRON);
35-
final MMDMaterial lapis = Materials.getMaterialByName(MaterialNames.LAPIS);
36-
final MMDMaterial obsidian = Materials.getMaterialByName(MaterialNames.OBSIDIAN);
3731
final MMDMaterial quartz = Materials.getMaterialByName(MaterialNames.QUARTZ);
38-
final MMDMaterial redstone = Materials.getMaterialByName(MaterialNames.REDSTONE);
39-
40-
coal.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.COAL_BLOCK);
41-
coal.addNewBlock(Names.ORE, net.minecraft.init.Blocks.COAL_ORE);
42-
43-
diamond.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.DIAMOND_BLOCK);
44-
diamond.addNewBlock(Names.ORE, net.minecraft.init.Blocks.DIAMOND_ORE);
45-
46-
emerald.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.EMERALD_BLOCK);
47-
emerald.addNewBlock(Names.ORE, net.minecraft.init.Blocks.EMERALD_ORE);
48-
49-
gold.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.GOLD_BLOCK);
50-
gold.addNewBlock(Names.ORE, net.minecraft.init.Blocks.GOLD_ORE);
51-
gold.addNewBlock(Names.PRESSURE_PLATE,
52-
net.minecraft.init.Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE);
53-
54-
iron.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.IRON_BLOCK);
55-
iron.addNewBlock(Names.ORE, net.minecraft.init.Blocks.IRON_ORE);
56-
iron.addNewBlock(Names.BARS, net.minecraft.init.Blocks.IRON_BARS);
57-
iron.addNewBlock(Names.DOOR, net.minecraft.init.Blocks.IRON_DOOR);
58-
iron.addNewBlock(Names.TRAPDOOR, net.minecraft.init.Blocks.IRON_TRAPDOOR);
59-
iron.addNewBlock(Names.PRESSURE_PLATE,
60-
net.minecraft.init.Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE);
61-
62-
lapis.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.LAPIS_BLOCK);
63-
lapis.addNewBlock(Names.ORE, net.minecraft.init.Blocks.LAPIS_ORE);
64-
65-
obsidian.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.OBSIDIAN);
66-
67-
quartz.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.QUARTZ_BLOCK);
68-
quartz.addNewBlock(Names.ORE, net.minecraft.init.Blocks.QUARTZ_ORE);
69-
quartz.addNewBlock(Names.STAIRS, net.minecraft.init.Blocks.QUARTZ_STAIRS);
70-
71-
redstone.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.REDSTONE_BLOCK);
72-
redstone.addNewBlock(Names.ORE, net.minecraft.init.Blocks.REDSTONE_ORE);
7332

7433
if (Materials.hasMaterial(MaterialNames.CHARCOAL)) {
7534
create(Names.BLOCK, charcoal);

‎src/main/java/com/mcmoddev/basemetals/vanillabits/VanillaItems.java

Lines changed: 1 addition & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@
1111
import com.mcmoddev.lib.init.Materials;
1212
import com.mcmoddev.lib.material.IMMDBurnableObject;
1313
import com.mcmoddev.lib.material.MMDMaterial;
14-
//import com.mcmoddev.lib.util.Config;
1514
import com.mcmoddev.lib.util.Config.Options;
1615

17-
import net.minecraft.item.ItemStack;
18-
1916
import net.minecraftforge.fml.common.Mod;
20-
import net.minecraftforge.fml.common.eventhandler.EventPriority;
2117
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
2218

2319
@Mod.EventBusSubscriber(modid=BaseMetals.MODID)
@@ -27,21 +23,8 @@ private VanillaItems() {
2723
// TODO Auto-generated constructor stub
2824
}
2925

30-
@SubscribeEvent(priority=EventPriority.HIGHEST)
26+
@SubscribeEvent
3127
public static void registerItemsEvent(MMDLibRegisterItems ev) {
32-
Materials.getMaterialByName(MaterialNames.CHARCOAL).addNewItemFromItemStack(Names.INGOT,
33-
new ItemStack(net.minecraft.init.Items.COAL, 1, 1));
34-
Materials.getMaterialByName(MaterialNames.COAL).addNewItemFromItemStack(Names.INGOT,
35-
new ItemStack(net.minecraft.init.Items.COAL, 1, 0));
36-
37-
Materials.getMaterialByName(MaterialNames.EMERALD).addNewItem(Names.INGOT,
38-
net.minecraft.init.Items.EMERALD);
39-
Materials.getMaterialByName(MaterialNames.LAPIS).addNewItemFromItemStack(Names.INGOT,
40-
new ItemStack(net.minecraft.init.Items.DYE, 1, 4));
41-
Materials.getMaterialByName(MaterialNames.QUARTZ).addNewItem(Names.INGOT,
42-
net.minecraft.init.Items.QUARTZ);
43-
Materials.getMaterialByName(MaterialNames.REDSTONE).addNewItem(Names.POWDER,
44-
net.minecraft.init.Items.REDSTONE);
4528
addDiamondBits();
4629
addGoldBits();
4730
addIronBits();
@@ -172,18 +155,6 @@ private static void doSpecialMats() {
172155
private static void addDiamondBits() {
173156
final MMDMaterial diamond = Materials.getMaterialByName(MaterialNames.DIAMOND);
174157

175-
diamond.addNewItem(Names.AXE, net.minecraft.init.Items.DIAMOND_AXE);
176-
diamond.addNewItem(Names.HOE, net.minecraft.init.Items.DIAMOND_HOE);
177-
diamond.addNewItem(Names.HORSE_ARMOR, net.minecraft.init.Items.DIAMOND_HORSE_ARMOR);
178-
diamond.addNewItem(Names.PICKAXE, net.minecraft.init.Items.DIAMOND_PICKAXE);
179-
diamond.addNewItem(Names.SHOVEL, net.minecraft.init.Items.DIAMOND_SHOVEL);
180-
diamond.addNewItem(Names.SWORD, net.minecraft.init.Items.DIAMOND_SWORD);
181-
diamond.addNewItem(Names.BOOTS, net.minecraft.init.Items.DIAMOND_BOOTS);
182-
diamond.addNewItem(Names.CHESTPLATE, net.minecraft.init.Items.DIAMOND_CHESTPLATE);
183-
diamond.addNewItem(Names.HELMET, net.minecraft.init.Items.DIAMOND_HELMET);
184-
diamond.addNewItem(Names.LEGGINGS, net.minecraft.init.Items.DIAMOND_LEGGINGS);
185-
diamond.addNewItem(Names.INGOT, net.minecraft.init.Items.DIAMOND);
186-
187158
if (Materials.hasMaterial(MaterialNames.DIAMOND)) {
188159
create(Names.BLEND, diamond);
189160
create(Names.NUGGET, diamond);
@@ -210,19 +181,6 @@ private static void addDiamondBits() {
210181
private static void addGoldBits() {
211182
final MMDMaterial gold = Materials.getMaterialByName(MaterialNames.GOLD);
212183

213-
gold.addNewItem(Names.AXE, net.minecraft.init.Items.GOLDEN_AXE);
214-
gold.addNewItem(Names.HOE, net.minecraft.init.Items.GOLDEN_HOE);
215-
gold.addNewItem(Names.HORSE_ARMOR, net.minecraft.init.Items.GOLDEN_HORSE_ARMOR);
216-
gold.addNewItem(Names.PICKAXE, net.minecraft.init.Items.GOLDEN_PICKAXE);
217-
gold.addNewItem(Names.SHOVEL, net.minecraft.init.Items.GOLDEN_SHOVEL);
218-
gold.addNewItem(Names.SWORD, net.minecraft.init.Items.GOLDEN_SWORD);
219-
gold.addNewItem(Names.BOOTS, net.minecraft.init.Items.GOLDEN_BOOTS);
220-
gold.addNewItem(Names.CHESTPLATE, net.minecraft.init.Items.GOLDEN_CHESTPLATE);
221-
gold.addNewItem(Names.HELMET, net.minecraft.init.Items.GOLDEN_HELMET);
222-
gold.addNewItem(Names.LEGGINGS, net.minecraft.init.Items.GOLDEN_LEGGINGS);
223-
gold.addNewItem(Names.INGOT, net.minecraft.init.Items.GOLD_INGOT);
224-
gold.addNewItem(Names.NUGGET, net.minecraft.init.Items.GOLD_NUGGET);
225-
226184
if (Materials.hasMaterial(MaterialNames.GOLD)) {
227185
create(Names.BLEND, gold);
228186
create(Names.POWDER, gold);
@@ -248,21 +206,6 @@ private static void addGoldBits() {
248206
private static void addIronBits() {
249207
final MMDMaterial iron = Materials.getMaterialByName(MaterialNames.IRON);
250208

251-
iron.addNewItem(Names.AXE, net.minecraft.init.Items.IRON_AXE);
252-
iron.addNewItem(Names.DOOR, net.minecraft.init.Items.IRON_DOOR);
253-
iron.addNewItem(Names.HOE, net.minecraft.init.Items.IRON_HOE);
254-
iron.addNewItem(Names.HORSE_ARMOR, net.minecraft.init.Items.IRON_HORSE_ARMOR);
255-
iron.addNewItem(Names.PICKAXE, net.minecraft.init.Items.IRON_PICKAXE);
256-
iron.addNewItem(Names.SHOVEL, net.minecraft.init.Items.IRON_SHOVEL);
257-
iron.addNewItem(Names.SWORD, net.minecraft.init.Items.IRON_SWORD);
258-
iron.addNewItem(Names.BOOTS, net.minecraft.init.Items.IRON_BOOTS);
259-
iron.addNewItem(Names.CHESTPLATE, net.minecraft.init.Items.IRON_CHESTPLATE);
260-
iron.addNewItem(Names.HELMET, net.minecraft.init.Items.IRON_HELMET);
261-
iron.addNewItem(Names.LEGGINGS, net.minecraft.init.Items.IRON_LEGGINGS);
262-
iron.addNewItem(Names.INGOT, net.minecraft.init.Items.IRON_INGOT);
263-
iron.addNewItem(Names.NUGGET, net.minecraft.init.Items.IRON_NUGGET);
264-
iron.addNewItem(Names.SHEARS, net.minecraft.init.Items.SHEARS);
265-
266209
if (Materials.hasMaterial(MaterialNames.IRON)) {
267210
create(Names.BLEND, iron);
268211
create(Names.INGOT, iron);
@@ -299,16 +242,6 @@ private static void addIronBits() {
299242
private static void addStoneBits() {
300243
final MMDMaterial stone = Materials.getMaterialByName(MaterialNames.STONE);
301244

302-
stone.addNewItem(Names.AXE, net.minecraft.init.Items.STONE_AXE);
303-
stone.addNewItem(Names.HOE, net.minecraft.init.Items.STONE_HOE);
304-
stone.addNewItem(Names.PICKAXE, net.minecraft.init.Items.STONE_PICKAXE);
305-
stone.addNewItem(Names.SHOVEL, net.minecraft.init.Items.STONE_SHOVEL);
306-
stone.addNewItem(Names.SWORD, net.minecraft.init.Items.STONE_SWORD);
307-
stone.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.STONE);
308-
stone.addNewBlock(Names.SLAB, net.minecraft.init.Blocks.STONE_SLAB);
309-
stone.addNewBlock(Names.DOUBLE_SLAB, net.minecraft.init.Blocks.DOUBLE_STONE_SLAB);
310-
stone.addNewBlock(Names.STAIRS, net.minecraft.init.Blocks.STONE_STAIRS);
311-
312245
if (Materials.hasMaterial(MaterialNames.STONE)) {
313246
create(Names.CRACKHAMMER, stone);
314247
create(Names.ROD, stone);
@@ -320,21 +253,6 @@ private static void addStoneBits() {
320253
private static void addWoodBits() {
321254
final MMDMaterial wood = Materials.getMaterialByName(MaterialNames.WOOD);
322255

323-
wood.addNewItem(Names.AXE, net.minecraft.init.Items.WOODEN_AXE);
324-
wood.addNewItem(Names.DOOR, net.minecraft.init.Items.OAK_DOOR);
325-
wood.addNewItem(Names.HOE, net.minecraft.init.Items.WOODEN_HOE);
326-
wood.addNewItem(Names.PICKAXE, net.minecraft.init.Items.WOODEN_PICKAXE);
327-
wood.addNewItem(Names.SHOVEL, net.minecraft.init.Items.WOODEN_SHOVEL);
328-
wood.addNewItem(Names.SWORD, net.minecraft.init.Items.WOODEN_SWORD);
329-
wood.addNewBlock(Names.DOOR, net.minecraft.init.Blocks.OAK_DOOR);
330-
wood.addNewBlock(Names.ORE, net.minecraft.init.Blocks.LOG);
331-
wood.addNewBlock(Names.TRAPDOOR, net.minecraft.init.Blocks.TRAPDOOR);
332-
wood.addNewBlock(Names.BLOCK, net.minecraft.init.Blocks.PLANKS);
333-
wood.addNewBlock(Names.SLAB, net.minecraft.init.Blocks.WOODEN_SLAB);
334-
wood.addNewBlock(Names.DOUBLE_SLAB, net.minecraft.init.Blocks.DOUBLE_WOODEN_SLAB);
335-
wood.addNewBlock(Names.STAIRS, net.minecraft.init.Blocks.OAK_STAIRS);
336-
wood.addNewItem(Names.SHEARS, net.minecraft.init.Items.SHEARS);
337-
338256
if (Materials.hasMaterial(MaterialNames.WOOD)) {
339257
create(Names.CRACKHAMMER, wood);
340258
create(Names.GEAR, wood);

0 commit comments

Comments
 (0)