firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[CHORE] Backport from 1.20.3

Browse Source
This commit is contained in:
HypherionSA
2024-01-02 00:51:14 +02:00
parent d97e6df36e
commit 9c05bec9a0
27 changed files with 150 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Forge/build.gradle
View File

@@ -5,7 +5,7 @@ dependencies {
shade "me.hypherionmc.moon-config:core:${moon_config}"
shade "me.hypherionmc.moon-config:toml:${moon_config}"
shade "com.hypherionmc:rpcsdk:1.0"
shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.19.1:2.0.0")
shade ("me.hypherionmc.sdlink:mcdiscordformatter-1.18.1:2.0.0")
// Do not edit or remove
implementation project(":Common")
@@ -111,8 +111,8 @@ publisher {
versionType = "release"
changelog = "https://raw.githubusercontent.com/hypherionmc/changelogs/main/craterlib/changelog-forge.md"
version = "${minecraft_version}-${project.version}"
displayName = "[FORGE 1.20.1/2] CraterLib - ${project.version}"
gameVersions = ["1.20", "1.20.1"]
displayName = "[FORGE 1.18.2] CraterLib - ${project.version}"
gameVersions = ["1.18.2"]
loaders = ["forge"]
artifact = remapJar
}

2
Forge/src/main/java/com/hypherionmc/craterlib/client/ForgeClientEvents.java
View File

@@ -13,7 +13,7 @@ import net.minecraftforge.fml.common.Mod;
public class ForgeClientEvents {
@SubscribeEvent
public static void clientTick(TickEvent.LevelTickEvent event) {
public static void clientTick(TickEvent.WorldTickEvent event) {
CraterClientTickEvent craterClientTickEvent = new CraterClientTickEvent(Minecraft.getInstance().level);
CraterEventBus.INSTANCE.postEvent(craterClientTickEvent);
}

6
Forge/src/main/java/com/hypherionmc/craterlib/mixin/ConfigScreenHandlerMixin.java
View File

@@ -6,7 +6,7 @@ import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraftforge.client.ConfigScreenHandler;
import net.minecraftforge.client.ConfigGuiHandler;
import net.minecraftforge.forgespi.language.IModInfo;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@@ -19,7 +19,7 @@ import java.util.function.BiFunction;
/**
* @author HypherionSA
*/
@Mixin(ConfigScreenHandler.class)
@Mixin(ConfigGuiHandler.class)
public class ConfigScreenHandlerMixin {
/**
@@ -28,7 +28,7 @@ public class ConfigScreenHandlerMixin {
* @param selectedMod
* @param cir
*/
@Inject(at = @At("RETURN"), method = "getScreenFactoryFor", cancellable = true, remap = false)
@Inject(at = @At("RETURN"), method = "getGuiFactoryFor", cancellable = true, remap = false)
private static void injectConfigScreen(IModInfo selectedMod, CallbackInfoReturnable<Optional<BiFunction<Minecraft, Screen, Screen>>> cir) {
ConfigController.getMonitoredConfigs().forEach((conf, watcher) -> {
if (!conf.getClass().isAnnotationPresent(NoConfigScreen.class)) {

6
Forge/src/main/resources/META-INF/mods.toml
View File

@@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[43,)"
loaderVersion = "[40,)"
license = "MIT"
issueTrackerURL = "https://github.com/firstdarkdev/craterLib/issues"
@@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION"
[[dependencies.${mod_id}]]
modId = "forge"
mandatory = true
versionRange = "[43,)"
versionRange = "[40,)"
ordering = "NONE"
side = "BOTH"
[[dependencies.${mod_id}]]
modId = "minecraft"
mandatory = true
versionRange = "[1.19.2,1.19.3)"
versionRange = "[1.18.2,1.19)"
ordering = "NONE"
side = "BOTH"