Merge branch '1.12' of https://github.com/squeek502/AppleCore into 1.…

…12.1
squeek502 · Feb 13, 2018 · 099a7f7f686b11a0fbf4cbf8bb73b92543f76025 · 099a7f7
2 parents d4faf90 + 2e7f052
commit 099a7f7f686b11a0fbf4cbf8bb73b92543f76025
Unified Split

Showing with 22 additions and 3 deletions.

+1 −1 gradle.properties

+7 −0 java/squeek/applecore/AppleCore.java

+12 −2 java/squeek/applecore/api_impl/AppleCoreRegistryImpl.java

+2 −0 resources/assets/applecore/lang/pl_PL.lang
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=3.1.0
+version=3.1.1
 api_version=3.1.0
 minecraft_version=1.12.1
 forge_version=14.22.0.2446
diff --git a/java/squeek/applecore/AppleCore.java b/java/squeek/applecore/AppleCore.java
@@ -6,6 +6,7 @@
 import net.minecraftforge.fml.common.Mod.EventHandler;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLInterModComms;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
@@ -45,6 +46,12 @@ public void preInit(FMLPreInitializationEvent event)
 		FMLInterModComms.sendRuntimeMessage(ModInfo.MODID, "versionchecker", "addVersionCheck", "http://www.ryanliptak.com/minecraft/versionchecker/squeek502/AppleCore");
 	}

+	@EventHandler
+	public void postInit(FMLPostInitializationEvent event)
+	{
+		AppleCoreRegistryImpl.INSTANCE.init();
+	}
+
 	@EventHandler
 	public void init(FMLInitializationEvent event)
 	{
diff --git a/java/squeek/applecore/api_impl/AppleCoreRegistryImpl.java b/java/squeek/applecore/api_impl/AppleCoreRegistryImpl.java
@@ -2,8 +2,8 @@

 import net.minecraft.block.Block;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.Item;
+import net.minecraftforge.fml.common.registry.GameRegistry;
 import squeek.applecore.api.AppleCoreAPI;
 import squeek.applecore.api.IAppleCoreRegistry;

@@ -20,7 +20,17 @@
 	private AppleCoreRegistryImpl()
 	{
 		AppleCoreAPI.registry = this;
-		registerEdibleBlock(Blocks.CAKE, Items.CAKE);
+	}
+
+	@GameRegistry.ObjectHolder("minecraft:cake")
+	public static final Block CAKE_BLOCK = null;
+
+	@GameRegistry.ObjectHolder("minecraft:cake")
+	public static final Item CAKE_ITEM = null;
+
+	public void init()
+	{
+		registerEdibleBlock(CAKE_BLOCK, CAKE_ITEM);
 	}

 	@Override
diff --git a/resources/assets/applecore/lang/pl_PL.lang b/resources/assets/applecore/lang/pl_PL.lang
@@ -0,0 +1,2 @@
+applecore.commands.hunger.usage=/hunger [gracz] <wartość>
+applecore.commands.hunger.set.hunger.to=Ustaw %s's głód na %d