Skip to content

Commit e306c71

Browse files
MichaelHillcoxMichaelHillcox
committed
feat: port to 21.11
1 parent 0bb5ed2 commit e306c71

File tree

6 files changed

+23
-26
lines changed

6 files changed

+23
-26
lines changed

‎common/src/main/java/pro/mikey/justhammers/HammerItem.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,26 @@
11
package pro.mikey.justhammers;
22

33
import net.minecraft.ChatFormatting;
4-
import net.minecraft.client.player.LocalPlayer;
54
import net.minecraft.core.BlockPos;
65
import net.minecraft.core.Direction;
76
import net.minecraft.core.component.DataComponents;
87
import net.minecraft.network.chat.Component;
98
import net.minecraft.server.level.ServerLevel;
109
import net.minecraft.server.level.ServerPlayer;
1110
import net.minecraft.stats.Stats;
12-
import net.minecraft.tags.BlockTags;
13-
import net.minecraft.world.InteractionHand;
1411
import net.minecraft.world.entity.EquipmentSlot;
1512
import net.minecraft.world.entity.ExperienceOrb;
1613
import net.minecraft.world.entity.LivingEntity;
1714
import net.minecraft.world.entity.item.ItemEntity;
1815
import net.minecraft.world.entity.player.Player;
1916
import net.minecraft.world.item.*;
2017
import net.minecraft.world.item.component.TooltipDisplay;
21-
import net.minecraft.world.level.GameRules;
2218
import net.minecraft.world.level.Level;
2319
import net.minecraft.world.level.block.Block;
2420
import net.minecraft.world.level.block.Blocks;
2521
import net.minecraft.world.level.block.state.BlockState;
2622
import net.minecraft.world.level.gameevent.GameEvent;
23+
import net.minecraft.world.level.gamerules.GameRules;
2724
import net.minecraft.world.level.levelgen.structure.BoundingBox;
2825
import net.minecraft.world.phys.BlockHitResult;
2926
import net.minecraft.world.phys.HitResult;
@@ -222,7 +219,7 @@ public void findAndBreakNearBlocks(BlockHitResult pick, BlockPos blockPos, ItemS
222219
.forEach(e -> Block.popResourceFromFace(level, pos, pick.getDirection(), e));
223220
}
224221

225-
if (xp != -1 && ((ServerLevel) level).getGameRules().getBoolean(GameRules.RULE_DOBLOCKDROPS)) {
222+
if (xp != -1 && ((ServerLevel) level).getGameRules().get(GameRules.BLOCK_DROPS)) {
226223
ExperienceOrb.award((ServerLevel) level, Vec3.atCenterOf(blockPos), xp);
227224
}
228225
}

‎common/src/main/java/pro/mikey/justhammers/HammerTags.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package pro.mikey.justhammers;
22

33
import net.minecraft.core.registries.Registries;
4-
import net.minecraft.resources.ResourceLocation;
4+
import net.minecraft.resources.Identifier;
55
import net.minecraft.tags.TagKey;
66
import net.minecraft.world.item.Item;
77
import net.minecraft.world.level.block.Block;
88

99
public interface HammerTags {
10-
TagKey<Block> HAMMER_NO_SMASHY = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(Hammers.MOD_ID, "hammer_no_smashy"));
11-
TagKey<Item> HAMMERS = TagKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(Hammers.MOD_ID, "hammer"));
10+
TagKey<Block> HAMMER_NO_SMASHY = TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath(Hammers.MOD_ID, "hammer_no_smashy"));
11+
TagKey<Item> HAMMERS = TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(Hammers.MOD_ID, "hammer"));
1212
}

‎common/src/main/java/pro/mikey/justhammers/Hammers.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package pro.mikey.justhammers;
22

3-
import net.minecraft.resources.ResourceLocation;
3+
import net.minecraft.resources.Identifier;
44
import pro.mikey.justhammers.config.SimpleJsonConfig;
5-
import pro.mikey.justhammers.recipe.HammerRecipes;
65
import pro.mikey.justhammers.utils.XPlatShim;
76

87
import java.util.ServiceLoader;
@@ -17,7 +16,7 @@ public static void init() {
1716
HammerItems.init();
1817
}
1918

20-
public static ResourceLocation id(String name) {
21-
return ResourceLocation.fromNamespaceAndPath(MOD_ID, name);
19+
public static Identifier id(String name) {
20+
return Identifier.fromNamespaceAndPath(MOD_ID, name);
2221
}
2322
}

‎common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import net.minecraft.client.Minecraft;
77
import net.minecraft.client.multiplayer.ClientLevel;
88
import net.minecraft.client.renderer.*;
9+
import net.minecraft.client.renderer.rendertype.RenderTypes;
910
import net.minecraft.core.BlockPos;
1011
import net.minecraft.core.component.DataComponents;
1112
import net.minecraft.world.level.block.state.BlockState;
@@ -82,7 +83,7 @@ public static void render(ClientLevel world, Camera camera, PoseStack poseStack,
8283

8384
// Transform the pose stack to the camera's position
8485
poseStack.pushPose();
85-
poseStack.translate(-camera.getPosition().x(), -camera.getPosition().y(), -camera.getPosition().z());
86+
poseStack.translate(-camera.position().x(), -camera.position().y(), -camera.position().z());
8687

8788
// Render the outline
8889
Iterator<BlockPos> blockPosStream = BlockPos.betweenClosedStream(boundingBox).iterator();
@@ -105,7 +106,7 @@ public static void render(ClientLevel world, Camera camera, PoseStack poseStack,
105106
// Shift the pose stack to the block's position
106107
poseStack.translate(pos.getX(), pos.getY(), pos.getZ());
107108

108-
ShapeRenderer.renderShape(poseStack, consumers.getBuffer(RenderType.lines()), renderShape, 0, 0, 0, 0x59000000);
109+
ShapeRenderer.renderShape(poseStack, consumers.getBuffer(RenderTypes.lines()), renderShape, 0, 0, 0, 0xFF000000, 4f);
109110
poseStack.popPose();
110111
}
111112

‎common/src/main/java/pro/mikey/justhammers/utils/DeferredResource.java‎

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

33
import net.minecraft.core.Registry;
44
import net.minecraft.resources.ResourceKey;
5-
import net.minecraft.resources.ResourceLocation;
5+
import net.minecraft.resources.Identifier;
66
import pro.mikey.justhammers.Hammers;
77

88
import java.util.Objects;
99
import java.util.function.Supplier;
1010

1111
public final class DeferredResource<R, T extends R> implements Supplier<T> {
12-
private final ResourceLocation location;
12+
private final Identifier location;
1313
private final Supplier<T> creator;
1414

1515
private T instance;
1616

17-
public DeferredResource(ResourceLocation location, Supplier<T> creator) {
17+
public DeferredResource(Identifier location, Supplier<T> creator) {
1818
this.location = location;
1919
this.creator = creator;
2020
}
@@ -23,7 +23,7 @@ public DeferredResource(String location, Supplier<T> creator) {
2323
this(Hammers.id(location), creator);
2424
}
2525

26-
public ResourceLocation location() {
26+
public Identifier location() {
2727
return location;
2828
}
2929

‎gradle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ org.gradle.jvmargs=-Xmx2048M
22

33
mod_id=justhammers
44

5-
minecraft_version=1.21.10
6-
minecraft_version_range=[%base%,1.21.11)
5+
minecraft_version=1.21.11
6+
minecraft_version_range=[%base%,1.21.12)
77

88
archives_base_name=just-hammers
9-
mod_version=21.10.0
9+
mod_version=21.11.0
1010

11-
fabric_loader_version=0.17.3
12-
fabric_api_version=0.138.3+1.21.10
11+
fabric_loader_version=0.18.4
12+
fabric_api_version=0.140.2+1.21.11
1313

14-
neoforge_version=21.10.52-beta
15-
neoforge_version_range=[21.10.0,22.0)
14+
neoforge_version=21.11.12-beta
15+
neoforge_version_range=[21.11.0-beta,22.0.0)
1616

1717
# Publishing
1818
modrinth_id=edU0NbZZ
1919
curseforge_id=681606
2020
github_repo=nanite/justhammers
2121

22-
jei_version=19.25.0.323
22+
jei_version=27.3.0.14

0 commit comments

Comments
 (0)