-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix gourd growth onto TerraformFarmlandBlock. Resolves #22
- Allow gourds to grow onto our Farmland blocks - Refactor Farmland mixins a bit more to be consistent
- Loading branch information
1 parent
5069ce0
commit a7d4e81
Showing
5 changed files
with
62 additions
and
53 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
10 changes: 3 additions & 7 deletions
10
...api-v1/src/main/java/com/terraformersmc/terraform/dirt/mixin/MixinPlantingOnFarmland.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
43 changes: 12 additions & 31 deletions
43
...-dirt-api-v1/src/main/java/com/terraformersmc/terraform/dirt/mixin/MixinRabbitEntity.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 |
|---|---|---|
| @@ -1,43 +1,24 @@ | ||
| package com.terraformersmc.terraform.dirt.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.wrapoperation.Operation; | ||
| import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; | ||
| import com.terraformersmc.terraform.dirt.TerraformDirtBlockTags; | ||
| import net.minecraft.block.*; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; | ||
| import org.spongepowered.asm.mixin.injection.callback.LocalCapture; | ||
|
|
||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.BlockState; | ||
| import net.minecraft.block.CarrotsBlock; | ||
| import net.minecraft.block.FarmlandBlock; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.world.WorldView; | ||
|
|
||
| @Mixin(targets = "net.minecraft.entity.passive.RabbitEntity$EatCarrotCropGoal") | ||
| public class MixinRabbitEntity { | ||
| @Shadow | ||
| private boolean wantsCarrots; | ||
|
|
||
| @Shadow | ||
| private boolean hasTarget; | ||
|
|
||
| @Inject(method = "isTargetPos", | ||
| at = @At(value = "FIELD", target = "Lnet/minecraft/block/Blocks;FARMLAND:Lnet/minecraft/block/Block;"), | ||
| cancellable = true, | ||
| locals = LocalCapture.CAPTURE_FAILHARD | ||
| @WrapOperation( | ||
| method = "isTargetPos", | ||
| at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z") | ||
| ) | ||
| private void terraformDirt$onIsTargetBlock(WorldView world, BlockPos pos, CallbackInfoReturnable<Boolean> cir, BlockState state) { | ||
| Block block = state.getBlock(); | ||
| if (block instanceof FarmlandBlock && state.isIn(TerraformDirtBlockTags.FARMLAND) && this.wantsCarrots && !this.hasTarget) { | ||
| state = world.getBlockState(pos.up()); | ||
| block = state.getBlock(); | ||
|
|
||
| if (block instanceof CarrotsBlock && ((CarrotsBlock) block).isMature(state)) { | ||
| this.hasTarget = true; | ||
| cir.setReturnValue(true); | ||
| } | ||
| @SuppressWarnings("unused") | ||
| private boolean terraformDirt$isOnFarmland(BlockState instance, Block block, Operation<Boolean> operation) { | ||
| if (Blocks.FARMLAND.equals(block) && instance.isIn(TerraformDirtBlockTags.FARMLAND)) { | ||
| return true; | ||
| } | ||
|
|
||
| return operation.call(instance, block); | ||
| } | ||
| } |
27 changes: 27 additions & 0 deletions
27
...orm-dirt-api-v1/src/main/java/com/terraformersmc/terraform/dirt/mixin/MixinStemBlock.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,27 @@ | ||
| package com.terraformersmc.terraform.dirt.mixin; | ||
|
|
||
| import com.llamalad7.mixinextras.injector.wrapoperation.Operation; | ||
| import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; | ||
| import com.terraformersmc.terraform.dirt.TerraformDirtBlockTags; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.BlockState; | ||
| import net.minecraft.block.Blocks; | ||
| import net.minecraft.block.StemBlock; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
|
|
||
| @Mixin(StemBlock.class) | ||
| public class MixinStemBlock { | ||
| @WrapOperation( | ||
| method = "randomTick", | ||
| at = @At(value = "INVOKE", target = "Lnet/minecraft/block/BlockState;isOf(Lnet/minecraft/block/Block;)Z") | ||
| ) | ||
| @SuppressWarnings("unused") | ||
| private boolean terraformDirt$isOnFarmland(BlockState instance, Block block, Operation<Boolean> operation) { | ||
| if (Blocks.FARMLAND.equals(block) && instance.isIn(TerraformDirtBlockTags.FARMLAND)) { | ||
| return true; | ||
| } | ||
|
|
||
| return operation.call(instance, block); | ||
| } | ||
| } |
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