Skip to content

Commit ac266a7

Browse files
ferreusveritasferreusveritas
committed
Code Alignment
1 parent 7065909 commit ac266a7

File tree

11 files changed

+44
-26
lines changed

11 files changed

+44
-26
lines changed

‎src/main/java/com/ferreusveritas/dynamictrees/ModBlocks.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
import com.ferreusveritas.dynamictrees.trees.DynamicTree;
1414

1515
import net.minecraft.block.Block;
16+
import net.minecraft.block.BlockDirt;
17+
import net.minecraft.block.state.IBlockState;
18+
import net.minecraft.init.Blocks;
1619
import net.minecraftforge.registries.IForgeRegistry;
1720

1821
public class ModBlocks {
@@ -23,8 +26,12 @@ public class ModBlocks {
2326
public static BlockBonsaiPot blockBonsaiPot;
2427
public static BlockVerboseFire blockVerboseFire;
2528

26-
public static void preInit() {
29+
public static CommonBlockStates blockStates;
2730

31+
public static void preInit() {
32+
33+
blockStates = new CommonBlockStates();
34+
2835
//Dirt
2936
blockRootyDirt = new BlockRootyDirt();
3037

@@ -65,5 +72,19 @@ public static void registerBlocks(IForgeRegistry<Block> registry) {
6572

6673
DynamicTrees.compatProxy.registerBlocks(registry);
6774
}
75+
76+
public static class CommonBlockStates {
77+
public final IBlockState dirt;
78+
public final IBlockState podzol;
79+
public final IBlockState redMushroom;
80+
public final IBlockState brownMushroom;
81+
82+
public CommonBlockStates() {
83+
dirt = Blocks.DIRT.getDefaultState();
84+
podzol = dirt.withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL);
85+
redMushroom = Blocks.RED_MUSHROOM.getDefaultState();
86+
brownMushroom = Blocks.BROWN_MUSHROOM.getDefaultState();
87+
}
88+
}
6889

6990
}

‎src/main/java/com/ferreusveritas/dynamictrees/ModRecipes.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.minecraftforge.fml.common.eventhandler.EventPriority;
1212
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
1313
import net.minecraftforge.fml.common.registry.GameRegistry;
14+
import net.minecraftforge.oredict.OreDictionary;
1415
import net.minecraftforge.registries.IForgeRegistry;
1516

1617
public class ModRecipes {
@@ -26,7 +27,6 @@ public static void registerRecipes(IForgeRegistry<IRecipe> registry) {
2627
IBlockState primitiveSapling = tree.getPrimitiveSapling();
2728

2829
if(primitiveSapling != null) {
29-
//Creates a seed from a vanilla sapling and a wooden bowl
3030
ItemStack saplingStack = new ItemStack(primitiveSapling.getBlock());
3131
saplingStack.setItemDamage(primitiveSapling.getValue(BlockSapling.TYPE).getMetadata());
3232

@@ -53,6 +53,9 @@ public static void registerRecipes(IForgeRegistry<IRecipe> registry) {
5353
Ingredient.fromItem(ModItems.dirtBucket)
5454
}
5555
);
56+
57+
//Register the seed in the ore dictionary as a sapling since we can convert for free anyway.
58+
OreDictionary.registerOre("treeSapling", seedStack);
5659
}
5760

5861
}

‎src/main/java/com/ferreusveritas/dynamictrees/blocks/BlockDynamicLeaves.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ public boolean isLocationSuitableForNewLeaves(World world, DynamicTree tree, Blo
298298
public boolean setBlockToLeaves(World world, DynamicTree tree, BlockPos pos, int hydro) {
299299
hydro = MathHelper.clamp(hydro, 0, 4);
300300
if(hydro != 0) {
301-
world.setBlockState(pos, getDefaultState().withProperty(HYDRO, hydro).withProperty(TREE, tree.getDynamicLeavesSub()), 2);//Removed Notify Neighbors Flag for performance
301+
world.setBlockState(pos, tree.getDynamicLeavesState().withProperty(HYDRO, hydro), 2);//Removed Notify Neighbors Flag for performance
302302
return true;
303303
} else {
304304
removeLeaves(world, pos);
@@ -545,7 +545,7 @@ Species getExactSpecies(IBlockAccess access, BlockPos pos, DynamicTree tree) {
545545

546546
if(access instanceof World) {
547547
World world = (World) access;
548-
ArrayList<BlockPos> branchList = new ArrayList<>();
548+
ArrayList<BlockPos> branchList = new ArrayList<BlockPos>();
549549

550550
//Find all of the branches that are nearby
551551
for(BlockPos dPos: tree.getLeafCluster().getAllNonZero()) {

‎src/main/java/com/ferreusveritas/dynamictrees/blocks/BlockRootyDirt.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.Random;
44

5+
import com.ferreusveritas.dynamictrees.ModBlocks;
56
import com.ferreusveritas.dynamictrees.api.TreeHelper;
67
import com.ferreusveritas.dynamictrees.api.cells.Cells;
78
import com.ferreusveritas.dynamictrees.api.cells.ICell;
@@ -70,11 +71,11 @@ public BlockRootyDirt(String name) {
7071

7172
public static enum EnumMimicType implements IStringSerializable {
7273

73-
DIRT(Blocks.DIRT.getDefaultState(), "dirt"),
74+
DIRT(ModBlocks.blockStates.dirt, "dirt"),
7475
GRASS(Blocks.GRASS.getDefaultState(), "grass"),
75-
PODZOL( Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL) , "podzol"),
76+
PODZOL(ModBlocks.blockStates.podzol, "podzol"),
7677
MYCELIUM(Blocks.MYCELIUM.getDefaultState(), "mycelium"),
77-
COARSEDIRT( Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT) , "coarsedirt"),
78+
COARSEDIRT(Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT) , "coarsedirt"),
7879
SNOWY(Blocks.GRASS.getDefaultState().withProperty(BlockGrass.SNOWY, true), "snowy");
7980

8081
private final IBlockState muse;

‎src/main/java/com/ferreusveritas/dynamictrees/genfeatures/GenFeaturePodzol.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,13 @@
1414
import net.minecraft.block.BlockLeaves;
1515
import net.minecraft.block.BlockMushroom;
1616
import net.minecraft.block.BlockTallGrass;
17-
import net.minecraft.block.state.IBlockState;
1817
import net.minecraft.init.Blocks;
1918
import net.minecraft.util.EnumFacing;
2019
import net.minecraft.util.math.BlockPos;
2120
import net.minecraft.world.EnumSkyBlock;
2221
import net.minecraft.world.World;
2322

2423
public class GenFeaturePodzol implements IGenFeature {
25-
26-
private static final IBlockState podzolState = Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL);
2724

2825
@Override
2926
public void gen(World world, BlockPos treePos, List<BlockPos> endPoints) {
@@ -58,7 +55,7 @@ public void gen(World world, BlockPos treePos, List<BlockPos> endPoints) {
5855
else
5956
if(block == Blocks.DIRT || block == Blocks.GRASS) {//Convert grass or dirt to podzol
6057
if(world.getLightFor(EnumSkyBlock.SKY, offPos.up()) <= darkThreshold) {
61-
world.setBlockState(offPos, podzolState);
58+
world.setBlockState(offPos, ModBlocks.blockStates.podzol);
6259
} else {
6360
spreadPodzol(world, pos);
6461
}
@@ -79,7 +76,7 @@ public static void spreadPodzol(World world, BlockPos pos) {
7976
Podzolish += (testBlock == Blocks.DIRT) && (world.getBlockState(deltaPos).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL) ? 1 : 0;
8077
Podzolish += testBlock == ModBlocks.blockRootyDirt ? 1 : 0;
8178
if(Podzolish >= 3) {
82-
world.setBlockState(pos, podzolState);
79+
world.setBlockState(pos, ModBlocks.blockStates.podzol);
8380
break;
8481
}
8582
}

‎src/main/java/com/ferreusveritas/dynamictrees/inspectors/NodeDestroyer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public boolean returnRun(World world, Block block, BlockPos pos, EnumFacing from
4949

5050
public void killSurroundingLeaves(World world, BlockPos twigPos) {
5151
if (!world.isRemote && !world.restoringBlockSnapshots) { // do not drop items while restoring blockstates, prevents item dupe
52-
ArrayList<ItemStack> dropList = new ArrayList<>();
52+
ArrayList<ItemStack> dropList = new ArrayList<ItemStack>();
5353
DynamicTree tree = species.getTree();
5454
for(BlockPos leavesPos : BlockPos.getAllInBox(twigPos.add(-3, -3, -3), twigPos.add(3, 3, 3))) {
5555
if(tree.isCompatibleGenericLeaves(world, leavesPos)) {

‎src/main/java/com/ferreusveritas/dynamictrees/inspectors/NodeFruitCocoa.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,7 @@ public boolean run(World world, Block block, BlockPos pos, EnumFacing fromDir) {
3737
pos = pos.offset(dir);
3838
if (world.isAirBlock(pos)) {
3939
IBlockState cocoaState = ModBlocks.blockFruitCocoa.getStateForPlacement(world, pos, dir, 0, 0, 0, 0, null);
40-
if(worldGen) {
41-
cocoaState = cocoaState.withProperty(BlockCocoa.AGE, 2);
42-
}
43-
world.setBlockState(pos, cocoaState, 2);
40+
world.setBlockState(pos, cocoaState.withProperty(BlockCocoa.AGE, worldGen ? 2 : 0), 2);
4441
}
4542
} else {
4643
finished = true;

‎src/main/java/com/ferreusveritas/dynamictrees/items/DendroPotion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public void addInformation(ItemStack stack, World world, List<String> tooltip, I
204204
if(tree == null) {
205205
tooltip.add(getPotionType(stack).getLore());
206206
} else {
207-
tooltip.add("Transform a tree into a " + tree.getName().getResourceDomain() + " tree");
207+
tooltip.add("Transform a tree into a " + tree.getName().getResourcePath() + " tree");
208208
}
209209
} else {
210210
tooltip.add(getPotionType(stack).getLore());

‎src/main/java/com/ferreusveritas/dynamictrees/todo.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
┍━━━━━━━━━━━━━┑
104104
│COMPATABILITY│
105105
┕━━━┯━━━━━━━━━┙
106-
│
106+
├[✔]Added OreDictionary for Seeds and treeSapling
107107
├[✔]Quark greener grass compatibility added
108108
╰[✔]Rework block flow so BlockEvent.HarvestDropsEvent works as expected
109109

‎src/main/java/com/ferreusveritas/dynamictrees/trees/TreeDarkOak.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
import java.util.ArrayList;
44
import java.util.Random;
55

6+
import com.ferreusveritas.dynamictrees.ModBlocks;
67
import com.ferreusveritas.dynamictrees.api.TreeHelper;
78
import com.ferreusveritas.dynamictrees.api.cells.Cells;
89
import com.ferreusveritas.dynamictrees.api.cells.ICell;
910
import com.ferreusveritas.dynamictrees.api.network.GrowSignal;
1011
import com.ferreusveritas.dynamictrees.cells.CellDarkOakLeaf;
1112
import com.ferreusveritas.dynamictrees.util.SimpleVoxmap;
1213

13-
import net.minecraft.block.BlockDirt;
1414
import net.minecraft.block.BlockPlanks;
1515
import net.minecraft.init.Biomes;
16-
import net.minecraft.init.Blocks;
1716
import net.minecraft.init.Items;
1817
import net.minecraft.item.ItemStack;
1918
import net.minecraft.util.EnumFacing;
@@ -135,8 +134,8 @@ public ICell getCellForLeaves(int hydro) {
135134
public boolean rot(World world, BlockPos pos, int neighborCount, int radius, Random random) {
136135
if(super.rot(world, pos, neighborCount, radius, random)) {
137136
if(radius > 2 && TreeHelper.isRootyDirt(world, pos.down()) && world.getLightFor(EnumSkyBlock.SKY, pos) < 6) {
138-
world.setBlockState(pos, Blocks.RED_MUSHROOM.getDefaultState());//Change branch to a red mushroom
139-
world.setBlockState(pos.down(), Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL));//Change rooty dirt to Podzol
137+
world.setBlockState(pos, ModBlocks.blockStates.redMushroom);//Change branch to a red mushroom
138+
world.setBlockState(pos.down(), ModBlocks.blockStates.podzol);//Change rooty dirt to Podzol
140139
}
141140
return true;
142141
}

0 commit comments

Comments
 (0)