diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index e63bbd191..0913479e4 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -83,7 +83,7 @@ public class Forestry { MinecraftForge.EVENT_BUS.register(eventHandlerCore); MinecraftForge.EVENT_BUS.register(new MultiblockEventHandler()); - configFolder = new File(event.getModConfigurationDirectory(), Constants.RESOURCE_ID); + configFolder = new File(event.getModConfigurationDirectory(), Constants.MOD_ID); Config.load(); PluginManager.runSetup(event); diff --git a/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java b/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java index 4bbd95517..ef4ca500c 100644 --- a/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java +++ b/src/main/java/forestry/apiculture/blocks/BlockTypeApicultureTesr.java @@ -35,9 +35,9 @@ public enum BlockTypeApicultureTesr implements IBlockTypeTesr { BlockTypeApicultureTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nullable AxisAlignedBB boundingBox) { if (boundingBox != null) { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0"); } else { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); } } diff --git a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java index f608f46c7..2d3362631 100755 --- a/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java +++ b/src/main/java/forestry/apiculture/items/ItemArmorApiarist.java @@ -40,9 +40,9 @@ public class ItemArmorApiarist extends ItemArmor implements IArmorApiarist, IArm @Override public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { if (stack != null && stack.getItem() == PluginApiculture.items.apiaristLegs) { - return Constants.RESOURCE_ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_SECONDARY; + return Constants.MOD_ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_SECONDARY; } else { - return Constants.RESOURCE_ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_PRIMARY; + return Constants.MOD_ID + ":" + Constants.TEXTURE_APIARIST_ARMOR_PRIMARY; } } diff --git a/src/main/java/forestry/arboriculture/FruitProviderNone.java b/src/main/java/forestry/arboriculture/FruitProviderNone.java index 313c55f59..561a8d025 100755 --- a/src/main/java/forestry/arboriculture/FruitProviderNone.java +++ b/src/main/java/forestry/arboriculture/FruitProviderNone.java @@ -40,7 +40,7 @@ public class FruitProviderNone implements IFruitProvider { public OverlayType(String ident) { this.ident = ident; - this.sprite = new ResourceLocation(Constants.RESOURCE_ID, "blocks/leaves/fruits." + ident); + this.sprite = new ResourceLocation(Constants.MOD_ID, "blocks/leaves/fruits." + ident); } } diff --git a/src/main/java/forestry/arboriculture/WoodHelper.java b/src/main/java/forestry/arboriculture/WoodHelper.java index 571cef891..d496c0a16 100644 --- a/src/main/java/forestry/arboriculture/WoodHelper.java +++ b/src/main/java/forestry/arboriculture/WoodHelper.java @@ -56,7 +56,7 @@ public class WoodHelper { WoodBlockKind blockKind = typed.getBlockKind(); for (IWoodType woodType : typed.getWoodTypes()) { if (woodType instanceof EnumForestryWoodType) { - resourceLocations.add(new ResourceLocation(Constants.RESOURCE_ID, blockKind + "/" + woodType)); + resourceLocations.add(new ResourceLocation(Constants.MOD_ID, blockKind + "/" + woodType)); } else if (woodType instanceof EnumVanillaWoodType) { resourceLocations.add(new ResourceLocation("minecraft", woodType + "_" + blockKind)); } diff --git a/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java b/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java index b41c5e633..cc66fa778 100644 --- a/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java +++ b/src/main/java/forestry/arboriculture/blocks/BlockTypeArboricultureTesr.java @@ -35,9 +35,9 @@ public enum BlockTypeArboricultureTesr implements IBlockTypeTesr { BlockTypeArboricultureTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nullable AxisAlignedBB boundingBox) { if (boundingBox != null) { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0"); } else { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); } } diff --git a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java index 0d3fb3114..f3a66e660 100644 --- a/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java +++ b/src/main/java/forestry/arboriculture/blocks/WoodTypeStateMapper.java @@ -82,7 +82,7 @@ public class WoodTypeStateMapper extends StateMapperBase { private ModelResourceLocation getForestryModelResourceLocation(IWoodType woodType, Map, Comparable> properties) { String resourceLocation = "arboriculture/" + blockPath + '/' + woodType; String propertyString = this.getPropertyString(properties); - return new ModelResourceLocation(Constants.RESOURCE_ID + ':' + resourceLocation, propertyString); + return new ModelResourceLocation(Constants.MOD_ID + ':' + resourceLocation, propertyString); } private ModelResourceLocation getVanillaModelResourceLocation(Block block, IWoodType woodType, Map, Comparable> properties) { diff --git a/src/main/java/forestry/arboriculture/genetics/WoodProvider.java b/src/main/java/forestry/arboriculture/genetics/WoodProvider.java index 76c6503fd..cf0b49239 100644 --- a/src/main/java/forestry/arboriculture/genetics/WoodProvider.java +++ b/src/main/java/forestry/arboriculture/genetics/WoodProvider.java @@ -42,8 +42,8 @@ public class WoodProvider implements IWoodProvider { @Override public void registerSprites(Item item, ITextureManager manager) { TextureMap textureMap = Proxies.common.getClientInstance().getTextureMapBlocks(); - woodTop = textureMap.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/wood/heart." + name)); - woodBark = textureMap.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/wood/bark." + name)); + woodTop = textureMap.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/wood/heart." + name)); + woodBark = textureMap.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/wood/bark." + name)); } @Nonnull diff --git a/src/main/java/forestry/arboriculture/models/TextureLeaves.java b/src/main/java/forestry/arboriculture/models/TextureLeaves.java index 463e25541..cf5889dce 100644 --- a/src/main/java/forestry/arboriculture/models/TextureLeaves.java +++ b/src/main/java/forestry/arboriculture/models/TextureLeaves.java @@ -48,10 +48,10 @@ public class TextureLeaves { private TextureLeaves(EnumLeafType enumLeafType) { String ident = enumLeafType.toString().toLowerCase(Locale.ENGLISH); - this.plain = new ResourceLocation(Constants.RESOURCE_ID, "blocks/leaves/" + ident + ".plain"); - this.fancy = new ResourceLocation(Constants.RESOURCE_ID, "blocks/leaves/" + ident + ".fancy"); - this.pollinatedPlain = new ResourceLocation(Constants.RESOURCE_ID, "blocks/leaves/" + ident + ".changed.plain"); - this.pollinatedFancy = new ResourceLocation(Constants.RESOURCE_ID, "blocks/leaves/" + ident + ".changed"); + this.plain = new ResourceLocation(Constants.MOD_ID, "blocks/leaves/" + ident + ".plain"); + this.fancy = new ResourceLocation(Constants.MOD_ID, "blocks/leaves/" + ident + ".fancy"); + this.pollinatedPlain = new ResourceLocation(Constants.MOD_ID, "blocks/leaves/" + ident + ".changed.plain"); + this.pollinatedFancy = new ResourceLocation(Constants.MOD_ID, "blocks/leaves/" + ident + ".changed"); } private void registerSprites() { diff --git a/src/main/java/forestry/arboriculture/render/FruitPodStateMapper.java b/src/main/java/forestry/arboriculture/render/FruitPodStateMapper.java index 9abd8c9b4..4eefe6d60 100644 --- a/src/main/java/forestry/arboriculture/render/FruitPodStateMapper.java +++ b/src/main/java/forestry/arboriculture/render/FruitPodStateMapper.java @@ -25,7 +25,7 @@ public class FruitPodStateMapper extends ForestryStateMapper { String modID = fruit.getModID(); if (Constants.MOD_ID.equals(modID)) { String modelName = fruit.getModelName(); - String resourcePath = Constants.RESOURCE_ID + ":pods/" + modelName; + String resourcePath = Constants.MOD_ID + ":pods/" + modelName; for (IBlockState state : block.getBlockState().getValidStates()) { String propertyString = getPropertyString(state.getProperties()); mapStateModelLocations.put(state, new ModelResourceLocation(resourcePath, propertyString)); diff --git a/src/main/java/forestry/arboriculture/render/PileStateMapper.java b/src/main/java/forestry/arboriculture/render/PileStateMapper.java index b71777529..0efba08ca 100644 --- a/src/main/java/forestry/arboriculture/render/PileStateMapper.java +++ b/src/main/java/forestry/arboriculture/render/PileStateMapper.java @@ -27,7 +27,7 @@ public class PileStateMapper extends ForestryStateMapper { @Override public Map putStateModelLocations(Block block) { - String location = Constants.RESOURCE_ID + ":pile"; + String location = Constants.MOD_ID + ":pile"; IBlockState woodPileState = PluginArboriculture.blocks.piles.get(EnumPileType.WOOD).getDefaultState(); mapStateModelLocations.put(woodPileState, new ModelResourceLocation(location, "type=wood")); diff --git a/src/main/java/forestry/core/CreativeTabForestry.java b/src/main/java/forestry/core/CreativeTabForestry.java index aa611cd4e..a3913aaaf 100755 --- a/src/main/java/forestry/core/CreativeTabForestry.java +++ b/src/main/java/forestry/core/CreativeTabForestry.java @@ -41,7 +41,7 @@ public class CreativeTabForestry extends CreativeTabs { } } - public static final CreativeTabs tabForestry = new CreativeTabForestry(0, Constants.RESOURCE_ID); + public static final CreativeTabs tabForestry = new CreativeTabForestry(0, Constants.MOD_ID); private final int icon; diff --git a/src/main/java/forestry/core/EventHandlerCore.java b/src/main/java/forestry/core/EventHandlerCore.java index d83cfe360..c905d03c2 100755 --- a/src/main/java/forestry/core/EventHandlerCore.java +++ b/src/main/java/forestry/core/EventHandlerCore.java @@ -102,7 +102,7 @@ public class EventHandlerCore { return; } - ResourceLocation resourceLocation = new ResourceLocation(Constants.RESOURCE_ID, event.getName().getResourcePath()); + ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, event.getName().getResourcePath()); LootTable forestryChestAdditions = LootTableLoader.loadBuiltinLootTable(resourceLocation); if (forestryChestAdditions != null) { for (String poolName : PluginManager.getLootPoolNames()) { diff --git a/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java b/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java index 36442bb48..7480bfa73 100644 --- a/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java +++ b/src/main/java/forestry/core/blocks/BlockTypeCoreTesr.java @@ -31,7 +31,7 @@ public enum BlockTypeCoreTesr implements IBlockTypeTesr { private final IMachinePropertiesTesr machineProperties; BlockTypeCoreTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer) { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); } @Nonnull diff --git a/src/main/java/forestry/core/commands/CommandSaveStats.java b/src/main/java/forestry/core/commands/CommandSaveStats.java index 3bee4b08c..f54e73c35 100644 --- a/src/main/java/forestry/core/commands/CommandSaveStats.java +++ b/src/main/java/forestry/core/commands/CommandSaveStats.java @@ -119,7 +119,7 @@ public final class CommandSaveStats extends SubCommand { } } - File file = new File(Proxies.common.getForestryRoot(), "config/" + Constants.RESOURCE_ID + "/stats/" + player.getDisplayName() + '-' + saveHelper.getFileSuffix() + ".log"); + File file = new File(Proxies.common.getForestryRoot(), "config/" + Constants.MOD_ID + "/stats/" + player.getDisplayName() + '-' + saveHelper.getFileSuffix() + ".log"); try { File folder = file.getParentFile(); if (folder != null && !folder.exists()) { diff --git a/src/main/java/forestry/core/config/Constants.java b/src/main/java/forestry/core/config/Constants.java index 204d3c9e2..644b7058d 100644 --- a/src/main/java/forestry/core/config/Constants.java +++ b/src/main/java/forestry/core/config/Constants.java @@ -16,8 +16,7 @@ import forestry.api.core.IForestryConstants; public class Constants implements IForestryConstants { // System - public static final String MOD_ID = "Forestry"; - public static final String RESOURCE_ID = "forestry"; + public static final String MOD_ID = "forestry"; public static final String URL = "http://forestry.sengir.net/"; public static final String VERSION = "@VERSION@"; @@ -41,15 +40,15 @@ public class Constants implements IForestryConstants { public static final String TEXTURE_APIARIST_ARMOR_PRIMARY = TEXTURE_PATH_ITEMS + "/apiarist_armor_1.png"; public static final String TEXTURE_APIARIST_ARMOR_SECONDARY = TEXTURE_PATH_ITEMS + "/apiarist_armor_2.png"; public static final String TEXTURE_NATURALIST_ARMOR_PRIMARY = TEXTURE_PATH_ITEMS + "/naturalist_armor_1.png"; - public static final String TEXTURE_SKIN_BEEKPEEPER = RESOURCE_ID + ":" + TEXTURE_PATH_ENTITIES + "/beekeeper.png"; - public static final String TEXTURE_SKIN_LUMBERJACK = RESOURCE_ID + ":" + TEXTURE_PATH_ENTITIES + "/lumberjack.png"; + public static final String TEXTURE_SKIN_BEEKPEEPER = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/beekeeper.png"; + public static final String TEXTURE_SKIN_LUMBERJACK = Constants.MOD_ID + ":" + TEXTURE_PATH_ENTITIES + "/lumberjack.png"; // Villagers - public static final String ID_VILLAGER_APIARIST = RESOURCE_ID + ":apiarist"; - public static final String ID_VILLAGER_ARBORIST = RESOURCE_ID + ":arborist"; + public static final String ID_VILLAGER_APIARIST = Constants.MOD_ID + ":apiarist"; + public static final String ID_VILLAGER_ARBORIST = Constants.MOD_ID + ":arborist"; // Village Loot Key - public static final ResourceLocation VILLAGE_NATURALIST_LOOT_KEY = new ResourceLocation(RESOURCE_ID, "chests/village_naturalist"); + public static final ResourceLocation VILLAGE_NATURALIST_LOOT_KEY = new ResourceLocation(Constants.MOD_ID, "chests/village_naturalist"); // Item Ids diff --git a/src/main/java/forestry/core/errors/EnumErrorCode.java b/src/main/java/forestry/core/errors/EnumErrorCode.java index c39302f99..6b5935018 100644 --- a/src/main/java/forestry/core/errors/EnumErrorCode.java +++ b/src/main/java/forestry/core/errors/EnumErrorCode.java @@ -112,7 +112,7 @@ public enum EnumErrorCode implements IErrorState { @SideOnly(Side.CLIENT) @Override public void registerSprite() { - texture = TextureManager.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "gui/errors/" + iconName)); + texture = TextureManager.registerSprite(new ResourceLocation(Constants.MOD_ID, "gui/errors/" + iconName)); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/core/items/ItemArmorNaturalist.java b/src/main/java/forestry/core/items/ItemArmorNaturalist.java index 1aa623a2b..f09548850 100755 --- a/src/main/java/forestry/core/items/ItemArmorNaturalist.java +++ b/src/main/java/forestry/core/items/ItemArmorNaturalist.java @@ -36,7 +36,7 @@ public class ItemArmorNaturalist extends ItemArmor implements IArmorNaturalist, @Override public String getArmorTexture(ItemStack stack, Entity entity, EntityEquipmentSlot slot, String type) { - return Constants.RESOURCE_ID + ":" + Constants.TEXTURE_NATURALIST_ARMOR_PRIMARY; + return Constants.MOD_ID + ":" + Constants.TEXTURE_NATURALIST_ARMOR_PRIMARY; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/forestry/core/models/ModelManager.java b/src/main/java/forestry/core/models/ModelManager.java index c64355afc..c512e93e4 100644 --- a/src/main/java/forestry/core/models/ModelManager.java +++ b/src/main/java/forestry/core/models/ModelManager.java @@ -157,7 +157,7 @@ public class ModelManager implements IModelManager { @Override public ModelResourceLocation getModelLocation(String identifier) { - return getModelLocation(Constants.RESOURCE_ID, identifier); + return getModelLocation(Constants.MOD_ID, identifier); } @Override diff --git a/src/main/java/forestry/core/render/ForestryResource.java b/src/main/java/forestry/core/render/ForestryResource.java index 81b2e3a71..b98af36ed 100644 --- a/src/main/java/forestry/core/render/ForestryResource.java +++ b/src/main/java/forestry/core/render/ForestryResource.java @@ -17,7 +17,7 @@ import forestry.core.config.Constants; public class ForestryResource extends ResourceLocation { public ForestryResource(String path) { - super(Constants.RESOURCE_ID, path); + super(Constants.MOD_ID, path); } } diff --git a/src/main/java/forestry/core/render/TextureManager.java b/src/main/java/forestry/core/render/TextureManager.java index 83bbb7893..3a1a32692 100755 --- a/src/main/java/forestry/core/render/TextureManager.java +++ b/src/main/java/forestry/core/render/TextureManager.java @@ -59,7 +59,7 @@ public class TextureManager implements ITextureManager { "slots/blocked", "slots/blocked_2", "slots/liquid", "slots/container", "slots/locked", "mail/carrier.player", "mail/carrier.trader"}; for (String identifier : defaultIconNames) { - ResourceLocation resourceLocation = new ResourceLocation(Constants.RESOURCE_ID, "gui/" + identifier); + ResourceLocation resourceLocation = new ResourceLocation(Constants.MOD_ID, "gui/" + identifier); TextureAtlasSprite icon = registerSprite(resourceLocation); defaultIcons.put(identifier, icon); } diff --git a/src/main/java/forestry/core/utils/Log.java b/src/main/java/forestry/core/utils/Log.java index 2fbaeee96..7e5450eea 100644 --- a/src/main/java/forestry/core/utils/Log.java +++ b/src/main/java/forestry/core/utils/Log.java @@ -38,7 +38,7 @@ public class Log { } private static void log(Level logLevel, String message, Object... params) { - LogManager.getLogger(Constants.RESOURCE_ID).log(logLevel, message, params); + LogManager.getLogger(Constants.MOD_ID).log(logLevel, message, params); } } diff --git a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java index 798801024..cc5d40469 100644 --- a/src/main/java/forestry/energy/blocks/BlockTypeEngine.java +++ b/src/main/java/forestry/energy/blocks/BlockTypeEngine.java @@ -46,12 +46,12 @@ public enum BlockTypeEngine implements IBlockTypeTesr { protected static IMachinePropertiesTesr createEngineProperties(@Nonnull Class teClass, @Nonnull String name, @Nonnull String textureName) { TileEntitySpecialRenderer renderer = PluginEnergy.proxy.getRenderDefaultEngine(Constants.TEXTURE_PATH_BLOCKS + textureName + "_"); - return new MachinePropertiesEngine<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks" + textureName + ".0"); + return new MachinePropertiesEngine<>(teClass, name, renderer, Constants.MOD_ID + ":blocks" + textureName + ".0"); } protected static IMachinePropertiesTesr createMachineProperties(@Nonnull Class teClass, @Nonnull String name, @Nonnull String textureName) { TileEntitySpecialRenderer renderer = Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + textureName + "_"); - return new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks" + textureName + ".0"); + return new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks" + textureName + ".0"); } @Nonnull diff --git a/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java b/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java index 09b5e9291..8d1054d0a 100644 --- a/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java +++ b/src/main/java/forestry/factory/blocks/BlockTypeFactoryTesr.java @@ -47,11 +47,11 @@ public enum BlockTypeFactoryTesr implements IBlockTypeTesr { BlockTypeFactoryTesr(@Nonnull Class teClass, @Nonnull String name) { TileEntitySpecialRenderer renderer = Proxies.render.getRenderDefaultMachine(Constants.TEXTURE_PATH_BLOCKS + "/" + name + "_"); - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); } BlockTypeFactoryTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer) { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); } @Nonnull diff --git a/src/main/java/forestry/farming/blocks/EnumFarmBlockType.java b/src/main/java/forestry/farming/blocks/EnumFarmBlockType.java index 57d33dc01..31f7e6a14 100644 --- a/src/main/java/forestry/farming/blocks/EnumFarmBlockType.java +++ b/src/main/java/forestry/farming/blocks/EnumFarmBlockType.java @@ -41,14 +41,14 @@ public enum EnumFarmBlockType implements IStringSerializable { public static void registerSprites() { TextureMap map = Proxies.common.getClientInstance().getTextureMapBlocks(); sprites = Arrays.asList( - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/plain")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/reverse")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/top")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/band")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/gears")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/hatch")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/valve")), - map.registerSprite(new ResourceLocation(Constants.RESOURCE_ID, "blocks/farm/control")) + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/plain")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/reverse")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/top")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/band")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/gears")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/hatch")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/valve")), + map.registerSprite(new ResourceLocation(Constants.MOD_ID, "blocks/farm/control")) ); } diff --git a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java index acc087eea..68384f3ea 100644 --- a/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java +++ b/src/main/java/forestry/greenhouse/blocks/BlockGreenhouseType.java @@ -83,7 +83,7 @@ public enum BlockGreenhouseType { for (BlockGreenhouseSprites sprite : BlockGreenhouseSprites.VALUES) { if (sprite != BlockGreenhouseSprites.PLAIN && sprite != BlockGreenhouseSprites.GLASS) { - ResourceLocation location = new ResourceLocation(Constants.RESOURCE_ID, "blocks/greenhouse/" + sprite.spriteName); + ResourceLocation location = new ResourceLocation(Constants.MOD_ID, "blocks/greenhouse/" + sprite.spriteName); TextureAtlasSprite textureAtlasSprite = map.registerSprite(location); sprites.put(sprite, textureAtlasSprite); } diff --git a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java index f6b1b08f1..9779f5294 100644 --- a/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java +++ b/src/main/java/forestry/greenhouse/tiles/TileGreenhouseSprinkler.java @@ -40,7 +40,7 @@ public class TileGreenhouseSprinkler extends TileGreenhouseClimatiser { public TileGreenhouseSprinkler() { super(definition); - asm = Proxies.render.loadAnimationState(new ResourceLocation(Constants.RESOURCE_ID, "asms/block/sprinkler.json"), ImmutableMap.of( + asm = Proxies.render.loadAnimationState(new ResourceLocation(Constants.MOD_ID, "asms/block/sprinkler.json"), ImmutableMap.of( "cycle_length", cycleLength, "click_time", clickTime )); diff --git a/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java b/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java index 91dffdb1a..70cb5af13 100644 --- a/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java +++ b/src/main/java/forestry/lepidopterology/blocks/BlockTypeLepidopterologyTesr.java @@ -35,9 +35,9 @@ public enum BlockTypeLepidopterologyTesr implements IBlockTypeTesr { BlockTypeLepidopterologyTesr(@Nonnull Class teClass, @Nonnull String name, @Nullable TileEntitySpecialRenderer renderer, @Nullable AxisAlignedBB boundingBox) { if (boundingBox != null) { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, boundingBox, Constants.MOD_ID + ":blocks/" + name + ".0"); } else { - this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.RESOURCE_ID + ":blocks/" + name + ".0"); + this.machineProperties = new MachinePropertiesTesr<>(teClass, name, renderer, Constants.MOD_ID + ":blocks/" + name + ".0"); } } diff --git a/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java b/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java index a4ae3eba2..e66bc46f1 100644 --- a/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java +++ b/src/main/java/forestry/lepidopterology/blocks/CocoonStateMapper.java @@ -26,7 +26,7 @@ public class CocoonStateMapper extends ForestryStateMapper { if(allele instanceof IAlleleButterflyCocoon){ for(int age = 0;age < 3;age++){ IAlleleButterflyCocoon cocoon = (IAlleleButterflyCocoon) allele; - String resourcePath = Constants.RESOURCE_ID + ":cocoons/cocoon_" + cocoon.getCocoonName(); + String resourcePath = Constants.MOD_ID + ":cocoons/cocoon_" + cocoon.getCocoonName(); IBlockState state = block.getDefaultState().withProperty(AlleleButterflyCocoon.COCOON, cocoon).withProperty(AlleleButterflyCocoon.AGE, age); String propertyString = "age=" + age; mapStateModelLocations.put(state, new ModelResourceLocation(resourcePath, propertyString)); diff --git a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java index 5cf4d25fa..f2f995b21 100644 --- a/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/ButterflyDefinition.java @@ -315,7 +315,7 @@ public enum ButterflyDefinition implements IButterflyDefinition { String texture = "butterflies/" + uid; - IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); + IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.MOD_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); speciesBuilder.setRarity(rarity); setSpeciesProperties(speciesBuilder); this.species = speciesBuilder.build(); diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index c53779b6f..c289067e4 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -75,7 +75,7 @@ public enum MothDefinition implements IButterflyDefinition { String texture = "butterflies/" + uid; - IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.RESOURCE_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); + IAlleleButterflySpeciesBuilder speciesBuilder = ButterflyManager.butterflyFactory.createSpecies("forestry." + uid, unlocalizedName, "Sengir", unlocalizedDescription, Constants.MOD_ID, texture, dominant, branchDefinition.getBranch(), binomial, serumColor); speciesBuilder.setRarity(rarity); speciesBuilder.setNocturnal(); setSpeciesProperties(speciesBuilder); diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java index b9ee63e35..d8a6ba53a 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyCocoon.java @@ -78,7 +78,7 @@ public class AlleleButterflyCocoon extends AlleleCategorized implements IAlleleB @Override public ModelResourceLocation getCocoonItemModel(int age) { - return new ModelResourceLocation(Constants.RESOURCE_ID + ":lepidopterology/cocoons/cocoon_" + name + "_" + getAgeKey(age), "inventory"); + return new ModelResourceLocation(Constants.MOD_ID + ":lepidopterology/cocoons/cocoon_" + name + "_" + getAgeKey(age), "inventory"); } @Override diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyEffect.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyEffect.java index 865a715e5..f13a4d663 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyEffect.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflyEffect.java @@ -28,7 +28,7 @@ public class AlleleButterflyEffect extends AlleleCategorized implements IAlleleB } protected AlleleButterflyEffect(String valueName, boolean isDominant) { - super(Constants.RESOURCE_ID, "bf", valueName, isDominant); + super(Constants.MOD_ID, "bf", valueName, isDominant); } @Override diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index a98036b28..85a7c7357 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,6 +1,6 @@ [ { - "modid": "Forestry", + "modid": "forestry", "name": "Forestry", "description": "Trees, bees and more.", "credits": "mistaqur, Binnie, CovertJaguar, MysteriousAges, Nirek, Nedelosk",