MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactored Tag Constants (Pt II)

Browse source
This commit is contained in:
Frank 2022-01-23 21:35:48 +01:00
parent fffbc6acc2
commit 14fcb93e3b
28 changed files with 151 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ru/bclib/mixin/common/CraftingMenuMixin.java
View file

@ -11,7 +11,7 @@ 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 ru.bclib.api.TagAPI;
import ru.bclib.api.tag.CommonBlockTags;
@Mixin(CraftingMenu.class)
public abstract class CraftingMenuMixin {
@ -23,7 +23,7 @@ public abstract class CraftingMenuMixin {
private void bclib_stillValid(Player player, CallbackInfoReturnable<Boolean> info) {
if (access.evaluate((world, pos) -> {
BlockState state = world.getBlockState(pos);
return state.getBlock() instanceof CraftingTableBlock || state.is(TagAPI.COMMON_BLOCK_WORKBENCHES);
return state.getBlock() instanceof CraftingTableBlock || state.is(CommonBlockTags.WORKBENCHES);
}, true)) {
info.setReturnValue(true);
}

4
src/main/java/ru/bclib/mixin/common/EnchantmentMenuMixin.java
View file

@ -9,7 +9,7 @@ import net.minecraft.world.level.block.state.BlockState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import ru.bclib.api.TagAPI;
import ru.bclib.api.tag.CommonBlockTags;
@Mixin(EnchantmentMenu.class)
public abstract class EnchantmentMenuMixin extends AbstractContainerMenu {
@ -22,6 +22,6 @@ public abstract class EnchantmentMenuMixin extends AbstractContainerMenu {
target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z")//,
)
private boolean bclib_isBookshelf(BlockState state, Block block) {
return block == Blocks.BOOKSHELF ? state.is(TagAPI.COMMON_BLOCK_BOOKSHELVES) : state.is(block);
return block == Blocks.BOOKSHELF ? state.is(CommonBlockTags.BOOKSHELVES) : state.is(block);
}
}

4
src/main/java/ru/bclib/mixin/common/PistonBaseBlockMixin.java
View file

@ -9,13 +9,13 @@ 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.CallbackInfoReturnable;
import ru.bclib.api.TagAPI;
import ru.bclib.api.tag.CommonBlockTags;
@Mixin(PistonBaseBlock.class)
public class PistonBaseBlockMixin {
@Inject(method="isPushable", at=@At("HEAD"), cancellable = true)
private static void bclib_isPushable(BlockState blockState, Level level, BlockPos blockPos, Direction direction, boolean bl, Direction direction2, CallbackInfoReturnable<Boolean> cir){
if (blockState.is(TagAPI.COMMON_BLOCK_IMMOBILE)){
if (blockState.is(CommonBlockTags.IMMOBILE)){
cir.setReturnValue(false);
cir.cancel();
}

4
src/main/java/ru/bclib/mixin/common/PortalShapeMixin.java
View file

@ -8,7 +8,7 @@ import net.minecraft.world.level.portal.PortalShape;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
import ru.bclib.api.TagAPI;
import ru.bclib.api.tag.CommonBlockTags;
@Mixin(PortalShape.class)
public class PortalShapeMixin {
@ -28,6 +28,6 @@ public class PortalShapeMixin {
}
private static boolean be_FRAME(StatePredicate FRAME, BlockState state, BlockGetter getter, BlockPos pos){
return state.is(TagAPI.COMMON_BLOCK_NETHER_PORTAL_FRAME) || FRAME.test(state, getter, pos);
return state.is(CommonBlockTags.NETHER_PORTAL_FRAME) || FRAME.test(state, getter, pos);
}
}

2
src/main/java/ru/bclib/mixin/common/TagLoaderMixin.java
View file

@ -7,7 +7,7 @@ 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.ModifyArg;
import ru.bclib.api.TagAPI;
import ru.bclib.api.tag.TagAPI;
import java.util.Map;

4
src/main/java/ru/bclib/mixin/common/shears/ItemPredicateBuilderMixin.java
View file

@ -12,7 +12,7 @@ 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 ru.bclib.api.TagAPI;
import ru.bclib.api.tag.CommonItemTags;
import java.util.Set;
@ -24,7 +24,7 @@ public abstract class ItemPredicateBuilderMixin {
@Inject(method = "matches", at = @At("HEAD"), cancellable = true)
void bclib_of(ItemStack itemStack, CallbackInfoReturnable<Boolean> cir) {
if (this.items != null && this.items.size() == 1 && this.items.contains(Items.SHEARS)) {
if (itemStack.is(TagAPI.COMMON_ITEM_SHEARS) || itemStack.is(FabricToolTags.SHEARS)){
if (itemStack.is(CommonItemTags.SHEARS) || itemStack.is(FabricToolTags.SHEARS)){
cir.setReturnValue(true);
}
}