Skip to content

Commit 7773273

Browse files
committed
Update to 1.20.2, Forge is broken
1 parent f1fe3e4 commit 7773273

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

common/src/main/java/net/bettercombat/mixin/client/InGameHudInject.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@Mixin(InGameHud.class)
1616
public abstract class InGameHudInject {
17-
@Inject(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawTexture(Lnet/minecraft/util/Identifier;IIIIII)V"))
17+
@Inject(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;drawGuiTexture(Lnet/minecraft/util/Identifier;IIII)V"))
1818
private void pre_renderCrosshair(DrawContext context, CallbackInfo ci) {
1919
if (BetterCombatClient.config.isHighlightCrosshairEnabled) {
2020
setShaderForHighlighting();

common/src/main/java/net/bettercombat/mixin/client/MinecraftClientInject.java

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import net.minecraft.client.MinecraftClient;
2323
import net.minecraft.client.RunArgs;
2424
import net.minecraft.client.font.TextRenderer;
25-
import net.minecraft.client.gui.hud.InGameHud;
2625
import net.minecraft.client.gui.screen.Screen;
2726
import net.minecraft.client.network.ClientPlayerEntity;
2827
import net.minecraft.client.resource.language.I18n;

forge/src/main/java/net/bettercombat/forge/network/NetworkHandler.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import net.minecraftforge.network.NetworkRegistry;
66
import net.minecraftforge.network.simple.SimpleChannel;
77

8+
import java.nio.channels.Channel;
9+
810
public class NetworkHandler {
9-
public static SimpleChannel INSTANCE;
11+
public static Channel INSTANCE;
1012
private static int ID = 0;
1113

1214
public static void registerMessages(){
13-
INSTANCE = NetworkRegistry.newSimpleChannel(new Identifier(BetterCombat.MODID, "network"), () -> "1.0", s -> true, s -> true);
14-
15-
INSTANCE.registerMessage(ID++, PacketWrapper.class, PacketWrapper::encode, PacketWrapper::decode, PacketWrapper::handle);
15+
// INSTANCE = NetworkRegistry.newSimpleChannel(new Identifier(BetterCombat.MODID, "network"), () -> "1.0", s -> true, s -> true);
16+
// INSTANCE.registerMessage(ID++, PacketWrapper.class, PacketWrapper::encode, PacketWrapper::decode, PacketWrapper::handle);
1617
}
1718
}

gradle.properties

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,24 @@ org.gradle.daemon=false
66
platforms=fabric,forge
77

88
# Game
9-
minecraft_version=1.20.1
10-
yarn_mappings=1.20.1+build.2
9+
minecraft_version=1.20.2
10+
yarn_mappings=1.20.2+build.1
1111

1212
# Loader
13-
fabric_version=0.83.1+1.20.1
14-
loader_version=0.14.21
15-
forge_version=47.1.0
13+
fabric_version=0.89.2+1.20.2
14+
loader_version=0.14.22
15+
forge_version=48.0.4
1616

1717
# Mod Properties
1818
mod_version=1.7.3
1919
maven_group=net
2020
archives_base_name=bettercombat
2121

2222
# Dependencies
23-
cloth_config_version=11.1.106
23+
cloth_config_version=12.0.109
2424
player_anim_version=1.0.2+1.19.4
2525
tiny_config_version=2.3.2
2626

2727
# Compatibility
28-
mod_menu_version=7.0.1
29-
fpm_version=2.2.3-1.20
28+
mod_menu_version=8.0.0-beta.2
29+
fpm_version=2.2.3-1.20.2

0 commit comments

Comments
 (0)