Fix missing resources

This commit is contained in:
mezz committed 2016-12-22 19:18:00 -08:00
1 parent 08c99cb0ca
commit a2c12f3841
519 files changed
+974 -938

No files matched your search

@@ -90,9 +90,11 @@ public class BeekeepingLogic implements IBeekeepingLogic, IStreamable {
beeProgress = nbttagcompound.getInteger("BreedingTime");
queenWorkCycleThrottle = nbttagcompound.getInteger("Throttle");
NBTTagCompound queenNBT = nbttagcompound.getCompoundTag("queen");
queenStack = new ItemStack(queenNBT);
queen = BeeManager.beeRoot.getMember(queenStack);
if (nbttagcompound.hasKey("queen")) {
NBTTagCompound queenNBT = nbttagcompound.getCompoundTag("queen");
queenStack = new ItemStack(queenNBT);
queen = BeeManager.beeRoot.getMember(queenStack);
}
setActive(nbttagcompound.getBoolean("Active"));
@@ -53,23 +53,23 @@ public class ItemRegistryApiculture extends ItemRegistry {
public ItemRegistryApiculture() {
// / BEES
beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "beeQueenGE");
beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "beeDroneGE");
beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "beePrincessGE");
beeLarvaeGE = registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "beeLarvaeGE");
beeQueenGE = registerItem(new ItemBeeGE(EnumBeeType.QUEEN), "bee_queen_ge");
beeDroneGE = registerItem(new ItemBeeGE(EnumBeeType.DRONE), "bee_drone_ge");
beePrincessGE = registerItem(new ItemBeeGE(EnumBeeType.PRINCESS), "bee_princess_ge");
beeLarvaeGE = registerItem(new ItemBeeGE(EnumBeeType.LARVAE), "bee_larvae_ge");
habitatLocator = registerItem(new ItemHabitatLocator(), "habitatLocator");
habitatLocator = registerItem(new ItemHabitatLocator(), "habitat_locator");
imprinter = registerItem(new ItemImprinter(), "imprinter");
minecartBeehouse = registerItem(new ItemMinecartBeehouse(), "cart.beehouse");
// / COMB FRAMES
frameUntreated = registerItem(new ItemHiveFrame(80, 0.9f), "frameUntreated");
frameImpregnated = registerItem(new ItemHiveFrame(240, 0.4f), "frameImpregnated");
frameProven = registerItem(new ItemHiveFrame(720, 0.3f), "frameProven");
frameUntreated = registerItem(new ItemHiveFrame(80, 0.9f), "frame_untreated");
frameImpregnated = registerItem(new ItemHiveFrame(240, 0.4f), "frame_impregnated");
frameProven = registerItem(new ItemHiveFrame(720, 0.3f), "frame_proven");
// / BEE RESOURCES
honeyDrop = registerItem(new ItemOverlay(Tabs.tabApiculture, EnumHoneyDrop.VALUES), "honeyDrop");
honeyDrop = registerItem(new ItemOverlay(Tabs.tabApiculture, EnumHoneyDrop.VALUES), "honey_drop");
OreDictionary.registerOre(OreDictUtil.DROP_HONEY, honeyDrop);
pollenCluster = registerItem(new ItemPollenCluster(), "pollen");
@@ -80,20 +80,20 @@ public class ItemRegistryApiculture extends ItemRegistry {
honeydew = registerItem(new ItemForestry(Tabs.tabApiculture), "honeydew");
OreDictionary.registerOre(OreDictUtil.DROP_HONEYDEW, honeydew);
royalJelly = registerItem(new ItemForestry(Tabs.tabApiculture), "royalJelly");
royalJelly = registerItem(new ItemForestry(Tabs.tabApiculture), "royal_jelly");
OreDictionary.registerOre(OreDictUtil.DROP_ROYAL_JELLY, royalJelly);
waxCast = registerItem(new ItemWaxCast(), "waxCast");
waxCast = registerItem(new ItemWaxCast(), "wax_cast");
// / BEE COMBS
beeComb = registerItem(new ItemHoneyComb(), "beeCombs");
beeComb = registerItem(new ItemHoneyComb(), "bee_combs");
OreDictionary.registerOre(OreDictUtil.BEE_COMB, beeComb.getWildcard());
// / APIARIST'S CLOTHES
apiaristHat = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.HEAD), "apiaristHelmet");
apiaristChest = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.CHEST), "apiaristChest");
apiaristLegs = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.LEGS), "apiaristLegs");
apiaristBoots = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.FEET), "apiaristBoots");
apiaristHat = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.HEAD), "apiarist_helmet");
apiaristChest = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.CHEST), "apiarist_chest");
apiaristLegs = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.LEGS), "apiarist_legs");
apiaristBoots = registerItem(new ItemArmorApiarist(EntityEquipmentSlot.FEET), "apiarist_boots");
// TOOLS
scoop = registerItem(new ItemScoop(), "scoop");
@@ -95,6 +95,7 @@ import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraftforge.client.event.ModelBakeEvent;
@@ -414,7 +415,11 @@ public class PluginArboriculture extends BlankForestryPlugin {
RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.PAPAYA.getStack(), Fluids.JUICE.getFluid(juiceMultiplier * 3), mulch, (int) Math.floor(mulchMultiplier * 0.5f));
RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.DATES.getStack(), Fluids.JUICE.getFluid((int) Math.floor(juiceMultiplier * 0.25)), mulch, mulchMultiplier);
RecipeUtil.addFermenterRecipes(items.sapling.getItemStack(), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
NonNullList<ItemStack> saplings = NonNullList.create();
items.sapling.addCreativeItems(saplings, false);
for (ItemStack sapling : saplings) {
RecipeUtil.addFermenterRecipes(sapling, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
}
}
// Grafter
@@ -483,11 +483,11 @@ public abstract class BlockPile extends BlockStructure implements ITileEntityPro
@Override
public void registerModel(Item item, IModelManager manager) {
if (getPileType() == EnumPileType.WOOD) {
manager.registerItemModel(item, 0, "woodPile");
manager.registerItemModel(item, 0, "wood_pile");
} else if (getPileType() == EnumPileType.DIRT) {
manager.registerItemModel(item, 0, "dirtPile");
manager.registerItemModel(item, 0, "dirt_pile");
} else if (getPileType() == EnumPileType.ASH) {
manager.registerItemModel(item, 0, "ashPile");
manager.registerItemModel(item, 0, "ash_pile");
}
}
@@ -227,7 +227,7 @@ public class BlockRegistryArboriculture extends BlockRegistry {
// Saplings
TreeDefinition.preInit();
saplingGE = new BlockSapling();
registerBlock(saplingGE, new ItemBlockForestry(saplingGE), "saplingGE");
registerBlock(saplingGE, new ItemBlockForestry(saplingGE), "sapling_ge");
registerOreDictWildcard(OreDictUtil.TREE_SAPLING, saplingGE);
// Leaves
@@ -129,7 +129,7 @@ public class BlockSapling extends BlockTreeContainer implements IGrowable, IStat
@Override
public void registerModel(Item item, IModelManager manager) {
//To delete the error message
manager.registerItemModel(item, 0, "germlings/sapling.treeLarch");
manager.registerItemModel(item, 0, "germlings/sapling.tree_larch");
}
/* PLANTING */
@@ -201,11 +201,12 @@ public class ItemGermlingGE extends ItemGE implements IVariableFermentable, ICol
@Override
public float getFermentationModifier(ItemStack itemstack) {
ITree tree = TreeManager.treeRoot.getMember(itemstack);
if (tree == null) {
itemstack = GeneticsUtil.convertToGeneticEquivalent(itemstack);
if (!TreeManager.treeRoot.isMember(itemstack)) {
return 1.0f;
}
ITree tree = TreeManager.treeRoot.getMember(itemstack);
return tree.getGenome().getSappiness() * 10;
}
}
@@ -25,9 +25,9 @@ public class ItemRegistryArboriculture extends ItemRegistry {
sapling = registerItem(new ItemGermlingGE(EnumGermlingType.SAPLING), "sapling");
OreDictionary.registerOre(OreDictUtil.TREE_SAPLING, sapling.getWildcard());
pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollenFertile");
pollenFertile = registerItem(new ItemGermlingGE(EnumGermlingType.POLLEN), "pollen_fertile");
grafter = registerItem(new ItemGrafter(9), "grafter");
grafterProven = registerItem(new ItemGrafter(149), "grafterProven");
grafterProven = registerItem(new ItemGrafter(149), "grafter_proven");
}
}
@@ -14,6 +14,7 @@ import forestry.api.arboriculture.EnumGermlingType;
import forestry.api.arboriculture.IGermlingModelProvider;
import forestry.api.arboriculture.ILeafSpriteProvider;
import forestry.api.core.IModelManager;
import forestry.core.utils.StringUtil;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.item.Item;
@@ -29,8 +30,9 @@ public class ModelProviderGermling implements IGermlingModelProvider {
private ModelResourceLocation germlingModel;
private ModelResourceLocation pollenModel;
public ModelProviderGermling(String modelUid, ILeafSpriteProvider leafSpriteProvider) {
this.name = modelUid.substring("forestry.".length());
public ModelProviderGermling(String uid, ILeafSpriteProvider leafSpriteProvider) {
String modelName = uid.substring("forestry.".length());
this.name = StringUtil.camelCaseToUnderscores(modelName);
this.leafSpriteProvider = leafSpriteProvider;
}
+1 -1
View File
@@ -489,7 +489,7 @@ public class PluginCore extends BlankForestryPlugin {
@SubscribeEvent
@SideOnly(Side.CLIENT)
public void onBakeModel(ModelBakeEvent event) {
ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:camouflageSprayCan", "inventory");
ModelResourceLocation modelLocation = new ModelResourceLocation("forestry:camouflage_spray_can", "inventory");
ModelEntry blockModelIndex = new ModelEntry(modelLocation, new ModelCamouflageSprayCan());
Proxies.render.registerModel(blockModelIndex);
ModelManager.getInstance().registerCustomModels(event);
@@ -12,7 +12,10 @@ package forestry.core.blocks;
import javax.annotation.Nullable;
import java.util.Locale;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Log;
import forestry.plugins.PluginManager;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
@@ -25,6 +28,11 @@ public abstract class BlockRegistry {
if (PluginManager.getStage() != PluginManager.Stage.REGISTER) {
throw new RuntimeException("Tried to register Block outside of REGISTER");
}
if (!name.equals(name.toLowerCase(Locale.ENGLISH))) {
Log.error("Name must be lowercase");
}
block.setUnlocalizedName("for." + name);
block.setRegistryName(name);
GameRegistry.register(block);
@@ -35,7 +35,7 @@ public class BlockRegistryCore extends BlockRegistry {
registerBlock(escritoire, new ItemBlockForestry<>(escritoire), "escritoire");
bogEarth = new BlockBogEarth();
registerBlock(bogEarth, new ItemBlockForestry<>(bogEarth), "bogEarth");
registerBlock(bogEarth, new ItemBlockForestry<>(bogEarth), "bog_earth");
bogEarth.setHarvestLevel("shovel", 0);
humus = new BlockHumus();
@@ -50,7 +50,7 @@ public class BlockRegistryCore extends BlockRegistry {
OreDictionary.registerOre(OreDictUtil.ORE_TIN, resources.get(EnumResourceType.TIN, 1));
BlockResourceStorage resourceStorage = new BlockResourceStorage();
registerBlock(resourceStorage, new ItemBlockForestry(resourceStorage), "resourceStorage");
registerBlock(resourceStorage, new ItemBlockForestry(resourceStorage), "resource_storage");
resourceStorage.setHarvestLevel("pickaxe", 0);
resourceStorageApatite = resourceStorage.get(EnumResourceType.APATITE);
@@ -17,70 +17,70 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public enum EnumErrorCode implements IErrorState {
// Bees
TOO_HOT("tooHot"), // The bees are melting in the heat here and unable to work. Use the habitat locator to find a cooler climate.
TOO_COLD("tooCold"), // The bees are huddled together to survive the freezing cold here. Use the habitat locator to find a warmer climate.
TOO_HUMID("tooHumid"), // The damp climate here has made the bees' wings too damp to fly. Use the habitat locator to find a dryer climate.
TOO_ARID("tooArid", "invalidBiome"), // The dry climate here has made the bees parched and unable do work. Use the habitat locator to find a wetter climate.
IS_RAINING("isRaining"), // Only tolerant fliers can work in the rain.
NOT_GLOOMY("notGloomy"), // The bees can only work in darkness.
NOT_BRIGHT("notLucid"), // The bees have trouble navigating in the dark.
NOT_DAY("notDay"), // The bees can only work during the daytime.
NOT_NIGHT("notNight"), // The bees can only work during the night.
NO_FLOWER("noFlower"), // Hive members are not finding the right flowers. Use the Beealyzer to discover their flower preference.
NO_QUEEN("noQueen"), // Supply this hive with a queen or a princess and a drone.
NO_DRONE("noDrone"), // Mating requires a drone present.
NO_SKY("noSky"), // The hive requires direct sunlight from above.
TOO_HOT("too_hot"), // The bees are melting in the heat here and unable to work. Use the habitat locator to find a cooler climate.
TOO_COLD("too_cold"), // The bees are huddled together to survive the freezing cold here. Use the habitat locator to find a warmer climate.
TOO_HUMID("too_humid"), // The damp climate here has made the bees' wings too damp to fly. Use the habitat locator to find a dryer climate.
TOO_ARID("too_arid", "invalid_biome"), // The dry climate here has made the bees parched and unable do work. Use the habitat locator to find a wetter climate.
IS_RAINING("is_raining"), // Only tolerant fliers can work in the rain.
NOT_GLOOMY("not_gloomy"), // The bees can only work in darkness.
NOT_BRIGHT("not_lucid"), // The bees have trouble navigating in the dark.
NOT_DAY("not_day"), // The bees can only work during the daytime.
NOT_NIGHT("not_night"), // The bees can only work during the night.
NO_FLOWER("no_flower"), // Hive members are not finding the right flowers. Use the Beealyzer to discover their flower preference.
NO_QUEEN("no_queen"), // Supply this hive with a queen or a princess and a drone.
NO_DRONE("no_drone"), // Mating requires a drone present.
NO_SKY("no_sky"), // The hive requires direct sunlight from above.
// Machines
NO_RESOURCE("noResource"), // More resources need to be supplied for operation.
NO_RESOURCE_INVENTORY("noResourceInventory", "noResource"), // Resources need to be added to the machine's inventory to craft this recipe.
NO_RESOURCE_LIQUID("noResourceLiquid", "noLiquid"), // More liquid resources need to be supplied for operation.
NO_RECIPE("noRecipe"), // No matching recipe was found for the supplied resources.
NO_SPACE_INVENTORY("noSpace"), // Empty this machine's inventory.
NO_SPACE_TANK("noSpaceTank"), // Empty this machine's liquid tank.
NO_POWER("noPower"), // This machine requires RF energy from an engine to function.
NO_REDSTONE("noRedstone", "disabled"), // This machine requires a redstone signal to activate it.
DISABLED_BY_REDSTONE("disabledRedstone", "disabled"), // This machine is being disabled by a redstone signal.
NOT_DARK("notDark", "notGloomy"), // A lower light level is required for operation.
NO_RESOURCE("no_resource"), // More resources need to be supplied for operation.
NO_RESOURCE_INVENTORY("no_resource_inventory", "no_resource"), // Resources need to be added to the machine's inventory to craft this recipe.
NO_RESOURCE_LIQUID("no_resource_liquid", "no_liquid"), // More liquid resources need to be supplied for operation.
NO_RECIPE("no_recipe"), // No matching recipe was found for the supplied resources.
NO_SPACE_INVENTORY("no_space"), // Empty this machine's inventory.
NO_SPACE_TANK("no_space_tank"), // Empty this machine's liquid tank.
NO_POWER("no_power"), // This machine requires RF energy from an engine to function.
NO_REDSTONE("no_redstone", "disabled"), // This machine requires a redstone signal to activate it.
DISABLED_BY_REDSTONE("disabled_redstone", "disabled"), // This machine is being disabled by a redstone signal.
NOT_DARK("not_dark", "not_gloomy"), // A lower light level is required for operation.
// Rain Tank
NOT_RAINING("notRaining"), // Operation is only possible when it is raining.
NO_RAIN_BIOME("noRainBiome", "notRaining"), // This location never receives rain.
NO_SKY_RAIN_TANK("noSkyRainTank", "noSky"), // Clear the area above this machine so it can gather rain.
NOT_RAINING("not_raining"), // Operation is only possible when it is raining.
NO_RAIN_BIOME("no_rain_biome", "not_raining"), // This location never receives rain.
NO_SKY_RAIN_TANK("no_sky_rain_tank", "no_sky"), // Clear the area above this machine so it can gather rain.
// Alyzer
NO_HONEY("noHoney"), // This gadget requires honey drops or honeydew for operation.
NO_SPECIMEN("noSpecimen"), // Supply specimen to analyze.
NO_HONEY("no_honey"), // This gadget requires honey drops or honeydew for operation.
NO_SPECIMEN("no_specimen"), // Supply specimen to analyze.
// Engines
FORCED_COOLDOWN("forcedCooldown"), // Engine has overheated and is forced into cooldown.
NO_FUEL("noFuel"), // (Biogas & Peat-fired) Replenish this machine's fuel supplies.
NO_HEAT("noHeat"), // (Biogas engine) Refill the heating tank.
NO_ENERGY_NET("noEnergyNet"), // Your world is barren of any electricity. (Install IndustrialCraft\u00b2.)
FORCED_COOLDOWN("forced_cooldown"), // Engine has overheated and is forced into cooldown.
NO_FUEL("no_fuel"), // (Biogas & Peat-fired) Replenish this machine's fuel supplies.
NO_HEAT("no_heat"), // (Biogas engine) Refill the heating tank.
NO_ENERGY_NET("no_energy_net"), // Your world is barren of any electricity. (Install IndustrialCraft\u00b2.)
// Trade Station
NO_STAMPS("noStamps"), // The trade station requires more stamps to pay postage.
NO_PAPER("noPaper"), // The trade station requires more paper to send letters.
NO_SUPPLIES("noSupplies", "noResource"), // The trade station requires more supplies to send.
NO_TRADE("noTrade", "noResource"), // The trade station requires items to Send and Receive.
NO_STAMPS("no_stamps"), // The trade station requires more stamps to pay postage.
NO_PAPER("no_paper"), // The trade station requires more paper to send letters.
NO_SUPPLIES("no_supplies", "no_resource"), // The trade station requires more supplies to send.
NO_TRADE("no_trade", "no_resource"), // The trade station requires items to Send and Receive.
// Trade Station naming
NOT_ALPHANUMERIC("notAlphaNumeric"), // A Trade Station name must consist of letters and numbers only.
NOT_UNIQUE("notUnique"), // Trade Station names must be unique and this name is already taken.
NOT_ALPHANUMERIC("not_alpha_numeric"), // A Trade Station name must consist of letters and numbers only.
NOT_UNIQUE("not_unique"), // Trade Station names must be unique and this name is already taken.
// Letters
NOT_POST_PAID("notPostpaid", "noStamps"), // Apply more stamps to pay the postal service.
NO_RECIPIENT("noRecipient"), // You need to address your letter to a recipient to send it.
NOT_POST_PAID("not_postpaid", "no_stamps"), // Apply more stamps to pay the postal service.
NO_RECIPIENT("no_recipient"), // You need to address your letter to a recipient to send it.
// Circuit Boards
NO_CIRCUIT_BOARD("noCircuitBoard"), // Insert a circuit board to solder the selected tubes onto it.
NO_CIRCUIT_LAYOUT("noCircuitLayout"), // No layouts available due to the current game settings.
CIRCUIT_MISMATCH("circuitMismatch"), // Amount of tubes does not match size of circuit board.
NO_CIRCUIT_BOARD("no_circuit_board"), // Insert a circuit board to solder the selected tubes onto it.
NO_CIRCUIT_LAYOUT("no_circuit_layout"), // No layouts available due to the current game settings.
CIRCUIT_MISMATCH("circuit_mismatch"), // Amount of tubes does not match size of circuit board.
// Farms
NO_FERTILIZER("noFertilizer"), // Farms require fertilizer for function. Compost is insufficient.
NO_FARMLAND("noFarmland"), // Smooth sandstone, bricks or stone bricks create a platform the farm will build on.
NO_LIQUID_FARM("noLiquid") // Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water.
NO_FERTILIZER("no_fertilizer"), // Farms require fertilizer for function. Compost is insufficient.
NO_FARMLAND("no_farmland"), // Smooth sandstone, bricks or stone bricks create a platform the farm will build on.
NO_LIQUID_FARM("no_liquid") // Depending on rainfall, temperature and humidity farms need to be supplied with varying amounts of water.
;
private final String name;
@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
public class GuiCamouflageSprayCan extends GuiForestry<ContainerCamouflageSprayCan, ItemInventoryCamouflageSprayCan> {
public GuiCamouflageSprayCan(EntityPlayer player, ItemInventoryCamouflageSprayCan inventory) {
super(Constants.TEXTURE_PATH_GUI + "/camouflageSprayCan.png", new ContainerCamouflageSprayCan(inventory, player.inventory), inventory);
super(Constants.TEXTURE_PATH_GUI + "/camouflage_spray_can.png", new ContainerCamouflageSprayCan(inventory, player.inventory), inventory);
widgetManager.add(new WidgetCamouflageSlot(widgetManager, 80, 39, inventory, null));
}
@@ -34,7 +34,7 @@ public class ItemCamouflageSprayCan extends ItemWithGui {
@Override
public void registerModel(Item item, IModelManager manager) {
super.registerModel(item, manager);
ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:camouflageSprayCanFilled"));
ModelBakery.registerItemVariants(item, new ResourceLocation("forestry:camouflage_spray_can_filled"));
}
@Override
@@ -20,7 +20,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
public class ItemCraftingMaterial extends ItemForestry {
private final String[] definition = new String[]{"pulsatingDust", "pulsatingMesh", "silkWisp", "wovenSilk", "dissipationCharge", "iceShard", "scentedPaneling", "camouflagedPaneling"};
private final String[] definition = new String[]{"pulsating_dust", "pulsating_mesh", "silk_wisp", "woven_silk", "dissipation_charge", "ice_shard", "scented_paneling", "camouflaged_paneling"};
public ItemCraftingMaterial() {
setMaxDamage(0);
@@ -10,7 +10,11 @@
******************************************************************************/
package forestry.core.items;
import java.util.Locale;
import com.google.common.base.Preconditions;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Log;
import forestry.plugins.PluginManager;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -22,6 +26,11 @@ public abstract class ItemRegistry {
if (PluginManager.getStage() != PluginManager.Stage.REGISTER) {
throw new RuntimeException("Tried to register Item outside of REGISTER");
}
if (!name.equals(name.toLowerCase(Locale.ENGLISH))) {
Log.error("Name must be lowercase");
}
item.setUnlocalizedName("for." + name);
item.setRegistryName(name);
@@ -34,8 +43,8 @@ public abstract class ItemRegistry {
OreDictionary.registerOre(oreDictName, itemStack);
}
public static ItemStack createItemForOreName(String oreName) {
ItemStack oreItem = new ItemStack(registerItem(new ItemForestry(), oreName));
public static ItemStack createItemForOreName(String oreName, String registryName) {
ItemStack oreItem = new ItemStack(registerItem(new ItemForestry(), registryName));
OreDictionary.registerOre(oreName, oreItem);
return oreItem;
}
@@ -91,30 +91,30 @@ public class ItemRegistryCore extends ItemRegistry {
public final ItemCamouflageSprayCan camouflageSprayCan;
public ItemRegistryCore() {
fertilizerBio = registerItem(new ItemForestry(), "fertilizerBio");
fertilizerCompound = registerItem(new ItemFertilizer(), "fertilizerCompound");
fertilizerBio = registerItem(new ItemForestry(), "fertilizer_bio");
fertilizerCompound = registerItem(new ItemFertilizer(), "fertilizer_compound");
apatite = registerItem(new ItemForestry(), "apatite");
OreDictionary.registerOre(OreDictUtil.GEM_APATITE, apatite);
researchNote = registerItem(new ItemResearchNote(), "researchNote");
researchNote = registerItem(new ItemResearchNote(), "research_note");
portableAlyzer = registerItem(new ItemAlyzer(), "portableAlyzer");
portableAlyzer = registerItem(new ItemAlyzer(), "portable_alyzer");
ingotCopper = createItemForOreName(OreDictUtil.INGOT_COPPER);
ingotTin = createItemForOreName(OreDictUtil.INGOT_TIN);
ingotBronze = createItemForOreName(OreDictUtil.INGOT_BRONZE);
ingotCopper = createItemForOreName(OreDictUtil.INGOT_COPPER, "ingot_copper");
ingotTin = createItemForOreName(OreDictUtil.INGOT_TIN, "ingot_tin");
ingotBronze = createItemForOreName(OreDictUtil.INGOT_BRONZE, "ingot_bronze");
wrench = registerItem(new ItemWrench(), "wrench");
pipette = registerItem(new ItemPipette(), "pipette");
sturdyCasing = registerItem(new ItemForestry(), "sturdyMachine");
hardenedCasing = registerItem(new ItemForestry(), "hardenedMachine");
impregnatedCasing = registerItem(new ItemForestry(), "impregnatedCasing");
sturdyCasing = registerItem(new ItemForestry(), "sturdy_machine");
hardenedCasing = registerItem(new ItemForestry(), "hardened_machine");
impregnatedCasing = registerItem(new ItemForestry(), "impregnated_casing");
craftingMaterial = registerItem(new ItemCraftingMaterial(), "craftingMaterial");
craftingMaterial = registerItem(new ItemCraftingMaterial(), "crafting_material");
spectacles = registerItem(new ItemArmorNaturalist(), "naturalistHelmet");
spectacles = registerItem(new ItemArmorNaturalist(), "naturalist_helmet");
peat = registerItem(new ItemForestry(), "peat");
OreDictionary.registerOre(OreDictUtil.BRICK_PEAT, peat);
@@ -122,55 +122,55 @@ public class ItemRegistryCore extends ItemRegistry {
ash = registerItem(new ItemForestry(), "ash");
OreDictionary.registerOre(OreDictUtil.DUST_ASH, ash);
bituminousPeat = registerItem(new ItemForestry(), "bituminousPeat");
bituminousPeat = registerItem(new ItemForestry(), "bituminous_peat");
gearBronze = createItemForOreName(OreDictUtil.GEAR_BRONZE);
gearCopper = createItemForOreName(OreDictUtil.GEAR_COPPER);
gearTin = createItemForOreName(OreDictUtil.GEAR_TIN);
gearBronze = createItemForOreName(OreDictUtil.GEAR_BRONZE, "gear_bronze");
gearCopper = createItemForOreName(OreDictUtil.GEAR_COPPER, "gear_copper");
gearTin = createItemForOreName(OreDictUtil.GEAR_TIN, "gear_tin");
circuitboards = registerItem(new ItemCircuitBoard(), "chipsets");
solderingIron = new ItemSolderingIron();
solderingIron.setMaxDamage(5).setFull3D();
registerItem(solderingIron, "solderingIron");
registerItem(solderingIron, "soldering_iron");
tubes = registerItem(new ItemElectronTube(), "thermionicTubes");
tubes = registerItem(new ItemElectronTube(), "thermionic_tubes");
// / CARTONS
carton = registerItem(new ItemForestry(), "carton");
// / CRAFTING CARPENTER
stickImpregnated = registerItem(new ItemForestry(), "oakStick");
woodPulp = registerItem(new ItemForestry(), "woodPulp");
stickImpregnated = registerItem(new ItemForestry(), "oak_stick");
woodPulp = registerItem(new ItemForestry(), "wood_pulp");
OreDictionary.registerOre(OreDictUtil.PULP_WOOD, woodPulp);
// / RECLAMATION
brokenBronzePickaxe = registerItem(new ItemForestry(), "brokenBronzePickaxe");
brokenBronzeShovel = registerItem(new ItemForestry(), "brokenBronzeShovel");
brokenBronzePickaxe = registerItem(new ItemForestry(), "broken_bronze_pickaxe");
brokenBronzeShovel = registerItem(new ItemForestry(), "broken_bronze_shovel");
// / TOOLS
bronzePickaxe = new ItemForestryTool(new ItemStack(brokenBronzePickaxe));
bronzePickaxe.setHarvestLevel("pickaxe", 3);
registerItem(bronzePickaxe, "bronzePickaxe");
registerItem(bronzePickaxe, "bronze_pickaxe");
bronzeShovel = new ItemForestryTool(new ItemStack(brokenBronzeShovel));
bronzeShovel.setHarvestLevel("shovel", 3);
registerItem(bronzeShovel, "bronzeShovel");
registerItem(bronzeShovel, "bronze_shovel");
// / ASSEMBLY KITS
kitShovel = new ItemAssemblyKit(new ItemStack(bronzeShovel));
registerItem(kitShovel, "kitShovel");
registerItem(kitShovel, "kit_shovel");
kitPickaxe = new ItemAssemblyKit(new ItemStack(bronzePickaxe));
registerItem(kitPickaxe, "kitPickaxe");
registerItem(kitPickaxe, "kit_pickaxe");
// / MOISTENER RESOURCES
mouldyWheat = registerItem(new ItemForestry(), "mouldyWheat");
decayingWheat = registerItem(new ItemForestry(), "decayingWheat");
mouldyWheat = registerItem(new ItemForestry(), "mouldy_wheat");
decayingWheat = registerItem(new ItemForestry(), "decaying_wheat");
mulch = registerItem(new ItemForestry(), "mulch");
// / RAINMAKER SUBSTRATES
iodineCharge = registerItem(new ItemForestry(), "iodineCapsule");
iodineCharge = registerItem(new ItemForestry(), "iodine_capsule");
phosphor = registerItem(new ItemForestry(), "phosphor");
@@ -179,7 +179,7 @@ public class ItemRegistryCore extends ItemRegistry {
beeswax.setCreativeTab(Tabs.tabApiculture);
OreDictionary.registerOre(OreDictUtil.ITEM_BEESWAX, beeswax);
refractoryWax = registerItem(new ItemForestry(), "refractoryWax");
refractoryWax = registerItem(new ItemForestry(), "refractory_wax");
// FRUITS
fruits = registerItem(new ItemFruit(), "fruits");
@@ -189,7 +189,7 @@ public class ItemRegistryCore extends ItemRegistry {
}
// CAMOUFLAGE
camouflageSprayCan = registerItem(new ItemCamouflageSprayCan(), "camouflageSprayCan");
camouflageSprayCan = registerItem(new ItemCamouflageSprayCan(), "camouflage_spray_can");
}
}
@@ -44,7 +44,7 @@ public class ModelCamouflageSprayCan extends BlankModel {
@Override
public IBakedModel handleItemState(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) {
IModel basicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflageSprayCan"));
IModel basicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflage_spray_can"));
IBakedModel model = basicModel.bake(basicModel.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter());
IBakedModel filledModel = basicModel.bake(basicModel.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter());
IBakedModel camouflageModel = null;
@@ -53,7 +53,7 @@ public class ModelCamouflageSprayCan extends BlankModel {
ItemInventoryCamouflageSprayCan inventory = new ItemInventoryCamouflageSprayCan((EntityPlayer) entity, stack);
ItemStack camouflage = inventory.getStackInSlot(0);
if (!camouflage.isEmpty()) {
IModel filledBasicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflageSprayCanFilled"));
IModel filledBasicModel = ModelLoaderRegistry.getModelOrMissing(new ResourceLocation("forestry:item/camouflage_spray_can_filled"));
filledModel = filledBasicModel.bake(filledBasicModel.getDefaultState(), DefaultVertexFormats.ITEM, new DefaultTextureGetter());
camouflageModel = new TRSRBakedModel(Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(camouflage), -0.0625F * 3, 0.0625F * 3, 0.0625F, 0.5F);
@@ -12,6 +12,7 @@ package forestry.core.network;
import java.io.IOException;
import com.google.common.base.Preconditions;
import forestry.core.proxy.Proxies;
import forestry.core.utils.Log;
import net.minecraft.client.Minecraft;
@@ -10,12 +10,21 @@
******************************************************************************/
package forestry.core.utils;
import java.util.Locale;
import java.util.regex.Pattern;
import forestry.core.proxy.Proxies;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
public class StringUtil {
private static final Pattern camelCaseToUnderscores = Pattern.compile("(.)([A-Z])");
public static String camelCaseToUnderscores(String uid) {
return camelCaseToUnderscores.matcher(uid).replaceAll("$1_$2").toLowerCase(Locale.ENGLISH);
}
public static String append(String delim, String source, String appendix) {
if (source.length() <= 0) {
return appendix;
@@ -27,10 +27,10 @@ public class ItemRegistryFood extends ItemRegistry {
public ItemRegistryFood() {
// / FOOD ITEMS
honeyedSlice = registerItem(new ItemForestryFood(8, 0.6f), "honeyedSlice");
honeyedSlice = registerItem(new ItemForestryFood(8, 0.6f), "honeyed_slice");
beverage = registerItem(new ItemBeverage(), "beverage");
ambrosia = registerItem(new ItemAmbrosia().setIsDrink(), "ambrosia");
honeyPot = registerItem(new ItemForestryFood(2, 0.2f).setIsDrink(), "honeyPot");
honeyPot = registerItem(new ItemForestryFood(2, 0.2f).setIsDrink(), "honey_pot");
// / SEASONER
infuser = new ItemInfuser();
@@ -13,6 +13,7 @@ package forestry.lepidopterology.genetics;
import java.awt.Color;
import java.util.Arrays;
import java.util.Locale;
import java.util.regex.Pattern;
import forestry.api.core.EnumHumidity;
import forestry.api.core.EnumTemperature;
@@ -29,6 +30,7 @@ import forestry.api.lepidopterology.IButterflyMutationBuilder;
import forestry.core.config.Constants;
import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.EnumAllele;
import forestry.core.utils.StringUtil;
import net.minecraft.item.ItemStack;
public enum ButterflyDefinition implements IButterflyDefinition {
@@ -313,7 +315,7 @@ public enum ButterflyDefinition implements IButterflyDefinition {
String unlocalizedName = "for.butterflies.species." + parent.getUID().substring(parent.getLevel().name().toLowerCase(Locale.ENGLISH).length() + 1) + '.' + speciesName;
String unlocalizedDescription = "for.description." + uid;
String texture = "butterflies/" + uid;
String texture = StringUtil.camelCaseToUnderscores("butterflies/" + uid);
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.MOD_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
speciesBuilder.setRarity(rarity);
@@ -13,6 +13,7 @@ package forestry.lepidopterology.genetics;
import java.awt.Color;
import java.util.Arrays;
import java.util.Locale;
import java.util.regex.Pattern;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IClassification;
@@ -27,6 +28,7 @@ import forestry.api.lepidopterology.IButterflyMutationBuilder;
import forestry.core.config.Constants;
import forestry.core.genetics.alleles.AlleleHelper;
import forestry.core.genetics.alleles.EnumAllele;
import forestry.core.utils.StringUtil;
import forestry.lepidopterology.genetics.alleles.ButterflyAlleles;
import net.minecraft.item.ItemStack;
@@ -72,7 +74,7 @@ public enum MothDefinition implements IButterflyDefinition {
String unlocalizedName = "for.butterflies.species." + parent.getUID().substring(parent.getLevel().name().toLowerCase(Locale.ENGLISH).length() + 1) + '.' + speciesName;
String unlocalizedDescription = "for.description." + uid;
String texture = "butterflies/" + uid;
String texture = StringUtil.camelCaseToUnderscores("butterflies/" + uid);
IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.MOD_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor);
speciesBuilder.setRarity(rarity);
@@ -20,9 +20,9 @@ public class ItemRegistryLepidopterology extends ItemRegistry {
public final ItemButterflyGE cocoonGE;
public ItemRegistryLepidopterology() {
butterflyGE = registerItem(new ItemButterflyGE(EnumFlutterType.BUTTERFLY), "butterflyGE");
serumGE = registerItem(new ItemButterflyGE(EnumFlutterType.SERUM), "serumGE");
caterpillarGE = registerItem(new ItemButterflyGE(EnumFlutterType.CATERPILLAR), "caterpillarGE");
cocoonGE = registerItem(new ItemButterflyGE(EnumFlutterType.COCOON), "cocoonGE");
butterflyGE = registerItem(new ItemButterflyGE(EnumFlutterType.BUTTERFLY), "butterfly_ge");
serumGE = registerItem(new ItemButterflyGE(EnumFlutterType.SERUM), "serum_ge");
caterpillarGE = registerItem(new ItemButterflyGE(EnumFlutterType.CATERPILLAR), "caterpillar_ge");
cocoonGE = registerItem(new ItemButterflyGE(EnumFlutterType.COCOON), "cocoon_ge");
}
}
@@ -15,6 +15,7 @@ import java.util.Collections;
import java.util.concurrent.TimeUnit;
import com.google.common.base.Function;
import com.google.common.base.Throwables;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.google.common.collect.ImmutableMap;
@@ -65,9 +66,9 @@ public class ModelButterflyItem extends BlankModel {
if (modelButterfly == null) {
try {
modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterflyGE"));
modelButterfly = ModelLoaderRegistry.getModel(new ResourceLocation("forestry:item/butterfly_ge"));
} catch (Exception e) {
throw new IllegalArgumentException(e);
Throwables.propagate(e);
}
if (modelButterfly == null) {
throw new IllegalArgumentException("Could not bake butterfly model");
@@ -53,35 +53,35 @@ public class ItemRegistryStorage extends ItemRegistry {
IBackpackInterface backpackInterface = BackpackManager.backpackInterface;
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) {
apiaristBackpack = registerItem(backpackInterface.createNaturalistBackpack("apiarist", BeeManager.beeRoot), "apiaristBag");
apiaristBackpack = registerItem(backpackInterface.createNaturalistBackpack("apiarist", BeeManager.beeRoot), "apiarist_bag");
apiaristBackpack.setCreativeTab(Tabs.tabApiculture);
} else {
apiaristBackpack = null;
}
if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.LEPIDOPTEROLOGY)) {
lepidopteristBackpack = registerItem(backpackInterface.createNaturalistBackpack("lepidopterist", ButterflyManager.butterflyRoot), "lepidopteristBag");
lepidopteristBackpack = registerItem(backpackInterface.createNaturalistBackpack("lepidopterist", ButterflyManager.butterflyRoot), "lepidopterist_bag");
lepidopteristBackpack.setCreativeTab(Tabs.tabLepidopterology);
} else {
lepidopteristBackpack = null;
}
minerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.NORMAL), "minerBag");
minerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.WOVEN), "minerBagT2");
minerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.NORMAL), "miner_bag");
minerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.MINER_UID, EnumBackpackType.WOVEN), "miner_bag_t2");
diggerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.NORMAL), "diggerBag");
diggerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.WOVEN), "diggerBagT2");
diggerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.NORMAL), "digger_bag");
diggerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.DIGGER_UID, EnumBackpackType.WOVEN), "digger_bag_t2");
foresterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.NORMAL), "foresterBag");
foresterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.WOVEN), "foresterBagT2");
foresterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.NORMAL), "forester_bag");
foresterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.FORESTER_UID, EnumBackpackType.WOVEN), "forester_bag_t2");
hunterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.NORMAL), "hunterBag");
hunterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.WOVEN), "hunterBagT2");
hunterBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.NORMAL), "hunter_bag");
hunterBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.HUNTER_UID, EnumBackpackType.WOVEN), "hunter_bag_t2");
adventurerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.NORMAL), "adventurerBag");
adventurerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.WOVEN), "adventurerBagT2");
adventurerBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.NORMAL), "adventurer_bag");
adventurerBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.ADVENTURER_UID, EnumBackpackType.WOVEN), "adventurer_bag_t2");
builderBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.NORMAL), "builderBag");
builderBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.WOVEN), "builderBagT2");
builderBackpack = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.NORMAL), "builder_bag");
builderBackpackT2 = registerItem(backpackInterface.createBackpack(BackpackManager.BUILDER_UID, EnumBackpackType.WOVEN), "builder_bag_t2");
}
}