From b9f0db2f2cfdc661444c490f2b42370d570c622a Mon Sep 17 00:00:00 2001 From: okx-code Date: Fri, 28 May 2021 02:02:02 +0100 Subject: [PATCH] initial commit --- .gitignore | 21 + build.gradle | 59 +++ changelog.md | 11 + common/build.gradle | 37 ++ .../common/AbstractCivModernMod.java | 206 ++++++++ .../sh/okx/civmodern/common/CivMapConfig.java | 171 +++++++ .../civmodern/common/CustomItemRenderer.java | 125 +++++ .../civmodern/common/compat/CommonFont.java | 14 + .../common/compat/CompatProvider.java | 7 + .../compat/v1_16_1/v1_16_1CommonFont.java | 58 +++ .../compat/v1_16_1/v1_16_1CompatProvider.java | 13 + .../compat/v1_16_5/v1_16_5CommonFont.java | 31 ++ .../compat/v1_16_5/v1_16_5CompatProvider.java | 13 + .../common/events/ClientTickEvent.java | 5 + .../sh/okx/civmodern/common/events/Event.java | 5 + .../okx/civmodern/common/events/EventBus.java | 7 + .../events/PostRenderGameOverlayEvent.java | 21 + .../okx/civmodern/common/gui/Alignment.java | 32 ++ .../okx/civmodern/common/gui/ColorValue.java | 39 ++ .../okx/civmodern/common/gui/DoubleValue.java | 9 + .../sh/okx/civmodern/common/gui/Texture.java | 77 +++ .../gui/screen/CompactedConfigScreen.java | 137 ++++++ .../gui/screen/IceRoadConfigScreen.java | 53 ++ .../common/gui/screen/MainConfigScreen.java | 47 ++ .../common/gui/screen/RadarConfigScreen.java | 266 ++++++++++ .../common/gui/widget/CyclicButton.java | 33 ++ .../DoubleOptionUpdateableSliderWidget.java | 38 ++ .../common/gui/widget/HsbColourPicker.java | 190 ++++++++ .../common/gui/widget/ImageButton.java | 43 ++ .../civmodern/common/macro/HoldKeyMacro.java | 55 +++ .../civmodern/common/macro/IceRoadMacro.java | 60 +++ .../common/mixins/InventoryMixin.java | 16 + .../sh/okx/civmodern/common/radar/Radar.java | 454 ++++++++++++++++++ .../resources/assets/civmodern/gui/colour.png | Bin 0 -> 1143 bytes .../assets/civmodern/gui/rollback.png | Bin 0 -> 1290 bytes .../assets/civmodern/lang/en_us.json | 28 ++ .../src/main/resources/civmodern.properties | 10 + .../src/main/resources/mixin.civmodern.json | 14 + fabric/build.gradle | 98 ++++ .../fabric/FabricCivModernBootstrap.java | 53 ++ .../civmodern/fabric/FabricCivModernMod.java | 19 + .../okx/civmodern/fabric/FabricEventBus.java | 43 ++ fabric/src/main/resources/fabric.mod.json | 26 + forge/build.gradle | 103 ++++ forge/gradle.properties | 1 + .../forge/ForgeCivModernBootstrap.java | 25 + .../civmodern/forge/ForgeCivModernMod.java | 18 + .../sh/okx/civmodern/forge/ForgeEventBus.java | 59 +++ forge/src/main/resources/META-INF/mods.toml | 28 ++ forge/src/main/resources/pack.mcmeta | 6 + gradle.properties | 15 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 +++++++ gradlew.bat | 89 ++++ settings.gradle | 14 + 56 files changed, 3192 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 changelog.md create mode 100644 common/build.gradle create mode 100644 common/src/main/java/sh/okx/civmodern/common/AbstractCivModernMod.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/CivMapConfig.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/CustomItemRenderer.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/compat/CommonFont.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/compat/CompatProvider.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CommonFont.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CompatProvider.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CommonFont.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CompatProvider.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/events/ClientTickEvent.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/events/Event.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/events/EventBus.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/events/PostRenderGameOverlayEvent.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/Alignment.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/ColorValue.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/DoubleValue.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/Texture.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/screen/CompactedConfigScreen.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/screen/IceRoadConfigScreen.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/screen/MainConfigScreen.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/screen/RadarConfigScreen.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/widget/CyclicButton.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/widget/DoubleOptionUpdateableSliderWidget.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/widget/HsbColourPicker.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/gui/widget/ImageButton.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/macro/HoldKeyMacro.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/macro/IceRoadMacro.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/mixins/InventoryMixin.java create mode 100644 common/src/main/java/sh/okx/civmodern/common/radar/Radar.java create mode 100644 common/src/main/resources/assets/civmodern/gui/colour.png create mode 100644 common/src/main/resources/assets/civmodern/gui/rollback.png create mode 100644 common/src/main/resources/assets/civmodern/lang/en_us.json create mode 100644 common/src/main/resources/civmodern.properties create mode 100644 common/src/main/resources/mixin.civmodern.json create mode 100644 fabric/build.gradle create mode 100644 fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernBootstrap.java create mode 100644 fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernMod.java create mode 100644 fabric/src/main/java/sh/okx/civmodern/fabric/FabricEventBus.java create mode 100644 fabric/src/main/resources/fabric.mod.json create mode 100644 forge/build.gradle create mode 100644 forge/gradle.properties create mode 100644 forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernBootstrap.java create mode 100644 forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernMod.java create mode 100644 forge/src/main/java/sh/okx/civmodern/forge/ForgeEventBus.java create mode 100644 forge/src/main/resources/META-INF/mods.toml create mode 100644 forge/src/main/resources/pack.mcmeta create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..142f2a1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +build/ +*.ipr +run/ +*.iws +out/ +*.iml +.gradle/ +output/ +bin/ +libs/ + +.classpath +.project +.idea/ +classes/ +.metadata +.vscode +.settings +*.launch + +dist/ \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..2326983 --- /dev/null +++ b/build.gradle @@ -0,0 +1,59 @@ +plugins { + id "architectury-plugin" version "3.1-SNAPSHOT" + id "forgified-fabric-loom" version "0.6-SNAPSHOT" apply false +} + +architectury { + minecraft = rootProject.minecraft_version +} + +subprojects { + apply plugin: "forgified-fabric-loom" + + loom { + silentMojangMappingsLicense() + mixinConfig "mixin.civmodern.json" + } + + /*dependencies { + minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" + // The following line declares the mojmap mappings, you may use other mappings as well + mappings loom.officialMojangMappings() + // The following line declares the yarn mappings you may select this one as well. +// mappings "net.fabricmc:yarn:1.16.1+build.21" + }*/ +} + +allprojects { + apply plugin: "java" + apply plugin: "architectury-plugin" + apply plugin: "maven-publish" + + archivesBaseName = rootProject.archives_base_name + version = rootProject.mod_version + group = rootProject.maven_group + + repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + } + + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + + // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too + // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used. + // We'll use that if it's available, but otherwise we'll use the older option. + def targetVersion = 8 + if (JavaVersion.current().isJava9Compatible()) { + options.release = targetVersion + } + } + + java { + withSourcesJar() + } +} diff --git a/changelog.md b/changelog.md new file mode 100644 index 0000000..2c64a73 --- /dev/null +++ b/changelog.md @@ -0,0 +1,11 @@ +# 1.1 + +- Add toggle to player pings +- Minor bugfixes for hold left and right macros +- Add option to rollback colours to presets +- HSV colour picker starts with the current hue automatically selected +- Add ice road macro (default key is backspace, can optionally snap to a cardinal or intercardinal direction) + +# 1.0.1 + +- Fix crash bug on 1.16.1 \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..a464bf0 --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,37 @@ +dependencies { + // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies + // Do NOT use other classes from fabric loader + modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" + // Remove the next line if you don't want to depend on the API + //modApi "me.shedaniel:architectury:${rootProject.architectury_version}" + + minecraft "com.mojang:minecraft:1.16.5" + mappings loom.officialMojangMappings() +} + +architectury { + injectInjectables = false + common() +} + +java { + withSourcesJar() +} + +publishing { + publications { + mavenCommon(MavenPublication) { + artifactId = rootProject.archives_base_name + // add all the jars that should be included when publishing to maven + artifact remapJar + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/AbstractCivModernMod.java b/common/src/main/java/sh/okx/civmodern/common/AbstractCivModernMod.java new file mode 100644 index 0000000..f3903a0 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/AbstractCivModernMod.java @@ -0,0 +1,206 @@ +package sh.okx.civmodern.common; + +import com.mojang.blaze3d.platform.InputConstants.Type; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.nio.file.Path; +import java.util.Iterator; +import java.util.Properties; +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import net.minecraft.client.Options; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.core.NonNullList; +import net.minecraft.core.Registry; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.lwjgl.glfw.GLFW; +import org.lwjgl.system.CallbackI.I; +import sh.okx.civmodern.common.compat.CompatProvider; +import sh.okx.civmodern.common.compat.v1_16_1.v1_16_1CompatProvider; +import sh.okx.civmodern.common.compat.v1_16_5.v1_16_5CompatProvider; +import sh.okx.civmodern.common.events.ClientTickEvent; +import sh.okx.civmodern.common.events.EventBus; +import sh.okx.civmodern.common.gui.screen.MainConfigScreen; +import sh.okx.civmodern.common.macro.HoldKeyMacro; +import sh.okx.civmodern.common.macro.IceRoadMacro; +import sh.okx.civmodern.common.radar.Radar; + +public abstract class AbstractCivModernMod { + + private static AbstractCivModernMod INSTANCE; + private static final Logger LOGGER = LogManager.getLogger(); + + private final KeyMapping configBinding; + private final KeyMapping holdLeftBinding; + private final KeyMapping holdRightBinding; + private final KeyMapping iceRoadBinding; + private final CompatProvider compat; + private CivMapConfig config; + private Radar radar; + + private HoldKeyMacro leftMacro; + private HoldKeyMacro rightMacro; + private IceRoadMacro iceRoadMacro; + + private EventBus eventBus; + + public AbstractCivModernMod() { + int version = Minecraft.getInstance().getGame().getVersion().getProtocolVersion(); + if (version == 754) { + this.compat = new v1_16_5CompatProvider(); + } else { + this.compat = new v1_16_1CompatProvider(); + } + + this.configBinding = new KeyMapping( + "key.civmodern.config", + Type.KEYSYM, + GLFW.GLFW_KEY_R, + "category.civmodern" + ); + this.holdLeftBinding = new KeyMapping( + "key.civmodern.left", + Type.KEYSYM, + GLFW.GLFW_KEY_MINUS, + "category.civmodern" + ); + this.holdRightBinding = new KeyMapping( + "key.civmodern.right", + Type.KEYSYM, + GLFW.GLFW_KEY_EQUAL, + "category.civmodern" + ); + this.iceRoadBinding = new KeyMapping( + "key.civmodern.ice", + Type.KEYSYM, + GLFW.GLFW_KEY_BACKSPACE, + "category.civmodern" + ); + + if (INSTANCE == null) { + INSTANCE = this; + } else { + throw new IllegalStateException("AbstractCivModernMod initialised twice"); + } + } + + public final void enable() { + this.eventBus = provideEventBus(); + + registerKeyBinding(this.configBinding); + registerKeyBinding(this.holdLeftBinding); + registerKeyBinding(this.holdRightBinding); + registerKeyBinding(this.iceRoadBinding); + + loadConfig(); + replaceItemRenderer(); + + this.eventBus.listen(ClientTickEvent.class, e -> this.tick()); + + Options options = Minecraft.getInstance().options; + this.leftMacro = new HoldKeyMacro(this, this.holdLeftBinding, options.keyAttack); + this.rightMacro = new HoldKeyMacro(this, this.holdRightBinding, options.keyUse); + this.iceRoadMacro = new IceRoadMacro(this, config, this.iceRoadBinding); + } + + public abstract EventBus provideEventBus(); + public abstract void registerKeyBinding(KeyMapping mapping); + + private void onScroll() { + if (this.leftMacro != null) this.leftMacro.onScroll(); + if (this.rightMacro != null) this.rightMacro.onScroll(); + } + + private void tick() { + while (configBinding.consumeClick()) { + Minecraft.getInstance().setScreen(new MainConfigScreen(this, config)); + } + } + + private void replaceItemRenderer() { + // Look man, it's this or mixins + Minecraft minecraft = Minecraft.getInstance(); + for (Field field : Minecraft.class.getDeclaredFields()) { + if (field.getType() == ItemRenderer.class) { + field.setAccessible(true); + try { + field.set(minecraft, new CustomItemRenderer(minecraft.getItemRenderer(), config)); + replaceGuiItemRenderer(); + return; + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + LOGGER.warn("Unable to replace item renderer"); + } + + private void replaceGuiItemRenderer() { + Minecraft minecraft = Minecraft.getInstance(); + Gui gui = minecraft.gui; + for (Field field : Gui.class.getDeclaredFields()) { + if (field.getType() == ItemRenderer.class) { + field.setAccessible(true); + try { + field.set(gui, minecraft.getItemRenderer()); + return; + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + LOGGER.warn("Unable to replace hotbar item renderer"); + } + + private void loadConfig() { + Properties properties = new Properties(); + Path gameDir = Minecraft.getInstance().gameDirectory.toPath(); + File configFile = gameDir.resolve("config").resolve("civmodern.properties").toFile(); + try { + if (!configFile.exists()) { + InputStream resource = AbstractCivModernMod.class + .getResourceAsStream("/civmodern.properties"); + byte[] buffer = new byte[resource.available()]; + resource.read(buffer); + FileOutputStream fos = new FileOutputStream(configFile); + fos.write(buffer); + } + + FileInputStream input = new FileInputStream(configFile); + properties.load(input); + } catch (IOException ex) { + ex.printStackTrace(); + } + CivMapConfig config = new CivMapConfig(configFile, properties); + + this.config = config; + + this.radar = new Radar(config, eventBus, compat); + this.radar.init(); + } + + public EventBus getEventBus() { + return eventBus; + } + + public CompatProvider getCompat() { + return compat; + } + + public static void staticOnScroll() { + if (INSTANCE != null) { + INSTANCE.onScroll(); + } + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/CivMapConfig.java b/common/src/main/java/sh/okx/civmodern/common/CivMapConfig.java new file mode 100644 index 0000000..d42bb60 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/CivMapConfig.java @@ -0,0 +1,171 @@ +package sh.okx.civmodern.common; + +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.Properties; +import sh.okx.civmodern.common.gui.Alignment; + +public class CivMapConfig { + private final File file; + private int compactedColour; + private int radarCircles; + private int radarSize; + private float iconSize; + private Alignment alignment; + private double range; + private float transparency; + private int radarColour; + private boolean radarEnabled; + private boolean pingEnabled; + private int x; + private int y; + private boolean iceRoadCardinalEnabled; + + private String s = "hello".toUpperCase().toUpperCase(); + + public CivMapConfig(File file, Properties properties) { + this.file = file; + this.compactedColour = Integer.parseInt(properties.getProperty("compacted_colour", "16777048")); + this.radarCircles = Integer.parseInt(properties.getProperty("radar_circles", "4")); + this.radarSize = Integer.parseInt(properties.getProperty("radar_size", "50")); + this.alignment = Alignment.valueOf(properties.getProperty("alignment", "top_left").toUpperCase()); + this.iconSize = Float.parseFloat(properties.getProperty("icon_size", "1")); + this.range = Double.parseDouble(properties.getProperty("range", "64")); + this.transparency = Float.parseFloat(properties.getProperty("transparency", "0.8")); + this.radarColour = Integer.parseInt(properties.getProperty("radar_colour", "8947848")); + this.x = Integer.parseInt(properties.getProperty("x", "100")); + this.y = Integer.parseInt(properties.getProperty("y", "100")); + this.radarEnabled = Boolean.parseBoolean(properties.getProperty("radar_enabled", "true")); + this.pingEnabled = Boolean.parseBoolean(properties.getProperty("ping_enabled", "true")); + this.iceRoadCardinalEnabled = Boolean.parseBoolean(properties.getProperty("ice_road_cardinal", "true")); + } + + public void save() { + try { + Properties properties = new Properties(); + properties.setProperty("compacted_colour", Integer.toString(compactedColour)); + properties.setProperty("radar_circles", Integer.toString(radarCircles)); + properties.setProperty("radar_size", Integer.toString(radarSize)); + properties.setProperty("alignment", alignment.name().toLowerCase()); + properties.setProperty("icon_size", Float.toString(iconSize)); + properties.setProperty("range", Double.toString(range)); + properties.setProperty("transparency", Float.toString(transparency)); + properties.setProperty("radar_colour", Integer.toString(radarColour)); + properties.setProperty("x", Integer.toString(x)); + properties.setProperty("y", Integer.toString(y)); + properties.setProperty("radar_enabled", Boolean.toString(radarEnabled)); + properties.setProperty("ping_enabled", Boolean.toString(pingEnabled)); + properties.setProperty("ice_road_cardinal", Boolean.toString(iceRoadCardinalEnabled)); + + FileOutputStream output = new FileOutputStream(file); + properties.store(output, null); + } catch (IOException ex) { + ex.printStackTrace(); + } + } + + public int getColour() { + return compactedColour; + } + + public void setColour(int compactedColour) { + this.compactedColour = compactedColour; + } + + public void setRadarCircles(int radarCircles) { + this.radarCircles = radarCircles; + } + + public int getRadarCircles() { + return radarCircles; + } + + public int getRadarSize() { + return radarSize; + } + + public void setRadarSize(int radarSize) { + this.radarSize = radarSize; + } + + public Alignment getAlignment() { + return alignment; + } + + public void setAlignment(Alignment alignment) { + this.alignment = alignment; + } + + public float getIconSize() { + return iconSize; + } + + public void setIconSize(float iconSize) { + this.iconSize = iconSize; + } + + public double getRange() { + return range; + } + + public void setRange(double range) { + this.range = range; + } + + public float getTransparency() { + return transparency; + } + + public void setTransparency(float transparency) { + this.transparency = transparency; + } + + public int getRadarColour() { + return radarColour; + } + + public void setRadarColour(int radarColour) { + this.radarColour = radarColour; + } + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public int getY() { + return y; + } + + public void setY(int y) { + this.y = y; + } + + public boolean isRadarEnabled() { + return radarEnabled; + } + + public void setRadarEnabled(boolean radarEnabled) { + this.radarEnabled = radarEnabled; + } + + public boolean isPingEnabled() { + return pingEnabled; + } + + public void setPingEnabled(boolean pingEnabled) { + this.pingEnabled = pingEnabled; + } + + public void setIceRoadCardinalEnabled(boolean iceRoadCardinalEnabled) { + this.iceRoadCardinalEnabled = iceRoadCardinalEnabled; + } + + public boolean isIceRoadCardinalEnabled() { + return iceRoadCardinalEnabled; + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/CustomItemRenderer.java b/common/src/main/java/sh/okx/civmodern/common/CustomItemRenderer.java new file mode 100644 index 0000000..e94b4aa --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/CustomItemRenderer.java @@ -0,0 +1,125 @@ +package sh.okx.civmodern.common; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import java.lang.reflect.Field; +import net.minecraft.client.Minecraft; +import net.minecraft.client.color.item.ItemColors; +import net.minecraft.client.gui.Font; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.renderer.ItemModelShaper; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.client.renderer.entity.ItemRenderer; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.util.Mth; +import net.minecraft.world.item.ItemStack; + +public class CustomItemRenderer extends ItemRenderer { + + private final CivMapConfig config; + + public CustomItemRenderer(ItemRenderer old, CivMapConfig config) throws IllegalAccessException { + // Placeholder values just so it doesn't NPE + super(Minecraft.getInstance().getTextureManager(), Minecraft.getInstance().getModelManager(), + null); + this.config = config; + + // Steal all the fields from the old item renderer + // This is necessary otherwise all the items render with the missing texture + System.out.println("OLD IR: " + old); + for (Field field : ItemRenderer.class.getDeclaredFields()) { + if (field.getType() == ItemModelShaper.class + || field.getType() == ItemColors.class) { + field.setAccessible(true); + field.set(this, field.get(old)); + } + } + } + + @Override + public void renderGuiItemDecorations(Font renderer, ItemStack stack, int x, int y, String label) { + if (!stack.isEmpty()) { + PoseStack matrixstack = new PoseStack(); + boolean compacted = isCompacted(stack); + if (stack.getCount() != 1 || label != null || compacted) { + matrixstack.translate(0.0D, 0.0D, this.blitOffset + 200.0F); + MultiBufferSource.BufferSource irendertypebuffer$impl = MultiBufferSource.immediate( + Tesselator.getInstance().getBuilder()); + + //int colour = compacted ? 0xffff58 : 0xffffff; + int colour = compacted ? config.getColour() : 0xffffff; + String s = label == null ? String.valueOf(stack.getCount()) : label; + + renderer.drawInBatch(s, (float) (x + 19 - 2 - renderer.width(s)), (float) (y + 6 + 3), + colour, true, matrixstack.last().pose(), irendertypebuffer$impl, false, 0, 15728880); + irendertypebuffer$impl.endBatch(); + } + + if (stack.isDamaged()) { + RenderSystem.disableDepthTest(); + RenderSystem.disableTexture(); + RenderSystem.disableAlphaTest(); + RenderSystem.disableBlend(); + Tesselator tesselator = Tesselator.getInstance(); + BufferBuilder bufferBuilder = tesselator.getBuilder(); + float f = (float)stack.getDamageValue(); + float g = (float)stack.getMaxDamage(); + float h = Math.max(0.0F, (g - f) / g); + int k = Math.round(13.0F - f * 13.0F / g); + int l = Mth.hsvToRgb(h / 3.0F, 1.0F, 1.0F); + this.fillRect(bufferBuilder, x + 2, y + 13, 13, 2, 0, 0, 0, 255); + this.fillRect(bufferBuilder, x + 2, y + 13, k, 1, l >> 16 & 255, l >> 8 & 255, l & 255, 255); + RenderSystem.enableBlend(); + RenderSystem.enableAlphaTest(); + RenderSystem.enableTexture(); + RenderSystem.enableDepthTest(); + } + + LocalPlayer localPlayer = Minecraft.getInstance().player; + float m = localPlayer == null ? 0.0F : localPlayer.getCooldowns().getCooldownPercent(stack.getItem(), Minecraft.getInstance().getFrameTime()); + if (m > 0.0F) { + RenderSystem.disableDepthTest(); + RenderSystem.disableTexture(); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + Tesselator tesselator2 = Tesselator.getInstance(); + BufferBuilder bufferBuilder2 = tesselator2.getBuilder(); + this.fillRect(bufferBuilder2, x, y + Mth.floor(16.0F * (1.0F - m)), 16, Mth.ceil(16.0F * m), 255, 255, 255, 127); + RenderSystem.enableTexture(); + RenderSystem.enableDepthTest(); + } + } + } + + private void fillRect(BufferBuilder buffer, int a, int b, int c, int d, int e, int f, int g, + int h) { + buffer.begin(7, DefaultVertexFormat.POSITION_COLOR); + buffer.vertex(a, b, 0.0D).color(e, f, g, h).endVertex(); + buffer.vertex(a, b + d, 0.0D).color(e, f, g, h).endVertex(); + buffer.vertex(a + c, b + d, 0.0D).color(e, f, g, h).endVertex(); + buffer.vertex(a + c, b, 0.0D).color(e, f, g, h).endVertex(); + Tesselator.getInstance().end(); + } + + private boolean isCompacted(ItemStack item) { + if (!item.hasTag()) { + return false; + } + CompoundTag displayTag = item.getTagElement("display"); + if (displayTag != null && displayTag.getTagType("Lore") == 9) { + ListTag listTag = displayTag.getList("Lore", 8); + + for (int i = 0; i < listTag.size(); i++) { + String lore = listTag.getString(i); + if (lore.contains("Compacted Item")) { + return true; + } + } + } + return false; + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/compat/CommonFont.java b/common/src/main/java/sh/okx/civmodern/common/compat/CommonFont.java new file mode 100644 index 0000000..bd064e2 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/compat/CommonFont.java @@ -0,0 +1,14 @@ +package sh.okx.civmodern.common.compat; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; + +/** + * For some reason the Font class changed some method signatures between 1.16.1 and 1.16.5 + */ +public interface CommonFont { + void draw(PoseStack poseStack, Component component, float x, float y, int colour); + void drawShadow(PoseStack poseStack, Component component, float x, float y, int colour); + void drawShadowCentred(PoseStack poseStack, Component component, float x, float y, int colour); +} diff --git a/common/src/main/java/sh/okx/civmodern/common/compat/CompatProvider.java b/common/src/main/java/sh/okx/civmodern/common/compat/CompatProvider.java new file mode 100644 index 0000000..6518641 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/compat/CompatProvider.java @@ -0,0 +1,7 @@ +package sh.okx.civmodern.common.compat; + +import net.minecraft.client.gui.Font; + +public interface CompatProvider { + CommonFont provideFont(Font font); +} diff --git a/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CommonFont.java b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CommonFont.java new file mode 100644 index 0000000..e6ac18f --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CommonFont.java @@ -0,0 +1,58 @@ +package sh.okx.civmodern.common.compat.v1_16_1; + +import com.mojang.blaze3d.vertex.PoseStack; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Arrays; +import net.minecraft.client.gui.Font; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.FormattedText; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import sh.okx.civmodern.common.compat.CommonFont; + +public class v1_16_1CommonFont implements CommonFont { + + private static final Logger LOGGER = LogManager.getLogger(); + + private final Font font; + private Method drawInternalMethod; + + public v1_16_1CommonFont(Font font) { + this.font = font; + + Class[] parameterTypes = {FormattedText.class, float.class, float.class, int.class, com.mojang.math.Matrix4f.class, boolean.class}; + for (Method method : font.getClass().getDeclaredMethods()) { + LOGGER.info(method); + if (Arrays.equals(method.getParameterTypes(), parameterTypes)) { + method.setAccessible(true); + this.drawInternalMethod = method; + LOGGER.info("Font.drawInternal: " + drawInternalMethod); + break; + } + } + } + + private void drawInternal(PoseStack stack, Component component, float x, float y, int colour, boolean shadow) { + try { + drawInternalMethod.invoke(font, component, x, y, colour, stack.last().pose(), shadow); + } catch (IllegalAccessException | InvocationTargetException e) { + e.printStackTrace(); + } + } + + @Override + public void draw(PoseStack poseStack, Component component, float x, float y, int colour) { + drawInternal(poseStack, component, x, y, colour, false); + } + + @Override + public void drawShadow(PoseStack poseStack, Component component, float x, float y, int colour) { + drawInternal(poseStack, component, x, y, colour, true); + } + + @Override + public void drawShadowCentred(PoseStack poseStack, Component component, float x, float y, int colour) { + drawShadow(poseStack, component, x - font.width(component) / 2f, y, colour); + } +} \ No newline at end of file diff --git a/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CompatProvider.java b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CompatProvider.java new file mode 100644 index 0000000..c50a309 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_1/v1_16_1CompatProvider.java @@ -0,0 +1,13 @@ +package sh.okx.civmodern.common.compat.v1_16_1; + +import net.minecraft.client.gui.Font; +import sh.okx.civmodern.common.compat.CommonFont; +import sh.okx.civmodern.common.compat.CompatProvider; + +public class v1_16_1CompatProvider implements CompatProvider { + + @Override + public CommonFont provideFont(Font font) { + return new v1_16_1CommonFont(font); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CommonFont.java b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CommonFont.java new file mode 100644 index 0000000..33c54e6 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CommonFont.java @@ -0,0 +1,31 @@ +package sh.okx.civmodern.common.compat.v1_16_5; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.Font; +import net.minecraft.network.chat.Component; +import sh.okx.civmodern.common.compat.CommonFont; + +public class v1_16_5CommonFont implements CommonFont { + + private final Font font; + + public v1_16_5CommonFont(Font font) { + this.font = font; + } + + @Override + public void draw(PoseStack poseStack, Component component, float x, float y, int colour) { + font.draw(poseStack, component, x, y, colour); + } + + @Override + public void drawShadow(PoseStack poseStack, Component component, float x, float y, int colour) { + font.drawShadow(poseStack, component, x, y, colour); + } + + @Override + public void drawShadowCentred(PoseStack poseStack, Component component, float x, float y, + int colour) { + font.drawShadow(poseStack, component, x - font.width(component) / 2f, y, colour); + } +} \ No newline at end of file diff --git a/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CompatProvider.java b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CompatProvider.java new file mode 100644 index 0000000..beeeff1 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/compat/v1_16_5/v1_16_5CompatProvider.java @@ -0,0 +1,13 @@ +package sh.okx.civmodern.common.compat.v1_16_5; + +import net.minecraft.client.gui.Font; +import sh.okx.civmodern.common.compat.CommonFont; +import sh.okx.civmodern.common.compat.CompatProvider; + +public class v1_16_5CompatProvider implements CompatProvider { + + @Override + public CommonFont provideFont(Font font) { + return new v1_16_5CommonFont(font); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/events/ClientTickEvent.java b/common/src/main/java/sh/okx/civmodern/common/events/ClientTickEvent.java new file mode 100644 index 0000000..02d0b2f --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/events/ClientTickEvent.java @@ -0,0 +1,5 @@ +package sh.okx.civmodern.common.events; + +public class ClientTickEvent implements Event { + +} diff --git a/common/src/main/java/sh/okx/civmodern/common/events/Event.java b/common/src/main/java/sh/okx/civmodern/common/events/Event.java new file mode 100644 index 0000000..00787ec --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/events/Event.java @@ -0,0 +1,5 @@ +package sh.okx.civmodern.common.events; + +public interface Event { + +} diff --git a/common/src/main/java/sh/okx/civmodern/common/events/EventBus.java b/common/src/main/java/sh/okx/civmodern/common/events/EventBus.java new file mode 100644 index 0000000..9d5f280 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/events/EventBus.java @@ -0,0 +1,7 @@ +package sh.okx.civmodern.common.events; + +import java.util.function.Consumer; + +public interface EventBus { + void listen(Class event, Consumer listener); +} diff --git a/common/src/main/java/sh/okx/civmodern/common/events/PostRenderGameOverlayEvent.java b/common/src/main/java/sh/okx/civmodern/common/events/PostRenderGameOverlayEvent.java new file mode 100644 index 0000000..be3baa4 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/events/PostRenderGameOverlayEvent.java @@ -0,0 +1,21 @@ +package sh.okx.civmodern.common.events; + +import com.mojang.blaze3d.vertex.PoseStack; + +public class PostRenderGameOverlayEvent implements Event { + private final PoseStack poseStack; + private final float delta; + + public PostRenderGameOverlayEvent(PoseStack poseStack, float delta) { + this.poseStack = poseStack; + this.delta = delta; + } + + public PoseStack getPoseStack() { + return poseStack; + } + + public float getDelta() { + return delta; + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/Alignment.java b/common/src/main/java/sh/okx/civmodern/common/gui/Alignment.java new file mode 100644 index 0000000..a5ed9e8 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/Alignment.java @@ -0,0 +1,32 @@ +package sh.okx.civmodern.common.gui; + +public enum Alignment { + TOP_LEFT("Top Left"), + TOP_RIGHT("Top Right"), + BOTTOM_RIGHT("Bottom Right"), + BOTTOM_LEFT("Bottom Left"); + + private final String name; + + Alignment(String name) { + this.name = name; + } + + @Override + public String toString() { + return name; + } + + public Alignment next() { + switch (this) { + case TOP_LEFT: + return TOP_RIGHT; + case TOP_RIGHT: + return BOTTOM_RIGHT; + case BOTTOM_RIGHT: + return BOTTOM_LEFT; + default: + return TOP_LEFT; + } + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/ColorValue.java b/common/src/main/java/sh/okx/civmodern/common/gui/ColorValue.java new file mode 100644 index 0000000..9507aba --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/ColorValue.java @@ -0,0 +1,39 @@ +package sh.okx.civmodern.common.gui; + +import java.text.DecimalFormat; +import java.util.function.Consumer; +import java.util.function.Supplier; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TranslatableComponent; + +public class ColorValue implements DoubleValue { + private static final DecimalFormat PERCENT_FORMAT = new DecimalFormat("##%"); + + private final String name; + private final int bits; + private final Supplier supplier; + private final Consumer consumer; + + public ColorValue(String name, int bits, Supplier supplier, Consumer consumer) { + this.name = name; + this.bits = bits; + this.supplier = supplier; + this.consumer = consumer; + } + + @Override + public double get() { + return ((supplier.get() >> bits) & 0xFF) / 255d; + } + + @Override + public void set(double value) { + int set = (1 << bits + 8) - (1 << bits); + consumer.accept((supplier.get() & ~set) | ((int) (value * 255d) << bits)); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent(name, PERCENT_FORMAT.format(value)); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/DoubleValue.java b/common/src/main/java/sh/okx/civmodern/common/gui/DoubleValue.java new file mode 100644 index 0000000..ccf7393 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/DoubleValue.java @@ -0,0 +1,9 @@ +package sh.okx.civmodern.common.gui; + +import net.minecraft.network.chat.Component; + +public interface DoubleValue { + double get(); + void set(double value); + Component getText(double value); +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/Texture.java b/common/src/main/java/sh/okx/civmodern/common/gui/Texture.java new file mode 100644 index 0000000..8e85aff --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/Texture.java @@ -0,0 +1,77 @@ +package sh.okx.civmodern.common.gui; + +import static org.lwjgl.opengl.GL11.*; + +import com.mojang.blaze3d.platform.GlStateManager; +import com.mojang.blaze3d.platform.TextureUtil; +import java.util.Objects; +import net.minecraft.client.Minecraft; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +/** + * OpenGL interface for a texture binding + */ +public class Texture { + private final int id; + private int width; + private int height; + private int[] pixels; + + public Texture(int width, int height) { + this.id = TextureUtil.generateTextureId(); + glPixelStorei(GL_UNPACK_ALIGNMENT, 1); + bind(); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); + resize(width, height); + + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL12.GL_UNSIGNED_INT_8_8_8_8, this.pixels); + } + + public void resize(int width, int height) { + this.width = width; + this.height = height; + this.pixels = new int[width * height]; + } + + public void setPixels(int[] pixels) { + if (Objects.requireNonNull(pixels).length != width * height) { + throw new IllegalArgumentException("Pixels length array incorrect, should be " + (width * height) + ", is " + pixels.length); + } + this.pixels = pixels; + } + + public void update() { + bind(); + + // If this is removed you will be fuckedd do not removed this + GL11.glPixelStorei(0xcf0, 0); + GL11.glPixelStorei(0xcf1, 0); + GL11.glPixelStorei(0xcf2, 0); + GL11.glPixelStorei(0xcf3, 0); + GL11.glPixelStorei(0xcf4, 0); + GL11.glPixelStorei(0xcf5, 4); + + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL12.GL_UNSIGNED_INT_8_8_8_8, this.pixels); + } + + public void bind() { + GlStateManager._bindTexture(id); + } + + public void unbind() { + GlStateManager._bindTexture(0); + } + + public void delete() { + GlStateManager._deleteTexture(id); + } + + public int getWidth() { + return width; + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/screen/CompactedConfigScreen.java b/common/src/main/java/sh/okx/civmodern/common/gui/screen/CompactedConfigScreen.java new file mode 100644 index 0000000..427b870 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/screen/CompactedConfigScreen.java @@ -0,0 +1,137 @@ +package sh.okx.civmodern.common.gui.screen; + +import com.mojang.blaze3d.vertex.PoseStack; +import java.text.DecimalFormat; +import java.util.regex.Pattern; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.StringTag; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.CivMapConfig; +import sh.okx.civmodern.common.compat.CommonFont; +import sh.okx.civmodern.common.gui.widget.HsbColourPicker; +import sh.okx.civmodern.common.gui.widget.ImageButton; + +public class CompactedConfigScreen extends Screen { + private static final DecimalFormat FORMAT = new DecimalFormat("##%"); + + private static final ItemStack ITEM; + + private int itemX; + private int itemY; + + static { + CompoundTag item = new CompoundTag(); + item.putString("id", "stone"); + item.putInt("Count", 64); + CompoundTag tag = new CompoundTag(); + ListTag lore = new ListTag(); + lore.add(StringTag.valueOf("\"Compacted Item\"")); + CompoundTag display = new CompoundTag(); + display.put("Lore", lore); + tag.put("display", display); + item.put("tag", tag); + ITEM = ItemStack.of(item); + } + + private final AbstractCivModernMod mod; + private final CivMapConfig config; + private final Screen parent; + private CommonFont cFont; + + public CompactedConfigScreen(AbstractCivModernMod mod, CivMapConfig config, Screen parent) { + super(new TranslatableComponent("civmodern.screen.compacted.title")); + this.mod = mod; + this.config = config; + this.parent = parent; + } + + @Override + protected void init() { + this.cFont = mod.getCompat().provideFont(this.font); + + itemX = this.width / 2 - 16 / 2; + itemY = this.height / 6 - 24; + + int leftWidth = width / 2 - (60 + 8 + 20 + 8 + 20) / 2; + + EditBox widget = new EditBox(font, leftWidth, height / 6, 60, 20, TextComponent.EMPTY); + widget.setValue("#" + String.format("%06X", config.getColour())); + widget.setMaxLength(7); + Pattern pattern = Pattern.compile("^(#[0-9A-F]{0,6})?$", Pattern.CASE_INSENSITIVE); + widget.setFilter(string -> pattern.matcher(string).matches()); + widget.setResponder(val -> { + if (val.length() == 7) { + int rgb = Integer.parseInt(val.substring(1), 16); + config.setColour(rgb); + } + }); + addButton(widget); + + HsbColourPicker hsb = new HsbColourPicker(leftWidth + 60 + 8, height / 6, 20, 20, config.getColour(), + colour -> { + widget.setValue("#" + String.format("%06X", colour)); + config.setColour(colour); + }); + + addButton(new ImageButton(leftWidth + 60 + 8 + 20 + 8, height / 6, 20, 20, new ResourceLocation("civmodern", "gui/rollback.png"), imbg -> { + int colour = 0xffff58; + widget.setValue("#FFFF58"); + config.setColour(colour); + hsb.close(); + })); + + addButton(hsb); + + + addButton(new Button(this.width / 2 - 49, this.height / 6 + 169, 98, 20, CommonComponents.GUI_DONE, button -> { + Minecraft.getInstance().setScreen(parent); + })); + } + + @Override + public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { + super.renderBackground(matrices); + + drawCentredText(matrices, this.title, 0, 40, 0xffffff); + + drawItem(); + + if (isCursorOverItem(mouseX, mouseY)) { + this.renderTooltip(matrices, ITEM, mouseX, mouseY); + } + + super.render(matrices, mouseX, mouseY, delta); + } + + @Override + public void onClose() { + super.onClose(); + config.save(); + } + + private boolean isCursorOverItem(int mouseX, int mouseY) { + return mouseX >= itemX - 1 && mouseX < itemX + 17 && mouseY > itemY - 1 && mouseY < itemY + 17; + } + + private void drawItem() { + itemRenderer.renderGuiItem(ITEM, itemX, itemY); + itemRenderer.renderGuiItemDecorations(font, ITEM, itemX, itemY); + } + + private void drawCentredText(PoseStack matrix, Component text, int xOffsetCentre, int yOffsetTop, int colour) { + int width = Minecraft.getInstance().getWindow().getGuiScaledWidth(); + int centre = width / 2 - font.width(text) / 2; + this.cFont.drawShadow(matrix, text, centre + xOffsetCentre, yOffsetTop, colour); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/screen/IceRoadConfigScreen.java b/common/src/main/java/sh/okx/civmodern/common/gui/screen/IceRoadConfigScreen.java new file mode 100644 index 0000000..657f4f1 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/screen/IceRoadConfigScreen.java @@ -0,0 +1,53 @@ +package sh.okx.civmodern.common.gui.screen; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.TranslatableComponent; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.CivMapConfig; +import sh.okx.civmodern.common.compat.CommonFont; +import sh.okx.civmodern.common.gui.widget.CyclicButton; + +public class IceRoadConfigScreen extends Screen { + private final AbstractCivModernMod mod; + private final CivMapConfig config; + private final Screen parent; + private CommonFont cFont; + + protected IceRoadConfigScreen(AbstractCivModernMod mod, CivMapConfig config, Screen parent) { + super(new TranslatableComponent("civmodern.screen.ice.title")); + this.mod = mod; + this.config = config; + this.parent = parent; + } + + @Override + protected void init() { + this.cFont = mod.getCompat().provideFont(this.font); + + addButton(new CyclicButton(this.width / 2 - 75, this.height / 6 + 24, 150, 20, config.isIceRoadCardinalEnabled() ? 0 : 1, cycl -> { + config.setIceRoadCardinalEnabled(cycl.getIndex() == 0); + }, new TranslatableComponent("civmodern.screen.ice.cardinal.enable"), new TranslatableComponent("civmodern.screen.ice.cardinal.disable"))); + + addButton(new Button(this.width / 2 - 49, this.height / 6 + 169, 98, 20, CommonComponents.GUI_DONE, button -> { + Minecraft.getInstance().setScreen(parent); + })); + } + + @Override + public void render(PoseStack poseStack, int i, int j, float f) { + super.renderBackground(poseStack); + super.render(poseStack, i, j, f); + + cFont.drawShadowCentred(poseStack, this.title, this.width / 2f, 40, 0xffffff); + } + + @Override + public void onClose() { + super.onClose(); + config.save(); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/screen/MainConfigScreen.java b/common/src/main/java/sh/okx/civmodern/common/gui/screen/MainConfigScreen.java new file mode 100644 index 0000000..596a69a --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/screen/MainConfigScreen.java @@ -0,0 +1,47 @@ +package sh.okx.civmodern.common.gui.screen; + +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.TranslatableComponent; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.CivMapConfig; +import sh.okx.civmodern.common.compat.CommonFont; + +public class MainConfigScreen extends Screen { + + private final AbstractCivModernMod mod; + private final CivMapConfig config; + private CommonFont cFont; + + public MainConfigScreen(AbstractCivModernMod mod, CivMapConfig config) { + super(new TranslatableComponent("civmodern.screen.main.title")); + this.mod = mod; + this.config = config; + } + + @Override + protected void init() { + this.cFont = mod.getCompat().provideFont(this.font); + + int col0 = this.width / 2 - 150 / 2; + addButton(new Button(col0, this.height / 6, 150, 20, new TranslatableComponent("civmodern.screen.main.compacted"), button -> { + Minecraft.getInstance().setScreen(new CompactedConfigScreen(mod, config, this)); + })); + addButton(new Button(col0, this.height / 6 + 24, 150, 20, new TranslatableComponent("civmodern.screen.main.radar"), button -> { + Minecraft.getInstance().setScreen(new RadarConfigScreen(mod, config, this)); + })); + addButton(new Button(col0, this.height / 6 + 48, 150, 20, new TranslatableComponent("civmodern.screen.main.ice"), button -> { + Minecraft.getInstance().setScreen(new IceRoadConfigScreen(mod, config, this)); + })); + } + + @Override + public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { + super.renderBackground(matrices); + super.render(matrices, mouseX, mouseY, delta); + + cFont.drawShadow(matrices, this.title, this.width / 2f - this.font.width(this.title) / 2f, 40, 0xffffff); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/screen/RadarConfigScreen.java b/common/src/main/java/sh/okx/civmodern/common/gui/screen/RadarConfigScreen.java new file mode 100644 index 0000000..ee27218 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/screen/RadarConfigScreen.java @@ -0,0 +1,266 @@ +package sh.okx.civmodern.common.gui.screen; + +import com.mojang.blaze3d.vertex.PoseStack; +import java.text.DecimalFormat; +import java.util.regex.Pattern; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.resources.ResourceLocation; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.CivMapConfig; +import sh.okx.civmodern.common.compat.CommonFont; +import sh.okx.civmodern.common.gui.widget.DoubleOptionUpdateableSliderWidget; +import sh.okx.civmodern.common.gui.DoubleValue; +import sh.okx.civmodern.common.gui.widget.HsbColourPicker; +import sh.okx.civmodern.common.gui.widget.ImageButton; + +public class RadarConfigScreen extends Screen { + + private final AbstractCivModernMod mod; + private final CivMapConfig config; + private final Screen parent; + private CommonFont cFont; + + public RadarConfigScreen(AbstractCivModernMod mod, CivMapConfig config, Screen parent) { + super(new TranslatableComponent("civmodern.screen.radar.title")); + this.mod = mod; + this.config = config; + this.parent = parent; + } + + @Override + protected void init() { + this.cFont = mod.getCompat().provideFont(this.font); + + int centre = this.width / 2 - 98 / 2; + addButton(new Button(this.width / 2 - 75, this.height / 6 + 24, 150, 20, getRadarToggleMessage(), button -> { + config.setRadarEnabled(!config.isRadarEnabled()); + button.setMessage(getRadarToggleMessage()); + })); + addButton(new Button(this.width / 2 - 75, this.height / 6 + 48, 150, 20, getPingToggleMessage(), button -> { + config.setPingEnabled(!config.isPingEnabled()); + button.setMessage(getPingToggleMessage()); + })); + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 48 + 24, 150, 20, 1, 8, 1, new DoubleValue() { + @Override + public double get() { + return config.getRadarCircles(); + } + + @Override + public void set(double value) { + config.setRadarCircles((int) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.circles", + Integer.toString((int) value)); + } + })); + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 48 + 48, 150, 20, 50, 300, 1, new DoubleValue() { + @Override + public double get() { + return config.getRadarSize(); + } + + @Override + public void set(double value) { + config.setRadarSize((int) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.size", + Integer.toString((int) value)); + } + })); + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 48 + 72, 150, 20, 0.5, 2, 0.1, new DoubleValue() { + private final DecimalFormat format = new DecimalFormat("#.#"); + + @Override + public double get() { + return config.getIconSize(); + } + + @Override + public void set(double value) { + config.setIconSize((float) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.iconsize", format.format(value)); + } + })); + addButton(new Button(this.width / 2 - 75, this.height / 6 + 48 + 96, 150, 20, new TranslatableComponent("civmodern.screen.radar.alignment", config.getAlignment().toString()), button -> { + config.setAlignment(config.getAlignment().next()); + button.setMessage(new TranslatableComponent("civmodern.screen.radar.alignment", config.getAlignment().toString())); + })); + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 48 + 120, 150, 20, 20, 150, 1, new DoubleValue() { + + @Override + public double get() { + return config.getRange(); + } + + @Override + public void set(double value) { + config.setRange((int) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.range", String.valueOf((int) value)); + } + })); + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 48 + 144, 150, 20, 0, 300, 1, new DoubleValue() { + + @Override + public double get() { + return config.getX(); + } + + @Override + public void set(double value) { + config.setX((int) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.x", String.valueOf((int) value)); + } + })); + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 48 + 168, 150, 20, 0, 300, 1, new DoubleValue() { + + @Override + public double get() { + return config.getY(); + } + + @Override + public void set(double value) { + config.setY((int) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.y", String.valueOf((int) value)); + } + })); + + addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 168 + 48 + 24, 150, 20, 0, 1, 0.01, new DoubleValue() { + private final DecimalFormat format = new DecimalFormat("##%"); + + @Override + public double get() { + return config.getTransparency(); + } + + @Override + public void set(double value) { + config.setTransparency((float) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.transparency", format.format(value)); + } + })); + + int left = width / 2 - (60 + 8 + 20 + 8 + 20) / 2; + EditBox widget = new EditBox(font, left, height / 6 + 48 + 48 + 168, 60, 20, TextComponent.EMPTY); + widget.setValue("#" + String.format("%06X", config.getRadarColour())); + widget.setMaxLength(7); + Pattern pattern = Pattern.compile("^(#[0-9A-F]{0,6})?$", Pattern.CASE_INSENSITIVE); + widget.setFilter(string -> pattern.matcher(string).matches()); + widget.setResponder(val -> { + if (val.length() == 7) { + int rgb = Integer.parseInt(val.substring(1), 16); + config.setRadarColour(rgb); + } + }); + addButton(widget); + + HsbColourPicker hsb = new HsbColourPicker(left + 60 + 8, height / 6 + 48 + 48 + 168, + 20, 20, config.getRadarColour(), colour -> { + widget.setValue("#" + String.format("%06X", colour)); + config.setRadarColour(colour); + }); + addButton(new ImageButton(left + 60 + 8 + 20 + 8, height / 6 + 48 + 48 + 168, 20, 20, new ResourceLocation("civmodern", "gui/rollback.png"), imbg -> { + int colour = 0x888888; + widget.setValue("#888888"); + config.setRadarColour(colour); + hsb.close(); + })); + addButton(hsb); + + /*addButton(new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 24 + 150 + 48, 150, 20, 0, 1, 0.01, new DoubleValue() { + private final DecimalFormat format = new DecimalFormat("##%"); + + @Override + public double get() { + return config.getTransparency(); + } + + @Override + public void set(double value) { + config.setTransparency((float) value); + } + + @Override + public Component getText(double value) { + return new TranslatableComponent("civmodern.screen.radar.transparency", format.format(value)); + } + })); + DoubleOptionUpdateableSliderWidget redOption = new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 24 + 172 + 4 + 48, 150, 20, 0, 1, 1f / 255, + new ColorValue("civmodern.configscreen.colour.red", 16, config::getRadarColour, config::setRadarColour)); + addButton(redOption); + DoubleOptionUpdateableSliderWidget greenOption = new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 24 + 196 + 4 + 48, 150, 20, 0, 1, 1f / 255, + new ColorValue("civmodern.configscreen.colour.green", 8, config::getRadarColour, config::setRadarColour)); + addButton(greenOption); + DoubleOptionUpdateableSliderWidget blueOption = new DoubleOptionUpdateableSliderWidget(this.width / 2 - 75, this.height / 6 + 24 + 220 + 4 + 48, 150, 20, 0, 1, 1f / 255, + new ColorValue("civmodern.configscreen.colour.blue", 0, config::getRadarColour, config::setRadarColour)); + addButton(blueOption);*/ + + addButton(new Button(centre, this.height / 6 + 24 + 265 + 48, 98, 20, CommonComponents.GUI_DONE, button -> { + Minecraft.getInstance().setScreen(parent); + })); + } + + private Component getPingToggleMessage() { + if (config.isPingEnabled()) { + return new TextComponent("Pings: Enabled"); + } else { + return new TextComponent("Pings: Disabled"); + } + } + + @Override + public void onClose() { + config.save(); + super.onClose(); + } + + @Override + public void render(PoseStack matrices, int mouseX, int mouseY, float delta) { + //super.renderBackground(matrices); + super.render(matrices, mouseX, mouseY, delta); + + this.cFont.drawShadowCentred(matrices, this.title, this.width / 2f, 40, 0xffffff); + } + + private Component getRadarToggleMessage() { + if (config.isRadarEnabled()) { + return new TextComponent("Radar: Enabled"); + } else { + return new TextComponent("Radar: Disabled"); + } + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/widget/CyclicButton.java b/common/src/main/java/sh/okx/civmodern/common/gui/widget/CyclicButton.java new file mode 100644 index 0000000..da97472 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/widget/CyclicButton.java @@ -0,0 +1,33 @@ +package sh.okx.civmodern.common.gui.widget; + +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.Component; + +public class CyclicButton extends Button { + + private final OnPress onPress; + private final Component[] components; + private int index; + + public CyclicButton(int x, int y, int width, int height, int index, OnPress onPress, Component... components) { + super(x, y, width, height, components[index], b -> {}); + this.index = index; + this.components = components; + this.onPress = onPress; + } + + public int getIndex() { + return index; + } + + @Override + public void onPress() { + index = (index + 1) % components.length; + this.setMessage(components[index]); + onPress.onPress(this); + } + + public interface OnPress { + void onPress(CyclicButton button); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/widget/DoubleOptionUpdateableSliderWidget.java b/common/src/main/java/sh/okx/civmodern/common/gui/widget/DoubleOptionUpdateableSliderWidget.java new file mode 100644 index 0000000..2f5d2d1 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/widget/DoubleOptionUpdateableSliderWidget.java @@ -0,0 +1,38 @@ +package sh.okx.civmodern.common.gui.widget; + +import net.minecraft.client.gui.components.AbstractSliderButton; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.util.Mth; +import sh.okx.civmodern.common.gui.DoubleValue; + +public class DoubleOptionUpdateableSliderWidget extends AbstractSliderButton { + private final DoubleValue param; + private final double min; + private final double max; + private final double step; + + public DoubleOptionUpdateableSliderWidget(int x, int y, + int width, int height, double min, double max, double step, DoubleValue param) { + super(x, y, width, height, TextComponent.EMPTY, (param.get() - min) / (max - min)); + this.param = param; + this.min = min; + this.max = max; + this.step = step; + this.updateMessage(); + } + + public void update() { + updateMessage(); + this.value = (param.get() - min) / (max - min); + } + + @Override + protected void updateMessage() { + this.setMessage(this.param.getText(this.param.get())); + } + + @Override + protected void applyValue() { + param.set(Mth.lerp(this.value, min, max)); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/widget/HsbColourPicker.java b/common/src/main/java/sh/okx/civmodern/common/gui/widget/HsbColourPicker.java new file mode 100644 index 0000000..ab501f4 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/widget/HsbColourPicker.java @@ -0,0 +1,190 @@ +package sh.okx.civmodern.common.gui.widget; + +import static org.lwjgl.opengl.GL11.*; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.BufferUploader; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import java.awt.Color; +import java.util.function.Consumer; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.resources.ResourceLocation; +import sh.okx.civmodern.common.gui.Texture; + +public class HsbColourPicker extends AbstractWidget { + + private final Texture hueSelector; + private final Texture saturationBrightnessTexture; + private final Consumer colourConsumer; + + private int hue = 0; // [0, 360] + private int saturation = 0; // [0, 100] + private int brightness = 0; // [0, 100] + + private boolean showPalette = false; + private boolean updateTexture = true; + private boolean hueMouseDown = false; + + + public HsbColourPicker(int x, int y, int width, int height, int colour, Consumer colourConsumer) { + super(x, y, width, height, new TextComponent("HSB Colour Picker")); + + this.hue = Math.round(Color.RGBtoHSB(colour >> 16 & 0xFF, colour >> 8 & 0xFF, colour & 0xFF, null)[0] * 360); + + this.hueSelector = HsbColourPicker.getHueSelector(); + this.saturationBrightnessTexture = new Texture(128, 128); + this.colourConsumer = colourConsumer; + } + + @Override + public void renderButton(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) { + Minecraft minecraft = Minecraft.getInstance(); + minecraft.getTextureManager().bind(new ResourceLocation("civmodern", "gui/colour.png")); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); + Gui.blit(matrixStack, this.x, this.y, this.getBlitOffset(), 0, isHovered() ? 20 : 0, this.width, + this.height, 40, 20); + + if (showPalette) { + RenderSystem.enableTexture(); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + + if (this.updateTexture) { + updateTexture(this.saturationBrightnessTexture, this.hue); + this.updateTexture = false; + } else { + this.saturationBrightnessTexture.bind(); + } + + glPushMatrix(); + glTranslatef(0, 0, 1000); + // Saturation and brightness selector + Gui.blit(matrixStack, this.x, this.y + height, 0, 0, 0, 101, 101, 128, 128); + + // Hue selector + hueSelector.bind(); + Gui.blit(matrixStack, this.x + 106, this.y + height, 10, 101, 0, 0, 1, 360, 1, 360); + + RenderSystem.disableTexture(); + // Render cursor + glEnable(GL_LINE_SMOOTH); + glLineWidth(2f); + + Tesselator tessellator = Tesselator.getInstance(); + BufferBuilder buffer = tessellator.getBuilder(); + buffer.begin(GL_LINES, DefaultVertexFormat.POSITION); + + double hueOffset = (this.hue / 360f) * 101; + buffer.vertex(this.x + 106, this.y + height + hueOffset, 0f).endVertex(); + buffer.vertex(this.x + 116, this.y + height + hueOffset, 0f).endVertex(); + + buffer.end(); + BufferUploader.end(buffer); + glDisable(GL_LINE_SMOOTH); + + glPopMatrix(); + + RenderSystem.enableTexture(); + RenderSystem.disableBlend(); + RenderSystem.disableAlphaTest(); + + } + } + + @Override + public void onClick(double mouseX, double mouseY) { + showPalette = !showPalette; + } + + @Override + protected void onDrag(double mouseX, double mouseY, double dragX, double dragY) { + if (this.hueMouseDown) { + setHue(mouseX, mouseY, 0, true); + } + } + + @Override + public void onRelease(double d, double e) { + this.hueMouseDown = false; + } + + @Override + public boolean mouseClicked(double mouseX, double mouseY, int button) { + return selectColour(mouseX, mouseY, button) + || setHue(mouseX, mouseY, button, false) + || super.mouseClicked(mouseX, mouseY, button); + } + + private boolean selectColour(double mouseX, double mouseY, int button) { + if (active && visible && button == 0 && showPalette) { + if (mouseX >= this.x && mouseX < this.x + 101 + && mouseY >= this.y + height && mouseY < this.y + height + 101) { + this.saturation = (int) (mouseX - this.x); + this.brightness = (int) (mouseY - this.y - height); + colourConsumer.accept(toRgb()); + this.showPalette = false; + return true; + } + } + return false; + } + + private boolean setHue(double mouseX, double mouseY, int button, boolean force) { + // Cursor selector + if (active && visible && button == 0 && showPalette) { + if (!(mouseY >= this.y + height && mouseY <= this.y + height + 101)) { + return false; + } + + if (force || (mouseX >= this.x + 106 && mouseX <= this.x + 106 + 10)) { + this.hueMouseDown = true; + double yOffset = mouseY - (this.y + height); + int newHue = (int) ((yOffset / 101) * 360); + if (newHue != this.hue) { + this.hue = newHue; + this.updateTexture = true; + } + return true; + } + } + return false; + } + + private void updateTexture(Texture texture, int hue) { + int[] rgbaValues = new int[128 * 128]; + for (int saturation = 0; saturation <= 100; saturation++) { + for (int brightness = 0; brightness <= 100; brightness++) { + int rgb = Color.HSBtoRGB(hue / 360f, saturation / 100f, brightness / 100f) & 0xFFFFFF; + rgbaValues[(brightness * 128) + saturation] = rgb << 8 | 0xFF; + } + } + texture.setPixels(rgbaValues); + texture.update(); + } + + private int toRgb() { + return Color.HSBtoRGB(this.hue / 360f, this.saturation / 100f, this.brightness / 100f) & 0xFFFFFF; + } + + public static Texture getHueSelector() { + Texture hueSelector = new Texture(1, 360); + int[] rgbaValues = new int[360]; + for (int i = 0; i < 360; i++) { + int rgb = Color.HSBtoRGB(i / 360f, 1, 1); + rgbaValues[i] = rgb << 8 | 0xFF; + } + hueSelector.setPixels(rgbaValues); + hueSelector.update(); + return hueSelector; + } + + public void close() { + this.showPalette = false; + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/gui/widget/ImageButton.java b/common/src/main/java/sh/okx/civmodern/common/gui/widget/ImageButton.java new file mode 100644 index 0000000..f0ab79c --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/gui/widget/ImageButton.java @@ -0,0 +1,43 @@ +package sh.okx.civmodern.common.gui.widget; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.resources.ResourceLocation; + +public class ImageButton extends AbstractWidget { + + private final ResourceLocation image; + private final OnPress onPress; + + public ImageButton(int x, int y, int width, int height, ResourceLocation image, OnPress onPress) { + super(x, y, width, height, TextComponent.EMPTY); + this.image = image; + this.onPress = onPress; + } + + @Override + public void renderButton(PoseStack poseStack, int i, int j, float f) { + Minecraft minecraft = Minecraft.getInstance(); + minecraft.getTextureManager().bind(image); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); + int k = this.isHovered() ? 1 : 0; + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + RenderSystem.enableDepthTest(); + Gui.blit(poseStack, this.x, this.y, this.getBlitOffset(), 0, k * 20, this.width, this.height, 40, 20); + this.renderBg(poseStack, minecraft, i, j); + } + + @Override + public void onClick(double d, double e) { + this.onPress.onPress(this); + } + + public interface OnPress { + void onPress(ImageButton button); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/macro/HoldKeyMacro.java b/common/src/main/java/sh/okx/civmodern/common/macro/HoldKeyMacro.java new file mode 100644 index 0000000..43190c9 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/macro/HoldKeyMacro.java @@ -0,0 +1,55 @@ +package sh.okx.civmodern.common.macro; + +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.events.ClientTickEvent; + +public class HoldKeyMacro { + + private final KeyMapping holdBinding; + private final KeyMapping defaultBinding; + private boolean down = false; + + public HoldKeyMacro(AbstractCivModernMod mod, KeyMapping holdBinding, KeyMapping defaultBinding) { + mod.getEventBus().listen(ClientTickEvent.class, e -> tick()); + this.holdBinding = holdBinding; + this.defaultBinding = defaultBinding; + } + + public void tick() { + Minecraft mc = Minecraft.getInstance(); + if (mc.player == null) { + return; + } + + if (down && (mc.screen != null || !mc.mouseHandler.isMouseGrabbed())) { + set(false); + return; + } + + for (KeyMapping hotbar : mc.options.keyHotbarSlots) { + if (hotbar.isDown()) { + set(false); + return; + } + } + + while (holdBinding.consumeClick()) { + if (this.down) { + set(false); + } else if (!mc.player.isUsingItem()) { + set(true); + } + } + } + + public void onScroll() { + set(false); + } + + private void set(boolean down) { + this.down = down; + this.defaultBinding.setDown(down); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/macro/IceRoadMacro.java b/common/src/main/java/sh/okx/civmodern/common/macro/IceRoadMacro.java new file mode 100644 index 0000000..e1092a7 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/macro/IceRoadMacro.java @@ -0,0 +1,60 @@ +package sh.okx.civmodern.common.macro; + +import net.minecraft.client.KeyMapping; +import net.minecraft.client.Minecraft; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.CivMapConfig; +import sh.okx.civmodern.common.events.ClientTickEvent; + +public class IceRoadMacro { + private final CivMapConfig config; + private final KeyMapping key; + // alternate between true and false for maximum jumpage + private boolean enabled = false; + private boolean jump = false; + + public IceRoadMacro(AbstractCivModernMod mod, CivMapConfig config, KeyMapping key) { + // Options for ice road macro: + // Auto cardinal + // Auto eat + + mod.getEventBus().listen(ClientTickEvent.class, e -> tick()); + this.config = config; + this.key = key; + } + + public void tick() { + Minecraft mc = Minecraft.getInstance(); + + while (this.key.consumeClick()) { + if (enabled) { + mc.options.keySprint.setDown(false); + mc.options.keyUp.setDown(false); + if (jump) { + jump = false; + mc.options.keyJump.setDown(false); + } + enabled = false; + } else { + if (config.isIceRoadCardinalEnabled()) { + float rot = Math.round(mc.player.yRot / 45); + mc.player.yRot = rot * 45; + } + + enabled = true; + } + } + + if (enabled) { + if (!jump) { + mc.options.keyJump.setDown(true); + jump = true; + } else { + mc.options.keyJump.setDown(false); + jump = false; + } + mc.options.keySprint.setDown(true); + mc.options.keyUp.setDown(true); + } + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/mixins/InventoryMixin.java b/common/src/main/java/sh/okx/civmodern/common/mixins/InventoryMixin.java new file mode 100644 index 0000000..b37fc1c --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/mixins/InventoryMixin.java @@ -0,0 +1,16 @@ +package sh.okx.civmodern.common.mixins; + +import net.minecraft.world.entity.player.Inventory; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import sh.okx.civmodern.common.AbstractCivModernMod; + +@Mixin(Inventory.class) +public class InventoryMixin { + @Inject(at = @At("HEAD"), method = "swapPaint(D)V") + private void swapPaint(CallbackInfo info) { + AbstractCivModernMod.staticOnScroll(); + } +} diff --git a/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java b/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java new file mode 100644 index 0000000..7054e32 --- /dev/null +++ b/common/src/main/java/sh/okx/civmodern/common/radar/Radar.java @@ -0,0 +1,454 @@ +package sh.okx.civmodern.common.radar; + +import static org.lwjgl.opengl.GL11.*; + +import com.mojang.blaze3d.systems.RenderSystem; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; +import net.minecraft.ChatFormatting; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.multiplayer.PlayerInfo; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.player.RemotePlayer; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.ClickEvent; +import net.minecraft.network.chat.HoverEvent; +import net.minecraft.network.chat.KeybindComponent; +import net.minecraft.network.chat.Style; +import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.TranslatableComponent; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.vehicle.Boat; +import net.minecraft.world.entity.vehicle.Minecart; +import sh.okx.civmodern.common.CivMapConfig; +import sh.okx.civmodern.common.compat.CommonFont; +import sh.okx.civmodern.common.compat.CompatProvider; +import sh.okx.civmodern.common.events.ClientTickEvent; +import sh.okx.civmodern.common.events.EventBus; +import sh.okx.civmodern.common.events.PostRenderGameOverlayEvent; +import sh.okx.civmodern.common.gui.screen.RadarConfigScreen; + +public class Radar { + + private static final double COS_45 = 0.70710677D; + private static final int PLAYER_RANGE = 70; + + private final EventBus eventBus; + private final CivMapConfig config; + private final CommonFont cFont; + + private Set playersInRange = new HashSet<>(); + private String lastWaypointCommand; + + + public Radar(CivMapConfig config, EventBus eventBus, CompatProvider compatProvider) { + this.config = config; + this.eventBus = eventBus; + this.cFont = compatProvider.provideFont(Minecraft.getInstance().font); + } + + public void init() { + eventBus.listen(ClientTickEvent.class, this::onClientTick); + eventBus.listen(ClientTickEvent.class, this::onWorldTickPing); + eventBus.listen(PostRenderGameOverlayEvent.class, this::onRender); + } + + public void onClientTick(ClientTickEvent event) { + Minecraft client = Minecraft.getInstance(); + if (client.level == null) { + this.playersInRange = Collections.emptySet(); + } + } + + public void onWorldTickPing(ClientTickEvent event) { + ClientLevel world = Minecraft.getInstance().level; + if (world == null || !config.isPingEnabled()) { + return; + } + + Set newPlayersInRange = new HashSet<>(); + for (Entity entity : world.entitiesForRendering()) { + if (entity instanceof RemotePlayer) { + RemotePlayer player = (RemotePlayer) entity; + newPlayersInRange.add(player); + if (!playersInRange.contains(player)) { + BlockPos pos = player.blockPosition(); + lastWaypointCommand = + "/newWaypoint x:" + pos.getX() + ",y:" + pos.getY() + ",z:" + pos.getZ() + ",name:" + + player.getScoreboardName(); + Minecraft.getInstance().player.displayClientMessage( + new TranslatableComponent("civmodern.radar.enter", + player.getName(), + new TextComponent(Integer.toString(pos.getX())) + .withStyle(s -> s.applyFormat(ChatFormatting.AQUA)), + new TextComponent(Integer.toString(pos.getY())) + .withStyle(s -> s.applyFormat(ChatFormatting.AQUA)), + new TextComponent(Integer.toString(pos.getZ())) + .withStyle(s -> s.applyFormat(ChatFormatting.AQUA))) + .setStyle(Style.EMPTY + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, lastWaypointCommand)) + .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + new TranslatableComponent("civmodern.radar.hover", + new KeybindComponent("key.civmodern.highlight"))))), + false); + + } + } + } + + for (RemotePlayer player : playersInRange) { + if (!newPlayersInRange.contains(player)) { + BlockPos pos = player.blockPosition(); + lastWaypointCommand = + "/newWaypoint x:" + pos.getX() + ",y:" + pos.getY() + ",z:" + pos.getZ() + ",name:" + + player.getScoreboardName(); + Minecraft.getInstance().player.displayClientMessage( + new TranslatableComponent("civmodern.radar.leave", + player.getName(), + new TextComponent(Integer.toString(pos.getX())) + .withStyle(s -> s.applyFormat(ChatFormatting.AQUA)), + new TextComponent(Integer.toString(pos.getY())) + .withStyle(s -> s.applyFormat(ChatFormatting.AQUA)), + new TextComponent(Integer.toString(pos.getZ())) + .withStyle(s -> s.applyFormat(ChatFormatting.AQUA))) + .setStyle(Style.EMPTY + .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, lastWaypointCommand)) + .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, + new TranslatableComponent("civmodern.radar.hover", + new KeybindComponent("key.civmodern.highlight"))))), + false); + } + } + + this.playersInRange = newPlayersInRange; + } + + public void onRender(PostRenderGameOverlayEvent event) { + Screen screen = Minecraft.getInstance().screen; + if (screen == null + || screen instanceof RadarConfigScreen + || screen instanceof ChatScreen + //|| screen instanceof IngameMenuScreen + ) { + if (config.isRadarEnabled()) { + render(event.getPoseStack(), event.getDelta()); + } + } + } + + private int radius() { + return config.getRadarSize(); + } + + public void render(PoseStack matrices, float delta) { + Minecraft client = Minecraft.getInstance(); + LocalPlayer player = client.player; + glPushMatrix(); + + int offsetX = config.getX(); + int offsetY = config.getY(); + int z = 1000; + + int height = client.getWindow().getGuiScaledHeight(); + int width = client.getWindow().getGuiScaledWidth(); + switch (config.getAlignment()) { + case TOP_LEFT: + glTranslatef(offsetX, offsetY, z); + break; + case TOP_RIGHT: + glTranslatef(width - offsetX, offsetY, z); + break; + case BOTTOM_RIGHT: + glTranslatef(width - offsetX, height - offsetY, z); + break; + case BOTTOM_LEFT: + glTranslatef(offsetX, height - offsetY, z); + break; + } + float yaw = player.getViewYRot(delta); + glRotatef(-yaw, 0, 0, 1); + + renderCircleBackground(); + for (int i = 1; i <= config.getRadarCircles(); i++) { + renderCircleBorder(radius() * (i / (double) config.getRadarCircles())); + } + //renderRange(); + renderLines(); + + renderBoatsMinecarts(matrices, delta); + renderPlayers(matrices, delta); + + glPopMatrix(); + glColor4f(1.0F, 1.0F, 1.0F, 1); + } + + private void renderRange() { + glLineWidth(1f); + glEnable(GL_BLEND); + glDisable(GL_TEXTURE_2D); + glEnable(GL_LINE_SMOOTH); + glDisable(GL_LIGHTING); + glColor4f(1, 1, 1, 1); + + // If config.range < 98, then cut off a bit + double len = PLAYER_RANGE * (config.getRadarSize() / config.getRange()); + double corner = config.getRadarSize() * COS_45; + len = Math.min(len, corner); + + Tesselator tessellator = Tesselator.getInstance(); + BufferBuilder buffer = tessellator.getBuilder(); + buffer.begin(GL_LINES, DefaultVertexFormat.POSITION); + + buffer.vertex(-len, -len, 0f).endVertex(); + buffer.vertex(-len, len, 0f).endVertex(); + + buffer.vertex(-len, len, 0f).endVertex(); + buffer.vertex(len, len, 0f).endVertex(); + + buffer.vertex(len, len, 0f).endVertex(); + buffer.vertex(len, -len, 0f).endVertex(); + + buffer.vertex(len, -len, 0f).endVertex(); + buffer.vertex(-len, -len, 0f).endVertex(); + + tessellator.end(); + + glDisable(GL_BLEND); + glDisable(GL_LINE_SMOOTH); + glEnable(GL_TEXTURE_2D); + } + + private void renderBoatsMinecarts(PoseStack matrices, float delta) { + Minecraft minecraft = Minecraft.getInstance(); + + for (Entity entity : minecraft.level.entitiesForRendering()) { + if (entity instanceof Boat) { + Boat boat = (Boat) entity; + + double scale = config.getRadarSize() / config.getRange(); + + double px = minecraft.player.xOld + + (minecraft.player.getX() - minecraft.player.xOld) * delta; + double pz = minecraft.player.zOld + + (minecraft.player.getZ() - minecraft.player.zOld) * delta; + double x = boat.xOld + (boat.getX() - boat.xOld) * delta; + double z = boat.zOld + (boat.getZ() - boat.zOld) * delta; + double dx = px - x; + double dz = pz - z; + if (dx * dx + dz * dz > config.getRange() * config.getRange()) { + continue; + } + glEnable(GL_BLEND); + glColor4f(1.0F, 1.0F, 1.0F, 1); + + glPushMatrix(); + glTranslated(dx * scale, dz * scale, 0); + glRotatef(minecraft.player.getViewYRot(delta), 0, 0, 1); + + glPushMatrix(); + matrices.pushPose(); + matrices.scale(config.getIconSize(), config.getIconSize(), 0); + minecraft.getTextureManager().bind( + new ResourceLocation("textures/item/" + boat.getBoatType().getName() + "_boat.png")); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + Gui.blit(matrices, -4, -4, 8, 8, 0, 0, 16, 16, 16, 16); + matrices.popPose(); + + glPopMatrix(); + glPopMatrix(); + } else if (entity instanceof Minecart) { + Minecart minecart = (Minecart) entity; + + double scale = config.getRadarSize() / config.getRange(); + + double px = + minecraft.player.xOld + (minecraft.player.getX() - minecraft.player.xOld) * delta; + double pz = + minecraft.player.zOld + (minecraft.player.getZ() - minecraft.player.zOld) * delta; + double x = minecart.xOld + (minecart.getX() - minecart.xOld) * delta; + double z = minecart.zOld + (minecart.getZ() - minecart.zOld) * delta; + double dx = px - x; + double dz = pz - z; + if (dx * dx + dz * dz > config.getRange() * config.getRange()) { + continue; + } + glEnable(GL_BLEND); + glColor4f(1.0F, 1.0F, 1.0F, 1); + + glPushMatrix(); + glTranslated(dx * scale, dz * scale, 0); + glRotatef(minecraft.player.getViewYRot(delta), 0, 0, 1); + + glPushMatrix(); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + matrices.pushPose(); + matrices.scale(config.getIconSize(), config.getIconSize(), 0); + minecraft.getTextureManager().bind(new ResourceLocation("textures/item/minecart.png")); + RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); + Gui.blit(matrices, -4, -4, 8, 8, 0, 0, 16, 16, 16, 16); + matrices.popPose(); + + glPopMatrix(); + glDisable(GL_BLEND); + glPopMatrix(); + } + } + } + + private void renderPlayers(PoseStack matrices, float delta) { + Minecraft minecraft = Minecraft.getInstance(); + + glPushMatrix(); + + for (RemotePlayer player : playersInRange) { + if (!player.isAlive()) { + continue; + } + double v = config.getRadarSize() / config.getRange(); + + double px = minecraft.player.xOld + (minecraft.player.getX() - minecraft.player.xOld) * delta; + double pz = minecraft.player.zOld + (minecraft.player.getZ() - minecraft.player.zOld) * delta; + double x = player.xOld + (player.getX() - player.xOld) * delta; + double z = player.zOld + (player.getZ() - player.zOld) * delta; + double dx = px - x; + double dz = pz - z; + if (dx * dx + dz * dz > config.getRange() * config.getRange()) { + continue; + } + glEnable(GL_BLEND); + glColor4f(1.0F, 1.0F, 1.0F, 1); + + glPushMatrix(); + glTranslated(dx * v, dz * v, 0); + glRotatef(minecraft.player.getViewYRot(delta), 0, 0, 1); + + PlayerInfo entry = minecraft.player.connection.getPlayerInfo(player.getUUID()); + glPushMatrix(); + RenderSystem.enableBlend(); + RenderSystem.defaultBlendFunc(); + matrices.pushPose(); + matrices.scale(config.getIconSize(), config.getIconSize(), 0); + if (entry != null) { + minecraft.getTextureManager().bind(entry.getSkinLocation()); + } else { + minecraft.getTextureManager().bind(new ResourceLocation("textures/entity/steve.png")); + } + Gui.blit(matrices, -4, -4, 8, 8, 8.0F, 8, 8, 8, 64, 64); + matrices.pushPose(); + glDisable(GL_BLEND); + matrices.scale(0.6f, 0.6f, 0); + TextComponent component = new TextComponent( + player.getScoreboardName() + " (" + ((int) player.getY() + ")")); + this.cFont.draw(matrices, component, -minecraft.font.width(component) / 2f, 7, 0xffffff); + matrices.popPose(); + matrices.popPose(); + + glPopMatrix(); + glPopMatrix(); + } + + glPopMatrix(); + } + + private void renderCircleBackground() { + glLineWidth(1); + glEnable(GL_BLEND); + glDisable(GL_TEXTURE_2D); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + glColor4f((config.getRadarColour() >> 16 & 0xFF) / 255f, + (config.getRadarColour() >> 8 & 0xFF) / 255f, (config.getRadarColour() & 0xFF) / 255f, + 1 - config.getTransparency()); + + Tesselator tessellator = Tesselator.getInstance(); + BufferBuilder buffer = tessellator.getBuilder(); + buffer.begin(GL_TRIANGLE_FAN, DefaultVertexFormat.POSITION); + + for (int i = 0; i <= 360; i++) { + double x = Math.sin(i * Math.PI / 180.0D) * radius(); + double y = Math.cos(i * Math.PI / 180.0D) * radius(); + buffer.vertex(x, y, 0.0D).endVertex(); + } + tessellator.end(); + + glEnable(GL_TEXTURE_2D); + glDisable(GL_BLEND); + } + + private void renderCircleBorder(double radius) { + glEnable(GL_BLEND); + glDisable(GL_TEXTURE_2D); + glEnable(GL_POLYGON_SMOOTH); + glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + + Tesselator tessellator = Tesselator.getInstance(); + BufferBuilder buffer = tessellator.getBuilder(); + buffer.begin(GL_TRIANGLE_STRIP, DefaultVertexFormat.POSITION); + + double thicknesss = radius == radius() ? 1 : 0.5; + + for (int i = 0; i <= 360; i++) { + glColor4f((config.getRadarColour() >> 16 & 0xFF) / 255f, + (config.getRadarColour() >> 8 & 0xFF) / 255f, (config.getRadarColour() & 0xFF) / 255f, 1); + double x0 = Math.sin(i * Math.PI / 180.0D) * radius; + double y0 = Math.cos(i * Math.PI / 180.0D) * radius; + + double x1 = Math.sin(i * Math.PI / 180.0D) * (radius + thicknesss); + double y1 = Math.cos(i * Math.PI / 180.0D) * (radius + thicknesss); + buffer.vertex(x0, y0, 0.0D).endVertex(); + buffer.vertex(x1, y1, 0).endVertex(); + } + tessellator.end(); + + glDisable(GL_POLYGON_SMOOTH); + glEnable(GL_TEXTURE_2D); + glDisable(GL_BLEND); + } + + private void renderLines() { + glLineWidth(1f); + glEnable(GL_BLEND); + glDisable(GL_TEXTURE_2D); + glEnable(GL_LINE_SMOOTH); + glDisable(GL_LIGHTING); + glColor4f((config.getRadarColour() >> 16 & 0xFF) / 255f, + (config.getRadarColour() >> 8 & 0xFF) / 255f, (config.getRadarColour() & 0xFF) / 255f, 1); + + int scale = 0; + float radius = radius() + 0.5f; + double diagonalInner = COS_45; + double diagonalOuter = COS_45 * radius; + + Tesselator tessellator = Tesselator.getInstance(); + BufferBuilder buffer = tessellator.getBuilder(); + buffer.begin(GL_LINES, DefaultVertexFormat.POSITION); + + buffer.vertex(0, -radius, 0f).endVertex(); + buffer.vertex(0, radius, 0f).endVertex(); + + buffer.vertex(-radius, 0, 0f).endVertex(); + buffer.vertex(radius, 0, 0f).endVertex(); + + buffer.vertex(-diagonalOuter, -diagonalOuter, 0f).endVertex(); + buffer.vertex(diagonalOuter, diagonalOuter, 0f).endVertex(); + + buffer.vertex(-diagonalOuter, diagonalOuter, 0f).endVertex(); + buffer.vertex(diagonalOuter, -diagonalOuter, 0f).endVertex(); + + tessellator.end(); + + glDisable(GL_BLEND); + glDisable(GL_LINE_SMOOTH); + glEnable(GL_TEXTURE_2D); + } +} diff --git a/common/src/main/resources/assets/civmodern/gui/colour.png b/common/src/main/resources/assets/civmodern/gui/colour.png new file mode 100644 index 0000000000000000000000000000000000000000..fa1282a987f40203c4c96742727bca68730e42f1 GIT binary patch literal 1143 zcmV--1c>{IP)intLh(_kYu6lYhe>m}nwXBgB9vAlJb0w{D9(5CEs<5;u zbws8clL$cqct}uUog78{QVWtg|0oQRxIo1#ImZV;CP0sLesw?In8{DUTJFHBXDiQ#dT9l z?8D^_3_s~{BVLmnGVSR!yq`l~3)pK6mqLz|?|ov1=== z%{CTVq>wy-WkMccn`N;`6OxoZfRH9)VWA+Rh7=)BkSd@A(r^BgalY@~Gk5Z%u`$aEOdCve|4T zl}gESxfDGh2m;Ec)2XahD;bZ+-0lFe5mqIWPDCKgu^FH~81xs5g_G$TcSBiE#A!!I zM?9_BY#uUNN~IFznM_7zvl$J+0U!b@00eNYR;z)Po(VYO_txg_l{~QAi8O)+bKx3OS8#9)~F6qpx+uh9sB{e1+~xFLp6GEYOWM<0C{@F$+&rQ>}M!(iDZ z#L-`ndZ@n*dfy81{hA1fI3P87;dZRECdrdqu}9J zm4~Cb2w0PF7aap~fa-3!T(+^fuuI!u)Yji;WrXbr@Ag~Liw-*%yVmLPM+Cr>8Z9IzuUR_5(qts;_g=nlL8Qs_B42aVvhJ+ zzK+YOQmOEEfeu_n%lZ9Jz+SH>qtOUD1c5?2o#q_fQz#T%1q=oQ#%tGAD%&4jhO0^d z%IEWO8Q9pOoDgGJl*{GZm4!W;Oc()zFIs#Q-1L`>i}|Kd;eN)j-EQxpUH47tcDquo zR^!%#;1IzBWc%NFQzny%%becGyO!_1Daf?uf-%(8W8>YMB6n{}SV5=Zp#T5yP4O?= zKmVp^ps(|$;HuO1WiR*p{olSR#bVJl|8O|`%WsOkc5d}e`3dAD>kSD#J?;Pi002ov JPDHLkV1iG+9MJ#( literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/civmodern/gui/rollback.png b/common/src/main/resources/assets/civmodern/gui/rollback.png new file mode 100644 index 0000000000000000000000000000000000000000..4b673cf1f805cf58cd94151a046d10caaaddbfd6 GIT binary patch literal 1290 zcmV+l1@-!gP)5MU&!nfgpL8lmm@y2qyK-Kgr-eqYPcmCl$N*gAzLHQlHPPYXxZD!Srr;XW;& zObZ_g2Msx(@U_xYb$(HttMi9qBOaRtyXxu7{o&Lf*78PCcv#q9EL63|dDKljnbN|% z)B%};n8XMZ!bgfKs}!g(Dzzk;wf2qu`sOH$N0YzKI)*rMWKLqb4oL@Dy z)E-=HLI0zkG?KrPL#92Og|{>4PC)N1xR>i$HP$(OfcSw_suKWP|S!f9V zCFKPG000SaNLh0L01sgR01sgSs6VG^0009)Nkl+X^@0JygmH^br&9n7;6x%3II}|ObUM7hzlZ&PAC}9d z@uEu<5qQEQK#CF_qGaXSZnq{&rBYGH0EqyvcqCPn0fUf1;%Bp20|hvf$(UR+^ekmx z8$i3=E;1tl>s&6EW9meREjB!m0g@_FL0au_04v+uVi2=@LvoN2} z%?{9Fv1lJY3~Ht*q+^PAUREFqE8-85&*x+9s3D#7(W|c5Xs?nnwZD4>Xjm2D|E^ZU z@pycNqZE}Aj@8L4XF8jVJSt&xCru2d@KToDp6HjEo& zfbtFl#Yfa`w@qBFRxN#k!3GS-Ql<`&n0)l2x3{;z1Ar$YCr!XK3CLqp5F%jZqbD^8 z0~x{d&ir+2%IB8>61K)dHDUEpQ71X{e0X$QfBM*Eq5$}(cM5ipHHD3eD^ECJE>%|| zfhS$toL`zln+a literal 0 HcmV?d00001 diff --git a/common/src/main/resources/assets/civmodern/lang/en_us.json b/common/src/main/resources/assets/civmodern/lang/en_us.json new file mode 100644 index 0000000..03ea6ab --- /dev/null +++ b/common/src/main/resources/assets/civmodern/lang/en_us.json @@ -0,0 +1,28 @@ +{ + "key.civmodern.left": "Hold left mouse button", + "key.civmodern.right": "Hold right mouse button", + "key.civmodern.ice": "Toggle ice road macro", + "key.civmodern.config": "Open Civ Modern configuration", + "key.civmodern.highlight": "Highlight waypoint", + "category.civmodern": "Civ Modern", + "civmodern.screen.main.title": "Civ Modern Config", + "civmodern.screen.main.radar": "Radar Settings", + "civmodern.screen.main.ice": "Ice Road Macro", + "civmodern.screen.main.compacted": "Compacted Item Settings", + "civmodern.screen.radar.title": "Civ Modern Config (Radar)", + "civmodern.screen.radar.circles": "Circles: %s", + "civmodern.screen.radar.size": "Size: %s", + "civmodern.screen.radar.alignment": "Alignment: %s", + "civmodern.screen.radar.iconsize": "Icon Size: %s", + "civmodern.screen.radar.range": "Range: %s blocks", + "civmodern.screen.radar.x": "X: %s", + "civmodern.screen.radar.y": "Y: %s", + "civmodern.screen.radar.transparency": "Transparency: %s", + "civmodern.screen.compacted.title": "Civ Modern Config (Compacted Items)", + "civmodern.screen.ice.title": "Civ Modern Config (Ice Road Macro)", + "civmodern.screen.ice.cardinal.enable": "Snap to cardinal: Enabled", + "civmodern.screen.ice.cardinal.disable": "Snap to cardinal: Disabled", + "civmodern.radar.enter" : "§r%s §eappeared at §b[%s %s %s§b]", + "civmodern.radar.hover" : "Click or press %s to highlight position\nControl click to add waypoint", + "civmodern.radar.leave" : "§r%s §edisappeared at §b[%s %s %s§b]" +} \ No newline at end of file diff --git a/common/src/main/resources/civmodern.properties b/common/src/main/resources/civmodern.properties new file mode 100644 index 0000000..2f6497b --- /dev/null +++ b/common/src/main/resources/civmodern.properties @@ -0,0 +1,10 @@ +compacted_colour=16777048 +radar_colour=8947848 +radar_circles=4 +radar_size=50 +alignment=top_left +icon_size=1 +range=64 +radar_enabled=true +ping_enabled=true +ice_road_cardinal=true \ No newline at end of file diff --git a/common/src/main/resources/mixin.civmodern.json b/common/src/main/resources/mixin.civmodern.json new file mode 100644 index 0000000..ba0cc4a --- /dev/null +++ b/common/src/main/resources/mixin.civmodern.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "sh.okx.civmodern.common.mixins", + "compatibilityLevel": "JAVA_8", + "mixins": [], + "client": [ + "InventoryMixin" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..f88d319 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,98 @@ +plugins { + id "com.github.johnrengelman.shadow" version "5.0.0" +} + +configurations { + shadowCommon +} + +architectury { + platformSetupLoomIde() + fabric() +} + +dependencies { + modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" + modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" + // Remove the next line if you don't want to depend on the API + //modApi "me.shedaniel:architectury-fabric:${rootProject.architectury_version}" + + implementation(project(path: ":common")) { + transitive = false + } + developmentFabric(project(path: ":common")) { + transitive = false + } + shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { + transitive = false + } + minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" + mappings loom.officialMojangMappings() +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +shadowJar { + configurations = [project.configurations.shadowCommon] + classifier "dev-shadow" +} + +remapJar { + input.set shadowJar.archiveFile + dependsOn shadowJar + classifier "fabric" +} + +jar { + classifier "dev" +} + +java { + withSourcesJar() +} + +sourcesJar { + def commonSources = project(":common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } +} + +publishing { + publications { + mavenFabric(MavenPublication) { + artifactId = rootProject.archives_base_name + "-" + project.name + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + classifier null + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} + +task cleanJar(type: Delete) { + delete fileTree('../dist') { + include "*-fabric.jar" + } +} + +task copyJar(type: Copy) { + from remapJar + into '../dist' +} + +build.dependsOn copyJar +copyJar.dependsOn cleanJar \ No newline at end of file diff --git a/fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernBootstrap.java b/fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernBootstrap.java new file mode 100644 index 0000000..763d4cd --- /dev/null +++ b/fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernBootstrap.java @@ -0,0 +1,53 @@ +package sh.okx.civmodern.fabric; + +import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class FabricCivModernBootstrap implements ModInitializer { + private static final Logger LOGGER = LogManager.getLogger(); + + private final FabricCivModernMod mod; + + public FabricCivModernBootstrap() { + this.mod = new FabricCivModernMod(); + } + + @Override + public void onInitialize() { + ClientLifecycleEvents.CLIENT_STARTED.register(e -> mod.enable()); + } + + /*@SubscribeEvent + public void loadWorld(WorldEvent.Load event) { + LOGGER.info("World Load " + event.getPhase() + " " + event.getResult() + " " + event + .getWorld().getClass().getTypeName()); + if (event.getWorld() instanceof ClientWorld) { + BlockModelShapes shaper = Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelShapes(); + + Field cacheField = shaper.getClass().getDeclaredFields()[0]; + Map map; + try { + cacheField.setAccessible(true); + map = new IdentityHashMap<>((Map) cacheField.get(shaper)); + } catch (IllegalAccessException e) { + e.printStackTrace(); + return; + } + + Iterator> iterator = map.entrySet().iterator(); + while (iterator.hasNext()) { + Entry entry = iterator.next(); + IBakedModel model = entry.getValue(); + List quads = model + .getQuads(null, Direction.UP, ThreadLocalRandom.current(), + EmptyModelData.INSTANCE); + if (quads.isEmpty()) { + iterator.remove(); + } + } + System.out.println(map.size() + " toal size"); + } + }*/ +} diff --git a/fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernMod.java b/fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernMod.java new file mode 100644 index 0000000..1e56f3e --- /dev/null +++ b/fabric/src/main/java/sh/okx/civmodern/fabric/FabricCivModernMod.java @@ -0,0 +1,19 @@ +package sh.okx.civmodern.fabric; + +import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper; +import net.minecraft.client.KeyMapping; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.events.EventBus; + +public class FabricCivModernMod extends AbstractCivModernMod { + + @Override + public EventBus provideEventBus() { + return new FabricEventBus(); + } + + @Override + public void registerKeyBinding(KeyMapping mapping) { + KeyBindingHelper.registerKeyBinding(mapping); + } +} diff --git a/fabric/src/main/java/sh/okx/civmodern/fabric/FabricEventBus.java b/fabric/src/main/java/sh/okx/civmodern/fabric/FabricEventBus.java new file mode 100644 index 0000000..975cd98 --- /dev/null +++ b/fabric/src/main/java/sh/okx/civmodern/fabric/FabricEventBus.java @@ -0,0 +1,43 @@ +package sh.okx.civmodern.fabric; + +import java.util.Collections; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.function.Consumer; +import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback; +import sh.okx.civmodern.common.events.ClientTickEvent; +import sh.okx.civmodern.common.events.Event; +import sh.okx.civmodern.common.events.EventBus; +import sh.okx.civmodern.common.events.PostRenderGameOverlayEvent; + +public class FabricEventBus implements EventBus { + + private final Map, Set>> map = new ConcurrentHashMap<>(); + + public FabricEventBus() { + map.put(ClientTickEvent.class, new CopyOnWriteArraySet<>()); + map.put(PostRenderGameOverlayEvent.class, new CopyOnWriteArraySet<>()); + + ClientTickEvents.START_CLIENT_TICK.register(client -> push(new ClientTickEvent())); + HudRenderCallback.EVENT.register(((matrixStack, tickDelta) -> push(new PostRenderGameOverlayEvent(matrixStack, tickDelta)))); + } + + private void push(Event event) { + for (Consumer consumer : map.getOrDefault(event.getClass(), Collections.emptySet())) { + consumer.accept(event); + } + } + + @SuppressWarnings("unchecked") + @Override + public void listen(Class event, Consumer listener) { + Set> set = map.get(event); + if (set == null) { + throw new IllegalArgumentException("Class not supported: " + event); + } + set.add((Consumer) listener); + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..6af1087 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,26 @@ +{ + "schemaVersion": 1, + "id": "civmodern", + "version": "${version}", + "name": "Civ Modern", + "description": "Civ Modern", + "authors": [ + "Okx" + ], + "license": "Copyright", + "icon": "assets/civmodern/icon.png", + "environment": "client", + "entrypoints": { + "main": [ + "sh.okx.civmodern.fabric.FabricCivModernBootstrap" + ] + }, + "depends": { + "fabricloader": ">=0.7.4", + "fabric": "*", + "minecraft": "1.16.x" + }, + "mixins": [ + "mixin.civmodern.json" + ] +} \ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle new file mode 100644 index 0000000..670e35a --- /dev/null +++ b/forge/build.gradle @@ -0,0 +1,103 @@ +plugins { + id "com.github.johnrengelman.shadow" version "5.0.0" +} + +configurations { + shadowCommon +} + +architectury { + platformSetupLoomIde() + forge() +} + +loom { + useFabricMixin = true +} + +dependencies { + forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}" + // Remove the next line if you don't want to depend on the API + //modApi "me.shedaniel:architectury-forge:${rootProject.architectury_version}" + + implementation(project(path: ":common")) { + transitive = false + } + developmentForge(project(path: ":common")) { + transitive = false + } + shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { + transitive = false + } + minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" + mappings loom.officialMojangMappings() +} + +processResources { + inputs.property "version", project.version + + filesMatching("META-INF/mods.toml") { + expand "version": project.version + } +} + +shadowJar { + exclude "fabric.mod.json" + + configurations = [project.configurations.shadowCommon] + classifier "dev-shadow" +} + +remapJar { + input.set shadowJar.archiveFile + dependsOn shadowJar + classifier "forge" +} + +jar { + classifier "dev" +} + +java { + withSourcesJar() +} + +sourcesJar { + def commonSources = project(":common").sourcesJar + dependsOn commonSources + from commonSources.archiveFile.map { zipTree(it) } +} + +publishing { + publications { + mavenForge(MavenPublication) { + artifactId = rootProject.archives_base_name + "-" + project.name + // add all the jars that should be included when publishing to maven + artifact(remapJar) { + classifier null + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + } +} + +task cleanJar(type: Delete) { + delete fileTree('../dist') { + include "*-forge.jar" + } +} + +task copyJar(type: Copy) { + from remapJar + into '../dist' +} + +build.dependsOn copyJar +copyJar.dependsOn cleanJar \ No newline at end of file diff --git a/forge/gradle.properties b/forge/gradle.properties new file mode 100644 index 0000000..01c185b --- /dev/null +++ b/forge/gradle.properties @@ -0,0 +1 @@ +loom.forge=true \ No newline at end of file diff --git a/forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernBootstrap.java b/forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernBootstrap.java new file mode 100644 index 0000000..5ce6486 --- /dev/null +++ b/forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernBootstrap.java @@ -0,0 +1,25 @@ +package sh.okx.civmodern.forge; + +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +@Mod("civmodern") +public class ForgeCivModernBootstrap { + private static final Logger LOGGER = LogManager.getLogger(); + + private final ForgeCivModernMod mod; + + public ForgeCivModernBootstrap() { + this.mod = new ForgeCivModernMod(); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup); + MinecraftForge.EVENT_BUS.register(this); + } + + public void clientSetup(FMLClientSetupEvent event) { + this.mod.enable(); + } +} diff --git a/forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernMod.java b/forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernMod.java new file mode 100644 index 0000000..dfb5f65 --- /dev/null +++ b/forge/src/main/java/sh/okx/civmodern/forge/ForgeCivModernMod.java @@ -0,0 +1,18 @@ +package sh.okx.civmodern.forge; + +import net.minecraftforge.fml.client.registry.ClientRegistry; +import sh.okx.civmodern.common.AbstractCivModernMod; +import sh.okx.civmodern.common.events.EventBus; + +public class ForgeCivModernMod extends AbstractCivModernMod { + + @Override + public EventBus provideEventBus() { + return new ForgeEventBus(); + } + + @Override + public void registerKeyBinding(net.minecraft.client.KeyMapping mapping) { + ClientRegistry.registerKeyBinding(mapping); + } +} diff --git a/forge/src/main/java/sh/okx/civmodern/forge/ForgeEventBus.java b/forge/src/main/java/sh/okx/civmodern/forge/ForgeEventBus.java new file mode 100644 index 0000000..df60b0e --- /dev/null +++ b/forge/src/main/java/sh/okx/civmodern/forge/ForgeEventBus.java @@ -0,0 +1,59 @@ +package sh.okx.civmodern.forge; + +import java.util.Collections; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArraySet; +import java.util.function.Consumer; +import net.minecraftforge.client.event.RenderGameOverlayEvent; +import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.TickEvent; +import net.minecraftforge.event.TickEvent.Phase; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import sh.okx.civmodern.common.events.ClientTickEvent; +import sh.okx.civmodern.common.events.Event; +import sh.okx.civmodern.common.events.EventBus; +import sh.okx.civmodern.common.events.PostRenderGameOverlayEvent; + +public class ForgeEventBus implements EventBus { + + private final Map, Set>> map = new ConcurrentHashMap<>(); + + public ForgeEventBus() { + map.put(ClientTickEvent.class, new CopyOnWriteArraySet<>()); + map.put(PostRenderGameOverlayEvent.class, new CopyOnWriteArraySet<>()); + + MinecraftForge.EVENT_BUS.register(this); + } + + @SubscribeEvent + public void onClientTick(TickEvent.ClientTickEvent event) { + if (event.phase == Phase.START) { + push(new ClientTickEvent()); + } + } + + @SubscribeEvent + public void onRender(RenderGameOverlayEvent.Post event) { + if (event.getType() == ElementType.ALL) { + push(new PostRenderGameOverlayEvent(event.getMatrixStack(), event.getPartialTicks())); + } + } + + private void push(Event event) { + for (Consumer consumer : map.getOrDefault(event.getClass(), Collections.emptySet())) { + consumer.accept(event); + } + } + + @Override + public void listen(Class event, Consumer listener) { + Set> set = map.get(event); + if (set == null) { + throw new IllegalArgumentException("Class not supported: " + event); + } + set.add((Consumer) listener); + } +} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..6ef6228 --- /dev/null +++ b/forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,28 @@ +modLoader = "javafml" +loaderVersion = "[32,)" +#issueTrackerURL = "" +license = "GPL" + +[[mods]] +modId = "civmodern" +version = "${version}" +displayName = "Civ Modern" +authors = "Me!" +description = ''' +Civ Modern +''' +#logoFile = "" + +[[dependencies.civmodern]] +modId = "forge" +mandatory = true +versionRange = "[32,)" +ordering = "NONE" +side = "CLIENT" + +[[dependencies.civmodern]] +modId = "minecraft" +mandatory = true +versionRange = "[1.16.1,)" +ordering = "NONE" +side = "CLIENT" diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..06ca035 --- /dev/null +++ b/forge/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "Example Mod", + "pack_format": 6 + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..85f1a59 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,15 @@ +org.gradle.jvmargs=-Xmx2048M + +minecraft_version=1.16.5 + +archives_base_name=civmodern +mod_version=1.1.1 +maven_group=sh.okx.civmodern + +architectury_version=1.8.131 + +# https://fabricmc.net/versions.html +fabric_loader_version=0.11.3 +fabric_api_version=0.34.1+1.16 + +forge_version=36.0.46 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..2a56324 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..5201efb --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { url "https://maven.fabricmc.net/" } + maven { url "https://maven.architectury.dev/" } + maven { url "https://maven.minecraftforge.net/" } + gradlePluginPortal() + } +} + +include("common") +include("fabric") +include("forge") + +rootProject.name = "civmodern"