Skip to content

Commit

Permalink
1.20.4!
Browse files Browse the repository at this point in the history
  • Loading branch information
TexBlock committed Apr 3, 2024
1 parent 5b952cf commit d44f7be
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 40 deletions.
11 changes: 2 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,17 @@ group = libs.versions.maven.group.get()
version = "${libs.versions.minecraft.get()}-${libs.versions.mod.get()}"
base.archivesName = "${libs.versions.archives.name.get()}-forge"

loom {
forge {
mixinConfigs = [
"bounced.mixins.json"
]
}
}

repositories {
mavenCentral()
maven { url = "https://jitpack.io" }
maven { url = "https://api.modrinth.com/maven" }
maven { url = "https://maven.neoforged.net/releases/" }
}

dependencies {
minecraft(libs.minecraft)
mappings(libs.yarn) { artifact { classifier = "v2" } }
forge(libs.forge)
neoForge(libs.neoforge)

modCompileOnly(libs.splasher)
}
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx4G
org.gradle.parallel=true

loom.platform=forge
loom.platform=neoforge
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@ maven-group = "band.kessokuteatime"
archives-name = "bounced"
mod = "4.0.0"

minecraft = "1.20.1"
yarn = "1.20.1+build.10"
forge = "1.20.1-47.2.21"
minecraft = "1.20.4"
yarn = "1.20.4+build.3"
neoforge = "20.4.219"
architectury-loom = "1.5-SNAPSHOT"

splasher = "6.0.0-mc1.20"

[libraries]
minecraft = { group = "com.mojang", name = "minecraft", version.ref = "minecraft" }
yarn = { group = "net.fabricmc", name = "yarn", version.ref = "yarn" }
forge = { group = "net.minecraftforge", name = "forge", version.ref = "forge" }
neoforge = { group = "net.neoforged", name = "neoforge", version.ref = "neoforge" }

splasher = { group = "maven.modrinth", name = "splasher", version.ref = "splasher" }

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pluginManagement {
repositories {
maven { url = "https://maven.fabricmc.net/" }
maven { url = "https://maven.architectury.dev/" }
maven { url = "https://maven.minecraftforge.net/" }
maven { url = "https://maven.neoforged.net/releases/" }
mavenCentral()
gradlePluginPortal()
}
Expand Down
25 changes: 12 additions & 13 deletions src/main/java/band/kessokuteatime/bounced/Bounced.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
import net.minecraft.client.gui.screen.AccessibilityOnboardingScreen;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.screen.TitleScreen;
import net.minecraftforge.client.event.ScreenEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.IExtensionPoint;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.network.NetworkConstants;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.IExtensionPoint;
import net.neoforged.fml.ModList;
import net.neoforged.fml.ModLoadingContext;
import net.neoforged.fml.common.Mod;
import net.neoforged.fml.loading.FMLLoader;
import net.neoforged.neoforge.client.event.ScreenEvent;
import net.neoforged.neoforge.common.NeoForge;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -33,20 +32,20 @@ public class Bounced {
shouldJump = new AtomicBoolean(false);

public Bounced() {
ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (a, b) -> true));
if (FMLLoader.getDist().isClient()) {
this.onInitializeClient();
}
}

public void onInitializeClient() {
boolean isSplasherLoaded = ModList.get().isLoaded("splasher");
IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;
IEventBus forgeEventBus = NeoForge.EVENT_BUS;

forgeEventBus.<ScreenEvent.Init.Post>addListener(screenInitEvent -> {
forgeEventBus.addListener(ScreenEvent.Init.Post.class, screenInitEvent -> {
Screen screen = screenInitEvent.getScreen();
if (screen instanceof TitleScreen || screen instanceof AccessibilityOnboardingScreen) {
forgeEventBus.<ScreenEvent.MouseButtonPressed.Post>addListener(screenMousePressedEvent -> {
forgeEventBus.addListener(ScreenEvent.MouseButtonPressed.Post.class, screenMousePressedEvent -> {
double mouseX = screenMousePressedEvent.getMouseX();
double mouseY = screenMousePressedEvent.getMouseY();
double scaledWidth = screen.width;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ private void init(CallbackInfo ci) {
* Triggers and restarts the animation.
*/
@ModifyArg(
method = "render",
method = "renderBackground",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/RotatingCubeMapRenderer;render(FF)V"
Expand Down
18 changes: 7 additions & 11 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
modLoader = "javafml"
loaderVersion = "[43,)"
loaderVersion = "[1,)"
license = "GPL-3.0"

[[mods]]
Expand All @@ -13,23 +13,19 @@ Such A Vibrant Title!
'''
logoFile = "icon.png"

[[mixins]]
config = "bounced.mixins.json"

[[dependencies.bounced]]
modId = "forge"
modId = "neoforge"
mandatory = true
versionRange = "[43,)"
versionRange = "[20.3,)"
ordering = "NONE"
side = "BOTH"

[[dependencies.bounced]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20,)"
versionRange = "[1.20.3,1.20.4]"
ordering = "NONE"
side = "BOTH"

[[dependencies.bounced]]
modId = "architectury"
mandatory = true
versionRange = "[9,)"
ordering = "AFTER"
side = "BOTH"

0 comments on commit d44f7be

Please sign in to comment.