Skip to content

Commit

Permalink
Merge pull request #7 from bananasov/1.20.4
Browse files Browse the repository at this point in the history
Update minegasm to Minecraft 1.20.4
  • Loading branch information
vinceh121 authored Apr 2, 2024
2 parents 95d8e6e + 877838f commit 04a37c0
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "com.terraformersmc:modmenu:7.2.1"
modImplementation "com.terraformersmc:modmenu:${project.mod_menu_version}"
modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
exclude(group: "net.fabricmc.fabric-api")
}
Expand Down
13 changes: 7 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
org.gradle.jvmargs = -Xmx1G

#Fabric properties
minecraft_version = 1.20.1
yarn_mappings = 1.20.1+build.10
loader_version = 0.14.21
fabric_version = 0.86.1+1.20.1
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.3
loader_version=0.15.7
fabric_version=0.96.11+1.20.4

#Mod properties
mod_version = 2.1.2
mod_version = 2.1.3
maven_group = me.vinceh121.minegasm
archives_base_name = minegasm

cloth_config_version= 11.1.106
cloth_config_version= 13.0.121
mod_menu_version = 9.0.0
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Map;
import java.util.UUID;

import net.minecraft.client.session.Session;
import org.apache.logging.log4j.LogManager;

import com.mojang.authlib.GameProfile;
Expand Down Expand Up @@ -200,7 +201,7 @@ public static void onClientTick() {
}

private static void populatePlayerInfo() {
GameProfile profile = MinecraftClient.getInstance().getSession().getProfile();
Session.AccountType profile = MinecraftClient.getInstance().getSession().getAccountType();
playerName = profile.getName();
LOGGER.info("Current player: " + playerName + " " + getPlayerId());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ public void onRemoveEntity(int entityId, Entity.RemovalReason removalReason, Cal
ClientEventHandler.onWorldExit(entity);
}

@Inject(at = @At("HEAD"), method = "addEntityPrivate")
public void onEntityAdded(int id, Entity entity, CallbackInfo ci) {
@Inject(at = @At("HEAD"), method = "addEntity")
public void onEntityAdded(Entity entity, CallbackInfo ci) {
ClientEventHandler.onWorldEntry(entity);
}
}
6 changes: 3 additions & 3 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
},
"mixins": ["minegasm.mixins.json"],
"depends": {
"fabricloader": ">=0.14.21",
"fabricloader": ">=0.15.7",
"fabric": "*",
"minecraft": "1.20.1",
"minecraft": "1.20.4",
"java": ">=17",
"modmenu": "7.x.x"
"modmenu": "9.x"
}
}

0 comments on commit 04a37c0

Please # to comment.