-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove redundant locateany, fix leaves suffocating, fix certain leave…
…s not have hoe as a tool, added andisol grass path item, fix sheep not eating andisol grass, fix trees growing on sand setting dirt below, give small oak logs the oak logs tag for recipes and stuff, fix lang for potted yucca palm sapling #change "Leaves no longer suffocate entities" #change "Fixed certain leaves not easily broken by a hoe" #change "Fixed Andisol Grass Path not having an item" #change "Fixed Andisol Grass Blocks not being eaten by sheep" #change "Fixed sandy trees having dirt below them" #change "Fixed Andisol Grass Blocks spreading improperly" #change "Fixed small oak logs not having oak log recipes" #change "Fixed localization for Potted Yucca Palm Saplings" (#173)
- Loading branch information
1 parent
91a13fe
commit 5a26b64
Showing
14 changed files
with
98 additions
and
100 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 0 additions & 50 deletions
50
src/main/java/com/terraformersmc/terrestria/command/LocateAny.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
src/main/java/com/terraformersmc/terrestria/mixin/MixinTrunkPlacer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package com.terraformersmc.terrestria.mixin; | ||
|
|
||
| import com.terraformersmc.terrestria.init.TerrestriaBlocks; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.Blocks; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.world.ModifiableTestableWorld; | ||
| import net.minecraft.world.gen.feature.TreeFeature; | ||
| import net.minecraft.world.gen.trunk.TrunkPlacer; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| @Mixin(TrunkPlacer.class) | ||
| public class MixinTrunkPlacer { | ||
| @Inject(method = "method_27400", at = @At("HEAD"), cancellable = true) | ||
| private static void notAlwaysDirt(ModifiableTestableWorld world, BlockPos pos, CallbackInfo ci) { | ||
| if (world.testBlockState(pos, (blockState) -> { | ||
| Block block = blockState.getBlock(); | ||
| return block == Blocks.SAND || block == Blocks.RED_SAND || block == TerrestriaBlocks.BLACK_SAND; | ||
| })) { | ||
| ci.cancel(); | ||
| } else if (world.testBlockState(pos, (blockState) -> { | ||
| Block block = blockState.getBlock(); | ||
| return block == TerrestriaBlocks.ANDISOL || block == TerrestriaBlocks.ANDISOL_GRASS_BLOCK || block == TerrestriaBlocks.ANDISOL_PODZOL; | ||
| })) { | ||
| TreeFeature.setBlockStateWithoutUpdatingNeighbors(world, pos, TerrestriaBlocks.ANDISOL.getDefaultState()); | ||
| ci.cancel(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
10 changes: 10 additions & 0 deletions
10
src/main/resources/data/minecraft/tags/blocks/oak_logs.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:oak_log", | ||
| "minecraft:oak_wood", | ||
| "minecraft:stripped_oak_log", | ||
| "minecraft:stripped_oak_wood", | ||
| "#terrestria:small_oak_logs" | ||
| ] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/main/resources/data/minecraft/tags/items/oak_logs.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "minecraft:oak_log", | ||
| "minecraft:oak_wood", | ||
| "minecraft:stripped_oak_log", | ||
| "minecraft:stripped_oak_wood", | ||
| "#terrestria:small_oak_logs" | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters