diff --git a/build.gradle b/build.gradle index 242e428..26f9c99 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,15 @@ plugins { - id 'fabric-loom' version '1.1-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' } version = project.mod_version group = project.maven_group +base { + archivesName = project.archives_base_name +} + repositories { // Add repositories to retrieve artifacts from in here. // You should only use this when depending on other mods because @@ -18,6 +22,17 @@ repositories { } } +loom { + splitEnvironmentSourceSets() + + mods { + "haxxor" { + sourceSet sourceSets.client + sourceSet sourceSets.main + } + } +} + dependencies { // To change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" @@ -26,53 +41,43 @@ dependencies { // Fabric API. This is technically optional, but you probably want it anyway. modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation files("libs/cmods-1.2.1-dev.jar") + modImplementation files("libs/cmods-1.2.2-dev.jar") modCompileOnly "com.terraformersmc:modmenu:4.1.1" } processResources { inputs.property "version", project.version - filteringCharset "UTF-8" filesMatching("fabric.mod.json") { expand "version": project.version } } -def targetJavaVersion = 17 tasks.withType(JavaCompile).configureEach { - // ensure that the encoding is set to UTF-8, no matter what the system default is - // this fixes some edge cases with special characters not displaying correctly - // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html - // If Javadoc is generated, this must be specified in that task too. - it.options.encoding = "UTF-8" - if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) { - it.options.release = targetJavaVersion - } + it.options.release = 21 } java { - def javaVersion = JavaVersion.toVersion(targetJavaVersion) - if (JavaVersion.current() < javaVersion) { - toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion) - } - archivesBaseName = project.archives_base_name // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task // if it is present. // If you remove this line, sources will not be generated. withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } + rename { "${it}_${project.base.archivesName.get()}"} } } // configure the maven publication publishing { publications { - mavenJava(MavenPublication) { + create("mavenJava", MavenPublication) { + artifactId = project.archives_base_name from components.java } } diff --git a/gradle.properties b/gradle.properties index 99b64c9..9450578 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,13 +2,13 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=1.20.4 -yarn_mappings=1.20.4+build.3 -loader_version=0.15.6 +minecraft_version=1.21 +yarn_mappings=1.21+build.7 +loader_version=0.15.11 # Mod Properties -mod_version=2.4.1 +mod_version=2.4.2 maven_group=cmods archives_base_name=haxxor # Dependencies # check this on https://modmuss50.me/fabric.html -fabric_version=0.96.1+1.20.4 +fabric_version=0.100.4+1.21 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 73bb918..0d8ab51 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1 +1 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip diff --git a/src/main/java/cmods/haxxor/client/HaxxorClient.java b/src/client/java/cmods/haxxor/HaxxorClient.java similarity index 93% rename from src/main/java/cmods/haxxor/client/HaxxorClient.java rename to src/client/java/cmods/haxxor/HaxxorClient.java index de47bc7..e9aa9da 100644 --- a/src/main/java/cmods/haxxor/client/HaxxorClient.java +++ b/src/client/java/cmods/haxxor/HaxxorClient.java @@ -1,7 +1,10 @@ -package cmods.haxxor.client; +package cmods.haxxor; -import cmods.haxxor.HaxxorModule; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.hacks.AutoFarmer; +import cmods.haxxor.hacks.Elevator; +import cmods.haxxor.hacks.FallDamageCancel; +import cmods.haxxor.hacks.FlyHack; +import cmods.haxxor.options.HaxxorOptions; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/cmods/haxxor/HaxxorModule.java b/src/client/java/cmods/haxxor/HaxxorModule.java similarity index 89% rename from src/main/java/cmods/haxxor/HaxxorModule.java rename to src/client/java/cmods/haxxor/HaxxorModule.java index 8dd35b3..8889651 100644 --- a/src/main/java/cmods/haxxor/HaxxorModule.java +++ b/src/client/java/cmods/haxxor/HaxxorModule.java @@ -3,13 +3,13 @@ package cmods.haxxor; import cmods.cmods.api.ButtonBuilder; import cmods.cmods.api.Module; import cmods.cmods.api.ModuleOptions; -import cmods.cmods.client.ui.Line; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.AutoFarmer; -import cmods.haxxor.client.options.HaxxorOptions; -import cmods.haxxor.client.ui.ElevatorOptionsScreen; -import cmods.haxxor.client.ui.FarmerOptionsScreen; -import cmods.haxxor.client.ui.GlowOptionsScreen; +import cmods.cmods.ui.Line; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.hacks.AutoFarmer; +import cmods.haxxor.options.HaxxorOptions; +import cmods.haxxor.ui.ElevatorOptionsScreen; +import cmods.haxxor.ui.FarmerOptionsScreen; +import cmods.haxxor.ui.GlowOptionsScreen; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; @@ -17,8 +17,8 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.function.Consumer; -import static cmods.cmods.client.ui.Constants.buttonHeight; -import static cmods.cmods.client.ui.Constants.buttonWidth; +import static cmods.cmods.ui.Constants.buttonHeight; +import static cmods.cmods.ui.Constants.buttonWidth; public class HaxxorModule extends Module { private static final int precedence = 0; diff --git a/src/main/java/cmods/haxxor/client/ModMenuConfig.java b/src/client/java/cmods/haxxor/ModMenuConfig.java similarity index 82% rename from src/main/java/cmods/haxxor/client/ModMenuConfig.java rename to src/client/java/cmods/haxxor/ModMenuConfig.java index 1ee14a4..e28abc4 100644 --- a/src/main/java/cmods/haxxor/client/ModMenuConfig.java +++ b/src/client/java/cmods/haxxor/ModMenuConfig.java @@ -1,6 +1,6 @@ -package cmods.haxxor.client; +package cmods.haxxor; -import cmods.haxxor.client.ui.HaxxorOptionsScreen; +import cmods.haxxor.ui.HaxxorOptionsScreen; import com.terraformersmc.modmenu.api.ConfigScreenFactory; import com.terraformersmc.modmenu.api.ModMenuApi; import net.minecraft.client.gui.screen.Screen; diff --git a/src/main/java/cmods/haxxor/client/AutoFarmer.java b/src/client/java/cmods/haxxor/hacks/AutoFarmer.java similarity index 99% rename from src/main/java/cmods/haxxor/client/AutoFarmer.java rename to src/client/java/cmods/haxxor/hacks/AutoFarmer.java index e866e50..41628cc 100644 --- a/src/main/java/cmods/haxxor/client/AutoFarmer.java +++ b/src/client/java/cmods/haxxor/hacks/AutoFarmer.java @@ -1,6 +1,6 @@ -package cmods.haxxor.client; +package cmods.haxxor.hacks; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.options.HaxxorOptions; import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import net.minecraft.block.*; diff --git a/src/main/java/cmods/haxxor/client/Elevator.java b/src/client/java/cmods/haxxor/hacks/Elevator.java similarity index 98% rename from src/main/java/cmods/haxxor/client/Elevator.java rename to src/client/java/cmods/haxxor/hacks/Elevator.java index f58f0aa..9290fc5 100644 --- a/src/main/java/cmods/haxxor/client/Elevator.java +++ b/src/client/java/cmods/haxxor/hacks/Elevator.java @@ -1,6 +1,6 @@ -package cmods.haxxor.client; +package cmods.haxxor.hacks; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.options.HaxxorOptions; import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; import net.minecraft.client.MinecraftClient; import net.minecraft.client.option.KeyBinding; diff --git a/src/main/java/cmods/haxxor/client/FallDamageCancel.java b/src/client/java/cmods/haxxor/hacks/FallDamageCancel.java similarity index 95% rename from src/main/java/cmods/haxxor/client/FallDamageCancel.java rename to src/client/java/cmods/haxxor/hacks/FallDamageCancel.java index ae2b4b4..3f42f97 100644 --- a/src/main/java/cmods/haxxor/client/FallDamageCancel.java +++ b/src/client/java/cmods/haxxor/hacks/FallDamageCancel.java @@ -1,6 +1,6 @@ -package cmods.haxxor.client; +package cmods.haxxor.hacks; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.MinecraftClient; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/cmods/haxxor/client/FlyHack.java b/src/client/java/cmods/haxxor/hacks/FlyHack.java similarity index 95% rename from src/main/java/cmods/haxxor/client/FlyHack.java rename to src/client/java/cmods/haxxor/hacks/FlyHack.java index 39984ce..6957888 100644 --- a/src/main/java/cmods/haxxor/client/FlyHack.java +++ b/src/client/java/cmods/haxxor/hacks/FlyHack.java @@ -1,6 +1,6 @@ -package cmods.haxxor.client; +package cmods.haxxor.hacks; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.MinecraftClient; import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket; diff --git a/src/main/java/cmods/haxxor/mixin/GlobalGlow.java b/src/client/java/cmods/haxxor/mixin/GlobalGlow.java similarity index 92% rename from src/main/java/cmods/haxxor/mixin/GlobalGlow.java rename to src/client/java/cmods/haxxor/mixin/GlobalGlow.java index 6373b8e..82e557f 100644 --- a/src/main/java/cmods/haxxor/mixin/GlobalGlow.java +++ b/src/client/java/cmods/haxxor/mixin/GlobalGlow.java @@ -1,6 +1,6 @@ package cmods.haxxor.mixin; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.entity.LivingEntity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/cmods/haxxor/mixin/GlobalGlowAll.java b/src/client/java/cmods/haxxor/mixin/GlobalGlowAll.java similarity index 93% rename from src/main/java/cmods/haxxor/mixin/GlobalGlowAll.java rename to src/client/java/cmods/haxxor/mixin/GlobalGlowAll.java index a5525bb..45a56ac 100644 --- a/src/main/java/cmods/haxxor/mixin/GlobalGlowAll.java +++ b/src/client/java/cmods/haxxor/mixin/GlobalGlowAll.java @@ -1,6 +1,6 @@ package cmods.haxxor.mixin; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.entity.Entity; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/cmods/haxxor/client/options/HaxxorOptions.java b/src/client/java/cmods/haxxor/options/HaxxorOptions.java similarity index 97% rename from src/main/java/cmods/haxxor/client/options/HaxxorOptions.java rename to src/client/java/cmods/haxxor/options/HaxxorOptions.java index cdf94c9..8424e85 100644 --- a/src/main/java/cmods/haxxor/client/options/HaxxorOptions.java +++ b/src/client/java/cmods/haxxor/options/HaxxorOptions.java @@ -1,9 +1,9 @@ -package cmods.haxxor.client.options; +package cmods.haxxor.options; import cmods.cmods.api.ModuleOptions; -import cmods.cmods.client.options.BooleanOption; -import cmods.cmods.client.options.IntegerOption; -import cmods.haxxor.client.AutoFarmer; +import cmods.cmods.options.BooleanOption; +import cmods.cmods.options.IntegerOption; +import cmods.haxxor.hacks.AutoFarmer; import org.jetbrains.annotations.Nullable; import java.util.Properties; diff --git a/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java b/src/client/java/cmods/haxxor/ui/CropSelectScreen.java similarity index 90% rename from src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java rename to src/client/java/cmods/haxxor/ui/CropSelectScreen.java index 9e437b5..bd0767a 100644 --- a/src/main/java/cmods/haxxor/client/ui/CropSelectScreen.java +++ b/src/client/java/cmods/haxxor/ui/CropSelectScreen.java @@ -1,9 +1,9 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.CmodsOptions; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.AutoFarmer; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.cmods.options.CmodsOptions; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.hacks.AutoFarmer; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -13,7 +13,7 @@ import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; -import static cmods.cmods.client.ui.Constants.*; +import static cmods.cmods.ui.Constants.*; public class CropSelectScreen extends Screen { private final CmodsOptions global_options = CmodsOptions.getInstance(); @@ -62,19 +62,19 @@ public class CropSelectScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { + super.render(context, mouseX, mouseY, delta); + final int column1 = width / 2 + column1_offset; final int column2 = width / 2 + column2_offset; final int startHeight = (int) Math.floor(height * startHeight_multiplier) + heightOffset; - this.renderBackground(context, mouseX, mouseY, delta); +// this.renderBackground(context, mouseX, mouseY, delta); context.drawCenteredTextWithShadow(textRenderer, Text.translatable("haxxor.options.farmer.crop_select.seeds"), column1 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); context.drawCenteredTextWithShadow(textRenderer, Text.translatable("haxxor.options.farmer.crop_select.blocks"), column2 + buttonWidth / 2, startHeight - rowIncrement, 0xffffff); - - super.render(context, mouseX, mouseY, delta); } public void removed() { diff --git a/src/main/java/cmods/haxxor/client/ui/CycleButtonWidget.java b/src/client/java/cmods/haxxor/ui/CycleButtonWidget.java similarity index 94% rename from src/main/java/cmods/haxxor/client/ui/CycleButtonWidget.java rename to src/client/java/cmods/haxxor/ui/CycleButtonWidget.java index 307da38..7290582 100644 --- a/src/main/java/cmods/haxxor/client/ui/CycleButtonWidget.java +++ b/src/client/java/cmods/haxxor/ui/CycleButtonWidget.java @@ -1,4 +1,4 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.Text; @@ -10,7 +10,7 @@ public class CycleButtonWidget extends ButtonWidget { public CycleButtonWidget(int x, int y, int width, int height, Text[] options, int startIndex, CycleAction onCycle) { - this(x, y, width, height, options, startIndex, onCycle, ButtonWidget.DEFAULT_NARRATION_SUPPLIER); + this(x, y, width, height, options, startIndex, onCycle, DEFAULT_NARRATION_SUPPLIER); } public CycleButtonWidget(int x, int y, int width, int height, Text[] options, int startIndex, CycleAction onCycle, diff --git a/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java b/src/client/java/cmods/haxxor/ui/ElevatorOptionsScreen.java similarity index 87% rename from src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java rename to src/client/java/cmods/haxxor/ui/ElevatorOptionsScreen.java index a8483a7..40b32be 100644 --- a/src/main/java/cmods/haxxor/client/ui/ElevatorOptionsScreen.java +++ b/src/client/java/cmods/haxxor/ui/ElevatorOptionsScreen.java @@ -1,9 +1,9 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.CmodsOptions; -import cmods.cmods.client.ui.IntegerAdjustWidget; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.cmods.options.CmodsOptions; +import cmods.cmods.ui.IntegerAdjustWidget; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -12,7 +12,7 @@ import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; -import static cmods.cmods.client.ui.Constants.*; +import static cmods.cmods.ui.Constants.*; public class ElevatorOptionsScreen extends Screen { private final Screen parent; @@ -53,9 +53,9 @@ public class ElevatorOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); +// this.renderBackground(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); } public void removed() { diff --git a/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java b/src/client/java/cmods/haxxor/ui/FarmerOptionsScreen.java similarity index 90% rename from src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java rename to src/client/java/cmods/haxxor/ui/FarmerOptionsScreen.java index c1befdb..9f88558 100644 --- a/src/main/java/cmods/haxxor/client/ui/FarmerOptionsScreen.java +++ b/src/client/java/cmods/haxxor/ui/FarmerOptionsScreen.java @@ -1,10 +1,10 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.CmodsOptions; -import cmods.cmods.client.ui.IntegerAdjustWidget; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.HaxxorClient; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.cmods.options.CmodsOptions; +import cmods.cmods.ui.IntegerAdjustWidget; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.HaxxorClient; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -13,7 +13,7 @@ import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; -import static cmods.cmods.client.ui.Constants.*; +import static cmods.cmods.ui.Constants.*; public class FarmerOptionsScreen extends Screen { private final Screen parent; @@ -77,9 +77,9 @@ public class FarmerOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); +// this.renderBackground(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); } public void removed() { diff --git a/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java b/src/client/java/cmods/haxxor/ui/GlowOptionsScreen.java similarity index 88% rename from src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java rename to src/client/java/cmods/haxxor/ui/GlowOptionsScreen.java index 909957f..2170ba5 100644 --- a/src/main/java/cmods/haxxor/client/ui/GlowOptionsScreen.java +++ b/src/client/java/cmods/haxxor/ui/GlowOptionsScreen.java @@ -1,9 +1,9 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.CmodsOptions; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.HaxxorClient; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.cmods.options.CmodsOptions; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.HaxxorClient; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -12,7 +12,7 @@ import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; -import static cmods.cmods.client.ui.Constants.*; +import static cmods.cmods.ui.Constants.*; public class GlowOptionsScreen extends Screen { private final Screen parent; @@ -56,9 +56,9 @@ public class GlowOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); +// this.renderBackground(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); } public void removed() { diff --git a/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java b/src/client/java/cmods/haxxor/ui/HaxxorOptionsScreen.java similarity index 89% rename from src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java rename to src/client/java/cmods/haxxor/ui/HaxxorOptionsScreen.java index b80dfce..0aa438a 100644 --- a/src/main/java/cmods/haxxor/client/ui/HaxxorOptionsScreen.java +++ b/src/client/java/cmods/haxxor/ui/HaxxorOptionsScreen.java @@ -1,9 +1,9 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.CmodsOptions; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.HaxxorClient; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.cmods.options.CmodsOptions; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.HaxxorClient; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -12,7 +12,7 @@ import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; -import static cmods.cmods.client.ui.Constants.*; +import static cmods.cmods.ui.Constants.*; public class HaxxorOptionsScreen extends Screen { private final Screen parent; @@ -58,14 +58,14 @@ public class HaxxorOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - renderBackground(context, mouseX, mouseY, delta); - Text versionText = Text.literal("v" + HaxxorClient.version); +// renderBackground(context, mouseX, mouseY, delta); + super.render(context, mouseX, mouseY, delta); + Text versionText = Text.literal("v" + HaxxorClient.version); context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); context.drawTextWithShadow(textRenderer, versionText, width - textRenderer.getWidth(versionText) - 2, this.height - textRenderer.fontHeight - 2, 0xffffff); - super.render(context, mouseX, mouseY, delta); } public void removed() { diff --git a/src/main/java/cmods/haxxor/client/ui/OptionsSlideWidget.java b/src/client/java/cmods/haxxor/ui/OptionsSlideWidget.java similarity index 93% rename from src/main/java/cmods/haxxor/client/ui/OptionsSlideWidget.java rename to src/client/java/cmods/haxxor/ui/OptionsSlideWidget.java index 6154e72..cc0b6c8 100644 --- a/src/main/java/cmods/haxxor/client/ui/OptionsSlideWidget.java +++ b/src/client/java/cmods/haxxor/ui/OptionsSlideWidget.java @@ -1,6 +1,6 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.IntegerOption; +import cmods.cmods.options.IntegerOption; import net.minecraft.client.gui.widget.SliderWidget; import net.minecraft.text.Text; diff --git a/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java b/src/client/java/cmods/haxxor/ui/UIOptionsScreen.java similarity index 88% rename from src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java rename to src/client/java/cmods/haxxor/ui/UIOptionsScreen.java index c1df995..fa02451 100644 --- a/src/main/java/cmods/haxxor/client/ui/UIOptionsScreen.java +++ b/src/client/java/cmods/haxxor/ui/UIOptionsScreen.java @@ -1,8 +1,8 @@ -package cmods.haxxor.client.ui; +package cmods.haxxor.ui; -import cmods.cmods.client.options.CmodsOptions; -import cmods.cmods.client.ui.ToggleButton; -import cmods.haxxor.client.options.HaxxorOptions; +import cmods.cmods.options.CmodsOptions; +import cmods.cmods.ui.ToggleButton; +import cmods.haxxor.options.HaxxorOptions; import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.widget.ButtonWidget; @@ -11,7 +11,7 @@ import net.minecraft.client.gui.widget.SimplePositioningWidget; import net.minecraft.screen.ScreenTexts; import net.minecraft.text.Text; -import static cmods.cmods.client.ui.Constants.*; +import static cmods.cmods.ui.Constants.*; public class UIOptionsScreen extends Screen { private final Screen parent; @@ -51,9 +51,9 @@ public class UIOptionsScreen extends Screen { } public void render(DrawContext context, int mouseX, int mouseY, float delta) { - this.renderBackground(context, mouseX, mouseY, delta); - context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); +// this.renderBackground(context, mouseX, mouseY, delta); super.render(context, mouseX, mouseY, delta); + context.drawCenteredTextWithShadow(textRenderer, title, width / 2, 15, 0xffffff); } public void removed() { diff --git a/src/main/resources/haxxor.mixins.json b/src/client/resources/haxxor.mixins.json similarity index 100% rename from src/main/resources/haxxor.mixins.json rename to src/client/resources/haxxor.mixins.json diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5f5f56b..8f692d2 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -14,8 +14,12 @@ "icon": "assets/haxxor/icon.png", "environment": "client", "entrypoints": { - "client": ["cmods.haxxor.client.HaxxorClient"], - "modmenu": ["cmods.haxxor.client.ModMenuConfig"] + "client": [ + "cmods.haxxor.HaxxorClient" + ], + "modmenu": [ + "cmods.haxxor.ModMenuConfig" + ] }, "mixins": [ "haxxor.mixins.json" @@ -23,7 +27,7 @@ "depends": { "fabricloader": ">=0.14.10", "fabric": "*", - "minecraft": "1.20.4", - "cmods": "1.2.1" + "minecraft": "1.21.0", + "cmods": "1.2.2" } }