Move GardenDecor into main project area

jaquadro · Feb 17, 2015 · e361467 · e361467
1 parent 8668039
commit e361467
Show file tree

Hide file tree

Showing 21 changed files with 83 additions and 49 deletions.
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_heavy.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_heavy.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_heavy_gold.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_heavy_gold.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_ladder.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_ladder.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_light.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_light.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_light_gold.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/chain_light_gold.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/iron_baseplate_1.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/iron_baseplate_1.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/iron_baseplate_4.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/iron_baseplate_4.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/blocks/iron_lattice.png b/GardenCore/resources/assets/gardenstuff/textures/blocks/iron_lattice.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/items/gold_chain_link.png b/GardenCore/resources/assets/gardenstuff/textures/items/gold_chain_link.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/items/iron_chain_link.png b/GardenCore/resources/assets/gardenstuff/textures/items/iron_chain_link.png
diff --git a/GardenCore/resources/assets/gardenstuff/textures/items/iron_nugget.png b/GardenCore/resources/assets/gardenstuff/textures/items/iron_nugget.png
diff --git a/GardenCore/resources/mcmod.info b/GardenCore/resources/mcmod.info
@@ -1,12 +1,22 @@
 [
-{
-	"modid": "GardenCore",
-	"name": "Garden Core",
-	"description": "Base mod for a collection of garden and plant mods.",
-	"version": "1.0.0",
-	"credits": "By jaquadro",
-	"logoFile": "",
-	"url": "http://www.jaquadro.com/",
-	"authors": [ "jaquadro" ]
-}
+	{
+		"modid": "GardenCore",
+		"name": "Garden Core",
+		"description": "Base mod for a collection of garden and plant mods.",
+		"version": "1.0.0",
+		"credits": "By jaquadro",
+		"logoFile": "",
+		"url": "http://www.jaquadro.com/",
+		"authors": [ "jaquadro" ]
+	},
+	{
+		"modid": "GardenStuff",
+		"name": "Garden Stuff",
+		"description": "Decorative blocks and miscellaneous things for gardens and more.",
+		"version": "1.0.0",
+		"credits": "By jaquadro",
+		"logoFile": "",
+		"url": "http://www.jaquadro.com/",
+		"authors": [ "jaquadro" ]
+	}
 ]
diff --git a/GardenCore/src/com/jaquadro/minecraft/gardenstuff/GardenStuff.java b/GardenCore/src/com/jaquadro/minecraft/gardenstuff/GardenStuff.java
@@ -0,0 +1,41 @@
+package com.jaquadro.minecraft.gardenstuff;
+
+import com.jaquadro.minecraft.gardenstuff.core.CommonProxy;
+import com.jaquadro.minecraft.gardenstuff.core.ModBlocks;
+import cpw.mods.fml.common.Mod;
+import cpw.mods.fml.common.SidedProxy;
+import cpw.mods.fml.common.event.FMLInitializationEvent;
+import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.FMLPreInitializationEvent;
+
+@Mod(modid = GardenStuff.MOD_ID, name = GardenStuff.MOD_NAME, version = GardenStuff.MOD_VERSION, dependencies = "required-after:GardenCore")
+public class GardenStuff
+{
+    public static final String MOD_ID = "GardenStuff";
+    public static final String MOD_NAME = "Garden Stuff";
+    public static final String MOD_VERSION = "@VERSION@";
+    static final String SOURCE_PATH = "com.jaquadro.minecraft.gardenstuff.";
+
+    @Mod.Instance(MOD_ID)
+    public static GardenStuff instance;
+
+    @SidedProxy(clientSide = SOURCE_PATH + "core.ClientProxy", serverSide = SOURCE_PATH + "core.CommonProxy")
+    public static CommonProxy proxy;
+
+    public static final ModBlocks blocks = new ModBlocks();
+
+    @Mod.EventHandler
+    public void preInit (FMLPreInitializationEvent event) {
+        blocks.init();
+    }
+
+    @Mod.EventHandler
+    public void init (FMLInitializationEvent event) {
+        proxy.registerRenderers();
+    }
+
+    @Mod.EventHandler
+    public void postInit (FMLPostInitializationEvent event) {
+    }
+
+}
diff --git a/...ft/gardendecor/block/BlockHeavyChain.java → ...ft/gardenstuff/block/BlockHeavyChain.java b/...ft/gardendecor/block/BlockHeavyChain.java → ...ft/gardenstuff/block/BlockHeavyChain.java
@@ -1,7 +1,7 @@
-package com.jaquadro.minecraft.gardendecor.block;
+package com.jaquadro.minecraft.gardenstuff.block;
 
-import com.jaquadro.minecraft.gardencontainers.GardenContainers;
 import com.jaquadro.minecraft.gardencore.core.ModCreativeTabs;
+import com.jaquadro.minecraft.gardenstuff.GardenStuff;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.util.AxisAlignedBB;
@@ -17,7 +17,7 @@ public BlockHeavyChain (String blockName) {
         setResistance(5f);
         setStepSound(Block.soundTypeMetal);
         setBlockBounds(.5f - .125f, 0, .5f - .125f, .5f + .125f, 1, .5f + .125f);
-        setBlockTextureName(GardenContainers.MOD_ID + ":chain_heavy");
+        setBlockTextureName(GardenStuff.MOD_ID + ":chain_heavy");
         setCreativeTab(ModCreativeTabs.tabGardenCore);
     }
 

diff --git a/...ndecor/block/BlockLargeMountingPlate.java → ...nstuff/block/BlockLargeMountingPlate.java b/...ndecor/block/BlockLargeMountingPlate.java → ...nstuff/block/BlockLargeMountingPlate.java
@@ -1,7 +1,7 @@
-package com.jaquadro.minecraft.gardendecor.block;
+package com.jaquadro.minecraft.gardenstuff.block;
 
-import com.jaquadro.minecraft.gardencontainers.GardenContainers;
 import com.jaquadro.minecraft.gardencore.core.ModCreativeTabs;
+import com.jaquadro.minecraft.gardenstuff.GardenStuff;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 
@@ -15,7 +15,7 @@ public BlockLargeMountingPlate (String blockName) {
         setResistance(5f);
         setStepSound(Block.soundTypeMetal);
         setBlockBounds(0, 1 - .125f, 0, 1, 1, 1);
-        setBlockTextureName(GardenContainers.MOD_ID + ":iron_baseplate_4");
+        setBlockTextureName(GardenStuff.MOD_ID + ":iron_baseplate_4");
         setCreativeTab(ModCreativeTabs.tabGardenCore);
     }
 

diff --git a/...ft/gardendecor/block/BlockLightChain.java → ...ft/gardenstuff/block/BlockLightChain.java b/...ft/gardendecor/block/BlockLightChain.java → ...ft/gardenstuff/block/BlockLightChain.java
@@ -1,17 +1,13 @@
-package com.jaquadro.minecraft.gardendecor.block;
+package com.jaquadro.minecraft.gardenstuff.block;
 
-import com.jaquadro.minecraft.gardencontainers.GardenContainers;
-import com.jaquadro.minecraft.gardencontainers.core.ClientProxy;
-import com.jaquadro.minecraft.gardencore.api.GardenCoreAPI;
-import com.jaquadro.minecraft.gardencore.api.IBonemealHandler;
 import com.jaquadro.minecraft.gardencore.api.IPlantProxy;
-import com.jaquadro.minecraft.gardencore.block.BlockGarden;
 import com.jaquadro.minecraft.gardencore.block.tile.TileEntityGarden;
 import com.jaquadro.minecraft.gardencore.core.ModBlocks;
 import com.jaquadro.minecraft.gardencore.core.ModCreativeTabs;
+import com.jaquadro.minecraft.gardenstuff.GardenStuff;
+import com.jaquadro.minecraft.gardenstuff.core.ClientProxy;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -26,7 +22,7 @@ public BlockLightChain (String blockName) {
         setResistance(5f);
         setStepSound(Block.soundTypeMetal);
         setBlockBounds(.5f - .0625f, 0, .5f - .0625f, .5f + .0625f, 1, .5f + .0625f);
-        setBlockTextureName(GardenContainers.MOD_ID + ":chain_light");
+        setBlockTextureName(GardenStuff.MOD_ID + ":chain_light");
         setCreativeTab(ModCreativeTabs.tabGardenCore);
     }
 

diff --git a/...necraft/gardendecor/core/ClientProxy.java → ...necraft/gardenstuff/core/ClientProxy.java b/...necraft/gardendecor/core/ClientProxy.java → ...necraft/gardenstuff/core/ClientProxy.java
@@ -1,6 +1,6 @@
-package com.jaquadro.minecraft.gardendecor.core;
+package com.jaquadro.minecraft.gardenstuff.core;
 
-import com.jaquadro.minecraft.gardendecor.client.renderer.LightChainRenderer;
+import com.jaquadro.minecraft.gardenstuff.renderer.LightChainRenderer;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 
 public class ClientProxy extends CommonProxy

diff --git a/...necraft/gardendecor/core/CommonProxy.java → ...necraft/gardenstuff/core/CommonProxy.java b/...necraft/gardendecor/core/CommonProxy.java → ...necraft/gardenstuff/core/CommonProxy.java
@@ -1,4 +1,4 @@
-package com.jaquadro.minecraft.gardendecor.core;
+package com.jaquadro.minecraft.gardenstuff.core;
 
 public class CommonProxy
 {

diff --git a/...minecraft/gardendecor/core/ModBlocks.java → ...minecraft/gardenstuff/core/ModBlocks.java b/...minecraft/gardendecor/core/ModBlocks.java → ...minecraft/gardenstuff/core/ModBlocks.java
@@ -1,9 +1,9 @@
-package com.jaquadro.minecraft.gardendecor.core;
+package com.jaquadro.minecraft.gardenstuff.core;
 
-import com.jaquadro.minecraft.gardendecor.GardenDecor;
-import com.jaquadro.minecraft.gardendecor.block.BlockHeavyChain;
-import com.jaquadro.minecraft.gardendecor.block.BlockLargeMountingPlate;
-import com.jaquadro.minecraft.gardendecor.block.BlockLightChain;
+import com.jaquadro.minecraft.gardenstuff.GardenStuff;
+import com.jaquadro.minecraft.gardenstuff.block.BlockHeavyChain;
+import com.jaquadro.minecraft.gardenstuff.block.BlockLargeMountingPlate;
+import com.jaquadro.minecraft.gardenstuff.block.BlockLightChain;
 import cpw.mods.fml.common.registry.GameData;
 import cpw.mods.fml.common.registry.GameRegistry;
 import net.minecraft.block.Block;
@@ -21,11 +21,11 @@ public void init () {
 
         GameRegistry.registerBlock(heavyChain, "heavy_chain");
         GameRegistry.registerBlock(lightChain, "light_chain");
-        GameRegistry.registerBlock(largeMountingPlate, "large_mounting_plate");
+        //GameRegistry.registerBlock(largeMountingPlate, "large_mounting_plate");
     }
 
     public static Block get (String name) {
-        return GameRegistry.findBlock(GardenDecor.MOD_ID, name);
+        return GameRegistry.findBlock(GardenStuff.MOD_ID, name);
     }
 
     public static String getQualifiedName (Block block) {

diff --git a/...r/client/renderer/LightChainRenderer.java → ...denstuff/renderer/LightChainRenderer.java b/...r/client/renderer/LightChainRenderer.java → ...denstuff/renderer/LightChainRenderer.java
@@ -1,9 +1,8 @@
-package com.jaquadro.minecraft.gardendecor.client.renderer;
+package com.jaquadro.minecraft.gardenstuff.renderer;
 
-import com.jaquadro.minecraft.gardencontainers.core.ClientProxy;
-import com.jaquadro.minecraft.gardencore.GardenCore;
 import com.jaquadro.minecraft.gardencore.api.block.IChainAttachable;
 import com.jaquadro.minecraft.gardencore.core.ModBlocks;
+import com.jaquadro.minecraft.gardenstuff.core.ClientProxy;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;

diff --git a/GardenDecor/src/com/jaquadro/minecraft/gardendecor/GardenDecor.java b/GardenDecor/src/com/jaquadro/minecraft/gardendecor/GardenDecor.java