Skip to content

Commit 353d526

Browse files
committed
1.19.1
1 parent dcd07e8 commit 353d526

File tree

4 files changed

+26
-21
lines changed

4 files changed

+26
-21
lines changed

build.gradle

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ import com.modrinth.minotaur.TaskModrinthUpload
33
plugins {
44
id 'fabric-loom' version '0.12-SNAPSHOT'
55
id 'maven-publish'
6+
7+
// Quilt Mappings, for parameters and javadoc. Also hashed mojmap.
8+
id "org.quiltmc.quilt-mappings-on-loom" version "4.2.0"
9+
610
id "com.matthewprenger.cursegradle" version "1.4.0"
711
id "com.modrinth.minotaur" version "1.1.0"
812
}
@@ -28,8 +32,14 @@ repositories {
2832
dependencies {
2933
// To change the versions see the gradle.properties file
3034
minecraft "com.mojang:minecraft:${project.minecraft_version}"
31-
mappings loom.officialMojangMappings()
3235
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
36+
mappings loom.layered {
37+
it.addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:${rootProject.minecraft_version}+build.${rootProject.quilt_mappings}:v2"))
38+
// https://lambdaurora.dev/tools/import_quilt.html
39+
it.officialMojangMappings {
40+
setNameSyntheticMembers(false)
41+
}
42+
}
3343

3444
// Fabric API. This is technically optional, but you probably want it anyway.
3545
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

gradle.properties

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
# Done to increase the memory available to gradle.
22
org.gradle.jvmargs=-Xmx1G
33
# Fabric Properties
4-
minecraft_version=1.19
5-
yarn_mappings=1.19+build.1
6-
loader_version=0.14.6
4+
minecraft_version=1.19.1
5+
yarn_mappings=1.19.1+build.1
6+
loader_version=0.14.8
77
#Fabric api
8-
fabric_version=0.55.2+1.19
8+
fabric_version=0.58.5+1.19.1
9+
quilt_mappings=1
910
# Mod Properties
10-
mod_version=1.1.0
11+
mod_version=1.2.0
1112
maven_group=org.samo_lego
1213
archives_base_name=healthcare
13-
# Config editing lib
14-
c2b_version=1.1.4
15-
translations_version=1.4.14+1.19-rc2
14+
# Dependencies
15+
c2b_version=1.2.1
16+
translations_version=1.4.16+1.19

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ pluginManagement {
44
name = 'Fabric'
55
url = 'https://maven.fabricmc.net/'
66
}
7+
maven { url = "https://maven.quiltmc.org/repository/release" }
78
gradlePluginPortal()
89
}
910
}

src/main/java/org/samo_lego/healthcare/mixin/ServerPlayNetworkHandlerMixin_HealthTag.java

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package org.samo_lego.healthcare.mixin;
22

3-
import io.netty.util.concurrent.Future;
4-
import io.netty.util.concurrent.GenericFutureListener;
53
import net.minecraft.core.Registry;
6-
import net.minecraft.network.Connection;
4+
import net.minecraft.network.PacketSendListener;
75
import net.minecraft.network.chat.Component;
86
import net.minecraft.network.chat.MutableComponent;
97
import net.minecraft.network.protocol.Packet;
@@ -16,7 +14,6 @@
1614
import net.minecraft.world.entity.player.Player;
1715
import org.jetbrains.annotations.Nullable;
1816
import org.samo_lego.healthcare.healthbar.HealthbarPreferences;
19-
import org.spongepowered.asm.mixin.Final;
2017
import org.spongepowered.asm.mixin.Mixin;
2118
import org.spongepowered.asm.mixin.Shadow;
2219
import org.spongepowered.asm.mixin.Unique;
@@ -36,15 +33,11 @@ public abstract class ServerPlayNetworkHandlerMixin_HealthTag {
3633
public ServerPlayer player;
3734

3835
@Shadow
39-
@Final
40-
public Connection connection;
36+
public abstract void send(Packet<?> packet, @Nullable PacketSendListener packetSendListener);
4137

4238
@Unique
4339
private boolean hc_skipCheck;
4440

45-
@Shadow
46-
public abstract void send(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericFutureListener);
47-
4841
/**
4942
* Dummy handler used for creating modified
5043
* packets with health.
@@ -65,14 +58,14 @@ public abstract class ServerPlayNetworkHandlerMixin_HealthTag {
6558
* @param ci
6659
*/
6760
@Inject(
68-
method = "send(Lnet/minecraft/network/protocol/Packet;Lio/netty/util/concurrent/GenericFutureListener;)V",
61+
method = "send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V",
6962
at = @At(
7063
value = "INVOKE",
71-
target = "Lnet/minecraft/network/Connection;send(Lnet/minecraft/network/protocol/Packet;Lio/netty/util/concurrent/GenericFutureListener;)V"
64+
target = "Lnet/minecraft/network/Connection;send(Lnet/minecraft/network/protocol/Packet;Lnet/minecraft/network/PacketSendListener;)V"
7265
),
7366
cancellable = true
7467
)
75-
private void onPacketSend(Packet<?> packet, GenericFutureListener<? extends Future<? super Void>> listener, CallbackInfo ci) {
68+
private void onPacketSend(Packet<?> packet, PacketSendListener listener, CallbackInfo ci) {
7669
if (packet instanceof ClientboundSetEntityDataPacket && !this.hc_skipCheck) {
7770
int id = ((EntityTrackerUpdateS2CPacketAccessor) packet).getId();
7871
Entity entity = this.player.getLevel().getEntity(id);

0 commit comments

Comments
 (0)