Getting things running, pretty much

jaquadro · jaquadro · commit afffe749c65e · 2017-05-19T01:12:46.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ minecraft {
 
     replaceIn "StorageDrawersExtras.java"
     replace '@VERSION@', project.version
-    replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[${storagedrawers_version},${storagedrawers_max_version})"
+    replace 'required-after:storagedrawers', "required-after:storagedrawers@[${storagedrawers_version},${storagedrawers_max_version})"
 }
 
 sourceSets.main {
diff --git a/resources/assets/storagedrawersextra/lang/en_US.lang b/resources/assets/storagedrawersextra/lang/en_US.lang
@@ -8,68 +8,68 @@ tile.extraDrawers.halfdrawers4.name=Half Drawers 2x2
 tile.extraTrim.name=Storage Trim
 
 # Materials (Natura)
-storageDrawers.material.natura:eucalyptus=Eucalyptus
-storageDrawers.material.natura:sakura=Sakura
-storageDrawers.material.natura:ghostwood=Ghostwood
-storageDrawers.material.natura:redwood=Redwood
-storageDrawers.material.natura:bloodwood=Bloodwood
-storageDrawers.material.natura:hopseed=Hopseed
-storageDrawers.material.natura:maple=Maple
-storageDrawers.material.natura:silverbell=Silverbell
-storageDrawers.material.natura:purpleheart=Amaranth
-storageDrawers.material.natura:tigerwood=Tigerwood
-storageDrawers.material.natura:willow=Willow
-storageDrawers.material.natura:darkwood=Darkwood
-storageDrawers.material.natura:fusewood=Fusewood
+storagedrawers.material.natura:eucalyptus=Eucalyptus
+storagedrawers.material.natura:sakura=Sakura
+storagedrawers.material.natura:ghostwood=Ghostwood
+storagedrawers.material.natura:redwood=Redwood
+storagedrawers.material.natura:bloodwood=Bloodwood
+storagedrawers.material.natura:hopseed=Hopseed
+storagedrawers.material.natura:maple=Maple
+storagedrawers.material.natura:silverbell=Silverbell
+storagedrawers.material.natura:purpleheart=Amaranth
+storagedrawers.material.natura:tigerwood=Tigerwood
+storagedrawers.material.natura:willow=Willow
+storagedrawers.material.natura:darkwood=Darkwood
+storagedrawers.material.natura:fusewood=Fusewood
 
 # Materials (Biomes O' Plenty)
-storageDrawers.material.biomesoplenty:sacredoak=Sacred Oak
-storageDrawers.material.biomesoplenty:cherry=Cherry
-storageDrawers.material.biomesoplenty:dark=Umbran
-storageDrawers.material.biomesoplenty:fir=Fir
-storageDrawers.material.biomesoplenty:ethereal=Ethereal
-storageDrawers.material.biomesoplenty:magic=Magic
-storageDrawers.material.biomesoplenty:mangrove=Mangrove
-storageDrawers.material.biomesoplenty:palm=Palm
-storageDrawers.material.biomesoplenty:redwood=Redwood
-storageDrawers.material.biomesoplenty:willow=Willow
-storageDrawers.material.biomesoplenty:pine=Pine
-storageDrawers.material.biomesoplenty:hellbark=Hellbark
-storageDrawers.material.biomesoplenty:jacaranda=Jacaranda
-storageDrawers.material.biomesoplenty:mahogany=Mahogany
-storageDrawers.material.biomesoplenty:ebony=Ebony
-storageDrawers.material.biomesoplenty:eucalyptus=Eucalyptus
+storagedrawers.material.biomesoplenty:sacredoak=Sacred Oak
+storagedrawers.material.biomesoplenty:cherry=Cherry
+storagedrawers.material.biomesoplenty:dark=Umbran
+storagedrawers.material.biomesoplenty:fir=Fir
+storagedrawers.material.biomesoplenty:ethereal=Ethereal
+storagedrawers.material.biomesoplenty:magic=Magic
+storagedrawers.material.biomesoplenty:mangrove=Mangrove
+storagedrawers.material.biomesoplenty:palm=Palm
+storagedrawers.material.biomesoplenty:redwood=Redwood
+storagedrawers.material.biomesoplenty:willow=Willow
+storagedrawers.material.biomesoplenty:pine=Pine
+storagedrawers.material.biomesoplenty:hellbark=Hellbark
+storagedrawers.material.biomesoplenty:jacaranda=Jacaranda
+storagedrawers.material.biomesoplenty:mahogany=Mahogany
+storagedrawers.material.biomesoplenty:ebony=Ebony
+storagedrawers.material.biomesoplenty:eucalyptus=Eucalyptus
 
 # Materials (Forestry)
-storageDrawers.material.forestry:larch=Larch
-storageDrawers.material.forestry:teak=Teak
-storageDrawers.material.forestry:acacia=Acacia
-storageDrawers.material.forestry:lime=Lime
-storageDrawers.material.forestry:chestnut=Chestnut
-storageDrawers.material.forestry:wenge=Wenge
-storageDrawers.material.forestry:baobab=Baobab
-storageDrawers.material.forestry:sequoia=Sequoia
-storageDrawers.material.forestry:kapok=Kapok
-storageDrawers.material.forestry:ebony=Ebony
-storageDrawers.material.forestry:mahogany=Mahogany
-storageDrawers.material.forestry:balsa=Balsa
-storageDrawers.material.forestry:willow=Willow
-storageDrawers.material.forestry:walnut=Walnut
-storageDrawers.material.forestry:greenheart=Greenheart
-storageDrawers.material.forestry:cherry=Cherry
-storageDrawers.material.forestry:mahoe=Mahoe
-storageDrawers.material.forestry:poplar=Poplar
-storageDrawers.material.forestry:palm=Palm
-storageDrawers.material.forestry:papaya=Papaya
-storageDrawers.material.forestry:pine=Pine
-storageDrawers.material.forestry:plum=Plum
-storageDrawers.material.forestry:maple=Maple
-storageDrawers.material.forestry:citrus=Citrus
-storageDrawers.material.forestry:giganteum=Giant Sequoia
-storageDrawers.material.forestry:ipe=Ipe
-storageDrawers.material.forestry:padauk=Padauk
-storageDrawers.material.forestry:cocobolo=Cocobolo
-storageDrawers.material.forestry:zebrawood=Zebrawood
+storagedrawers.material.forestry:larch=Larch
+storagedrawers.material.forestry:teak=Teak
+storagedrawers.material.forestry:acacia=Acacia
+storagedrawers.material.forestry:lime=Lime
+storagedrawers.material.forestry:chestnut=Chestnut
+storagedrawers.material.forestry:wenge=Wenge
+storagedrawers.material.forestry:baobab=Baobab
+storagedrawers.material.forestry:sequoia=Sequoia
+storagedrawers.material.forestry:kapok=Kapok
+storagedrawers.material.forestry:ebony=Ebony
+storagedrawers.material.forestry:mahogany=Mahogany
+storagedrawers.material.forestry:balsa=Balsa
+storagedrawers.material.forestry:willow=Willow
+storagedrawers.material.forestry:walnut=Walnut
+storagedrawers.material.forestry:greenheart=Greenheart
+storagedrawers.material.forestry:cherry=Cherry
+storagedrawers.material.forestry:mahoe=Mahoe
+storagedrawers.material.forestry:poplar=Poplar
+storagedrawers.material.forestry:palm=Palm
+storagedrawers.material.forestry:papaya=Papaya
+storagedrawers.material.forestry:pine=Pine
+storagedrawers.material.forestry:plum=Plum
+storagedrawers.material.forestry:maple=Maple
+storagedrawers.material.forestry:citrus=Citrus
+storagedrawers.material.forestry:giganteum=Giant Sequoia
+storagedrawers.material.forestry:ipe=Ipe
+storagedrawers.material.forestry:padauk=Padauk
+storagedrawers.material.forestry:cocobolo=Cocobolo
+storagedrawers.material.forestry:zebrawood=Zebrawood
 
 # Materials (Immersive Engineering)
-storageDrawers.material.immersiveengineering:immeng_treated=Treated Wood
+storagedrawers.material.immersiveengineering:immeng_treated=Treated Wood
diff --git a/resources/mcmod.info b/resources/mcmod.info
@@ -8,8 +8,8 @@
 	"logoFile": "",
 	"url": "http://www.jaquadro.com/",
 	"authorList": [ "jaquadro" ],
-	"requiredMods": [ "Forge", "Chameleon", "StorageDrawers" ],
-	"dependencies": [ "Chameleon", "StorageDrawers" ],
+	"requiredMods": [ "forge", "chameleon", "storagedrawers" ],
+	"dependencies": [ "chameleon", "storagedrawers" ],
 	"useDependencyInformation": true
 }
 ]
diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/StorageDrawersExtra.java b/src/com/jaquadro/minecraft/storagedrawersextra/StorageDrawersExtra.java
@@ -18,9 +18,9 @@
 import java.io.File;
 
 @Mod(modid = StorageDrawersExtra.MOD_ID, name = StorageDrawersExtra.MOD_NAME, version = StorageDrawersExtra.MOD_VERSION,
-    dependencies = "required-after:StorageDrawers;required-after:Chameleon[2.2.1,2.3.0);after:waila;",
+    dependencies = "required-after:storagedrawers;required-after:chameleon;after:waila;",
     guiFactory = StorageDrawersExtra.SOURCE_PATH + "core.ModGuiFactory",
-    acceptedMinecraftVersions = "[1.9,1.11)")
+    acceptedMinecraftVersions = "[1.11,1.12)")
 public class StorageDrawersExtra
 {
     public static final String MOD_ID = "storagedrawersextra";
diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java
@@ -9,7 +9,7 @@
 public enum EnumMod implements IStringSerializable
 {
     NATURA("natura", EnumVariant.NATURA_WILLOW),
-    BOP("BiomesOPlenty", EnumVariant.BOP_WILLOW),
+    BOP("biomesoplenty", EnumVariant.BOP_WILLOW),
     FORESTRY("forestry", EnumVariant.FORESTRY_WILLOW),
     IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED)
     ;
diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java
@@ -183,7 +183,7 @@ public static int groupCount () {
 
     private static class ID {
         public static final String NATURA = "natura";
-        public static final String BOP = "BiomesOPlenty";
+        public static final String BOP = "biomesoplenty";
         public static final String FORESTRY = "forestry";
         public static final String IMMENG = "immersiveengineering";
     }
diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/core/ModCreativeTabs.java b/src/com/jaquadro/minecraft/storagedrawersextra/core/ModCreativeTabs.java
@@ -3,6 +3,7 @@
 import com.jaquadro.minecraft.storagedrawersextra.block.EnumMod;
 import com.jaquadro.minecraft.storagedrawersextra.block.EnumVariant;
 import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.fml.relauncher.Side;
@@ -14,12 +15,12 @@ public class ModCreativeTabs
 {
     private ModCreativeTabs () { }
 
-    public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storagedrawers") {
+    public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storagedrawersextra") {
         @Override
         @Nonnull
         @SideOnly(Side.CLIENT)
         public ItemStack getTabIconItem () {
-            ItemStack stack = super.getIconItemStack();
+            @Nonnull ItemStack stack = new ItemStack(Item.getItemFromBlock(ModBlocks.extraDrawers), 1, 1);
 
             EnumVariant material = EnumVariant.DEFAULT;
             for (EnumMod mod : EnumMod.values()) {
diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/core/ModGuiFactory.java b/src/com/jaquadro/minecraft/storagedrawersextra/core/ModGuiFactory.java
@@ -12,6 +12,16 @@ public class ModGuiFactory implements IModGuiFactory
     @Override
     public void initialize (Minecraft minecraftInstance) { }
 
+    @Override
+    public boolean hasConfigGui () {
+        return false;
+    }
+
+    @Override
+    public GuiScreen createConfigGui (GuiScreen parentScreen) {
+        return null;
+    }
+
     @Override
     public Class<? extends GuiScreen> mainConfigGuiClass () {
         return ModConfigGui.class;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ minecraft {`
`52`	`52`
`53`	`53`	`replaceIn "StorageDrawersExtras.java"`
`54`	`54`	`replace '@VERSION@', project.version`
`55`		`- replace 'required-after:StorageDrawers', "required-after:StorageDrawers@[${storagedrawers_version},${storagedrawers_max_version})"`
	`55`	`+ replace 'required-after:storagedrawers', "required-after:storagedrawers@[${storagedrawers_version},${storagedrawers_max_version})"`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`sourceSets.main {`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`"logoFile": "",`
`9`	`9`	`"url": "http://www.jaquadro.com/",`
`10`	`10`	`"authorList": [ "jaquadro" ],`
`11`		`- "requiredMods": [ "Forge", "Chameleon", "StorageDrawers" ],`
`12`		`- "dependencies": [ "Chameleon", "StorageDrawers" ],`
	`11`	`+ "requiredMods": [ "forge", "chameleon", "storagedrawers" ],`
	`12`	`+ "dependencies": [ "chameleon", "storagedrawers" ],`
`13`	`13`	`"useDependencyInformation": true`
`14`	`14`	`}`
`15`	`15`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`public enum EnumMod implements IStringSerializable`
`10`	`10`	`{`
`11`	`11`	`NATURA("natura", EnumVariant.NATURA_WILLOW),`
`12`		`- BOP("BiomesOPlenty", EnumVariant.BOP_WILLOW),`
	`12`	`+ BOP("biomesoplenty", EnumVariant.BOP_WILLOW),`
`13`	`13`	`FORESTRY("forestry", EnumVariant.FORESTRY_WILLOW),`
`14`	`14`	`IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED)`
`15`	`15`	`;`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ public static int groupCount () {`
`183`	`183`
`184`	`184`	`private static class ID {`
`185`	`185`	`public static final String NATURA = "natura";`
`186`		`- public static final String BOP = "BiomesOPlenty";`
	`186`	`+ public static final String BOP = "biomesoplenty";`
`187`	`187`	`public static final String FORESTRY = "forestry";`
`188`	`188`	`public static final String IMMENG = "immersiveengineering";`
`189`	`189`	`}`