aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/bop
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/bop')
-rw-r--r--src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java19
-rw-r--r--src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java4
-rw-r--r--src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java30
4 files changed, 29 insertions, 27 deletions
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
index 6ac0800b85..93a8d1febb 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java
@@ -7,6 +7,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
@@ -58,7 +59,7 @@ public class LeavesBase extends BlockLeaves {
}
}
else {
- Utils.LOG_WARNING("Unable to drop anything, Leaf Type array and Loot array are different sizes.");
+ Logger.WARNING("Unable to drop anything, Leaf Type array and Loot array are different sizes.");
}
}
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
index a4346622a1..727b36638e 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java
@@ -7,6 +7,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.creative.AddToCreativeTab;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
@@ -59,7 +60,7 @@ public class SaplingBase extends BlockSapling
try {
return this.saplingTextures[meta];
}catch(Throwable T){
- Utils.LOG_WARNING("Invalid Sapling meta is "+meta);
+ Logger.WARNING("Invalid Sapling meta is "+meta);
return this.saplingTextures[0];
}
}
@@ -72,11 +73,11 @@ public class SaplingBase extends BlockSapling
if (!world.isRemote){
super.updateTick(world, x, y, z, rand);
if (world.getBlockLightValue(x, y + 1, z) >= 9 && rand.nextInt(7) == 0){
- Utils.LOG_WARNING("Update Tick");
+ Logger.WARNING("Update Tick");
this.updateMeta(world, x, y, z, rand);
}
else {
- Utils.LOG_WARNING("Tried to Tick.");
+ Logger.WARNING("Tried to Tick.");
}
}
}
@@ -84,7 +85,7 @@ public class SaplingBase extends BlockSapling
//Dunno - Think it is doGrow || doGrowthTick
@Override
public void func_149853_b(World world, Random rand, int x, int y, int z){
- Utils.LOG_WARNING("Please find what calls me - func_149853_b");
+ Logger.WARNING("Please find what calls me - func_149853_b");
this.updateMeta(world, x, y, z, rand);
}
@@ -94,22 +95,22 @@ public class SaplingBase extends BlockSapling
@Override
public void func_149879_c(World world, int x, int y, int z, Random rand){
- Utils.LOG_WARNING("func_149879_c - 1");
+ Logger.WARNING("func_149879_c - 1");
int l = world.getBlockMetadata(x, y, z);
if ((l & 8) == 0){
- Utils.LOG_WARNING("func_149879_c - 2");
+ Logger.WARNING("func_149879_c - 2");
world.setBlockMetadataWithNotify(x, y, z, l | 8, 4);
}
else{
- Utils.LOG_WARNING("func_149879_c - 3");
+ Logger.WARNING("func_149879_c - 3");
this.func_149878_d(world, x, y, z, rand);
}
}
@Override
public void func_149878_d(World world, int x, int y, int z, Random rand){
- Utils.LOG_WARNING("func_149878_d - 1");
+ Logger.WARNING("func_149878_d - 1");
if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(world, rand, x, y, z)) return;
int l = world.getBlockMetadata(x, y, z) & 7;
Object object = rand.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true);
@@ -121,7 +122,7 @@ public class SaplingBase extends BlockSapling
{
case 0:
default:
- Utils.LOG_WARNING("Case 0 - Grow Tree");
+ Logger.WARNING("Case 0 - Grow Tree");
break;
}
diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
index 0cd76fa734..26accd283e 100644
--- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
+++ b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.bop.blocks.rainforest;
import java.util.Random;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import gtPlusPlus.xmod.bop.blocks.base.SaplingBase;
import gtPlusPlus.xmod.bop.world.features.trees.WorldGenRainForestTree_Ex;
@@ -19,7 +19,7 @@ public class SaplingRainforestTree extends SaplingBase {
@Override
public void func_149878_d(World world, int x, int y, int z, Random rand){
- Utils.LOG_WARNING("func_149878_d - 1");
+ Logger.WARNING("func_149878_d - 1");
if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(world, rand, x, y, z)) return;
int l = world.getBlockMetadata(x, y, z) & 7;
rand.nextInt(10);
diff --git a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java b/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java
index 15ce246515..2357fe4ea6 100644
--- a/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java
+++ b/src/Java/gtPlusPlus/xmod/bop/world/features/trees/WorldGenRainForestTree_Ex.java
@@ -2,7 +2,7 @@ package gtPlusPlus.xmod.bop.world.features.trees;
import java.util.Random;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSapling;
import net.minecraft.init.Blocks;
@@ -74,23 +74,23 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{
block2.onPlantGrow(world, x, y - 1, z, x, y, z);
byte b0 = 3;
byte b1 = 0;
- Utils.LOG_WARNING("Sapling located at X:"+x+" | Y:"+y+" | Z:"+z);
+ Logger.WARNING("Sapling located at X:"+x+" | Y:"+y+" | Z:"+z);
for (int k1 = y - b0 + treeHeight; k1 <= y + treeHeight; k1++)
{
- Utils.LOG_WARNING("[1]| k1 = "+k1+" | y = "+y+" | b0 = "+b0+" | l = "+treeHeight+" | ");
+ Logger.WARNING("[1]| k1 = "+k1+" | y = "+y+" | b0 = "+b0+" | l = "+treeHeight+" | ");
int i3 = k1 - (y + treeHeight);
int l1 = b1 + 1 - i3;
for (int i2 = x - l1; i2 <= x + l1; i2++){
int j2 = i2 - x;
- Utils.LOG_WARNING("[2]| i2 = "+i2+" | x = "+x+" | l1 = "+l1+" | j2 = "+j2+" | ");
+ Logger.WARNING("[2]| i2 = "+i2+" | x = "+x+" | l1 = "+l1+" | j2 = "+j2+" | ");
for (int k2 = z - l1; k2 <= z + l1; k2++){
int l2 = k2 - z;
- Utils.LOG_WARNING("[3]| k2 = "+k2+" | z = "+z+" | l1 = "+l1+" | l2 = "+l2+" | ");
+ Logger.WARNING("[3]| k2 = "+k2+" | z = "+z+" | l1 = "+l1+" | l2 = "+l2+" | ");
if ((Math.abs(j2) != l1) || (Math.abs(l2) != l1) || ((random.nextInt(2) != 0) && (i3 != 0)))
{
Block block1 = world.getBlock(i2, k1, k2);
if ((block1.isAir(world, i2, k1, k2)) || (block1.isLeaves(world, i2, k1, k2))) {
- Utils.LOG_WARNING("Setting something as leaves?");
+ Logger.WARNING("Setting something as leaves?");
setBlockAndNotifyAdequately(world, i2, k1, k2, this.leaves, this.leavesMeta);
}
}
@@ -99,7 +99,7 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{
}
for (int k1 = 0; k1 < treeHeight; k1++)
{
- Utils.LOG_WARNING("Building tree - Layer "+k1+" | Max height is "+treeHeight);
+ Logger.WARNING("Building tree - Layer "+k1+" | Max height is "+treeHeight);
Block block = world.getBlock(x, y + k1, z);
if ((block.isAir(world, x, y + k1, z)) || (block.isLeaves(world, x, y + k1, z))){
setBlockAndNotifyAdequately(world, x, y + k1, z, this.wood, this.woodMeta);
@@ -118,10 +118,10 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{
for (int xDir = -5; xDir <= 5; xDir++){
for (int zDir = -5; zDir <= 5; zDir++){
if (canRemoveLeafBlockLayer2(-5, 5, xDir, -5, 5, zDir)){
- Utils.LOG_WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+" z="+zDir);
+ Logger.WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+" z="+zDir);
}
else {
- Utils.LOG_WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y+" z="+zDir);
+ Logger.WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y+" z="+zDir);
block5 = world.getBlock(x+xDir, y+k1, z+zDir);
if (block5.isAir(world, x+xDir, y+k1, x+zDir)){
setBlockAndNotifyAdequately(world, x+xDir, y + k1, z+zDir, this.leaves, this.leavesMeta);
@@ -133,10 +133,10 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{
for (int xDir = -4; xDir <= 4; xDir++){
for (int zDir = -4; zDir <= 4; zDir++){
if (canRemoveLeafBlockLayer2(-4, 4, xDir, -4, 4, zDir)){
- Utils.LOG_WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+k1+1+" z="+zDir);
+ Logger.WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+k1+1+" z="+zDir);
}
else {
- Utils.LOG_WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y + k1 + 1+" z="+zDir);
+ Logger.WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y + k1 + 1+" z="+zDir);
block5 = world.getBlock(x+xDir, y+k1 + 1, z+zDir);
if (block5.isAir(world, x+xDir, y+k1 + 1, x+zDir)){
setBlockAndNotifyAdequately(world, x+xDir, y + k1 + 1, z+zDir, this.leaves, this.leavesMeta);
@@ -149,10 +149,10 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{
for (int xDir = -3; xDir <= 3; xDir++){
for (int zDir = -3; zDir <= 3; zDir++){
if (canRemoveLeafBlockLayer2(-3, 3, xDir, -3, 3, zDir)){
- Utils.LOG_WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+k1+2+" z="+zDir);
+ Logger.WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+k1+2+" z="+zDir);
}
else {
- Utils.LOG_WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y+k1+2+" z="+zDir);
+ Logger.WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y+k1+2+" z="+zDir);
block5 = world.getBlock(x+xDir, y+k1+2, z+zDir);
if (block5.isAir(world, x+xDir, y+k1+2, x+zDir)){
setBlockAndNotifyAdequately(world, x+xDir, y + k1 + 2, z+zDir, this.leaves, this.leavesMeta);
@@ -165,10 +165,10 @@ public class WorldGenRainForestTree_Ex extends WorldGenAbstractTree{
for (int xDir = -2; xDir <= 2; xDir++){
for (int zDir = -2; zDir <= 2; zDir++){
if (canRemoveLeafBlockLayer2(-2, 2, xDir, -2, 2, zDir)){
- Utils.LOG_WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+k1+3+" z="+zDir);
+ Logger.WARNING("Doing Nothing at "+"x="+xDir+" | y="+y+k1+3+" z="+zDir);
}
else {
- Utils.LOG_WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y+k1+3+" z="+zDir);
+ Logger.WARNING("Trying to place leaves at "+"x="+xDir+" | y="+y+k1+3+" z="+zDir);
block5 = world.getBlock(x+xDir, y+k1+3, z+zDir);
if (block5.isAir(world, x+xDir, y+k1+3, x+zDir)){
setBlockAndNotifyAdequately(world, x+xDir, y + k1 + 3, z+zDir, this.leaves, this.leavesMeta);
generated by cgit (git 2.46.0) at 2025-03-10 19:14:38 +0000