Skip to content

Commit b53d119

Browse files
ekulxamekulxam
committed
Fix use transforms in 1.21.1
1 parent e16b7c7 commit b53d119

19 files changed

+113
-113
lines changed

‎src/main/java/survivalblock/crossbow_scoping/client/ScopeRenderer.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,70 +5,70 @@
55
import net.fabricmc.api.EnvType;
66
import net.fabricmc.api.Environment;
77
//? if >1.21.1
8-
import net.fabricmc.fabric.api.client.rendering.v1.RenderStateDataKey;
8+
//import net.fabricmc.fabric.api.client.rendering.v1.RenderStateDataKey;
99
import net.minecraft.client.Minecraft;
1010
import net.minecraft.client.multiplayer.ClientLevel;
1111
import net.minecraft.client.renderer.MultiBufferSource;
1212
//? if >1.21.8
13-
import net.minecraft.client.renderer.SubmitNodeCollector;
13+
//import net.minecraft.client.renderer.SubmitNodeCollector;
1414
import net.minecraft.client.renderer.entity.ItemRenderer;
1515
//? if >1.21.1
16-
import net.minecraft.client.renderer.item.ItemStackRenderState;
16+
//import net.minecraft.client.renderer.item.ItemStackRenderState;
1717
//? if >1.21.8
18-
import net.minecraft.world.entity.ItemOwner;
18+
//import net.minecraft.world.entity.ItemOwner;
1919
import net.minecraft.world.item.ItemDisplayContext;
2020
import net.minecraft.world.item.ItemStack;
2121
import survivalblock.crossbow_scoping.common.CrossbowScoping;
2222
import survivalblock.crossbow_scoping.common.init.CrossbowScopingDataComponentTypes;
2323
//? if >1.21.1 && <1.21.9
24-
/*import survivalblock.crossbow_scoping.mixin.crossbow.client.ItemRendererAccessor;*/
24+
//import survivalblock.crossbow_scoping.mixin.crossbow.client.ItemRendererAccessor;
2525

2626
@Environment(EnvType.CLIENT)
2727
public final class ScopeRenderer {
2828

2929
//? if >1.21.1 {
30-
public static final RenderStateDataKey<ItemStack> SCOPE = RenderStateDataKey.create(CrossbowScoping.id("scope")::toString);
30+
/*public static final RenderStateDataKey<ItemStack> SCOPE = RenderStateDataKey.create(CrossbowScoping.id("scope")::toString);
3131
public static final RenderStateDataKey<ItemStack> REVERSE_REFERENCE = RenderStateDataKey.create(CrossbowScoping.id("reverse_reference")::toString);
32-
//?}
32+
*///?}
3333

3434
//? if <1.21.9 && >1.21.1
35-
/*private static final ItemStackRenderState SCOPE_RENDER_STATE = new ItemStackRenderState();*/
35+
//private static final ItemStackRenderState SCOPE_RENDER_STATE = new ItemStackRenderState();
3636

3737
//? if >=1.21.10
38-
public static final RenderStateDataKey<ItemStackRenderState> CROSSBOW_TO_HEAD = RenderStateDataKey.create(CrossbowScoping.id("crossbow_to_head")::toString);
38+
//public static final RenderStateDataKey<ItemStackRenderState> CROSSBOW_TO_HEAD = RenderStateDataKey.create(CrossbowScoping.id("crossbow_to_head")::toString);
3939

4040
private ScopeRenderer() {
4141
}
4242

43-
public static void renderScopeOnCrossbow(ItemStack /*? <=1.21.1 {*/ /*stack *//*?} else {*/ scope /*?}*/, PoseStack matrices, /*? <=1.21.8 {*/ /*MultiBufferSource vertexConsumers *//*?} else {*/ SubmitNodeCollector renderQueue /*?}*/, int light, int overlay, ItemRenderer itemRenderer /*? >1.21.8 {*/, int outlineColor /*?}*/) {
43+
public static void renderScopeOnCrossbow(ItemStack /*? <=1.21.1 {*/ stack /*?} else {*/ /*scope *//*?}*/, PoseStack matrices, /*? <=1.21.8 {*/ MultiBufferSource vertexConsumers /*?} else {*/ /*SubmitNodeCollector renderQueue *//*?}*/, int light, int overlay, ItemRenderer itemRenderer /*? >1.21.8 {*//*, int outlineColor *//*?}*/) {
4444
//? if <=1.21.1 {
45-
/*if (!(CrossbowScoping.isValidCrossbow(stack))) {
45+
if (!(CrossbowScoping.isValidCrossbow(stack))) {
4646
return;
4747
}
4848
ItemStack scope = stack.getOrDefault(CrossbowScopingDataComponentTypes.CROSSBOW_SCOPE, ItemStack.EMPTY);
4949
if (scope == null || scope.isEmpty()) {
5050
return;
5151
}
52-
*///?}
52+
//?}
5353
matrices.pushPose();
5454
matrices.mulPose(Axis.ZP.rotationDegrees(-135));
5555
final ItemDisplayContext displayContext = ItemDisplayContext.THIRD_PERSON_RIGHT_HAND;
5656
ClientLevel world = Minecraft.getInstance().level;
5757
//? if <=1.21.1 {
58-
/*matrices.translate(-0.707, 0.1, 0.6);
58+
matrices.translate(-0.707, 0.1, 0.6);
5959
itemRenderer.renderStatic(scope, displayContext, light, overlay, matrices, vertexConsumers, world, 0);
60-
*///?} else {
61-
matrices.translate(0, 0.1, 0.1);
60+
//?} else {
61+
/*matrices.translate(0, 0.1, 0.1);
6262
//? if >1.21.8
63-
final ItemStackRenderState SCOPE_RENDER_STATE = new ItemStackRenderState();
64-
/*? <=1.21.8 && >1.21.1 {*/ /*((ItemRendererAccessor) itemRenderer).crossbow_scoping$getItemModelManager() *//*?} else {*/ Minecraft.getInstance().getItemModelResolver() /*?}*/
63+
//final ItemStackRenderState SCOPE_RENDER_STATE = new ItemStackRenderState();
64+
/^? <=1.21.8 && >1.21.1 {^/ /^((ItemRendererAccessor) itemRenderer).crossbow_scoping$getItemModelManager() ^//^?} else {^/ Minecraft.getInstance().getItemModelResolver() /^?}^/
6565
.updateForTopItem(SCOPE_RENDER_STATE, scope, displayContext, world, null, 0);
6666
SCOPE_RENDER_STATE.setAnimated();
6767
SCOPE_RENDER_STATE.appendModelIdentityElement("crossbow_scoping:scope");
68-
SCOPE_RENDER_STATE./*? <=1.21.8 {*/ /*render *//*?} else {*/ submit /*?}*/(matrices, /*? <=1.21.8 {*/ /*vertexConsumers *//*?} else {*/ renderQueue /*?}*/, light, overlay /*? >1.21.8 {*/, outlineColor /*?}*/);
68+
SCOPE_RENDER_STATE./^? <=1.21.8 {^/ render /^?} else {^/ /^submit ^//^?}^/(matrices, /^? <=1.21.8 {^/ vertexConsumers /^?} else {^/ /^renderQueue ^//^?}^/, light, overlay /^? >1.21.8 {^//^, outlineColor ^//^?}^/);
6969
//? if <1.21.9
70-
//SCOPE_RENDER_STATE.clear();
71-
//?}
70+
SCOPE_RENDER_STATE.clear();
71+
*///?}
7272
matrices.popPose();
7373
}
7474
}

‎src/main/java/survivalblock/crossbow_scoping/client/networking/ScopedCrossbowC2SPayload.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void receive(ScopedCrossbowC2SPayload payload, ServerPlayNetworking.Conte
6161
InteractionHand hand = payload.leftHand ? InteractionHand.OFF_HAND : InteractionHand.MAIN_HAND;
6262
player.crossbow_scoping$setAttacking(true);
6363
ItemStack stack = player.getItemInHand(hand);
64-
if (stack.isEmpty() || stack.getOrDefault(CrossbowScopingDataComponentTypes.CROSSBOW_SCOPE, ItemStack.EMPTY).isEmpty() || !CrossbowScoping.isLoaded(stack) || player.getCooldowns().isOnCooldown(stack/*? <=1.21.1 {*/ /*.getItem() *//*?}*/)) {
64+
if (stack.isEmpty() || stack.getOrDefault(CrossbowScopingDataComponentTypes.CROSSBOW_SCOPE, ItemStack.EMPTY).isEmpty() || !CrossbowScoping.isLoaded(stack) || player.getCooldowns().isOnCooldown(stack/*? <=1.21.1 {*/ .getItem() /*?}*/)) {
6565
return;
6666
}
6767
stack.use(player.level(), player, hand);

‎src/main/java/survivalblock/crossbow_scoping/common/CrossbowScoping.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static Pair<ItemStack, InteractionHand> getCrossbowWithScope(Player playe
5050
isValidCrossbow(stack)
5151
&& !stack.getOrDefault(CrossbowScopingDataComponentTypes.CROSSBOW_SCOPE, ItemStack.EMPTY).isEmpty()
5252
&& (!checkLoaded || isLoaded(stack))
53-
&& (!checkCooldown || !player.getCooldowns().isOnCooldown(stack/*? <=1.21.1 {*/ /*.getItem() *//*?}*/));
53+
&& (!checkCooldown || !player.getCooldowns().isOnCooldown(stack/*? <=1.21.1 {*/ .getItem() /*?}*/));
5454
ItemStack stack = player.getUseItem();
5555
if (predicate.test(stack)) {
5656
return Pair.of(stack, player.getUsedItemHand());

‎src/main/java/survivalblock/crossbow_scoping/common/datagen/CrossbowScopingTagGenerator.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,38 @@ public CrossbowScopingEntityTypeTagGenerator(FabricDataOutput output, Completabl
2222

2323
@Override
2424
protected void addTags(HolderLookup.Provider wrapperLookup) {
25-
/*? <=1.21.1 {*/ /*getOrCreateTagBuilder *//*?} else {*/ valueLookupBuilder /*?}*/(CrossbowScopingTags.ALLOW_NO_GRAVITY)
25+
/*? <=1.21.1 {*/ getOrCreateTagBuilder /*?} else {*/ /*valueLookupBuilder *//*?}*/(CrossbowScopingTags.ALLOW_NO_GRAVITY)
2626
.add(EntityType.ARROW, EntityType.SPECTRAL_ARROW, EntityType.FIREWORK_ROCKET);
2727
}
2828
}
2929

30-
public static class CrossbowScopingEnchantmentTagGenerator extends FabricTagProvider/*? <=1.21.1 {*/ /*.EnchantmentTagProvider *//*?} else {*/ <Enchantment> /*?}*/ {
30+
public static class CrossbowScopingEnchantmentTagGenerator extends FabricTagProvider/*? <=1.21.1 {*/ .EnchantmentTagProvider /*?} else {*/ /*<Enchantment> *//*?}*/ {
3131

3232
private static final String OMNICROSSBOW = "omnicrossbow";
3333

3434
public CrossbowScopingEnchantmentTagGenerator(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> completableFuture) {
35-
super(output, /*? >1.21.1 {*/ Registries.ENCHANTMENT, /*?}*/ completableFuture);
35+
super(output, /*? >1.21.1 {*/ /*Registries.ENCHANTMENT, *//*?}*/ completableFuture);
3636
}
3737

3838
@Override
3939
protected void addTags(HolderLookup.Provider wrapperLookup) {
40-
/*? <=1.21.1 {*/ /*getOrCreateTagBuilder *//*?} else {*/ getOrCreateRawBuilder /*?}*/(CrossbowScopingTags.USES_EXTENDED_COOLDOWN)
41-
./*? <=1.21.1 {*/ /*addOptional *//*?} else {*/ addOptionalElement /*?}*/(ResourceLocation.fromNamespaceAndPath(OMNICROSSBOW, "multichambered"));
40+
/*? <=1.21.1 {*/ getOrCreateTagBuilder /*?} else {*/ /*getOrCreateRawBuilder *//*?}*/(CrossbowScopingTags.USES_EXTENDED_COOLDOWN)
41+
./*? <=1.21.1 {*/ addOptional /*?} else {*/ /*addOptionalElement *//*?}*/(ResourceLocation.fromNamespaceAndPath(OMNICROSSBOW, "multichambered"));
4242
}
4343
}
4444

45-
public static class CrossbowScopingItemTagGenerator extends FabricTagProvider/*? <=1.21.1 {*/ /*.ItemTagProvider *//*?} else {*/ <Item> /*?}*/ {
45+
public static class CrossbowScopingItemTagGenerator extends FabricTagProvider/*? <=1.21.1 {*/ .ItemTagProvider /*?} else {*/ /*<Item> *//*?}*/ {
4646

4747
private static final String PIERCED = "pierced";
4848

4949
public CrossbowScopingItemTagGenerator(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> completableFuture) {
50-
super(output, /*? >1.21.1 {*/ Registries.ITEM, /*?}*/ completableFuture);
50+
super(output, /*? >1.21.1 {*/ /*Registries.ITEM, *//*?}*/ completableFuture);
5151
}
5252

5353
@Override
5454
protected void addTags(HolderLookup.Provider wrapperLookup) {
55-
/*? <=1.21.1 {*/ /*getOrCreateTagBuilder *//*?} else {*/ getOrCreateRawBuilder /*?}*/(CrossbowScopingTags.INCOMPATIBLE_ITEMS)
56-
./*? <=1.21.1 {*/ /*addOptional *//*?} else {*/ addOptionalElement /*?}*/(ResourceLocation.fromNamespaceAndPath(PIERCED, "long_crossbow"));
55+
/*? <=1.21.1 {*/ getOrCreateTagBuilder /*?} else {*/ /*getOrCreateRawBuilder *//*?}*/(CrossbowScopingTags.INCOMPATIBLE_ITEMS)
56+
./*? <=1.21.1 {*/ addOptional /*?} else {*/ /*addOptionalElement *//*?}*/(ResourceLocation.fromNamespaceAndPath(PIERCED, "long_crossbow"));
5757
}
5858
}
5959
}

‎src/main/java/survivalblock/crossbow_scoping/mixin/compat/sodium/client/ItemRendererMixinMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//? if <=1.21.1 {
2-
/*package survivalblock.crossbow_scoping.mixin.compat.sodium.client;
2+
package survivalblock.crossbow_scoping.mixin.compat.sodium.client;
33

44
import com.bawnorton.mixinsquared.TargetHandler;
55
import com.mojang.blaze3d.vertex.PoseStack;
@@ -25,4 +25,4 @@ private void sodiumBrokeMyMod(ItemStack stack, ItemDisplayContext renderMode, bo
2525
ScopeRenderer.renderScopeOnCrossbow(stack, matrices, vertexConsumers, light, overlay, (ItemRenderer) (Object) this);
2626
}
2727
}
28-
*///?}
28+
//?}

‎src/main/java/survivalblock/crossbow_scoping/mixin/crossbow/CrossbowItemMixin.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import net.minecraft.world.InteractionHand;
88
import net.minecraft.world.InteractionResult;
99
//? <=1.21.1
10-
//import net.minecraft.world.InteractionResultHolder;
10+
import net.minecraft.world.InteractionResultHolder;
1111
import net.minecraft.world.entity.LivingEntity;
1212
import net.minecraft.world.entity.SlotAccess;
1313
import net.minecraft.world.entity.player.Player;
@@ -19,7 +19,7 @@
1919
import net.minecraft.world.item.SpyglassItem;
2020
import net.minecraft.world.item.TooltipFlag;
2121
//? if >1.21.1
22-
import net.minecraft.world.item.component.TooltipDisplay;
22+
//import net.minecraft.world.item.component.TooltipDisplay;
2323
import net.minecraft.world.item.enchantment.EnchantmentHelper;
2424
import net.minecraft.world.level.Level;
2525
import net.minecraft.world.level.block.state.BlockState;
@@ -60,13 +60,13 @@ protected void insertOrExtractSpyglass(ItemStack stack, ItemStack otherStack, Sl
6060

6161
@Override
6262
//? if <=1.21.1 {
63-
/*protected void preventMining(BlockState state, Level world, BlockPos pos, Player miner, CallbackInfoReturnable<Boolean> cir) {
64-
*///?} else {
65-
protected void preventMining(ItemStack tool, BlockState state, Level level, BlockPos pos, LivingEntity living, CallbackInfoReturnable<Boolean> cir) {
63+
protected void preventMining(BlockState state, Level world, BlockPos pos, Player miner, CallbackInfoReturnable<Boolean> cir) {
64+
//?} else {
65+
/*protected void preventMining(ItemStack tool, BlockState state, Level level, BlockPos pos, LivingEntity living, CallbackInfoReturnable<Boolean> cir) {
6666
if (!(living instanceof Player miner)) {
6767
return;
6868
}
69-
//?}
69+
*///?}
7070
miner.crossbow_scoping$setAttacking(true);
7171
ItemStack stack = CrossbowScoping.getCrossbowWithScope(miner).getFirst();
7272
miner.crossbow_scoping$setAttacking(false);
@@ -77,7 +77,7 @@ protected void preventMining(ItemStack tool, BlockState state, Level level, Bloc
7777
}
7878

7979
@Inject(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/CrossbowItem;performShooting(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;FFLnet/minecraft/world/entity/LivingEntity;)V", shift = At.Shift.BEFORE), cancellable = true)
80-
private void scopeInsteadOfShooting(Level world, Player user, InteractionHand hand, CallbackInfoReturnable</*? <=1.21.1 {*/ /*InteractionResultHolder<ItemStack> *//*?} else {*/ InteractionResult /*?}*/> cir, @Local ItemStack stack) {
80+
private void scopeInsteadOfShooting(Level world, Player user, InteractionHand hand, CallbackInfoReturnable</*? <=1.21.1 {*/ InteractionResultHolder<ItemStack> /*?} else {*/ /*InteractionResult *//*?}*/> cir, @Local ItemStack stack) {
8181
if (stack.has(LOADING_PHASE)) {
8282
stack.remove(LOADING_PHASE);
8383
}
@@ -87,31 +87,31 @@ private void scopeInsteadOfShooting(Level world, Player user, InteractionHand ha
8787
user.releaseUsingItem();
8888
}
8989
if (EnchantmentHelper.hasTag(stack, CrossbowScopingTags.USES_EXTENDED_COOLDOWN)) {
90-
user.getCooldowns().addCooldown(stack/*? <=1.21.1 {*/ /*.getItem() *//*?}*/, 11);
90+
user.getCooldowns().addCooldown(stack/*? <=1.21.1 {*/ .getItem() /*?}*/, 11);
9191
} else {
92-
user.getCooldowns().addCooldown(stack/*? <=1.21.1 {*/ /*.getItem() *//*?}*/, 5);
92+
user.getCooldowns().addCooldown(stack/*? <=1.21.1 {*/ .getItem() /*?}*/, 5);
9393
}
9494
return;
9595
}
9696
ItemStack stackInComponents = stack.getOrDefault(CROSSBOW_SCOPE, ItemStack.EMPTY);
9797
if (!stackInComponents.isEmpty() && stackInComponents.getItem() instanceof SpyglassItem) {
98-
if (user.getCooldowns().isOnCooldown(stack/*? <=1.21.1 {*/ /*.getItem() *//*?}*/)) {
99-
cir.setReturnValue(/*? <=1.21.1 {*/ /*InteractionResultHolder.pass(stack) *//*?} else {*/ InteractionResult.PASS /*?}*/);
98+
if (user.getCooldowns().isOnCooldown(stack/*? <=1.21.1 {*/ .getItem() /*?}*/)) {
99+
cir.setReturnValue(/*? <=1.21.1 {*/ InteractionResultHolder.pass(stack) /*?} else {*/ /*InteractionResult.PASS *//*?}*/);
100100
return;
101101
}
102102
user.crossbow_scoping$setStartingToScope(stackInComponents);
103-
/*? <=1.21.1 {*/ /*InteractionResultHolder<ItemStack> *//*?} else {*/ InteractionResult /*?}*/ result = stackInComponents.use(world, user, hand);
103+
/*? <=1.21.1 {*/ InteractionResultHolder<ItemStack> /*?} else {*/ /*InteractionResult *//*?}*/ result = stackInComponents.use(world, user, hand);
104104
user.crossbow_scoping$setStartingToScope(ItemStack.EMPTY);
105105
ItemStack value;
106106
//? if <=1.21.1 {
107-
/*value = result.getObject();
108-
*///?} else {
109-
if (result instanceof InteractionResult.Success success) {
107+
value = result.getObject();
108+
//?} else {
109+
/*if (result instanceof InteractionResult.Success success) {
110110
value = Objects.requireNonNullElse(success.heldItemTransformedTo(), stackInComponents);
111111
} else {
112112
value = stackInComponents;
113113
}
114-
//?}
114+
*///?}
115115
if (!ItemStack.matches(stackInComponents, value)) {
116116
if (value.isEmpty()) {
117117
stack.remove(CROSSBOW_SCOPE);
@@ -120,29 +120,29 @@ private void scopeInsteadOfShooting(Level world, Player user, InteractionHand ha
120120
}
121121
}
122122
//? if <=1.21.1 {
123-
/*//noinspection unchecked
123+
//noinspection unchecked
124124
((TypedActionResultAccessor<ItemStack>) result).crossbow_scoping$setValue(stack);
125-
*///?}
125+
//?}
126126
cir.setReturnValue(result);
127127
}
128128
}
129129

130130
@Inject(method = "use", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/player/Player;startUsingItem(Lnet/minecraft/world/InteractionHand;)V"))
131-
private void setWasLoading(Level world, Player user, InteractionHand hand, CallbackInfoReturnable</*? <=1.21.1 {*/ /*InteractionResultHolder<ItemStack> *//*?} else {*/ InteractionResult /*?}*/> cir, @Local ItemStack stack) {
131+
private void setWasLoading(Level world, Player user, InteractionHand hand, CallbackInfoReturnable</*? <=1.21.1 {*/ InteractionResultHolder<ItemStack> /*?} else {*/ /*InteractionResult *//*?}*/> cir, @Local ItemStack stack) {
132132
stack.set(LOADING_PHASE, Unit.INSTANCE);
133133
}
134134

135135
//? if <=1.21.1 {
136-
/*@Inject(method = "appendHoverText", at = @At("HEAD"))
136+
@Inject(method = "appendHoverText", at = @At("HEAD"))
137137
private void appendScopeInTooltip(ItemStack stack, Item.TooltipContext context, List<Component> tooltip, TooltipFlag type, CallbackInfo ci) {
138-
*///?} else {
139-
@Override
138+
//?} else {
139+
/*@Override
140140
protected void appendScopeInTooltip(ItemStack stack, Item.TooltipContext context, TooltipDisplay tooltipDisplay, Consumer<Component> tooltipAdder, TooltipFlag flag, CallbackInfo ci) {
141-
//?}
141+
*///?}
142142
ItemStack stackInComponents = stack.getOrDefault(CROSSBOW_SCOPE, ItemStack.EMPTY);
143143
if (!stackInComponents.isEmpty()) {
144144
Component text = stackInComponents.getHoverName();
145-
/*? <=1.21.1 {*/ /*tooltip.add *//*?} else {*/ tooltipAdder.accept /*?}*/(Component.translatable("item.crossbow_scoping.crossbow.scope", text).setStyle(text.getStyle()));
145+
/*? <=1.21.1 {*/ tooltip.add /*?} else {*/ /*tooltipAdder.accept *//*?}*/(Component.translatable("item.crossbow_scoping.crossbow.scope", text).setStyle(text.getStyle()));
146146
}
147147
}
148148
}

‎src/main/java/survivalblock/crossbow_scoping/mixin/crossbow/ItemMixin.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.minecraft.world.item.ItemStack;
1212
import net.minecraft.world.item.TooltipFlag;
1313
//? if >1.21.1
14-
import net.minecraft.world.item.component.TooltipDisplay;
14+
//import net.minecraft.world.item.component.TooltipDisplay;
1515
import net.minecraft.world.level.Level;
1616
import net.minecraft.world.level.block.state.BlockState;
1717
import org.spongepowered.asm.mixin.Mixin;
@@ -32,18 +32,18 @@ protected void insertOrExtractSpyglass(ItemStack stack, ItemStack otherStack, Sl
3232
}
3333

3434
//? if <=1.21.1 {
35-
/*@Inject(method = "canAttackBlock", at = @At("HEAD"), cancellable = true)
35+
@Inject(method = "canAttackBlock", at = @At("HEAD"), cancellable = true)
3636
protected void preventMining(BlockState state, Level world, BlockPos pos, Player miner, CallbackInfoReturnable<Boolean> cir) {
3737

3838
}
39-
*///?} else {
40-
@Inject(method = "canDestroyBlock", at = @At("HEAD"), cancellable = true)
39+
//?} else {
40+
/*@Inject(method = "canDestroyBlock", at = @At("HEAD"), cancellable = true)
4141
protected void preventMining(ItemStack stack, BlockState state, Level level, BlockPos pos, LivingEntity entity, CallbackInfoReturnable<Boolean> cir) {
4242
4343
}
4444
4545
@Inject(method = "appendHoverText", at = @At("HEAD"))
4646
protected void appendScopeInTooltip(ItemStack stack, Item.TooltipContext context, TooltipDisplay tooltipDisplay, Consumer<Component> tooltipAdder, TooltipFlag flag, CallbackInfo ci) {
4747
}
48-
//?}
48+
*///?}
4949
}

0 commit comments

Comments
 (0)