diff --git a/resources/assets/storagedrawersextra/lang/en_US.lang b/resources/assets/storagedrawersextra/lang/en_US.lang index 04071f6..6b4473a 100644 --- a/resources/assets/storagedrawersextra/lang/en_US.lang +++ b/resources/assets/storagedrawersextra/lang/en_US.lang @@ -8,68 +8,74 @@ 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 + +# Materials (Aether) +storagedrawers.material.aether.skyroot=Skyroot +storagedrawers.material.aether.greatroot=Greatroot +storagedrawers.material.aether.wisproot=Wisproot +storagedrawers.material.aether.therawood=Therawood diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_greatroot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_greatroot.png new file mode 100644 index 0000000..247748d Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_greatroot.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_skyroot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_skyroot.png new file mode 100644 index 0000000..519a7cf Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_skyroot.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_therawood.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_therawood.png new file mode 100644 index 0000000..cf9fe4e Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_therawood.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_wisproot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_wisproot.png new file mode 100644 index 0000000..19e06e2 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/base_wisproot.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_greatroot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_greatroot.png new file mode 100644 index 0000000..a3b56e5 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_greatroot.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_skyroot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_skyroot.png new file mode 100644 index 0000000..624eb5e Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_skyroot.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_therawood.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_therawood.png new file mode 100644 index 0000000..8af18bc Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_therawood.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_wisproot.png b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_wisproot.png new file mode 100644 index 0000000..c8eaddc Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/base/trim_wisproot.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_1.png new file mode 100644 index 0000000..1d7a0a1 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_1.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_2.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_2.png new file mode 100644 index 0000000..3c09925 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_2.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_4.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_4.png new file mode 100644 index 0000000..277afac Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_front_4.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side.png new file mode 100644 index 0000000..61130d5 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_h.png new file mode 100644 index 0000000..8b4a3c1 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_h.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_v.png new file mode 100644 index 0000000..3f617d8 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_side_v.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_sort.png new file mode 100644 index 0000000..0356056 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_sort.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_trim.png new file mode 100644 index 0000000..187dd3f Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_greatroot_trim.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_1.png new file mode 100644 index 0000000..fdaaaee Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_1.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_2.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_2.png new file mode 100644 index 0000000..3dff43e Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_2.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_4.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_4.png new file mode 100644 index 0000000..3b901ba Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_front_4.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side.png new file mode 100644 index 0000000..422d5bf Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_h.png new file mode 100644 index 0000000..912df16 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_h.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_v.png new file mode 100644 index 0000000..4661632 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_side_v.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_sort.png new file mode 100644 index 0000000..b42d7f3 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_sort.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_trim.png new file mode 100644 index 0000000..30066d9 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_skyroot_trim.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_1.png new file mode 100644 index 0000000..85cf651 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_1.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_2.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_2.png new file mode 100644 index 0000000..e4a8f01 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_2.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_4.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_4.png new file mode 100644 index 0000000..50e81a8 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_front_4.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side.png new file mode 100644 index 0000000..f0c3242 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_h.png new file mode 100644 index 0000000..cd87fff Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_h.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_v.png new file mode 100644 index 0000000..3078813 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_side_v.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_sort.png new file mode 100644 index 0000000..e9f4ded Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_sort.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_trim.png new file mode 100644 index 0000000..9265ac4 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_therawood_trim.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_1.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_1.png new file mode 100644 index 0000000..8476779 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_1.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_2.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_2.png new file mode 100644 index 0000000..e621b46 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_2.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_4.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_4.png new file mode 100644 index 0000000..491c27c Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_front_4.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side.png new file mode 100644 index 0000000..df41cca Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_h.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_h.png new file mode 100644 index 0000000..1e6fbe8 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_h.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_v.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_v.png new file mode 100644 index 0000000..175e973 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_side_v.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_sort.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_sort.png new file mode 100644 index 0000000..70a2121 Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_sort.png differ diff --git a/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_trim.png b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_trim.png new file mode 100644 index 0000000..e2d88ff Binary files /dev/null and b/resources/assets/storagedrawersextra/textures/blocks/aether/drawers_wisproot_trim.png differ diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java index 0c4020a..4478987 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockExtraDrawers.java @@ -20,6 +20,7 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.common.Loader; import javax.annotation.Nonnull; @@ -68,6 +69,10 @@ public void getSubBlocks (CreativeTabs creativeTabs, NonNullList list EnumMod mod = material.getMod(); if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod))) continue; + // only add skyroot if Aether 2 is not installed + if (mod == EnumMod.AETHER && material != EnumVariant.AETHER_SKYROOT + && !Loader.isModLoaded("aether")) + continue; ItemStack stack = new ItemStack(this, 1, type.getMetadata()); diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java index 91efa46..c04894f 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/BlockTrimExtra.java @@ -25,6 +25,7 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; +import net.minecraftforge.fml.common.Loader; import javax.annotation.Nonnull; import java.util.ArrayList; @@ -87,6 +88,10 @@ public void getSubBlocks (CreativeTabs creativeTabs, NonNullList list EnumMod mod = variant.getMod(); if (mod == null || !mod.isEnabled(configExt.getModToggleState(mod))) continue; + // only add skyroot if Aether 2 is not installed + if (mod == EnumMod.AETHER && variant != EnumVariant.AETHER_SKYROOT + && !Loader.isModLoaded("aether")) + continue; if (group == variant.getGroupIndex()) list.add(new ItemStack(this, 1, variant.getGroupMeta())); diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java index a53108c..ab29552 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumMod.java @@ -11,7 +11,12 @@ public enum EnumMod implements IStringSerializable NATURA("natura", EnumVariant.NATURA_WILLOW), BOP("biomesoplenty", EnumVariant.BOP_WILLOW), FORESTRY("forestry", EnumVariant.FORESTRY_WILLOW), - IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED) + IMMENG("immersiveengineering", EnumVariant.IMMENG_TREATED), + AETHER("aether", EnumVariant.AETHER_SKYROOT) { + public boolean isLoaded() { + return Loader.isModLoaded("aether") || Loader.isModLoaded("aether_legacy"); + } + } ; private String id; diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java index ee8f6c9..1014733 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/block/EnumVariant.java @@ -1,13 +1,15 @@ package com.jaquadro.minecraft.storagedrawersextra.block; -import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; +import java.util.HashMap; +import java.util.Map; import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.Map; +import com.jaquadro.minecraft.storagedrawersextra.StorageDrawersExtra; + +import net.minecraft.util.IStringSerializable; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.oredict.OreDictionary; public enum EnumVariant implements IStringSerializable { @@ -74,7 +76,12 @@ public enum EnumVariant implements IStringSerializable FORESTRY_COCOBOLO(ID.FORESTRY, "cocobolo", 57, "planks.1", 11, "slabs.3", 3), FORESTRY_ZEBRAWOOD(ID.FORESTRY, "zebrawood", 58, "planks.1", 12, "slabs.3", 4), - IMMENG_TREATED(ID.IMMENG, "immeng_treated", 59, "treatedWood", 0, "treatedWoodSlab", 0), + IMMENG_TREATED(ID.IMMENG, "immeng_treated", 59, "treated_wood", OreDictionary.WILDCARD_VALUE, "treated_wood_slab", OreDictionary.WILDCARD_VALUE), + + AETHER_SKYROOT(ID.AETHER, "skyroot", 60, "skyroot_planks", 0, "skyroot_slab", 0), + AETHER_GREATROOT(ID.AETHER, "greatroot", 61, "dark_skyroot_planks", 0, "greatroot_slab", 0), + AETHER_WISPROOT(ID.AETHER, "wisproot", 62, "light_skyroot_planks", 0, "wisproot_slab", 0), + AETHER_THERAWOOD(ID.AETHER, "therawood", 63, "therawood_planks", 0, "therawood_slab", 0) ; private static final Map RESOURCE_LOOKUP; @@ -115,7 +122,9 @@ public String getPath () { @Override @Nonnull public String getName () { - return resource.toString(); + // good practice to use dots to separate domain and path instead of + // colon in unlocalized name, to support future versions + return resource.getResourceDomain() + "." + resource.getResourcePath(); } public EnumMod getMod () { @@ -186,5 +195,6 @@ private static class ID { public static final String BOP = "biomesoplenty"; public static final String FORESTRY = "forestry"; public static final String IMMENG = "immersiveengineering"; + public static final String AETHER = "aether"; } } diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java b/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java index ecf6ae9..00c4d89 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/core/ModBlocks.java @@ -87,7 +87,6 @@ public static ItemStack makeBasicDrawerItemStack (EnumBasicDrawer info, String m @SubscribeEvent public static void registerRecipes (RegistryEvent.Register event) { IForgeRegistry registry = event.getRegistry(); - ConfigManager config = StorageDrawers.config; ConfigManagerExt configExt = StorageDrawersExtra.config; for (EnumVariant variant : EnumVariant.values()) { @@ -112,40 +111,57 @@ public static void registerRecipes (RegistryEvent.Register event) { slabStack = new ItemStack(block, 1, variant.getSlabMeta()); } - String material = variant.getResource().toString(); - - if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) { - @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName())); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood") - .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString())); - } - if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) { - @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta()); - registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack) - .setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString())); + registerRecipes(registry, variant, plankStack, slabStack); + + // attempt to do Aether 1 skyroot as well + if (variant == EnumVariant.AETHER_SKYROOT) { + Block block = Block.getBlockFromName("aether_legacy:skyroot_plank"); + if (block != null) + plankStack = new ItemStack(block, 1, variant.getPlankMeta()); + block = Block.getBlockFromName("aether_legacy:skyroot_slab"); + if (block != null) + slabStack = new ItemStack(block, 1, variant.getSlabMeta()); + + registerRecipes(registry, variant, plankStack, slabStack); } } } + + private static void registerRecipes(IForgeRegistry registry, EnumVariant variant, ItemStack plankStack, ItemStack slabStack) { + ConfigManager config = StorageDrawers.config; + String material = variant.getResource().toString(); + + if (config.isBlockEnabled(EnumBasicDrawer.FULL1.getUnlocalizedName()) && !plankStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL1, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL1.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xxx", " y ", "xxx", 'x', plankStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL1.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.FULL2.getUnlocalizedName()) && !plankStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL2, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL2.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', plankStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL2.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.FULL4.getUnlocalizedName()) && !plankStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.FULL4, material, config.getBlockRecipeOutput(EnumBasicDrawer.FULL4.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', plankStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.FULL4.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.HALF2.getUnlocalizedName()) && !slabStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF2, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF2.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "xxx", "xyx", 'x', slabStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF2.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled(EnumBasicDrawer.HALF4.getUnlocalizedName()) && !slabStack.isEmpty()) { + @Nonnull ItemStack result = makeBasicDrawerItemStack(EnumBasicDrawer.HALF4, material, config.getBlockRecipeOutput(EnumBasicDrawer.HALF4.getUnlocalizedName())); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "yxy", "xxx", "yxy", 'x', slabStack, 'y', "chestWood") + .setRegistryName(result.getItem().getRegistryName() + "_" + EnumBasicDrawer.HALF4.getUnlocalizedName() + "_" + variant.toString())); + } + if (config.isBlockEnabled("trim") && !plankStack.isEmpty()) { + @Nonnull ItemStack result = new ItemStack(ModBlocks.extraTrim[variant.getGroupIndex()], config.getBlockRecipeOutput("trim"), variant.getGroupMeta()); + registry.register(new ShapedOreRecipe(EMPTY_GROUP, result, "xyx", "yyy", "xyx", 'x', "stickWood", 'y', plankStack) + .setRegistryName(result.getItem().getRegistryName() + "_" + variant.toString())); + } + } @SubscribeEvent @SideOnly(Side.CLIENT) diff --git a/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java b/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java index eba02c9..5966b90 100644 --- a/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java +++ b/src/com/jaquadro/minecraft/storagedrawersextra/item/ItemTrimExtra.java @@ -17,30 +17,30 @@ public class ItemTrimExtra extends ItemBlock { - public ItemTrimExtra (final Block block) { + public ItemTrimExtra(final Block block) { super(block); setMaxDamage(0); } @Override - public int getMetadata (int damage) { + public int getMetadata(int damage) { return damage; } @Override @Nonnull - public String getUnlocalizedName (@Nonnull ItemStack stack) { - return "tile.extra_trim"; + public String getUnlocalizedName(@Nonnull ItemStack stack) { + return "tile.extraTrim"; } @Override @SideOnly(Side.CLIENT) - public void addInformation (@Nonnull ItemStack itemStack, @Nullable World world, List list, ITooltipFlag advanced) { + public void addInformation(@Nonnull ItemStack itemStack, @Nullable World world, List list, ITooltipFlag advanced) { Block block = Block.getBlockFromItem(itemStack.getItem()); if (block instanceof BlockTrimExtra) { BlockTrimExtra trim = (BlockTrimExtra)block; - EnumVariant varient = EnumVariant.byGroupMeta(trim.getGroup(), itemStack.getMetadata()); - list.add(I18n.format("storageDrawers.material", I18n.format("storageDrawers.material." + varient.getName()))); + EnumVariant variant = EnumVariant.byGroupMeta(trim.getGroup(), itemStack.getMetadata()); + list.add(I18n.format("storagedrawers.material", I18n.format("storagedrawers.material." + variant.getName()))); } } }