From e8cd34e65a98611a9d3ed60fc576453579d4c845 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Tue, 29 Jul 2014 17:00:47 -0400 Subject: [PATCH] Tweaked the Spruce Forest and overriden vanilla Forest, changed Loftwood logs/leaves/etc. to Ethereal logs/leaves/etc. --- .../biomesoplenty/api/content/BOPCBlocks.java | 2 +- .../biome/overridden/BiomeGenBOPForest.java | 3 +- .../overworld/sub/BiomeGenSpruceWoods.java | 32 +++++++++++------- .../common/blocks/BlockBOPLeaves.java | 4 +-- .../common/blocks/BlockBOPLog.java | 4 +-- .../common/blocks/BlockBOPPlank.java | 2 +- .../common/blocks/BlockBOPSapling.java | 4 +-- .../common/blocks/BlockBOPSlab.java | 2 +- .../common/blocks/BlockBOPStairs.java | 4 +-- .../biomesoplenty/common/core/BOPBlocks.java | 6 ++-- .../common/core/BOPCrafting.java | 8 ++--- .../misc/BonemealEventHandler.java | 2 +- .../common/handlers/FurnaceFuelHandler.java | 2 +- .../integration/TreecapitatorIntegration.java | 4 +-- .../common/itemblocks/ItemBlockPlank.java | 2 +- .../common/itemblocks/ItemBlockSapling.java | 2 +- .../assets/biomesoplenty/lang/en_US.lang | 14 ++++---- .../textures/blocks/better_leaves_holy.png | Bin 1003 -> 0 bytes .../textures/blocks/leaves_ethereal_fancy.png | Bin 0 -> 366 bytes .../textures/blocks/leaves_ethereal_fast.png | Bin 0 -> 327 bytes .../textures/blocks/leaves_holy_fancy.png | Bin 732 -> 0 bytes .../textures/blocks/leaves_holy_fast.png | Bin 686 -> 0 bytes .../textures/blocks/leaves_holy_round.png | Bin 706 -> 0 bytes .../textures/blocks/log_ethereal_heart.png | Bin 0 -> 515 bytes .../textures/blocks/log_ethereal_side.png | Bin 0 -> 572 bytes .../textures/blocks/log_holy_heart.png | Bin 536 -> 0 bytes .../textures/blocks/log_holy_side.png | Bin 621 -> 0 bytes .../textures/blocks/plank_ethereal.png | Bin 0 -> 332 bytes .../textures/blocks/plank_holy.png | Bin 339 -> 0 bytes .../textures/blocks/sapling_ethereal.png | Bin 0 -> 600 bytes .../textures/blocks/sapling_holy.png | Bin 342 -> 0 bytes 31 files changed, 53 insertions(+), 44 deletions(-) delete mode 100755 src/main/resources/assets/biomesoplenty/textures/blocks/better_leaves_holy.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal_fancy.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal_fast.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_fancy.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_fast.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_round.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/log_ethereal_heart.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/log_ethereal_side.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/log_holy_heart.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/log_holy_side.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/plank_ethereal.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/plank_holy.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/sapling_holy.png diff --git a/src/main/java/biomesoplenty/api/content/BOPCBlocks.java b/src/main/java/biomesoplenty/api/content/BOPCBlocks.java index bdb28ade5..476e6d51f 100644 --- a/src/main/java/biomesoplenty/api/content/BOPCBlocks.java +++ b/src/main/java/biomesoplenty/api/content/BOPCBlocks.java @@ -87,7 +87,7 @@ public class BOPCBlocks public static Block cherryStairs; public static Block darkStairs; public static Block firStairs; - public static Block holyStairs; + public static Block etherealStairs; public static Block magicStairs; public static Block mangroveStairs; public static Block palmStairs; diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java index 9124af1cf..cd31c5bf1 100644 --- a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java @@ -21,11 +21,12 @@ public class BiomeGenBOPForest extends BOPInheritedOverworldBiome this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6; this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; this.theBiomeDecorator.bopFeatures.bushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1; this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; - this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2; this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java index 89f25527a..9a1feac90 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java @@ -10,6 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTaiga2; import biomesoplenty.api.content.BOPCBlocks; import biomesoplenty.common.biome.BOPSubBiome; +import biomesoplenty.common.world.features.WorldGenBOPFlora; import biomesoplenty.common.world.features.WorldGenBOPTallGrass; import biomesoplenty.common.world.features.trees.WorldGenBOPTaiga2; @@ -27,33 +28,40 @@ public class BiomeGenSpruceWoods extends BOPSubBiome this.spawnableCreatureList.add(new SpawnListEntry(EntityWolf.class, 8, 4, 4)); - this.theBiomeDecorator.treesPerChunk = 20; + this.theBiomeDecorator.treesPerChunk = 10; this.theBiomeDecorator.grassPerChunk = 6; this.theBiomeDecorator.mushroomsPerChunk = 4; this.theBiomeDecorator.bopFeatures.poisonIvyPerChunk = 1; - this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 3; - this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 3; - this.theBiomeDecorator.bopFeatures.wildCarrotsPerChunk = 1; - this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 5; - this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; - this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 6; - this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 3; + this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1; + this.theBiomeDecorator.bopFeatures.bushesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5; + this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; + this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 6; + this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 5; + this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 5; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; - this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 100; + this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2; + this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; + + this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 4), 8); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 1), 0.5D); + this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 2), 0.5D); this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 10), 0.5D); this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(BOPCBlocks.foliage, 11), 0.5D); - this.theBiomeDecorator.bopFeatures.weightedGrassGen.put(new WorldGenBOPTallGrass(Blocks.tallgrass, 1), 1D); } @Override //TODO: getRandomWorldGenForTrees() public WorldGenAbstractTree func_150567_a(Random random) { - return random.nextInt(3) == 0 ? new WorldGenBOPTaiga2(Blocks.log, Blocks.leaves, 1, 1, false, 9, 9, 6) : - (random.nextInt(2) == 0 ? worldGeneratorTrees : new WorldGenTaiga2(false)); + return random.nextInt(3) == 0 ? worldGeneratorTrees : new WorldGenTaiga2(false); } @Override diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java index d3d7994db..a34b994c6 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java @@ -38,7 +38,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable //leaves2 //Dead (0) //Fir (1) - //Loftwood (2) + //Ethereal (2) //Orange Autumn (3) //leaves3 @@ -51,7 +51,7 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable //Hellbark (0) //Jacaranda (1) - private static final String[] leaves = new String[] {"yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "holy", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda"}; + private static final String[] leaves = new String[] {"yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "ethereal", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda"}; private static final float[] fallingLeavesChance = new float[] {0.1F, 0.008F, 0.016F, 0.008F, 0.0F, 0.008F, 0.016F, 0.1F, 0.008F, 0.1F, 0.008F, 0.1F, 0.008F, 0.008F}; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java index 0d5a4a577..bca73fbc1 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPLog.java @@ -29,7 +29,7 @@ public class BlockBOPLog extends Block //Fir (3) //logs2 - //Loftwood (0) + //Ethereal (0) //Magic (1) //Mangrove (2) //Palm (3) @@ -46,7 +46,7 @@ public class BlockBOPLog extends Block //Jacaranda (2) //Mahogany (3) - private static final String[] types = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "dead", "bigflowerstem", "pine", "hellbark", "jacaranda", "mahogany"}; + private static final String[] types = new String[] {"sacredoak", "cherry", "dark", "fir", "ethereal", "magic", "mangrove", "palm", "redwood", "willow", "dead", "bigflowerstem", "pine", "hellbark", "jacaranda", "mahogany"}; private IIcon[] textures; private IIcon[] logHearts; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java index 4819922d9..4de4387e6 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java @@ -13,7 +13,7 @@ import biomesoplenty.BiomesOPlenty; public class BlockBOPPlank extends Block { - private static final String[] woodTypes = new String[] {"plank_sacredoak", "plank_cherry", "plank_dark", "plank_fir", "plank_holy", "plank_magic", "plank_mangrove", "plank_palm", "plank_redwood", "plank_willow", "bamboothatching", "plank_pine", "plank_hell_bark", "plank_jacaranda", "plank_mahogany"}; + private static final String[] woodTypes = new String[] {"plank_sacredoak", "plank_cherry", "plank_dark", "plank_fir", "plank_ethereal", "plank_magic", "plank_mangrove", "plank_palm", "plank_redwood", "plank_willow", "bamboothatching", "plank_pine", "plank_hell_bark", "plank_jacaranda", "plank_mahogany"}; private IIcon[] textures; public BlockBOPPlank() diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java index ee1de3bb1..683234aad 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java @@ -26,7 +26,7 @@ import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; public class BlockBOPSapling extends BlockSapling { - private static final String[] saplings = new String[] {"apple", "yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "holy", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda", "persimmon"}; + private static final String[] saplings = new String[] {"apple", "yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "ethereal", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda", "persimmon"}; private IIcon[] textures; private static final int TYPES = 15; @@ -175,7 +175,7 @@ public class BlockBOPSapling extends BlockSapling obj = new WorldGenBOPTaiga2(BOPCBlocks.logs1, BOPCBlocks.leaves2, 3, 1, false, 10, 10, 5); break; - /*case 7: // Holy Tree + /*case 7: // Ethereal Tree obj = new WorldGenPromisedTree(false); break;*/ diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java index ef0a746a2..6131bf977 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java @@ -25,7 +25,7 @@ public class BlockBOPSlab extends BlockSlab WOOD1, WOOD2, STONE; } - private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda", "mahogany"}; + private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "ethereal", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda", "mahogany"}; private static final String[] rockTypes = new String[] {"mudbrick"}; private IIcon[] textures; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java index 0387bbfd7..afaf48069 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java @@ -13,7 +13,7 @@ public class BlockBOPStairs extends BlockStairs { public static enum Category { - SACREDOAK ("wood"), CHERRY ("wood"), DARK ("wood"), FIR ("wood"), HOLY ("wood"), MAGIC ("wood"), MANGROVE ("wood"), PALM ("wood"), REDWOOD ("wood"), WILLOW ("wood"), PINE ("wood"), HELL_BARK ("wood"), JACARANDA ("wood"), MAHOGANY ("wood"), MUD_BRICKS ("stone"); + SACREDOAK ("wood"), CHERRY ("wood"), DARK ("wood"), FIR ("wood"), ETHEREAL ("wood"), MAGIC ("wood"), MANGROVE ("wood"), PALM ("wood"), REDWOOD ("wood"), WILLOW ("wood"), PINE ("wood"), HELL_BARK ("wood"), JACARANDA ("wood"), MAHOGANY ("wood"), MUD_BRICKS ("stone"); private final List values; private String type; @@ -25,7 +25,7 @@ public class BlockBOPStairs extends BlockStairs } } - private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda", "mahogany"}; + private static final String[] woodTypes = new String[] {"sacredoak", "cherry", "dark", "fir", "ethereal", "magic", "mangrove", "palm", "redwood", "willow", "pine", "hell_bark", "jacaranda", "mahogany"}; private static final String[] stoneTypes = new String[] {"mudbrick"}; private IIcon[] textures; diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index a466e3c08..9c1074b2a 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -31,7 +31,7 @@ import static biomesoplenty.api.content.BOPCBlocks.hardIce; import static biomesoplenty.api.content.BOPCBlocks.hardSand; import static biomesoplenty.api.content.BOPCBlocks.hellBarkStairs; import static biomesoplenty.api.content.BOPCBlocks.hive; -import static biomesoplenty.api.content.BOPCBlocks.holyStairs; +import static biomesoplenty.api.content.BOPCBlocks.etherealStairs; import static biomesoplenty.api.content.BOPCBlocks.honey; import static biomesoplenty.api.content.BOPCBlocks.honeyBlock; import static biomesoplenty.api.content.BOPCBlocks.ivy; @@ -263,7 +263,7 @@ public class BOPBlocks cherryStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.CHERRY).setBlockName("cherryStairs")); darkStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.DARK).setBlockName("darkStairs")); firStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.FIR).setBlockName("firStairs")); - holyStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.HOLY).setBlockName("holyStairs")); + etherealStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.ETHEREAL).setBlockName("etherealStairs")); magicStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.MAGIC).setBlockName("magicStairs")); mangroveStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.MANGROVE).setBlockName("mangroveStairs")); palmStairs = registerBlock(new BlockBOPStairs(BOPCBlocks.planks, Category.PALM).setBlockName("palmStairs")); @@ -306,7 +306,7 @@ public class BOPBlocks Blocks.fire.setFireInfo(BOPCBlocks.cherryStairs, 5, 20); Blocks.fire.setFireInfo(BOPCBlocks.darkStairs, 5, 20); Blocks.fire.setFireInfo(BOPCBlocks.firStairs, 5, 20); - Blocks.fire.setFireInfo(BOPCBlocks.holyStairs, 5, 20); + Blocks.fire.setFireInfo(BOPCBlocks.etherealStairs, 5, 20); Blocks.fire.setFireInfo(BOPCBlocks.magicStairs, 5, 20); Blocks.fire.setFireInfo(BOPCBlocks.mangroveStairs, 5, 20); Blocks.fire.setFireInfo(BOPCBlocks.palmStairs, 5, 20); diff --git a/src/main/java/biomesoplenty/common/core/BOPCrafting.java b/src/main/java/biomesoplenty/common/core/BOPCrafting.java index 971e64c2e..35ad27cdf 100644 --- a/src/main/java/biomesoplenty/common/core/BOPCrafting.java +++ b/src/main/java/biomesoplenty/common/core/BOPCrafting.java @@ -124,11 +124,11 @@ public class BOPCrafting addRecipeToFront(new ItemStack(BOPCBlocks.mangroveStairs, 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPCBlocks.planks, 1, 6)}); addRecipeToFront(new ItemStack(BOPCBlocks.mangroveStairs, 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPCBlocks.planks, 1, 6)}); - //Holy + //Ethereal GameRegistry.addShapelessRecipe(new ItemStack(BOPCBlocks.planks, 4, 4), new Object[] {new ItemStack(BOPCBlocks.logs2,1,0)}); addRecipeToFront(new ItemStack(BOPCBlocks.woodenSingleSlab1,6,4), new Object[] {"RRR", 'R', new ItemStack(BOPCBlocks.planks,1,4)}); - addRecipeToFront(new ItemStack(BOPCBlocks.holyStairs, 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPCBlocks.planks,1,4)}); - addRecipeToFront(new ItemStack(BOPCBlocks.holyStairs, 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPCBlocks.planks,1,4)}); + addRecipeToFront(new ItemStack(BOPCBlocks.etherealStairs, 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPCBlocks.planks,1,4)}); + addRecipeToFront(new ItemStack(BOPCBlocks.etherealStairs, 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPCBlocks.planks,1,4)}); //Pine GameRegistry.addShapelessRecipe(new ItemStack(BOPCBlocks.planks, 4, 11), new Object[] {new ItemStack(BOPCBlocks.logs4, 1, 0)}); @@ -352,7 +352,7 @@ public class BOPCrafting OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.magicStairs)); OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.palmStairs)); OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.mangroveStairs)); - OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.holyStairs)); + OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.etherealStairs)); OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.pineStairs)); OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.hellBarkStairs)); OreDictionary.registerOre("stairWood", new ItemStack(BOPCBlocks.jacarandaStairs)); diff --git a/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java index 55c2714c5..e474c3542 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java @@ -42,7 +42,7 @@ public class BonemealEventHandler chance = 0.1D; break; - case 7: // Holy Sapling + case 7: // Ethereal Sapling chance = 0.15D; break; diff --git a/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java b/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java index 53d6846fd..61fa93544 100644 --- a/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java +++ b/src/main/java/biomesoplenty/common/handlers/FurnaceFuelHandler.java @@ -40,7 +40,7 @@ public class FurnaceFuelHandler implements IFuelHandler addFuel(BOPCBlocks.magicStairs, 300); addFuel(BOPCBlocks.palmStairs, 300); addFuel(BOPCBlocks.mangroveStairs, 300); - addFuel(BOPCBlocks.holyStairs, 300); + addFuel(BOPCBlocks.etherealStairs, 300); addFuel(BOPCBlocks.pineStairs, 300); addFuel(BOPCBlocks.jacarandaStairs, 300); addFuel(BOPCBlocks.hellBarkStairs, 300); diff --git a/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java b/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java index 29f7aa508..9ea3b2755 100644 --- a/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java +++ b/src/main/java/biomesoplenty/common/integration/TreecapitatorIntegration.java @@ -96,9 +96,9 @@ public class TreecapitatorIntegration /* * logs2 trees */ - // BoP holy + // BoP ethereal tree = new NBTTagCompound(); - tree.setString("treeName", "holy"); + tree.setString("treeName", "ethereal"); tree.setString("logs", String.format("%s,0; %s,4; %s,8", logs2, logs2, logs2)); tree.setString("leaves", String.format("%s,2; %s,10", leaves2, leaves2)); tree.setBoolean("requireLeafDecayCheck", false); diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java index db96b9700..d1d165909 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlank.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; public class ItemBlockPlank extends ItemBlock { - private static final String[] woodTypes = new String[] {"sacredoakPlank", "cherryPlank", "darkPlank", "firPlank", "holyPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching", "pinePlank", "hellBarkPlank", "jacarandaPlank", "mahoganyPlank"}; + private static final String[] woodTypes = new String[] {"sacredoakPlank", "cherryPlank", "darkPlank", "firPlank", "etherealPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching", "pinePlank", "hellBarkPlank", "jacarandaPlank", "mahoganyPlank"}; public ItemBlockPlank(Block block) { diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java index 85cdfb9f2..a9d42b6ba 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockSapling.java @@ -7,7 +7,7 @@ import net.minecraft.util.IIcon; public class ItemBlockSapling extends ItemBlock { - private static final String[] saplings = new String[] {"apple", "yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "holy", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda", "persimmon"}; + private static final String[] saplings = new String[] {"apple", "yellowautumn", "bamboo", "magic", "dark", "dead", "fir", "ethereal", "orangeautumn", "origin", "pinkcherry", "maple", "whitecherry", "hellbark", "jacaranda", "persimmon"}; private static final int MAX = 15; public ItemBlockSapling(Block block) diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 7e284f417..760b516f2 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -101,7 +101,7 @@ tile.saplings.magicSapling.name=Magic Sapling tile.saplings.darkSapling.name=Dark Sapling tile.saplings.deadSapling.name=Dying Sapling tile.saplings.firSapling.name=Fir Sapling -tile.saplings.holySapling.name=Loftwood Sapling +tile.saplings.etherealSapling.name=Ethereal Sapling tile.saplings.orangeautumnSapling.name=Orange Autumn Sapling tile.saplings.originSapling.name=Origin Sapling tile.saplings.pinkcherrySapling.name=Pink Cherry Sapling @@ -182,7 +182,7 @@ tile.planks.sacredoakPlank.name=Sacred Oak Wood Planks tile.planks.cherryPlank.name=Cherry Wood Planks tile.planks.darkPlank.name=Dark Wood Planks tile.planks.firPlank.name=Fir Wood Planks -tile.planks.holyPlank.name=Loftwood Wood Planks +tile.planks.etherealPlank.name=Ethereal Wood Planks tile.planks.magicPlank.name=Magic Wood Planks tile.planks.mangrovePlank.name=Mangrove Wood Planks tile.planks.palmPlank.name=Palm Wood Planks @@ -199,7 +199,7 @@ tile.logs1.cherryWood.name=Cherry Wood tile.logs1.darkWood.name=Dark Wood tile.logs1.firWood.name=Fir Wood -tile.logs2.holyWood.name=Loftwood Wood +tile.logs2.etherealWood.name=Ethereal Wood tile.logs2.magicWood.name=Magic Wood tile.logs2.mangroveWood.name=Mangrove Wood tile.logs2.palmWood.name=Palm Wood @@ -221,7 +221,7 @@ tile.leaves1.dark.name=Dark Leaves tile.leaves2.dead.name=Dying Leaves tile.leaves2.fir.name=Fir Leaves -tile.leaves2.holy.name=Loftwood Leaves +tile.leaves2.ethereal.name=Ethereal Leaves tile.leaves2.orangeautumn.name=Orange Autumn Leaves tile.leaves3.origin.name=Origin Leaves @@ -248,7 +248,7 @@ tile.woodenDoubleSlab1.sacredoakSlab.name=Sacred Oak Wood Slab tile.woodenDoubleSlab1.cherrySlab.name=Cherry Wood Slab tile.woodenDoubleSlab1.darkSlab.name=Dark Wood Slab tile.woodenDoubleSlab1.firSlab.name=Fir Wood Slab -tile.woodenDoubleSlab1.holySlab.name=Loftwood Wood Slab +tile.woodenDoubleSlab1.etherealSlab.name=Ethereal Wood Slab tile.woodenDoubleSlab1.magicSlab.name=Magic Wood Slab tile.woodenDoubleSlab1.mangroveSlab.name=Mangrove Wood Slab tile.woodenDoubleSlab1.palmSlab.name=Palm Wood Slab @@ -263,7 +263,7 @@ tile.woodenSingleSlab1.sacredoakSlab.name=Sacred Oak Wood Slab tile.woodenSingleSlab1.cherrySlab.name=Cherry Wood Slab tile.woodenSingleSlab1.darkSlab.name=Dark Wood Slab tile.woodenSingleSlab1.firSlab.name=Fir Wood Slab -tile.woodenSingleSlab1.holySlab.name=Loftwood Wood Slab +tile.woodenSingleSlab1.etherealSlab.name=Ethereal Wood Slab tile.woodenSingleSlab1.magicSlab.name=Magic Wood Slab tile.woodenSingleSlab1.mangroveSlab.name=Mangrove Wood Slab tile.woodenSingleSlab1.palmSlab.name=Palm Wood Slab @@ -278,7 +278,7 @@ tile.sacredoakStairs.name=Sacred Oak Wood Stairs tile.cherryStairs.name=Cherry Wood Stairs tile.darkStairs.name=Dark Wood Stairs tile.firStairs.name=Fir Wood Stairs -tile.holyStairs.name=Loftwood Wood Stairs +tile.etherealStairs.name=Ethereal Wood Stairs tile.magicStairs.name=Magic Wood Stairs tile.mangroveStairs.name=Mangrove Wood Stairs tile.palmStairs.name=Palm Wood Stairs diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/better_leaves_holy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/better_leaves_holy.png deleted file mode 100755 index 3889a9aaad608ed0f20e5701440379268f5f1c24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1003 zcmVpFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZi*;U{+B)aVx@s`kIeR|O`+eW{ zoagzzAPFsB05H}%2>|xlAoC{M2>|D(eQcOGOwIY!1Z7m@69A-W52a`iGmjP!0J3WA z%z1W!0C4eB4gH~VaX%K9nYI7`D1CK|2d8Vfxv7lO_ikFoZV~{T3)g9%y^;t5;Oi?T z02nHZ=!{%rVfY*sUbTRQrD36b`}1l7fal{$y2riD^cK(=>Ee$57A`Ce(=pe|{MV<2 z004q_%(ZeQ|3?AeehhMSqLZT&os7k08hlm)z@C>!=;+%o22$c;aajyf`0gIn@F@kv z;&M`gO=tEdmegmZd)!L^F#06|!2Du}0I=;z<*)7NrdmGb7R2H*V{th#tMGkVXC8`~ zXJ0-jej9vNZmcV&snJbCl}$VsYWXz<0KkE_)vWkZM`OT6XQYefP#Xcj_W2T}Xd4Yx zHZdyz*wTD}h2e9QqKP;y{F(yXvX{k!9%j|pnK#)k5?IFSX$}R%45VlecfYwyW37`? zw2iq#ern~D1Ss$M#=2thz~sNaL#61%;xaAc_2Sy`HAwTw4FbT<7q!&OC#`@n;1UWq zlv}7=H@&Uo+4slAf5w1|yQXf7J>T3^mh>uW;gbY7=32#GF8`dL_K6B-pACx2XQ(V< zdH4hm%_Npz4^I-X^_Gz&q-Yy=O*JNxeGO8I_K0NO$0b}?8m49JCUb|b696(Q^11I# z6>Ys`zsj^e9f6JQ1C(~O%$G5AZ47&zA1fZKoc8iCK zVpBs2O^t5mJZ(-|%Iu5foL>ylGJZ?U);w~G#(<02Egli8hey$ej#Y}4C)iMBqkT3= zXQWG%RshHy^3&*-=!|r+=tIYSxZ?c^^Pn)Uqb5lb}Qo^l|POlmul^@W`BUL|F zg7x|VH9XYx^K|`y8vc*{JY7HVTb`uqex9x$Sjme@sHLB$>j#$eLV(tOo~|EI`2T)j zl_mREejw$!;BWf@RR@#5N2bZe?^J zG%heMGmPe!Pyhe`>`6pHR5(vNJLW<-;{If@MBbYPE}^c#zV+1j_3CXq zkQ_`7vLN#c5^d$DqvmOZ{||=?d0=zNzP+rarnr`f{=SAamw-5(>1_5+l6#o7a;JTM ziaa5a0g(m1tJ(j($F!KaSFJ`Sip=Rbr2QpF?M^mxNphCx_`h%%zGh-B&t!co^8f$< M07*qoM6N<$g4oWSqyPW_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal_fast.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_ethereal_fast.png new file mode 100644 index 0000000000000000000000000000000000000000..8a546ea4e638df7f37167d7863079729088cbec7 GIT binary patch literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J>#Bd(*uBNj(WN{ zhFJLLPBi2@j&*NOy+po9Er&bL0r-tRvWr7&TIuxEC&?*vn~jPv9dnnwQi%O@{) Uyu`ZA1?V9LPgg&ebxsLQ0A25V#sB~S literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_fancy.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_fancy.png deleted file mode 100644 index 0db0e085dcdebd5cdbb4152d1b0cebe23003bfbe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 732 zcmV<20wev2P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0006@NklEbw2$1J0hIHTdQ5dgKN*gm2;xlisLSb_g9EviV17eC}8cV`~JGxu0H;kaC7aVE`eC_`Rz2u5J5@v_}= zSUFjX>V*c_>r16yXUg<@zg?0TUPhYfE5gLi2Y#;)Thx$+n^x;N> z*9#{&%Ka1fAbQyQE@91?WvK^qjo+1>L2OG;H(IuTsRz!X8)ibzS4bANgmr0yyk#Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0006VNklOwGsE-DftD3oP6S)o^g)Dl6v$da{$ zBCopW^K#^cFX#C_=RDu@oadZJo%k?$z?Rj$9%)OS&26iI3-TUym>gK6I@Ys2rSe}~ zhxKkX#o_@-PLt=)za=?wu-*aj?LG$C=Sw82SU_a93Tp|M>gf?@>KeT2(^MaU74H8TD)r?h8O>?=88#KZXikHnI(FT=pkI*`X3WJ$?Mu08v7Yl@3GT{B&pM z_uRYWLx9E-ap64m{+xHVMsi7%5V;J2o|$1|3J!Nx;zY&`5Nphb{rNYJJ@z!LEDdfc zk)r_OOx<;DK7asQf1MEYhg!;W+x?0s`gU*Ns$FZW|JGt{E~99B-0--+_7NhZ2(U+c zY89@c`4}7jQmA|`NaL7{2(-mkd%PI}=ddB54?UKbnBcR>?D-Dz8yIUKbxFCO z88>jcc)1`jmj-_E{pg&SQP_nE5*%y}_y@6Is) z0;jSK7y{AI=KSY9vIVx@0Q1rk6L3l(Bacy~U+$SFfV7C-Q#u2Y_5)ha$o2H}e`T2x Uq06XTga7~l07*qoM6N<$g5jq-JOBUy diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_round.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_holy_round.png deleted file mode 100644 index cd3b274e77d7041319fb582395e819c3a318d112..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 706 zcmV;z0zLhSP)pFAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd zMgRZ;NJ&INRCwBKQ|(JraTI?3jPyE}`3FR1ZfUM<_g-g9AzxsP)~2j26;_PQUS!q6 zpy)$T5cy%S9P}X~A%sAg+IF$9Pl4nRA^MOn%yprQe!B4VVfbT{9r(fT91hPp=Q+;- zNgREZcJl2F5vZA4=|r;q1b~KNHw{xG09e8b>wFyq09DUW)ibOK5S;BH07!xJREiJj zD2x*TdcIxZz($x&@m{KbXK2q&v9g=0mP-eVG)#^1PJ*XD4G{naH?Pr~_p{#LNu`)( z>)a$u2aA+<5)=TApD(%lZ=TC5(_CJereSK7f=&X!g)f&W&t4K$4)Y9CqbRPFW@wmN z6~OVE7t13Bo%H7YWj-P*0bp-GO8_|aK0rtzmzc{iH9?-E@QTh~Z$#zh`vc-H1)Xdh z@z5Ic5{|++RXs@n=vy12@6QM=(Jm^*G;P^(-1Yk&RXs^5N2bZe?^J zG%heMGmPe!Pyhe{fk{L`R5(vvl2=axK@^4eKl!LAqDWhsg_x*_3aGdXEX{(6K?O@p z#6+=Rd-P}eEq5GOle3dEbLZT0c8m=to~xSv$QUcgR-$kLTcVJBGX>wOC-RM?0W$~n z=)J@0Md+@q57Wc_^zZ<(VucJ6B%Yf7^X=*GPN26tezM6rd0GtLR3RF(msb3-L3ULk zcx5G@TMKVTUZh^!6Vflfx6yEo?1s7QGY2&)5R>Yx0#dMwOayKPM6ju|q6i33ZSLBZ zPUIe0X!4JM0AtB8konic%;&LAOc5b&OMFbjKKs=brIZ55W-j(ZeOoI_?Ti}Q>^F2v z;vnDz>x9rVb(BjC_cKGy*C{{*OCQP{T%uKoD_AQ>_(2536UaY!ZC$U#Wat`usleO> zAfwd<0z&u(U$w)(E@2CqsKczfEAfh{xPUjxB?J?lJV##p879yxLHI2^6GE{E#}$nJ zw5krMfRDU9*#>Vd9RkXwLMx4w*9&JXxV(7{P6WBC`3*ieI+W|V3s(RD002ovPDHLk FV1lnk)o}m- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/log_ethereal_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/log_ethereal_side.png new file mode 100644 index 0000000000000000000000000000000000000000..4bd86bd9e9c7835414fe11155367d4d9d8a2384a GIT binary patch literal 572 zcmV-C0>k}@P)N2bZe?^J zG%heMGmPe!Pyhe{x=BPqR5(vP(pgWFK@@jVuqQ(RL*1TUF*}2RZtP`PCb15zQTt&IT*A|Fahh! zjqW#bqF2AMV!+@%p<|nwV5a^^Lg4g&t*gXZ6loY=|38hCYK!K*yttSEJ81jX07<9C zBYgR{t*e-a+R)N?<+e0;oy7n^Ns{o%1kTg+SXp9HnbKnw*CRHK9Na0`azN0VR#lt7 zB~eNQI0QkRAHFTeccBDU;+T+$b_fIM)zCa+tUMuX&FPtG{lzQAkQQ^cC>9g|0000< KMNUMnLSTYyy#1sA literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/log_holy_heart.png b/src/main/resources/assets/biomesoplenty/textures/blocks/log_holy_heart.png deleted file mode 100644 index 5274c414ec8da21a7cc2ea7650760a4294c90c61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjSP)N2bPDNB8 zb~7$DE-^7j^FlWO00ERqL_t(IPhFB*F9T5&h3AKP6^RE)wbdKan@T%c)3it%{(+w% z5rhzpdT@zb2wF-AAw=Sd@PZIx_)hoaWJuPWtTX$peOc!i`Tn4l3bePju!3CD4;Qc{ z3MrZqcp)7sX2J&SeIxs_nr3z5c{!JEP5C_Mjk{Fk06`};$gpUg% zAf7<}!ENhcUzeJJ#46CNz}y5NtO6ydmGBKd5cj%V!j^hjT^|Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qQF!XYv0005pNklh*1?WyK#AATW7zb5 zZu@!&aD{*aOsoh~R%n8zctD#P5aaywyvTwB8N_72i%1Yej$M5}&HcWub0Rly9E=5y zLJ!wGoKcBKEpMk*m3Ud^PCiUxyTO6>Dq;{OvhHOkL#M04oSkB*=#fO&JJ56!UO<&A zA*qjkNUfN2pocRftqN1#xCF;L&bDTN@}(p{hn*TuHhuVDjvN@hXc-6Nqi8w?M`~qh zxoI?>D`=UfPN1j!APEA_#ZG`EjD?WQ=RO*eC(@P|<>`atLGpoS-V}f&JA;RCcf3qh z(hsuz7mYiWVJ%Q3k>D?5;8@A{YBIj2Xt3Oop`p0Z7P>(_GJYIrJ+P0Mol&UQh*|Dr z#X$(*q8n4}jMY&5ymkQABgv8nnud?G6;Hk}HOk|v!?dhFmaj{}ypb$400000NkvXX Hu0mjfKkW{p diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/plank_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/blocks/plank_ethereal.png new file mode 100644 index 0000000000000000000000000000000000000000..c5ecd076eddbc86c10bb0279be20267cca33488c GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J>#Bd(*uBNPI>?v|fRKGSl zp1ppQckR7;W@DSiZLFJAOD8E^LVlZ=T>dKeM4&5 aN9Kk)9iQp#6(K-hF?hQAxvX!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L0m@TF)WP}O-) z7sn6_|J;cic@H@Vu(T+ z{^-+B|4Pi??)-pj{cpok?xb1 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png b/src/main/resources/assets/biomesoplenty/textures/blocks/sapling_ethereal.png new file mode 100644 index 0000000000000000000000000000000000000000..fbab9ac8ada3ccba6e75e53bde4bb7d7a46e711b GIT binary patch literal 600 zcmV-e0;m0nP)N2bZe?^J zG%heMGmPe!Pyhe{)=5M`R5(vVt1hnlurF#1axqR5w*B1Z^5r z5gK$s%DT4m%F^VXU?1%ayT4hu~^7zwUW!_BEW99i#5`yiS<7? zoldgZZ0!RG0KeZ)ZnslHEZN_n8#@dK1lyIWoELuJ z4r-Nj30y!9fB?A7 z*CL5?{c(e@-Zw=yqe|?B0&KvD&)A8Qo^Fls99M3a8DtWOk+bkGdXruX4!LQ&9A%JT m9#GCex{LZ!zwK_DPxK7{gpn#DrcGb~0000!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsOplZ zi(`m||Jh0Vxegf!w12i?RA+Bh@DNX5XffMW{(yTyaarMs-4-4CPqdEIosI3hV&6O2 z-l8h={qLtmD}Uxk+V|>R37nS7B==r?;`6t4KhHj?xUu!a&nl_3M~C*@EWIQ)DgXNE zh_gZLdO5T5SASRI`g}!3VzT3guZulSv%EK8P+PO!O2XK4eyeAeY3T%Mro>747lQ3{ z%9a{zjW6GM&S}EFEeh>B-CDWxlxHR^xcfqI>66VC`f3MQJ}VeZob>+E!osPp3%nAo kF3evYAtA7-Mlo6LFVdQ&MBb@07g!Q9RL6T