diff options
| author | NotAPenguin <michiel.vandeginste@gmail.com> | 2024-09-02 23:17:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-02 23:17:17 +0200 |
| commit | 1b820de08a05070909a267e17f033fcf58ac8710 (patch) | |
| tree | 02831a025986a06b20f87e5bcc69d1e0c639a342 /src/main/java/gtPlusPlus/xmod/bop | |
| parent | afd3fd92b6a6ab9ab0d0dc3214e6bc8ff7a86c9b (diff) | |
| download | GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.gz GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.tar.bz2 GT5-Unofficial-1b820de08a05070909a267e17f033fcf58ac8710.zip | |
The Great Renaming (#3014)
* move kekztech to a single root dir
* move detrav to a single root dir
* move gtnh-lanthanides to a single root dir
* move tectech and delete some gross reflection in gt++
* remove more reflection inside gt5u
* delete more reflection in gt++
* fix imports
* move bartworks and bwcrossmod
* fix proxies
* move galactigreg and ggfab
* move gtneioreplugin
* try to fix gt++ bee loader
* apply the rename rules to BW
* apply rename rules to bwcrossmod
* apply rename rules to detrav scanner mod
* apply rename rules to galacticgreg
* apply rename rules to ggfab
* apply rename rules to goodgenerator
* apply rename rules to gtnh-lanthanides
* apply rename rules to gt++
* apply rename rules to kekztech
* apply rename rules to kubatech
* apply rename rules to tectech
* apply rename rules to gt
apply the rename rules to gt
* fix tt import
* fix mui hopefully
* fix coremod except intergalactic
* rename assline recipe class
* fix a class name i stumbled on
* rename StructureUtility to GTStructureUtility to prevent conflict with structurelib
* temporary rename of GTTooltipDataCache to old name
* fix gt client/server proxy names
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/bop')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/BiomesOPlentyHandler.java (renamed from src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java) | 8 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/BOPBlockRegistrator.java (renamed from src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java) | 97 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java | 6 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java | 84 |
7 files changed, 103 insertions, 104 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java b/src/main/java/gtPlusPlus/xmod/bop/BiomesOPlentyHandler.java index 7727eaef38..b1e97782af 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/HANDLER_BiomesOPlenty.java +++ b/src/main/java/gtPlusPlus/xmod/bop/BiomesOPlentyHandler.java @@ -10,9 +10,9 @@ import net.minecraft.item.ItemStack; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; -public class HANDLER_BiomesOPlenty { +public class BiomesOPlentyHandler { public static Item mPineCone; @@ -33,7 +33,7 @@ public class HANDLER_BiomesOPlenty { public static Block colorizedSaplings; public static void preInit() { - BOP_Block_Registrator.run(); + BOPBlockRegistrator.run(); if (BiomesOPlenty.isModLoaded()) { setFields(); registerPineconeToOreDict(); @@ -41,7 +41,7 @@ public class HANDLER_BiomesOPlenty { } public static void postInit() { - BOP_Block_Registrator.recipes(); + BOPBlockRegistrator.recipes(); } private static void registerPineconeToOreDict() { diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOPBlockRegistrator.java index 4a3c91e9cb..0cb1852dee 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/BOP_Block_Registrator.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/BOPBlockRegistrator.java @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.bop.blocks; import static gregtech.api.recipe.RecipeMaps.cutterRecipes; -import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.loaders.oreprocessing.ProcessingLog.addPyrolyeOvenRecipes; import net.minecraft.block.Block; @@ -10,13 +10,13 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import gregtech.GT_Mod; -import gregtech.api.enums.GT_Values; +import gregtech.GTMod; +import gregtech.api.enums.GTValues; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTOreDictUnificator; +import gregtech.api.util.GTUtility; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -27,7 +27,7 @@ import gtPlusPlus.xmod.bop.blocks.rainforest.LeavesRainforestTree; import gtPlusPlus.xmod.bop.blocks.rainforest.LogRainforestTree; import gtPlusPlus.xmod.bop.blocks.rainforest.SaplingRainforestTree; -public class BOP_Block_Registrator { +public class BOPBlockRegistrator { public static Block log_Rainforest; public static Block leaves_Rainforest; @@ -71,7 +71,7 @@ public class BOP_Block_Registrator { RecipeUtils.addShapelessGregtechRecipe( new ItemStack[] { aStack }, ItemUtils - .getSimpleStack(Item.getItemFromBlock(Blocks.planks), GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 4)); + .getSimpleStack(Item.getItemFromBlock(Blocks.planks), GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 4)); RecipeUtils.recipeBuilder( CI.craftingToolSaw, null, @@ -83,91 +83,90 @@ public class BOP_Block_Registrator { null, null, ItemUtils.getSimpleStack(Item.getItemFromBlock(Blocks.planks), 4)); - GT_ModHandler.addCraftingRecipe( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), - GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "sLf", 'L', GT_Utility.copyAmount(1L, aStack) }); + GTModHandler.addCraftingRecipe( + GTOreDictUnificator.get(OrePrefixes.stickLong, Materials.Wood, 2L), + GTModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GTModHandler.RecipeBits.BUFFERED, + new Object[] { "sLf", 'L', GTUtility.copyAmount(1L, aStack) }); final short aMeta = (short) aStack.getItemDamage(); - if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), + if (GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1L, aStack)); } if (aMeta == 32767) { for (int i = 0; i < 32767; ++i) { - if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), + if (GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); + GTModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } - final ItemStack tStack = GT_ModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); + final ItemStack tStack = GTModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); if (tStack == null) { if (i >= 16) { break; } } else { - final ItemStack tPlanks = GT_Utility.copy(tStack); + final ItemStack tPlanks = GTUtility.copy(tStack); tPlanks.stackSize = tPlanks.stackSize * 3 / 2; - GT_Values.RA.stdBuilder() + GTValues.RA.stdBuilder() .itemInputs(new ItemStack(aStack.getItem(), 1, i)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) : (((long) tStack.stackSize) * 5L / 4), tStack), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_ModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) + GTModHandler.removeRecipe(new ItemStack(aStack.getItem(), 1, i)); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack.stackSize) : (((long) tStack.stackSize) * 5L / 4), tStack), new Object[] { "s", "L", 'L', new ItemStack(aStack.getItem(), 1, i) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility - .copyAmount(tStack.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(tStack.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack), new Object[] { new ItemStack(aStack.getItem(), 1, i) }); } } } else { - final ItemStack tStack2 = GT_ModHandler.getRecipeOutput(GT_Utility.copyAmount(1L, aStack)); + final ItemStack tStack2 = GTModHandler.getRecipeOutput(GTUtility.copyAmount(1L, aStack)); if (tStack2 != null) { - final ItemStack tPlanks2 = GT_Utility.copy(tStack2); + final ItemStack tPlanks2 = GTUtility.copy(tStack2); tPlanks2.stackSize = tPlanks2.stackSize * 3 / 2; - GT_Values.RA.stdBuilder() - .itemInputs(GT_Utility.copyAmount(1L, aStack)) + GTValues.RA.stdBuilder() + .itemInputs(GTUtility.copyAmount(1L, aStack)) .itemOutputs( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) : (((long) tStack2.stackSize) * 5L / 4), tStack2), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) + GTOreDictUnificator.get(OrePrefixes.dust, Materials.Wood, 2L)) .duration(10 * SECONDS) .eut(8) .addTo(cutterRecipes); - GT_ModHandler.removeRecipe(GT_Utility.copyAmount(1L, aStack)); - GT_ModHandler.addCraftingRecipe( - GT_Utility.copyAmount( - GT_Mod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) + GTModHandler.removeRecipe(GTUtility.copyAmount(1L, aStack)); + GTModHandler.addCraftingRecipe( + GTUtility.copyAmount( + GTMod.gregtechproxy.mNerfedWoodPlank ? ((long) tStack2.stackSize) : (((long) tStack2.stackSize) * 5L / 4), tStack2), - new Object[] { "s", "L", 'L', GT_Utility.copyAmount(1L, aStack) }); - GT_ModHandler.addShapelessCraftingRecipe( - GT_Utility.copyAmount(tStack2.stackSize / (GT_Mod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2), - new Object[] { GT_Utility.copyAmount(1L, aStack) }); + new Object[] { "s", "L", 'L', GTUtility.copyAmount(1L, aStack) }); + GTModHandler.addShapelessCraftingRecipe( + GTUtility.copyAmount(tStack2.stackSize / (GTMod.gregtechproxy.mNerfedWoodPlank ? 2 : 1), tStack2), + new Object[] { GTUtility.copyAmount(1L, aStack) }); } } - if (GT_Utility.areStacksEqual( - GT_ModHandler.getSmeltingOutput(GT_Utility.copyAmount(1L, aStack), false, null), + if (GTUtility.areStacksEqual( + GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1L, aStack), false, null), new ItemStack(Items.coal, 1, 1))) { addPyrolyeOvenRecipes(aStack); - GT_ModHandler.removeFurnaceSmelting(GT_Utility.copyAmount(1L, aStack)); + GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1L, aStack)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java index 93f7e59a1e..4136e7f8e5 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/LeavesPineTree.java @@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.bop.blocks.base.LeavesBase; public class LeavesPineTree extends LeavesBase { @@ -23,7 +23,7 @@ public class LeavesPineTree extends LeavesBase { @Override public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Item.getItemFromBlock(BOP_Block_Registrator.sapling_Pine); + return Item.getItemFromBlock(BOPBlockRegistrator.sapling_Pine); } @Override // Drops when Leaf is broken diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java index 2c2bb38af6..b37a4dc3d9 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/pine/SaplingPineTree.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.xmod.bop.blocks.base.SaplingBase; import gtPlusPlus.xmod.bop.world.features.trees.WorldGenPineTree; @@ -44,7 +44,7 @@ public class SaplingPineTree extends SaplingBase { Object obj = new WorldGenPineTree(); if (obj != null) { world.setBlockToAir(x, y, z); - if (!((WorldGenerator) obj).generate(world, CORE.RANDOM, x, y, z)) { + if (!((WorldGenerator) obj).generate(world, GTPPCore.RANDOM, x, y, z)) { world.setBlock(x, y, z, this, 0, 2); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java index 816b666a40..30f57e1ce6 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/LeavesRainforestTree.java @@ -7,7 +7,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.bop.blocks.base.LeavesBase; public class LeavesRainforestTree extends LeavesBase { @@ -20,6 +20,6 @@ public class LeavesRainforestTree extends LeavesBase { @Override public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) { - return Item.getItemFromBlock(BOP_Block_Registrator.sapling_Rainforest); + return Item.getItemFromBlock(BOPBlockRegistrator.sapling_Rainforest); } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java index 362eb2f541..a9cb0e2c98 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenTrees; import net.minecraft.world.gen.feature.WorldGenerator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; import gtPlusPlus.xmod.bop.blocks.base.SaplingBase; import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex; @@ -43,8 +43,8 @@ public class SaplingRainforestTree extends SaplingBase { world.setBlock(x, y, z, block, 0, 4); } Object o = new WorldGenRainForestTree_Ex( - BOP_Block_Registrator.log_Rainforest, - BOP_Block_Registrator.leaves_Rainforest, + BOPBlockRegistrator.log_Rainforest, + BOPBlockRegistrator.leaves_Rainforest, 0, 0, true, diff --git a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java index bc97042c82..5d33b482a6 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java +++ b/src/main/java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenPineTree.java @@ -10,7 +10,7 @@ import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraftforge.common.util.ForgeDirection; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; +import gtPlusPlus.xmod.bop.blocks.BOPBlockRegistrator; public class WorldGenPineTree extends WorldGenAbstractTree { @@ -49,7 +49,7 @@ public class WorldGenPineTree extends WorldGenAbstractTree { int c; int r = MathUtils.randInt(1, 3); for (c = 0; c < height; ++c) { - this.buildBlock(world, x, y + h, z, BOP_Block_Registrator.log_Pine, 0); + this.buildBlock(world, x, y + h, z, BOPBlockRegistrator.log_Pine, 0); h++; if (c >= r && c % 2 == 0) { this.generateBranch(world, random, x, y + h, z, c); @@ -64,16 +64,16 @@ public class WorldGenPineTree extends WorldGenAbstractTree { public void generateTop(World world, int x, int y, int z) { for (int i = -1; i < 2; ++i) { for (int j = -1; j < 2; ++j) { - this.buildBlock(world, x + i, y, z + j, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + i, y, z + j, BOPBlockRegistrator.leaves_Pine, 0); } } - this.buildBlock(world, x, y, z, BOP_Block_Registrator.log_Pine, 0); - this.buildBlock(world, x + 1, y + 1, z, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x, y + 1, z - 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x, y + 1, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 1, y + 1, z, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x, y + 2, z, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x, y, z, BOPBlockRegistrator.log_Pine, 0); + this.buildBlock(world, x + 1, y + 1, z, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x, y + 1, z - 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x, y + 1, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y + 1, z, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x, y + 2, z, BOPBlockRegistrator.leaves_Pine, 0); } public void generateBranch(World world, Random rand, int x, int y, int z, int n) { @@ -81,7 +81,7 @@ public class WorldGenPineTree extends WorldGenAbstractTree { int var99998; for (var99999 = -1; var99999 < 2; ++var99999) { for (var99998 = -1; var99998 < 2; ++var99998) { - this.buildBlock(world, x + var99999, y, z + var99998, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + var99999, y, z + var99998, BOPBlockRegistrator.leaves_Pine, 0); } } @@ -91,72 +91,72 @@ public class WorldGenPineTree extends WorldGenAbstractTree { int var99996 = rand.nextInt(2); if (n % 2 == 0) { if (var99998 == 0) { - this.buildBlock(world, x + 1, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 2, y - 1, z - 1, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z - 1, BOPBlockRegistrator.leaves_Pine, 0); if (var99999 == 0) { - this.buildBlock(world, x + 2, y - 2, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 2, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x + 2, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x + 1, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 2, y, z - 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 2, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z - 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } if (var99997 == 0) { - this.buildBlock(world, x - 2, y - 1, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 1, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); if (var99996 == 0) { - this.buildBlock(world, x - 2, y - 2, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 2, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x - 2, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x - 2, y, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 1, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 2, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { if (var99998 == 0) { - this.buildBlock(world, x + 2, y - 1, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 1, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); if (var99999 == 0) { - this.buildBlock(world, x + 2, y - 2, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 2, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x + 2, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x + 2, y, z + 1, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x + 1, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z + 1, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x + 1, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); if (var99999 == 0) { - this.buildBlock(world, x + 2, y - 1, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y - 1, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x + 2, y, z + 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x + 2, y, z + 2, BOPBlockRegistrator.leaves_Pine, 0); } } if (var99997 == 0) { - this.buildBlock(world, x - 1, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 2, y - 1, z - 1, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z - 1, BOPBlockRegistrator.leaves_Pine, 0); if (var99996 == 0) { - this.buildBlock(world, x - 2, y - 2, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 2, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x - 2, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } } else { - this.buildBlock(world, x - 1, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); - this.buildBlock(world, x - 2, y, z - 1, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 1, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z - 1, BOPBlockRegistrator.leaves_Pine, 0); if (var99996 == 0) { - this.buildBlock(world, x - 2, y - 1, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y - 1, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } else { - this.buildBlock(world, x - 2, y, z - 2, BOP_Block_Registrator.leaves_Pine, 0); + this.buildBlock(world, x - 2, y, z - 2, BOPBlockRegistrator.leaves_Pine, 0); } } } - this.buildBlock(world, x, y, z, BOP_Block_Registrator.log_Pine, 0); - this.buildBlock(world, x, y + 1, z, BOP_Block_Registrator.log_Pine, 0); + this.buildBlock(world, x, y, z, BOPBlockRegistrator.log_Pine, 0); + this.buildBlock(world, x, y + 1, z, BOPBlockRegistrator.log_Pine, 0); } public void buildBlock(World world, int x, int y, int z, Block block, int meta) { |
