mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 04:32:24 +00:00
Fix assets to use lowercase for 1.11
This commit is contained in:
1 parent
2423adae4c
commit
fef0b7ede9
650 files changed
+955
-948
No files matched your search
@@ -28,8 +28,8 @@ import java.util.List;
|
||||
public class ItemInsulatedTube extends ItemCore implements IColoredItem {
|
||||
|
||||
public ItemInsulatedTube() {
|
||||
super("insulatedTube");
|
||||
setUnlocalizedName("insulatedTube");
|
||||
super("insulated_tube");
|
||||
setUnlocalizedName("insulated_tube");
|
||||
setCreativeTab(CreativeTabBotany.instance);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@@ -134,7 +134,13 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
|
||||
if (modelName.isEmpty()) {
|
||||
modelName = "normal";
|
||||
}
|
||||
manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, type.getName() + (weedKilled ? "NoWeed" : "") + "/" + modelName);
|
||||
final String identifier;
|
||||
if (weedKilled) {
|
||||
identifier = type.getName() + "_no_weed/" + modelName;
|
||||
} else {
|
||||
identifier = type.getName() + "/" + modelName;
|
||||
}
|
||||
manager.registerItemModel(item, moisture.ordinal() + acidity.ordinal() * 3, identifier);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,9 +27,9 @@ public class ItemSoilMeter extends Item implements IItemModelRegister {
|
||||
|
||||
public ItemSoilMeter() {
|
||||
this.setCreativeTab(CreativeTabBotany.instance);
|
||||
this.setUnlocalizedName("soilMeter");
|
||||
this.setUnlocalizedName("soil_meter");
|
||||
this.setMaxStackSize(1);
|
||||
setRegistryName("soilMeter");
|
||||
setRegistryName("soil_meter");
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -40,9 +40,9 @@ public class ItemTrowel extends Item implements IItemModelRegister {
|
||||
this.maxStackSize = 1;
|
||||
this.setMaxDamage(p_i45343_1_.getMaxUses());
|
||||
this.setCreativeTab(CreativeTabBotany.instance);
|
||||
this.setUnlocalizedName("trowel" + material);
|
||||
this.locName = "trowel" + material;
|
||||
setRegistryName("trowel" + material);
|
||||
this.setUnlocalizedName("trowel_" + material);
|
||||
this.locName = "trowel_" + material;
|
||||
setRegistryName("trowel_" + material);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -57,25 +57,25 @@ public class ModuleGardening implements IInitializable {
|
||||
Botany.proxy.registerBlock(Botany.loam, new ItemSoil(Botany.loam));
|
||||
Botany.flowerbed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed", false);
|
||||
Botany.proxy.registerBlock(Botany.flowerbed, new ItemSoil(Botany.flowerbed));
|
||||
Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soilNoWeed", true);
|
||||
Botany.soilNoWeed = new BlockSoil(EnumSoilType.SOIL, "soil_no_weed", true);
|
||||
Botany.proxy.registerBlock(Botany.soilNoWeed, new ItemSoil(Botany.soilNoWeed));
|
||||
Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loamNoWeed", true);
|
||||
Botany.loamNoWeed = new BlockSoil(EnumSoilType.LOAM, "loam_no_weed", true);
|
||||
Botany.proxy.registerBlock(Botany.loamNoWeed, new ItemSoil(Botany.loamNoWeed));
|
||||
Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbedNoWeed", true);
|
||||
Botany.flowerbedNoWeed = new BlockSoil(EnumSoilType.FLOWERBED, "flowerbed_no_weed", true);
|
||||
Botany.proxy.registerBlock(Botany.flowerbedNoWeed, new ItemSoil(Botany.flowerbedNoWeed));
|
||||
Botany.soilMeter = new ItemSoilMeter();
|
||||
Botany.proxy.registerItem(Botany.soilMeter);
|
||||
Botany.insulatedTube = new ItemInsulatedTube();
|
||||
Botany.proxy.registerItem(Botany.insulatedTube);
|
||||
Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "Wood");
|
||||
Botany.trowelWood = new ItemTrowel(Item.ToolMaterial.WOOD, "wood");
|
||||
Botany.proxy.registerItem(Botany.trowelWood);
|
||||
Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "Stone");
|
||||
Botany.trowelStone = new ItemTrowel(Item.ToolMaterial.STONE, "stone");
|
||||
Botany.proxy.registerItem(Botany.trowelStone);
|
||||
Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "Iron");
|
||||
Botany.trowelIron = new ItemTrowel(Item.ToolMaterial.IRON, "iron");
|
||||
Botany.proxy.registerItem(Botany.trowelIron);
|
||||
Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.DIAMOND, "Diamond");
|
||||
Botany.trowelDiamond = new ItemTrowel(Item.ToolMaterial.DIAMOND, "diamond");
|
||||
Botany.proxy.registerItem(Botany.trowelDiamond);
|
||||
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "Gold");
|
||||
Botany.trowelGold = new ItemTrowel(Item.ToolMaterial.GOLD, "gold");
|
||||
Botany.proxy.registerItem(Botany.trowelGold);
|
||||
Botany.misc = new ItemMisc(CreativeTabBotany.instance, BotanyItems.values());
|
||||
Botany.proxy.registerItem(Botany.misc);
|
||||
|
||||
@@ -25,8 +25,8 @@ import java.util.TreeSet;
|
||||
|
||||
public class FlowerBreedingSystem extends BreedingSystem {
|
||||
public FlowerBreedingSystem() {
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee");
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscovered_bee");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discovered_bee");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -35,8 +35,8 @@ public class ItemDictionary extends Item implements IItemModelRegister {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, "botanistDatabase");
|
||||
manager.registerItemModel(item, 1, "masterBotanistDatabase");
|
||||
manager.registerItemModel(item, 0, "botanist_database");
|
||||
manager.registerItemModel(item, 1, "master_botanist_database");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -7,12 +7,12 @@ import net.minecraft.item.ItemStack;
|
||||
import java.util.List;
|
||||
|
||||
public enum BotanyItems implements IItemMiscProvider {
|
||||
AshPowder("Ash Powder", "powderAsh"),
|
||||
PulpPowder("Wood Pulp Powder", "powderPulp"),
|
||||
MulchPowder("Mulch Powder", "powderMulch"),
|
||||
SulphurPowder("Sulphur Powder", "powderSulphur"),
|
||||
FertiliserPowder("Fertiliser Powder", "powderFertiliser"),
|
||||
CompostPowder("Compost Powder", "powderCompost"),
|
||||
AshPowder("Ash Powder", "powder_ash"),
|
||||
PulpPowder("Wood Pulp Powder", "powder_pulp"),
|
||||
MulchPowder("Mulch Powder", "powder_mulch"),
|
||||
SulphurPowder("Sulphur Powder", "powder_sulphur"),
|
||||
FertiliserPowder("Fertiliser Powder", "powder_fertiliser"),
|
||||
CompostPowder("Compost Powder", "powder_compost"),
|
||||
Mortar("Mortar", "mortar"),
|
||||
Weedkiller("Weedkiller", "weedkiller");
|
||||
|
||||
|
||||
@@ -24,8 +24,8 @@ import java.util.TreeSet;
|
||||
|
||||
class BeeBreedingSystem extends BreedingSystem {
|
||||
public BeeBreedingSystem() {
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscoveredBee");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discoveredBee");
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/undiscovered_bee");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraBees.instance, "icon/discovered_bee");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -21,8 +21,8 @@ import java.util.TreeSet;
|
||||
|
||||
class MothBreedingSystem extends BreedingSystem {
|
||||
public MothBreedingSystem() {
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredMoth");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredMoth");
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscovered_moth");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discovered_moth");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -51,8 +51,8 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
this.discoveredFruits = new UniqueItemStackSet();
|
||||
this.discoveredWoods = new UniqueItemStackSet();
|
||||
this.discoveredPlanks = new UniqueItemStackSet();
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscoveredTree");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discoveredTree");
|
||||
this.iconUndiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/undiscovered_tree");
|
||||
this.iconDiscovered = Binnie.RESOURCE.getItemSprite(ExtraTrees.instance, "icon/discovered_tree");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -27,8 +27,8 @@ public class ItemFieldKit extends ItemCore {
|
||||
private ModelResourceLocation fieldKit3;
|
||||
|
||||
public ItemFieldKit() {
|
||||
super("fieldKit");
|
||||
this.setUnlocalizedName("fieldKit");
|
||||
super("field_kit");
|
||||
this.setUnlocalizedName("field_kit");
|
||||
this.setCreativeTab(CreativeTabs.TOOLS);
|
||||
this.setMaxStackSize(1);
|
||||
this.setMaxDamage(64);
|
||||
@@ -38,10 +38,10 @@ public class ItemFieldKit extends ItemCore {
|
||||
@Override
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, new FieldKitMeshDefinition());
|
||||
fieldKit = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit", "inventory");
|
||||
fieldKit1 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit1", "inventory");
|
||||
fieldKit2 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit2", "inventory");
|
||||
fieldKit3 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":fieldKit3", "inventory");
|
||||
fieldKit = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit", "inventory");
|
||||
fieldKit1 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit1", "inventory");
|
||||
fieldKit2 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit2", "inventory");
|
||||
fieldKit3 = new ModelResourceLocation(Constants.CORE_MOD_ID + ":field_kit3", "inventory");
|
||||
ModelBakery.registerItemVariants(item, fieldKit, fieldKit1, fieldKit2, fieldKit3);
|
||||
}
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ class StandardCompartment {
|
||||
|
||||
public static class PackageCompartmentCopper extends Compartment.PackageCompartment {
|
||||
public PackageCompartmentCopper() {
|
||||
super("compartmentCopper", BinnieCoreTexture.CompartmentCopper);
|
||||
super("compartment_copper", BinnieCoreTexture.CompartmentCopper);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -51,7 +51,7 @@ class StandardCompartment {
|
||||
|
||||
public static class PackageCompartmentBronze extends Compartment.PackageCompartment {
|
||||
public PackageCompartmentBronze() {
|
||||
super("compartmentBronze", BinnieCoreTexture.CompartmentBronze);
|
||||
super("compartment_bronze", BinnieCoreTexture.CompartmentBronze);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -72,7 +72,7 @@ class StandardCompartment {
|
||||
|
||||
public static class PackageCompartmentIron extends Compartment.PackageCompartment {
|
||||
public PackageCompartmentIron() {
|
||||
super("compartmentIron", BinnieCoreTexture.CompartmentIron);
|
||||
super("compartment_iron", BinnieCoreTexture.CompartmentIron);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -93,7 +93,7 @@ class StandardCompartment {
|
||||
|
||||
public static class PackageCompartmentGold extends Compartment.PackageCompartment {
|
||||
public PackageCompartmentGold() {
|
||||
super("compartmentGold", BinnieCoreTexture.CompartmentGold);
|
||||
super("compartment_gold", BinnieCoreTexture.CompartmentGold);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -114,7 +114,7 @@ class StandardCompartment {
|
||||
|
||||
public static class PackageCompartmentDiamond extends Compartment.PackageCompartment {
|
||||
public PackageCompartmentDiamond() {
|
||||
super("compartmentDiamond", BinnieCoreTexture.CompartmentDiamond);
|
||||
super("compartment_diamond", BinnieCoreTexture.CompartmentDiamond);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,12 +11,12 @@ import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public enum BinnieCoreTexture implements IBinnieTexture {
|
||||
Compartment(ResourceType.Tile, "Compartment"),
|
||||
CompartmentIron(ResourceType.Tile, "CompartmentIron"),
|
||||
CompartmentDiamond(ResourceType.Tile, "CompartmentDiamond"),
|
||||
CompartmentCopper(ResourceType.Tile, "CompartmentCopper"),
|
||||
CompartmentGold(ResourceType.Tile, "CompartmentGold"),
|
||||
CompartmentBronze(ResourceType.Tile, "CompartmentBronze"),
|
||||
Compartment(ResourceType.Tile, "compartment"),
|
||||
CompartmentIron(ResourceType.Tile, "compartment_iron"),
|
||||
CompartmentDiamond(ResourceType.Tile, "compartment_diamond"),
|
||||
CompartmentCopper(ResourceType.Tile, "compartment_copper"),
|
||||
CompartmentGold(ResourceType.Tile, "compartment_gold"),
|
||||
CompartmentBronze(ResourceType.Tile, "compartment_bronze"),
|
||||
GUIBreeding(ResourceType.GUI, "breeding"),
|
||||
GUIAnalyst(ResourceType.GUI, "guianalyst");
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ public enum EnumHiveFrame implements IHiveFrame, IBeeModifier {
|
||||
EnumHiveFrame(int maxDamage) {
|
||||
this.maxDamage = maxDamage;
|
||||
this.logic = new BeeModifierLogic();
|
||||
this.item = new ItemHiveFrame(this).setRegistryName("hiveFrame." + name().toLowerCase());
|
||||
this.item = new ItemHiveFrame(this).setRegistryName("hive_frame." + name().toLowerCase());
|
||||
}
|
||||
|
||||
public int getIconIndex() {
|
||||
|
||||
@@ -28,7 +28,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt
|
||||
this.setMaxDamage(frame.getMaxDamage());
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setMaxStackSize(1);
|
||||
this.setUnlocalizedName("hiveFrame");
|
||||
this.setUnlocalizedName("hive_frame");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -16,36 +16,36 @@ import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public enum ExtraBeeItems implements IItemMiscProvider {
|
||||
ScentedGear("Scented Gear", "scentedGear"),
|
||||
DiamondShard("Diamond Fragment", "diamondShard"),
|
||||
EmeraldShard("Emerald Fragment", "emeraldShard"),
|
||||
RubyShard("Ruby Fragment", "rubyShard"),
|
||||
SapphireShard("Sapphire Fragment", "sapphireShard"),
|
||||
LapisShard("Lapis Fragment", "lapisShard"),
|
||||
IronDust("Iron Grains", "ironDust"),
|
||||
GoldDust("Gold Grains", "goldDust"),
|
||||
SilverDust("Silver Grains", "silverDust"),
|
||||
PlatinumDust("Platinum Grains", "platinumDust"),
|
||||
CopperDust("Copper Grains", "copperDust"),
|
||||
TinDust("Tin Grains", "tinDust"),
|
||||
NickelDust("Nickel Grains", "nickelDust"),
|
||||
LeadDust("Lead Grains", "leadDust"),
|
||||
ZincDust("Zinc Grains", "zincDust"),
|
||||
TitaniumDust("Titanium Grains", "titaniumDust"),
|
||||
TungstenDust("Tungsten Grains", "tungstenDust"),
|
||||
UraniumDust("Radioactive Fragments", "radioactiveDust"),
|
||||
CoalDust("Coal Grains", "coalDust"),
|
||||
RedDye("Red Dye", "dyeRed"),
|
||||
YellowDye("Yellow Dye", "dyeYellow"),
|
||||
BlueDye("Blue Dye", "dyeBlue"),
|
||||
GreenDye("Green Dye", "dyeGreen"),
|
||||
WhiteDye("White Dye", "dyeWhite"),
|
||||
BlackDye("Black Dye", "dyeBlack"),
|
||||
BrownDye("Brown Dye", "dyeBrown"),
|
||||
ClayDust("Clay Dust", "clayDust"),
|
||||
YelloriumDust("Yellorium Grains", "yelloriumDust"),
|
||||
BlutoniumDust("Blutonium Grains", "blutoniumDust"),
|
||||
CyaniteDust("Cyanite Grains", "cyaniteDust");
|
||||
ScentedGear("Scented Gear", "scented_gear"),
|
||||
DiamondShard("Diamond Fragment", "diamond_shard"),
|
||||
EmeraldShard("Emerald Fragment", "emerald_shard"),
|
||||
RubyShard("Ruby Fragment", "ruby_shard"),
|
||||
SapphireShard("Sapphire Fragment", "sapphire_shard"),
|
||||
LapisShard("Lapis Fragment", "lapis_shard"),
|
||||
IronDust("Iron Grains", "iron_dust"),
|
||||
GoldDust("Gold Grains", "gold_dust"),
|
||||
SilverDust("Silver Grains", "silver_dust"),
|
||||
PlatinumDust("Platinum Grains", "platinum_dust"),
|
||||
CopperDust("Copper Grains", "copper_dust"),
|
||||
TinDust("Tin Grains", "tin_dust"),
|
||||
NickelDust("Nickel Grains", "nickel_dust"),
|
||||
LeadDust("Lead Grains", "lead_dust"),
|
||||
ZincDust("Zinc Grains", "zinc_dust"),
|
||||
TitaniumDust("Titanium Grains", "titanium_dust"),
|
||||
TungstenDust("Tungsten Grains", "tungsten_dust"),
|
||||
UraniumDust("Radioactive Fragments", "radioactive_dust"),
|
||||
CoalDust("Coal Grains", "coal_dust"),
|
||||
RedDye("Red Dye", "dye_red"),
|
||||
YellowDye("Yellow Dye", "dye_yellow"),
|
||||
BlueDye("Blue Dye", "dye_blue"),
|
||||
GreenDye("Green Dye", "dye_green"),
|
||||
WhiteDye("White Dye", "dye_white"),
|
||||
BlackDye("Black Dye", "dye_black"),
|
||||
BrownDye("Brown Dye", "dye_brown"),
|
||||
ClayDust("Clay Dust", "clay_dust"),
|
||||
YelloriumDust("Yellorium Grains", "yellorium_dust"),
|
||||
BlutoniumDust("Blutonium Grains", "blutonium_dust"),
|
||||
CyaniteDust("Cyanite Grains", "cyanite_dust");
|
||||
|
||||
String name;
|
||||
String modelPath;
|
||||
|
||||
@@ -67,6 +67,6 @@ public class ItemDictionary extends Item implements IItemModelRegister {
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, getRegistryName().getResourcePath());
|
||||
manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "Master");
|
||||
manager.registerItemModel(item, 1, getRegistryName().getResourcePath() + "_master");
|
||||
}
|
||||
}
|
||||
@@ -19,8 +19,8 @@ public class ItemHoneyComb extends ItemProduct implements IColoredItem {
|
||||
public ItemHoneyComb() {
|
||||
super(EnumHoneyComb.values());
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setUnlocalizedName("honeyComb");
|
||||
setRegistryName("honeyComb");
|
||||
this.setUnlocalizedName("honey_comb");
|
||||
setRegistryName("honey_comb");
|
||||
}
|
||||
|
||||
public static void addSubtypes() {
|
||||
|
||||
@@ -24,7 +24,7 @@ public class ItemHoneyCrystal extends Item {
|
||||
this.setMaxDamage(27);
|
||||
this.setMaxStackSize(1);
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setUnlocalizedName("honeyCrystal");
|
||||
this.setUnlocalizedName("honey_crystal");
|
||||
setRegistryName(name);
|
||||
ExtraBees.proxy.registermodel(this, 0);
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ public class ItemHoneyCrystalEmpty extends ItemHoneyCrystal {
|
||||
super(name);
|
||||
this.setMaxDamage(0);
|
||||
this.setMaxStackSize(64);
|
||||
this.setUnlocalizedName("honeyCrystalEmpty");
|
||||
this.setUnlocalizedName("honey_crystal_empty");
|
||||
}
|
||||
|
||||
// @SideOnly(Side.CLIENT)
|
||||
|
||||
@@ -10,8 +10,8 @@ public class ItemHoneyDrop extends ItemProduct implements IColoredItem {
|
||||
public ItemHoneyDrop() {
|
||||
super(EnumHoneyDrop.values());
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
this.setUnlocalizedName("honeyDrop");
|
||||
setRegistryName("honeyDrop");
|
||||
this.setUnlocalizedName("honey_drop");
|
||||
setRegistryName("honey_drop");
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -11,8 +11,8 @@ import net.minecraftforge.oredict.OreDictionary;
|
||||
public class ModuleProducts implements IInitializable {
|
||||
@Override
|
||||
public void preInit() {
|
||||
ExtraBees.honeyCrystal = new ItemHoneyCrystal("honeyCrystal");
|
||||
ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honeyCrystalEmpty");
|
||||
ExtraBees.honeyCrystal = new ItemHoneyCrystal("honey_crystal");
|
||||
ExtraBees.honeyCrystalEmpty = new ItemHoneyCrystalEmpty("honey_crystal_empty");
|
||||
ExtraBees.honeyDrop = new ItemHoneyDrop();
|
||||
ExtraBees.comb = new ItemHoneyComb();
|
||||
ExtraBees.propolis = new ItemPropolis();
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package binnie.extratrees.block;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
import binnie.Constants;
|
||||
import forestry.api.arboriculture.IWoodType;
|
||||
import forestry.api.arboriculture.TreeManager;
|
||||
@@ -9,6 +7,8 @@ import forestry.api.arboriculture.WoodBlockKind;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import java.util.Locale;
|
||||
|
||||
public enum EnumETLog implements IWoodType {
|
||||
Apple("Apple", PlankType.ExtraTreePlanks.Apple),
|
||||
Fig("Fig", PlankType.ExtraTreePlanks.Fig),
|
||||
@@ -76,7 +76,6 @@ public enum EnumETLog implements IWoodType {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
|
||||
public void addRecipe() {
|
||||
if (this.plank == null) {
|
||||
return;
|
||||
@@ -116,7 +115,8 @@ public enum EnumETLog implements IWoodType {
|
||||
|
||||
@Override
|
||||
public String getHeartTexture() {
|
||||
return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name().toLowerCase() + "Trunk";
|
||||
String name = name().toLowerCase(Locale.ENGLISH).replace(" ", "_");
|
||||
return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name + "_trunk";
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -131,7 +131,8 @@ public enum EnumETLog implements IWoodType {
|
||||
|
||||
@Override
|
||||
public String getBarkTexture() {
|
||||
return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name().toLowerCase() + "Bark";
|
||||
String name = name().toLowerCase(Locale.ENGLISH).replace(" ", "_");
|
||||
return Constants.EXTRA_TREES_MOD_ID + ":blocks/logs/" + name + "_bark";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -244,7 +244,7 @@ public enum ButterflySpecies implements IAlleleButterflySpecies {
|
||||
if (itemstack.getItem() == Mods.Forestry.item("honeydew")) {
|
||||
return 0.7f;
|
||||
}
|
||||
if (itemstack.getItem() == Mods.Forestry.item("bee_comb")) {
|
||||
if (itemstack.getItem() == Mods.Forestry.item("bee_combs")) {
|
||||
return 0.4f;
|
||||
}
|
||||
if (AlleleManager.alleleRegistry.isIndividual(itemstack)) {
|
||||
|
||||
@@ -7,20 +7,20 @@ import net.minecraft.item.ItemStack;
|
||||
import java.util.List;
|
||||
|
||||
public enum ExtraTreeItems implements IItemMiscProvider {
|
||||
CarpentryHammer("Fake Hammer", "carpentryHammer"),
|
||||
CarpentryHammer("Fake Hammer", "carpentry_hammer"),
|
||||
Sawdust("Sawdust", "sawdust"),
|
||||
Bark("Bark", "bark"),
|
||||
ProvenGear("Proven Gear", "provenGear"),
|
||||
WoodWax("Wood Polish", "woodWax"),
|
||||
ProvenGear("Proven Gear", "proven_gear"),
|
||||
WoodWax("Wood Polish", "wood_wax"),
|
||||
Hops("Hops", "hops"),
|
||||
Yeast("Yeast", "yeast"),
|
||||
LagerYeast("Lager Yeast", "yeastLager"),
|
||||
GrainWheat("Wheat Grain", "grainWheat"),
|
||||
GrainBarley("Barley Grain", "grainBarley"),
|
||||
GrainRye("Rye Grain", "grainRye"),
|
||||
GrainCorn("Corn Grain", "grainCorn"),
|
||||
GrainRoasted("Roasted Grain", "grainRoasted"),
|
||||
GlassFitting("Glass Fittings", "glassFitting");
|
||||
LagerYeast("Lager Yeast", "yeast_lager"),
|
||||
GrainWheat("Wheat Grain", "grain_wheat"),
|
||||
GrainBarley("Barley Grain", "grain_barley"),
|
||||
GrainRye("Rye Grain", "grain_rye"),
|
||||
GrainCorn("Corn Grain", "grain_corn"),
|
||||
GrainRoasted("Roasted Grain", "grain_roasted"),
|
||||
GlassFitting("Glass Fittings", "glass_fitting");
|
||||
|
||||
String name;
|
||||
String modelPath;
|
||||
|
||||
@@ -48,8 +48,8 @@ public class ItemArboristDatabase extends Item implements IItemModelRegister {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, "arboristDatabase");
|
||||
manager.registerItemModel(item, 1, "masterArboristDatabase");
|
||||
manager.registerItemModel(item, 0, "arborist_database");
|
||||
manager.registerItemModel(item, 1, "master_arborist_database");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -17,16 +17,16 @@ public class ItemHammer extends Item implements IToolHammer, IItemModelRegister
|
||||
this.isDurableHammer = false;
|
||||
this.isDurableHammer = durable;
|
||||
this.setCreativeTab(CreativeTabs.TOOLS);
|
||||
this.setUnlocalizedName(durable ? "durableHammer" : "hammer");
|
||||
this.setUnlocalizedName(durable ? "durable_hammer" : "hammer");
|
||||
this.setMaxStackSize(1);
|
||||
this.setMaxDamage(durable ? 1562 : 251);
|
||||
setRegistryName(durable ? "durableHammer" : "hammer");
|
||||
setRegistryName(durable ? "durable_hammer" : "hammer");
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, isDurableHammer ? "durableHammer" : "carpentryHammer");
|
||||
manager.registerItemModel(item, 0, isDurableHammer ? "durable_hammer" : "carpentry_hammer");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -32,8 +32,8 @@ public class ItemMothDatabase extends Item implements IItemModelRegister {
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerModel(Item item, IModelManager manager) {
|
||||
manager.registerItemModel(item, 0, "lepiDatabase");
|
||||
manager.registerItemModel(item, 1, "masterLepiDatabase");
|
||||
manager.registerItemModel(item, 0, "lepi_database");
|
||||
manager.registerItemModel(item, 1, "master_lepi_database");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -140,7 +140,7 @@ public class ModuleItems implements IInitializable {
|
||||
GameRegistry.addSmelting(ExtraTreeItems.GrainCorn.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f);
|
||||
GameRegistry.addSmelting(ExtraTreeItems.GrainBarley.get(1), ExtraTreeItems.GrainRoasted.get(1), 0.0f);
|
||||
try {
|
||||
final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("miniumShard").get(null);
|
||||
final Item minium = (Item) Class.forName("com.pahimar.ee3.lib.ItemIds").getField("minium_shard").get(null);
|
||||
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(Food.PAPAYIMAR.get(1), minium, "cropPapaya"));
|
||||
} catch (Exception ex) {
|
||||
}
|
||||
|
||||
@@ -13,20 +13,20 @@ import javax.annotation.Nullable;
|
||||
|
||||
public enum GeneticsTexture implements IBinnieTexture {
|
||||
GeneticMachine(ResourceType.Tile, "GeneticMachine"),
|
||||
Genepool(ResourceType.Tile, "Genepool"),
|
||||
Incubator(ResourceType.Tile, "Incubator"),
|
||||
Genepool(ResourceType.Tile, "genepool"),
|
||||
Incubator(ResourceType.Tile, "incubator"),
|
||||
GUIProcess(ResourceType.GUI, "process"),
|
||||
GUIProcess2(ResourceType.GUI, "process2"),
|
||||
Isolator(ResourceType.Tile, "Isolator"),
|
||||
Sequencer(ResourceType.Tile, "Sequencer"),
|
||||
Polymeriser(ResourceType.Tile, "Polymeriser"),
|
||||
Inoculator(ResourceType.Tile, "Inoculator"),
|
||||
Analyser(ResourceType.Tile, "Analyser"),
|
||||
Isolator(ResourceType.Tile, "isolator"),
|
||||
Sequencer(ResourceType.Tile, "sequencer"),
|
||||
Polymeriser(ResourceType.Tile, "polymeriser"),
|
||||
Inoculator(ResourceType.Tile, "inoculator"),
|
||||
Analyser(ResourceType.Tile, "analyser"),
|
||||
MachineGlow(ResourceType.Tile, "MachineGlow"),
|
||||
GeneBank(ResourceType.Tile, "GeneBank"),
|
||||
LabMachine(ResourceType.Tile, "LabMachine"),
|
||||
Acclimatiser(ResourceType.Tile, "Acclimatiser"),
|
||||
Splicer(ResourceType.Tile, "Splicer");
|
||||
LabMachine(ResourceType.Tile, "lab_machine"),
|
||||
Acclimatiser(ResourceType.Tile, "acclimatiser"),
|
||||
Splicer(ResourceType.Tile, "splicer");
|
||||
|
||||
private final String texture;
|
||||
private final ResourceType type;
|
||||
|
||||
@@ -26,7 +26,7 @@ public class GenepoolRecipeCategory extends BlankRecipeCategory<GenepoolRecipeWr
|
||||
|
||||
@Override
|
||||
public String getTitle() {
|
||||
return "Genepool";
|
||||
return "genepool";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -9,17 +9,17 @@ import javax.annotation.Nonnull;
|
||||
import java.util.List;
|
||||
|
||||
public enum GeneticsItems implements IItemMiscProvider {
|
||||
LaboratoryCasing("Reinforced Casing", "casingIron"),
|
||||
DNADye("DNA Dye", "dnaDye"),
|
||||
FluorescentDye("Fluorescent Dye", "dyeFluor"),
|
||||
LaboratoryCasing("Reinforced Casing", "casing_iron"),
|
||||
DNADye("DNA Dye", "dna_dye"),
|
||||
FluorescentDye("Fluorescent Dye", "dye_fluor"),
|
||||
Enzyme("Enzyme", "enzyme"),
|
||||
GrowthMedium("Growth Medium", "growthMedium"),
|
||||
EmptySequencer("Blank Sequence", "sequencerEmpty"),
|
||||
EmptySerum("Empty Serum Vial", "serumEmpty"),
|
||||
EmptyGenome("Empty Serum Array", "genomeEmpty"),
|
||||
IntegratedCircuit("Integrated Circuit Board", "integratedCircuit"),
|
||||
IntegratedCPU("Integrated CPU", "integratedCPU"),
|
||||
IntegratedCasing("Integrated Casing", "casingCircuit");
|
||||
GrowthMedium("Growth Medium", "growth_medium"),
|
||||
EmptySequencer("Blank Sequence", "sequencer_empty"),
|
||||
EmptySerum("Empty Serum Vial", "serum_empty"),
|
||||
EmptyGenome("Empty Serum Array", "genome_empty"),
|
||||
IntegratedCircuit("Integrated Circuit Board", "integrated_circuit"),
|
||||
IntegratedCPU("Integrated CPU", "integrated_cpu"),
|
||||
IntegratedCasing("Integrated Casing", "casing_circuit");
|
||||
|
||||
String name;
|
||||
String modelPath;
|
||||
|
||||
@@ -19,9 +19,9 @@ public class ItemMasterRegistry extends ItemCore {
|
||||
// }
|
||||
|
||||
public ItemMasterRegistry() {
|
||||
super("masterRegistry");
|
||||
super("master_registry");
|
||||
this.setCreativeTab(CreativeTabGenetics.instance);
|
||||
this.setUnlocalizedName("masterRegistry");
|
||||
this.setUnlocalizedName("master_registry");
|
||||
this.setMaxStackSize(1);
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ import java.util.List;
|
||||
|
||||
public class ItemSerumArray extends ItemGene implements IItemSerum {
|
||||
public ItemSerumArray() {
|
||||
super("serumArray");
|
||||
super("serum_array");
|
||||
this.setMaxDamage(16);
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ public enum LaboratoryMachine implements IMachineType {
|
||||
|
||||
public static class PackageLabMachine extends GeneticMachine.PackageGeneticBase {
|
||||
public PackageLabMachine() {
|
||||
super("labMachine", GeneticsTexture.LabMachine, 16777215, false);
|
||||
super("lab_machine", GeneticsTexture.LabMachine, 16777215, false);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -27,8 +27,8 @@ public class ModuleMachine implements IInitializable {
|
||||
@Override
|
||||
public void preInit() {
|
||||
(Genetics.packageGenetic = new MachineGroup(Genetics.instance, "machine", "machine", GeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
(Genetics.packageLabMachine = new MachineGroup(Genetics.instance, "labMachine", "labMachine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
(Genetics.packageAdvGenetic = new MachineGroup(Genetics.instance, "advMachine", "advMachine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
(Genetics.packageLabMachine = new MachineGroup(Genetics.instance, "lab_machine", "lab_machine", LaboratoryMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
(Genetics.packageAdvGenetic = new MachineGroup(Genetics.instance, "adv_machine", "adv_machine", AdvGeneticMachine.values())).setCreativeTab(CreativeTabGenetics.instance);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -58,7 +58,7 @@ public class WindowAcclimatiser extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Acclimatiser";
|
||||
return "acclimatiser";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -71,7 +71,7 @@ public class WindowAnalyser extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Analyser";
|
||||
return "analyser";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class WindowGenepool extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Genepool";
|
||||
return "genepool";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -67,7 +67,7 @@ public class WindowIncubator extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Incubator";
|
||||
return "incubator";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -72,7 +72,7 @@ public class WindowInoculator extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Inoculator";
|
||||
return "inoculator";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -72,7 +72,7 @@ public class WindowIsolator extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Isolator";
|
||||
return "isolator";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -65,7 +65,7 @@ public class WindowPolymeriser extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Polymeriser";
|
||||
return "polymeriser";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -84,7 +84,7 @@ public class WindowSequencer extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Sequencer";
|
||||
return "sequencer";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -68,7 +68,7 @@ public class WindowSplicer extends WindowMachine {
|
||||
|
||||
@Override
|
||||
protected String getBackgroundTextureName() {
|
||||
return "Inoculator";
|
||||
return "inoculator";
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user