Skip to content

Commit afffe74

Browse files
committed
Getting things running, pretty much
1 parent f05d90d commit afffe74

File tree

8 files changed

+79
-68
lines changed

8 files changed

+79
-68
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ minecraft {
5252

5353
replaceIn "StorageDrawersExtras.java"
5454
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})"
5656
}
5757

5858
sourceSets.main {

resources/assets/storagedrawersextra/lang/en_US.lang

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -8,68 +8,68 @@ tile.extraDrawers.halfdrawers4.name=Half Drawers 2x2
88
tile.extraTrim.name=Storage Trim
99

1010
# Materials (Natura)
11-
storageDrawers.material.natura:eucalyptus=Eucalyptus
12-
storageDrawers.material.natura:sakura=Sakura
13-
storageDrawers.material.natura:ghostwood=Ghostwood
14-
storageDrawers.material.natura:redwood=Redwood
15-
storageDrawers.material.natura:bloodwood=Bloodwood
16-
storageDrawers.material.natura:hopseed=Hopseed
17-
storageDrawers.material.natura:maple=Maple
18-
storageDrawers.material.natura:silverbell=Silverbell
19-
storageDrawers.material.natura:purpleheart=Amaranth
20-
storageDrawers.material.natura:tigerwood=Tigerwood
21-
storageDrawers.material.natura:willow=Willow
22-
storageDrawers.material.natura:darkwood=Darkwood
23-
storageDrawers.material.natura:fusewood=Fusewood
11+
storagedrawers.material.natura:eucalyptus=Eucalyptus
12+
storagedrawers.material.natura:sakura=Sakura
13+
storagedrawers.material.natura:ghostwood=Ghostwood
14+
storagedrawers.material.natura:redwood=Redwood
15+
storagedrawers.material.natura:bloodwood=Bloodwood
16+
storagedrawers.material.natura:hopseed=Hopseed
17+
storagedrawers.material.natura:maple=Maple
18+
storagedrawers.material.natura:silverbell=Silverbell
19+
storagedrawers.material.natura:purpleheart=Amaranth
20+
storagedrawers.material.natura:tigerwood=Tigerwood
21+
storagedrawers.material.natura:willow=Willow
22+
storagedrawers.material.natura:darkwood=Darkwood
23+
storagedrawers.material.natura:fusewood=Fusewood
2424

2525
# Materials (Biomes O' Plenty)
26-
storageDrawers.material.biomesoplenty:sacredoak=Sacred Oak
27-
storageDrawers.material.biomesoplenty:cherry=Cherry
28-
storageDrawers.material.biomesoplenty:dark=Umbran
29-
storageDrawers.material.biomesoplenty:fir=Fir
30-
storageDrawers.material.biomesoplenty:ethereal=Ethereal
31-
storageDrawers.material.biomesoplenty:magic=Magic
32-
storageDrawers.material.biomesoplenty:mangrove=Mangrove
33-
storageDrawers.material.biomesoplenty:palm=Palm
34-
storageDrawers.material.biomesoplenty:redwood=Redwood
35-
storageDrawers.material.biomesoplenty:willow=Willow
36-
storageDrawers.material.biomesoplenty:pine=Pine
37-
storageDrawers.material.biomesoplenty:hellbark=Hellbark
38-
storageDrawers.material.biomesoplenty:jacaranda=Jacaranda
39-
storageDrawers.material.biomesoplenty:mahogany=Mahogany
40-
storageDrawers.material.biomesoplenty:ebony=Ebony
41-
storageDrawers.material.biomesoplenty:eucalyptus=Eucalyptus
26+
storagedrawers.material.biomesoplenty:sacredoak=Sacred Oak
27+
storagedrawers.material.biomesoplenty:cherry=Cherry
28+
storagedrawers.material.biomesoplenty:dark=Umbran
29+
storagedrawers.material.biomesoplenty:fir=Fir
30+
storagedrawers.material.biomesoplenty:ethereal=Ethereal
31+
storagedrawers.material.biomesoplenty:magic=Magic
32+
storagedrawers.material.biomesoplenty:mangrove=Mangrove
33+
storagedrawers.material.biomesoplenty:palm=Palm
34+
storagedrawers.material.biomesoplenty:redwood=Redwood
35+
storagedrawers.material.biomesoplenty:willow=Willow
36+
storagedrawers.material.biomesoplenty:pine=Pine
37+
storagedrawers.material.biomesoplenty:hellbark=Hellbark
38+
storagedrawers.material.biomesoplenty:jacaranda=Jacaranda
39+
storagedrawers.material.biomesoplenty:mahogany=Mahogany
40+
storagedrawers.material.biomesoplenty:ebony=Ebony
41+
storagedrawers.material.biomesoplenty:eucalyptus=Eucalyptus
4242

4343
# Materials (Forestry)
44-
storageDrawers.material.forestry:larch=Larch
45-
storageDrawers.material.forestry:teak=Teak
46-
storageDrawers.material.forestry:acacia=Acacia
47-
storageDrawers.material.forestry:lime=Lime
48-
storageDrawers.material.forestry:chestnut=Chestnut
49-
storageDrawers.material.forestry:wenge=Wenge
50-
storageDrawers.material.forestry:baobab=Baobab
51-
storageDrawers.material.forestry:sequoia=Sequoia
52-
storageDrawers.material.forestry:kapok=Kapok
53-
storageDrawers.material.forestry:ebony=Ebony
54-
storageDrawers.material.forestry:mahogany=Mahogany
55-
storageDrawers.material.forestry:balsa=Balsa
56-
storageDrawers.material.forestry:willow=Willow
57-
storageDrawers.material.forestry:walnut=Walnut
58-
storageDrawers.material.forestry:greenheart=Greenheart
59-
storageDrawers.material.forestry:cherry=Cherry
60-
storageDrawers.material.forestry:mahoe=Mahoe
61-
storageDrawers.material.forestry:poplar=Poplar
62-
storageDrawers.material.forestry:palm=Palm
63-
storageDrawers.material.forestry:papaya=Papaya
64-
storageDrawers.material.forestry:pine=Pine
65-
storageDrawers.material.forestry:plum=Plum
66-
storageDrawers.material.forestry:maple=Maple
67-
storageDrawers.material.forestry:citrus=Citrus
68-
storageDrawers.material.forestry:giganteum=Giant Sequoia
69-
storageDrawers.material.forestry:ipe=Ipe
70-
storageDrawers.material.forestry:padauk=Padauk
71-
storageDrawers.material.forestry:cocobolo=Cocobolo
72-
storageDrawers.material.forestry:zebrawood=Zebrawood
44+
storagedrawers.material.forestry:larch=Larch
45+
storagedrawers.material.forestry:teak=Teak
46+
storagedrawers.material.forestry:acacia=Acacia
47+
storagedrawers.material.forestry:lime=Lime
48+
storagedrawers.material.forestry:chestnut=Chestnut
49+
storagedrawers.material.forestry:wenge=Wenge
50+
storagedrawers.material.forestry:baobab=Baobab
51+
storagedrawers.material.forestry:sequoia=Sequoia
52+
storagedrawers.material.forestry:kapok=Kapok
53+
storagedrawers.material.forestry:ebony=Ebony
54+
storagedrawers.material.forestry:mahogany=Mahogany
55+
storagedrawers.material.forestry:balsa=Balsa
56+
storagedrawers.material.forestry:willow=Willow
57+
storagedrawers.material.forestry:walnut=Walnut
58+
storagedrawers.material.forestry:greenheart=Greenheart
59+
storagedrawers.material.forestry:cherry=Cherry
60+
storagedrawers.material.forestry:mahoe=Mahoe
61+
storagedrawers.material.forestry:poplar=Poplar
62+
storagedrawers.material.forestry:palm=Palm
63+
storagedrawers.material.forestry:papaya=Papaya
64+
storagedrawers.material.forestry:pine=Pine
65+
storagedrawers.material.forestry:plum=Plum
66+
storagedrawers.material.forestry:maple=Maple
67+
storagedrawers.material.forestry:citrus=Citrus
68+
storagedrawers.material.forestry:giganteum=Giant Sequoia
69+
storagedrawers.material.forestry:ipe=Ipe
70+
storagedrawers.material.forestry:padauk=Padauk
71+
storagedrawers.material.forestry:cocobolo=Cocobolo
72+
storagedrawers.material.forestry:zebrawood=Zebrawood
7373

7474
# Materials (Immersive Engineering)
75-
storageDrawers.material.immersiveengineering:immeng_treated=Treated Wood
75+
storagedrawers.material.immersiveengineering:immeng_treated=Treated Wood

resources/mcmod.info

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"logoFile": "",
99
"url": "http://www.jaquadro.com/",
1010
"authorList": [ "jaquadro" ],
11-
"requiredMods": [ "Forge", "Chameleon", "StorageDrawers" ],
12-
"dependencies": [ "Chameleon", "StorageDrawers" ],
11+
"requiredMods": [ "forge", "chameleon", "storagedrawers" ],
12+
"dependencies": [ "chameleon", "storagedrawers" ],
1313
"useDependencyInformation": true
1414
}
1515
]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
import java.io.File;
1919

2020
@Mod(modid = StorageDrawersExtra.MOD_ID, name = StorageDrawersExtra.MOD_NAME, version = StorageDrawersExtra.MOD_VERSION,
21-
dependencies = "required-after:StorageDrawers;required-after:Chameleon[2.2.1,2.3.0);after:waila;",
21+
dependencies = "required-after:storagedrawers;required-after:chameleon;after:waila;",
2222
guiFactory = StorageDrawersExtra.SOURCE_PATH + "core.ModGuiFactory",
23-
acceptedMinecraftVersions = "[1.9,1.11)")
23+
acceptedMinecraftVersions = "[1.11,1.12)")
2424
public class StorageDrawersExtra
2525
{
2626
public static final String MOD_ID = "storagedrawersextra";

src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
public enum EnumMod implements IStringSerializable
1010
{
1111
NATURA("natura", EnumVariant.NATURA_WILLOW),
12-
BOP("BiomesOPlenty", EnumVariant.BOP_WILLOW),
12+
BOP("biomesoplenty", EnumVariant.BOP_WILLOW),
1313
FORESTRY("forestry", EnumVariant.FORESTRY_WILLOW),
1414
IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED)
1515
;

src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ public static int groupCount () {
183183

184184
private static class ID {
185185
public static final String NATURA = "natura";
186-
public static final String BOP = "BiomesOPlenty";
186+
public static final String BOP = "biomesoplenty";
187187
public static final String FORESTRY = "forestry";
188188
public static final String IMMENG = "immersiveengineering";
189189
}

src/com/jaquadro/minecraft/storagedrawersextra/core/ModCreativeTabs.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.jaquadro.minecraft.storagedrawersextra.block.EnumMod;
44
import com.jaquadro.minecraft.storagedrawersextra.block.EnumVariant;
55
import net.minecraft.creativetab.CreativeTabs;
6+
import net.minecraft.item.Item;
67
import net.minecraft.item.ItemStack;
78
import net.minecraft.nbt.NBTTagCompound;
89
import net.minecraftforge.fml.relauncher.Side;
@@ -14,12 +15,12 @@ public class ModCreativeTabs
1415
{
1516
private ModCreativeTabs () { }
1617

17-
public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storagedrawers") {
18+
public static final CreativeTabs tabStorageDrawers = new CreativeTabs("storagedrawersextra") {
1819
@Override
1920
@Nonnull
2021
@SideOnly(Side.CLIENT)
2122
public ItemStack getTabIconItem () {
22-
ItemStack stack = super.getIconItemStack();
23+
@Nonnull ItemStack stack = new ItemStack(Item.getItemFromBlock(ModBlocks.extraDrawers), 1, 1);
2324

2425
EnumVariant material = EnumVariant.DEFAULT;
2526
for (EnumMod mod : EnumMod.values()) {

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ public class ModGuiFactory implements IModGuiFactory
1212
@Override
1313
public void initialize (Minecraft minecraftInstance) { }
1414

15+
@Override
16+
public boolean hasConfigGui () {
17+
return false;
18+
}
19+
20+
@Override
21+
public GuiScreen createConfigGui (GuiScreen parentScreen) {
22+
return null;
23+
}
24+
1525
@Override
1626
public Class<? extends GuiScreen> mainConfigGuiClass () {
1727
return ModConfigGui.class;

0 commit comments

Comments
 (0)