Skip to content

Commit 8b064e9

Browse files
jaquadrojaquadro
committed
Update for Forge RB
1 parent f8d8bb2 commit 8b064e9

File tree

7 files changed

+125
-165
lines changed

7 files changed

+125
-165
lines changed

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ org.gradle.jvmargs=-Xmx3G
22

33
minecraft_base_version=1.12
44
minecraft_version=1.12
5-
mod_version=3.0.1
5+
mod_version=3.1.0
66
storagedrawers_version=5.0.0
77
storagedrawers_max_version=6.0.0

‎src/com/jaquadro/minecraft/storagedrawersextra/StorageDrawersExtra.java‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
import com.jaquadro.minecraft.storagedrawersextra.config.ConfigManagerExt;
55
import com.jaquadro.minecraft.storagedrawersextra.core.CommonProxy;
66
import com.jaquadro.minecraft.storagedrawersextra.core.ModBlocks;
7-
import com.jaquadro.minecraft.storagedrawersextra.core.ModRecipes;
87
import net.minecraftforge.common.MinecraftForge;
98
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
109
import net.minecraftforge.fml.common.Mod;
1110
import net.minecraftforge.fml.common.SidedProxy;
1211
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
13-
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
1412
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
1513
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1614
import net.minecraftforge.fml.common.network.NetworkRegistry;
@@ -29,7 +27,6 @@ public class StorageDrawersExtra
2927
public static final String SOURCE_PATH = "com.jaquadro.minecraft.storagedrawersextra.";
3028

3129
public static final ModBlocks blocks = new ModBlocks();
32-
public static final ModRecipes recipes = new ModRecipes();
3330

3431
public static ConfigManagerExt config;
3532

@@ -42,24 +39,13 @@ public class StorageDrawersExtra
4239
@Mod.EventHandler
4340
public void preInit (FMLPreInitializationEvent event) {
4441
config = new ConfigManagerExt(new File(event.getModConfigurationDirectory(), MOD_ID + ".cfg"));
45-
46-
blocks.init();
47-
48-
proxy.initDynamic();
49-
proxy.initClient();
50-
proxy.registerRenderers();
5142
}
5243

5344
public void init (FMLInitializationEvent event) {
5445
NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler());
5546
MinecraftForge.EVENT_BUS.register(instance);
5647
}
5748

58-
@Mod.EventHandler
59-
public void postInit (FMLPostInitializationEvent event) {
60-
recipes.init();
61-
}
62-
6349
@SubscribeEvent
6450
public void onConfigChanged (ConfigChangedEvent.OnConfigChangedEvent event) {
6551
if (event.getModID().equals(MOD_ID))

‎src/com/jaquadro/minecraft/storagedrawersextra/core/ClientProxy.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
package com.jaquadro.minecraft.storagedrawersextra.core;
22

3-
import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra;
4-
53
public class ClientProxy extends CommonProxy
64
{
7-
@Override
8-
public void initDynamic () {
9-
StorageDrawersExtra.blocks.initDynamic();
10-
}
11-
12-
@Override
13-
public void initClient () {
14-
StorageDrawersExtra.blocks.initClient();
15-
}
16-
17-
@Override
18-
public void registerRenderers () {
195

20-
}
216
}

‎src/com/jaquadro/minecraft/storagedrawersextra/core/CommonProxy.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,5 @@
22

33
public class CommonProxy
44
{
5-
public void initDynamic ()
6-
{ }
75

8-
public void registerRenderers ()
9-
{ }
10-
11-
public void initClient ()
12-
{ }
136
}

‎src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java‎

Lines changed: 124 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,53 +2,153 @@
22

33
import com.jaquadro.minecraft.chameleon.Chameleon;
44
import com.jaquadro.minecraft.chameleon.resources.ModelRegistry;
5+
import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
6+
import com.jaquadro.minecraft.storagedrawers.api.storage.EnumBasicDrawer;
7+
import com.jaquadro.minecraft.storagedrawers.config.ConfigManager;
8+
import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra;
59
import com.jaquadro.minecraft.storagedrawersextra.block.BlockExtraDrawers;
610
import com.jaquadro.minecraft.storagedrawersextra.block.BlockTrimExtra;
11+
import com.jaquadro.minecraft.storagedrawersextra.block.EnumMod;
712
import com.jaquadro.minecraft.storagedrawersextra.block.EnumVariant;
813
import com.jaquadro.minecraft.storagedrawersextra.client.model.ExtraDrawerModel;
914
import com.jaquadro.minecraft.storagedrawersextra.client.model.ExtraTrimModel;
15+
import com.jaquadro.minecraft.storagedrawersextra.config.ConfigManagerExt;
1016
import com.jaquadro.minecraft.storagedrawersextra.item.ItemExtraDrawers;
1117
import com.jaquadro.minecraft.storagedrawersextra.item.ItemTrimExtra;
18+
import net.minecraft.block.Block;
19+
import net.minecraft.item.Item;
1220
import net.minecraft.item.ItemStack;
13-
import net.minecraftforge.fml.common.registry.GameRegistry;
21+
import net.minecraft.item.crafting.IRecipe;
22+
import net.minecraft.nbt.NBTTagCompound;
23+
import net.minecraft.util.ResourceLocation;
24+
import net.minecraftforge.client.event.ModelRegistryEvent;
25+
import net.minecraftforge.event.RegistryEvent;
26+
import net.minecraftforge.fml.common.Mod;
27+
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1428
import net.minecraftforge.fml.relauncher.Side;
1529
import net.minecraftforge.fml.relauncher.SideOnly;
16-
import net.minecraftforge.oredict.OreDictionary;
30+
import net.minecraftforge.oredict.ShapedOreRecipe;
31+
import net.minecraftforge.registries.IForgeRegistry;
32+
33+
import javax.annotation.Nonnull;
1734

1835
public class ModBlocks
1936
{
2037
public static BlockExtraDrawers extraDrawers;
2138
public static BlockTrimExtra[] extraTrim;
2239

23-
public void init () {
24-
extraDrawers = new BlockExtraDrawers("extra_drawers", "extraDrawers");
40+
@Mod.EventBusSubscriber(modid = StorageDrawersExtra.MOD_ID)
41+
public static class Registration
42+
{
43+
@SubscribeEvent
44+
public static void registerBlocks (RegistryEvent.Register<Block> event) {
45+
IForgeRegistry<Block> registry = event.getRegistry();
2546

26-
GameRegistry.register(extraDrawers);
27-
GameRegistry.register(new ItemExtraDrawers(extraDrawers).setRegistryName(extraDrawers.getRegistryName()));
47+
extraDrawers = new BlockExtraDrawers("extra_drawers", "extraDrawers");
48+
registry.register(extraDrawers);
2849

29-
for (String key : new String[] { "drawerBasic" })
30-
OreDictionary.registerOre(key, new ItemStack(extraDrawers, 1, OreDictionary.WILDCARD_VALUE));
50+
extraTrim = new BlockTrimExtra[EnumVariant.groupCount()];
51+
for (int i = 0; i < extraTrim.length; i++) {
52+
extraTrim[i] = new BlockTrimExtra("extra_trim_" + i, "extraTrim" + i, i);
53+
registry.register(extraTrim[i]);
54+
}
55+
}
3156

32-
extraTrim = new BlockTrimExtra[EnumVariant.groupCount()];
33-
for (int i = 0; i < extraTrim.length; i++) {
34-
extraTrim[i] = new BlockTrimExtra("extra_trim_" + i, "extraTrim" + i, i);
57+
@SubscribeEvent
58+
public static void registerItems (RegistryEvent.Register<Item> event) {
59+
IForgeRegistry<Item> registry = event.getRegistry();
3560

36-
GameRegistry.register(extraTrim[i]);
37-
GameRegistry.register(new ItemTrimExtra(extraTrim[i]).setRegistryName(extraTrim[i].getRegistryName()));
61+
registry.register(new ItemExtraDrawers(extraDrawers).setRegistryName(extraDrawers.getRegistryName()));
62+
for (BlockTrimExtra trim : extraTrim)
63+
registry.register(new ItemTrimExtra(trim).setRegistryName(trim.getRegistryName()));
3864
}
39-
}
4065

41-
@SideOnly(Side.CLIENT)
42-
public void initDynamic () {
43-
extraDrawers.initDynamic();
44-
}
66+
private static final ResourceLocation EMPTY_GROUP = new ResourceLocation("", "");
67+
68+
@Nonnull
69+
public static ItemStack makeBasicDrawerItemStack (EnumBasicDrawer info, String material, int count) {
70+
@Nonnull ItemStack stack = new ItemStack(ModBlocks.extraDrawers, count, info.getMetadata());
71+
72+
NBTTagCompound data = new NBTTagCompound();
73+
data.setString("material", material);
74+
stack.setTagCompound(data);
75+
76+
return stack;
77+
}
78+
79+
@SubscribeEvent
80+
public static void registerRecipes (RegistryEvent.Register<IRecipe> event) {
81+
IForgeRegistry<IRecipe> registry = event.getRegistry();
82+
ConfigManager config = StorageDrawers.config;
83+
ConfigManagerExt configExt = StorageDrawersExtra.config;
4584

46-
@SideOnly(Side.CLIENT)
47-
public void initClient () {
48-
ModelRegistry modelRegistry = Chameleon.instance.modelRegistry;
85+
for (EnumVariant variant : EnumVariant.values()) {
86+
if (variant == EnumVariant.DEFAULT)
87+
continue;
4988

50-
modelRegistry.registerModel(new ExtraDrawerModel.Register());
51-
for (BlockTrimExtra block : extraTrim)
52-
modelRegistry.registerModel(new ExtraTrimModel.Register(block));
89+
EnumMod mod = variant.getMod();
90+
if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod)))
91+
continue;
92+
93+
@Nonnull ItemStack plankStack = ItemStack.EMPTY;
94+
if (variant.getPlankResource() != null) {
95+
Block block = Block.getBlockFromName(variant.getPlankResource().toString());
96+
if (block != null)
97+
plankStack = new ItemStack(block, 1, variant.getPlankMeta());
98+
}
99+
100+
@Nonnull ItemStack slabStack = ItemStack.EMPTY;
101+
if (variant.getSlabResource() != null) {
102+
Block block = Block.getBlockFromName(variant.getSlabResource().toString());
103+
if (block != null)
104+
slabStack = new ItemStack(block, 1, variant.getSlabMeta());
105+
}
106+
107+
String material = variant.getResource().toString();
108+
109+
if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) {
110+
@Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName()));
111+
registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood")
112+
.setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString()));
113+
}
114+
if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) {
115+
@Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName()));
116+
registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood")
117+
.setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString()));
118+
}
119+
if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) {
120+
@Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName()));
121+
registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood")
122+
.setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString()));
123+
}
124+
if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) {
125+
@Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName()));
126+
registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood")
127+
.setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString()));
128+
}
129+
if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) {
130+
@Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName()));
131+
registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood")
132+
.setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString()));
133+
}
134+
if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) {
135+
@Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta());
136+
registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack)
137+
.setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString()));
138+
}
139+
}
140+
}
141+
142+
@SubscribeEvent
143+
@SideOnly(Side.CLIENT)
144+
public static void registerModels (ModelRegistryEvent event) {
145+
extraDrawers.initDynamic();
146+
147+
ModelRegistry modelRegistry = Chameleon.instance.modelRegistry;
148+
149+
modelRegistry.registerModel(new ExtraDrawerModel.Register());
150+
for (BlockTrimExtra block : extraTrim)
151+
modelRegistry.registerModel(new ExtraTrimModel.Register(block));
152+
}
53153
}
54154
}

‎src/com/jaquadro/minecraft/storagedrawersextra/core/ModGuiFactory.java‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,8 @@ public GuiScreen createConfigGui (GuiScreen parentScreen) {
2222
return new ModConfigGui(parentScreen);
2323
}
2424

25-
@Override
26-
public Class<? extends GuiScreen> mainConfigGuiClass () {
27-
return ModConfigGui.class;
28-
}
29-
3025
@Override
3126
public Set<RuntimeOptionCategoryElement> runtimeGuiCategories () {
3227
return null;
3328
}
34-
35-
@Override
36-
public RuntimeOptionGuiHandler getHandlerFor (RuntimeOptionCategoryElement element) {
37-
return null;
38-
}
3929
}

‎src/com/jaquadro/minecraft/storagedrawersextra/core/ModRecipes.java‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)