From 914c47dfb3b707be1ff68dc6127809f74a4bfb4d Mon Sep 17 00:00:00 2001 From: alemidev Date: Wed, 1 Feb 2023 20:30:37 +0100 Subject: [PATCH 1/2] fix: older version works on java 8 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 076ad3f..337221d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true - classpath "com.palantir.gradle.gitversion:gradle-git-version:0.15.0" + classpath "com.palantir.gradle.gitversion:gradle-git-version:0.13.0" } } apply plugin: 'net.minecraftforge.gradle' From 3a84231cb69eaca41285810f1e942a85838a39bd Mon Sep 17 00:00:00 2001 From: alemidev Date: Wed, 1 Feb 2023 20:37:21 +0100 Subject: [PATCH 2/2] i fucking did it --- .../java/{co/fantabos => }/bscv/BoSCoVicino.java | 12 ++++++------ .../{co/fantabos => }/bscv/module/HudModule.java | 6 +++--- .../java/{co/fantabos => }/bscv/module/Module.java | 6 +++--- .../{co/fantabos => }/bscv/module/QuickModule.java | 5 +++-- .../fantabos => }/bscv/module/hud/ActiveModules.java | 10 +++++----- .../fantabos => }/bscv/module/hud/Coordinates.java | 10 +++++----- .../fantabos => }/bscv/module/hud/EntityList.java | 8 ++++---- .../fantabos => }/bscv/module/hud/InfoDisplay.java | 8 ++++---- .../bscv/module/motion/VanillaFlight.java | 6 +++--- .../fantabos => }/bscv/module/self/FastInteract.java | 8 ++++---- .../fantabos => }/bscv/module/vision/Fullbright.java | 6 +++--- .../java/{co/fantabos => }/bscv/tools/Anchor.java | 4 ++-- src/main/java/{co/fantabos => }/bscv/tools/Text.java | 6 +++--- .../java/{co/fantabos => }/bscv/tools/Utils.java | 2 +- 14 files changed, 49 insertions(+), 48 deletions(-) rename src/main/java/{co/fantabos => }/bscv/BoSCoVicino.java (96%) rename src/main/java/{co/fantabos => }/bscv/module/HudModule.java (92%) rename src/main/java/{co/fantabos => }/bscv/module/Module.java (96%) rename src/main/java/{co/fantabos => }/bscv/module/QuickModule.java (97%) rename src/main/java/{co/fantabos => }/bscv/module/hud/ActiveModules.java (83%) rename src/main/java/{co/fantabos => }/bscv/module/hud/Coordinates.java (86%) rename src/main/java/{co/fantabos => }/bscv/module/hud/EntityList.java (90%) rename src/main/java/{co/fantabos => }/bscv/module/hud/InfoDisplay.java (96%) rename src/main/java/{co/fantabos => }/bscv/module/motion/VanillaFlight.java (96%) rename src/main/java/{co/fantabos => }/bscv/module/self/FastInteract.java (86%) rename src/main/java/{co/fantabos => }/bscv/module/vision/Fullbright.java (91%) rename src/main/java/{co/fantabos => }/bscv/tools/Anchor.java (96%) rename src/main/java/{co/fantabos => }/bscv/tools/Text.java (94%) rename src/main/java/{co/fantabos => }/bscv/tools/Utils.java (88%) diff --git a/src/main/java/co/fantabos/bscv/BoSCoVicino.java b/src/main/java/bscv/BoSCoVicino.java similarity index 96% rename from src/main/java/co/fantabos/bscv/BoSCoVicino.java rename to src/main/java/bscv/BoSCoVicino.java index bd0864c..c198c46 100644 --- a/src/main/java/co/fantabos/bscv/BoSCoVicino.java +++ b/src/main/java/bscv/BoSCoVicino.java @@ -1,4 +1,4 @@ -package co.fantabos.bscv; +package bscv; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -27,11 +27,11 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import co.fantabos.bscv.module.Module; -import co.fantabos.bscv.module.vision.*; -import co.fantabos.bscv.module.motion.*; -import co.fantabos.bscv.module.self.*; -import co.fantabos.bscv.module.hud.*; +import bscv.module.Module; +import bscv.module.vision.*; +import bscv.module.motion.*; +import bscv.module.self.*; +import bscv.module.hud.*; // The value here should match an entry in the META-INF/mods.toml file @Mod("bscv") diff --git a/src/main/java/co/fantabos/bscv/module/HudModule.java b/src/main/java/bscv/module/HudModule.java similarity index 92% rename from src/main/java/co/fantabos/bscv/module/HudModule.java rename to src/main/java/bscv/module/HudModule.java index 61abcc9..529001e 100644 --- a/src/main/java/co/fantabos/bscv/module/HudModule.java +++ b/src/main/java/bscv/module/HudModule.java @@ -1,11 +1,11 @@ -package co.fantabos.bscv.module; +package bscv.module; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.DoubleArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; -import co.fantabos.bscv.module.Module; -import co.fantabos.bscv.tools.Anchor; +import bscv.module.Module; +import bscv.tools.Anchor; import net.minecraft.command.CommandSource; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.server.command.EnumArgument; diff --git a/src/main/java/co/fantabos/bscv/module/Module.java b/src/main/java/bscv/module/Module.java similarity index 96% rename from src/main/java/co/fantabos/bscv/module/Module.java rename to src/main/java/bscv/module/Module.java index 67beb13..c840ebf 100644 --- a/src/main/java/co/fantabos/bscv/module/Module.java +++ b/src/main/java/bscv/module/Module.java @@ -1,15 +1,15 @@ -package co.fantabos.bscv.module; +package bscv.module; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.ArgumentType; -import co.fantabos.bscv.BoSCoVicino; +import bscv.BoSCoVicino; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; -import static co.fantabos.bscv.BoSCoVicino.log; +import static bscv.BoSCoVicino.log; public abstract class Module { public enum Group { diff --git a/src/main/java/co/fantabos/bscv/module/QuickModule.java b/src/main/java/bscv/module/QuickModule.java similarity index 97% rename from src/main/java/co/fantabos/bscv/module/QuickModule.java rename to src/main/java/bscv/module/QuickModule.java index b79d2bb..2a7ff6c 100644 --- a/src/main/java/co/fantabos/bscv/module/QuickModule.java +++ b/src/main/java/bscv/module/QuickModule.java @@ -1,4 +1,4 @@ -package co.fantabos.bscv.module; +package bscv.module; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.StringArgumentType; @@ -12,7 +12,8 @@ import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.client.registry.ClientRegistry; -import co.fantabos.bscv.BoSCoVicino; + +import bscv.BoSCoVicino; // TODO rename public class QuickModule extends Module { diff --git a/src/main/java/co/fantabos/bscv/module/hud/ActiveModules.java b/src/main/java/bscv/module/hud/ActiveModules.java similarity index 83% rename from src/main/java/co/fantabos/bscv/module/hud/ActiveModules.java rename to src/main/java/bscv/module/hud/ActiveModules.java index ea748b2..c884261 100644 --- a/src/main/java/co/fantabos/bscv/module/hud/ActiveModules.java +++ b/src/main/java/bscv/module/hud/ActiveModules.java @@ -1,17 +1,17 @@ -package co.fantabos.bscv.module.hud; +package bscv.module.hud; -import static co.fantabos.bscv.tools.Text.TextBuilder; +import static bscv.tools.Text.TextBuilder; import com.mojang.brigadier.CommandDispatcher; -import co.fantabos.bscv.BoSCoVicino; +import bscv.BoSCoVicino; import net.minecraft.command.CommandSource; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; -import co.fantabos.bscv.module.HudModule; -import co.fantabos.bscv.module.Module; +import bscv.module.HudModule; +import bscv.module.Module; public class ActiveModules extends HudModule { diff --git a/src/main/java/co/fantabos/bscv/module/hud/Coordinates.java b/src/main/java/bscv/module/hud/Coordinates.java similarity index 86% rename from src/main/java/co/fantabos/bscv/module/hud/Coordinates.java rename to src/main/java/bscv/module/hud/Coordinates.java index bc1b73f..3f0bef0 100644 --- a/src/main/java/co/fantabos/bscv/module/hud/Coordinates.java +++ b/src/main/java/bscv/module/hud/Coordinates.java @@ -1,11 +1,7 @@ -package co.fantabos.bscv.module.hud; - -import static co.fantabos.bscv.tools.Text.TextBuilder; +package bscv.module.hud; import com.mojang.brigadier.CommandDispatcher; -import co.fantabos.bscv.BoSCoVicino; -import co.fantabos.bscv.module.HudModule; import net.minecraft.client.Minecraft; import net.minecraft.command.CommandSource; import net.minecraft.util.math.vector.Vector3d; @@ -14,6 +10,10 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType; import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.eventbus.api.SubscribeEvent; +import static bscv.tools.Text.TextBuilder; +import bscv.BoSCoVicino; +import bscv.module.HudModule; + public class Coordinates extends HudModule { public Coordinates(ForgeConfigSpec.Builder builder, CommandDispatcher dispatcher) { diff --git a/src/main/java/co/fantabos/bscv/module/hud/EntityList.java b/src/main/java/bscv/module/hud/EntityList.java similarity index 90% rename from src/main/java/co/fantabos/bscv/module/hud/EntityList.java rename to src/main/java/bscv/module/hud/EntityList.java index 5b6d24d..4f6f135 100644 --- a/src/main/java/co/fantabos/bscv/module/hud/EntityList.java +++ b/src/main/java/bscv/module/hud/EntityList.java @@ -1,6 +1,6 @@ -package co.fantabos.bscv.module.hud; +package bscv.module.hud; -import static co.fantabos.bscv.tools.Text.TextBuilder; +import static bscv.tools.Text.TextBuilder; import java.util.ArrayList; import java.util.Collections; @@ -9,8 +9,8 @@ import java.util.stream.Collectors; import com.mojang.brigadier.CommandDispatcher; -import co.fantabos.bscv.BoSCoVicino; -import co.fantabos.bscv.module.HudModule; +import bscv.BoSCoVicino; +import bscv.module.HudModule; import net.minecraft.command.CommandSource; import net.minecraft.entity.Entity; import net.minecraftforge.client.event.RenderGameOverlayEvent; diff --git a/src/main/java/co/fantabos/bscv/module/hud/InfoDisplay.java b/src/main/java/bscv/module/hud/InfoDisplay.java similarity index 96% rename from src/main/java/co/fantabos/bscv/module/hud/InfoDisplay.java rename to src/main/java/bscv/module/hud/InfoDisplay.java index a715a1a..5602bff 100644 --- a/src/main/java/co/fantabos/bscv/module/hud/InfoDisplay.java +++ b/src/main/java/bscv/module/hud/InfoDisplay.java @@ -1,14 +1,14 @@ -package co.fantabos.bscv.module.hud; +package bscv.module.hud; -import static co.fantabos.bscv.tools.Text.TextBuilder; +import static bscv.tools.Text.TextBuilder; import java.util.ArrayDeque; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.BoolArgumentType; -import co.fantabos.bscv.BoSCoVicino; -import co.fantabos.bscv.module.HudModule; +import bscv.BoSCoVicino; +import bscv.module.HudModule; import net.minecraft.client.Minecraft; import net.minecraft.command.CommandSource; import net.minecraft.util.math.vector.Vector3d; diff --git a/src/main/java/co/fantabos/bscv/module/motion/VanillaFlight.java b/src/main/java/bscv/module/motion/VanillaFlight.java similarity index 96% rename from src/main/java/co/fantabos/bscv/module/motion/VanillaFlight.java rename to src/main/java/bscv/module/motion/VanillaFlight.java index 2c32a39..8557e88 100644 --- a/src/main/java/co/fantabos/bscv/module/motion/VanillaFlight.java +++ b/src/main/java/bscv/module/motion/VanillaFlight.java @@ -1,12 +1,12 @@ -package co.fantabos.bscv.module.motion; +package bscv.module.motion; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.BoolArgumentType; import com.mojang.brigadier.arguments.DoubleArgumentType; import com.mojang.brigadier.arguments.IntegerArgumentType; -import co.fantabos.bscv.BoSCoVicino; -import co.fantabos.bscv.module.QuickModule; +import bscv.BoSCoVicino; +import bscv.module.QuickModule; import net.minecraft.client.entity.player.ClientPlayerEntity; import net.minecraft.command.CommandSource; import net.minecraftforge.common.ForgeConfigSpec; diff --git a/src/main/java/co/fantabos/bscv/module/self/FastInteract.java b/src/main/java/bscv/module/self/FastInteract.java similarity index 86% rename from src/main/java/co/fantabos/bscv/module/self/FastInteract.java rename to src/main/java/bscv/module/self/FastInteract.java index eba065f..cf40801 100644 --- a/src/main/java/co/fantabos/bscv/module/self/FastInteract.java +++ b/src/main/java/bscv/module/self/FastInteract.java @@ -1,6 +1,6 @@ -package co.fantabos.bscv.module.self; +package bscv.module.self; -import static co.fantabos.bscv.BoSCoVicino.log; +import static bscv.BoSCoVicino.log; import java.lang.reflect.Field; @@ -11,8 +11,8 @@ import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import co.fantabos.bscv.module.QuickModule; -import co.fantabos.bscv.BoSCoVicino; +import bscv.module.QuickModule; +import bscv.BoSCoVicino; public class FastInteract extends QuickModule { diff --git a/src/main/java/co/fantabos/bscv/module/vision/Fullbright.java b/src/main/java/bscv/module/vision/Fullbright.java similarity index 91% rename from src/main/java/co/fantabos/bscv/module/vision/Fullbright.java rename to src/main/java/bscv/module/vision/Fullbright.java index 77bdbce..183b933 100644 --- a/src/main/java/co/fantabos/bscv/module/vision/Fullbright.java +++ b/src/main/java/bscv/module/vision/Fullbright.java @@ -1,4 +1,4 @@ -package co.fantabos.bscv.module.vision; +package bscv.module.vision; import java.awt.event.KeyEvent; @@ -12,8 +12,8 @@ import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.event.TickEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; -import co.fantabos.bscv.module.QuickModule; -import co.fantabos.bscv.BoSCoVicino; +import bscv.module.QuickModule; +import bscv.BoSCoVicino; public class Fullbright extends QuickModule { diff --git a/src/main/java/co/fantabos/bscv/tools/Anchor.java b/src/main/java/bscv/tools/Anchor.java similarity index 96% rename from src/main/java/co/fantabos/bscv/tools/Anchor.java rename to src/main/java/bscv/tools/Anchor.java index 8d31b41..7f24333 100644 --- a/src/main/java/co/fantabos/bscv/tools/Anchor.java +++ b/src/main/java/bscv/tools/Anchor.java @@ -1,6 +1,6 @@ -package co.fantabos.bscv.tools; +package bscv.tools; -import co.fantabos.bscv.BoSCoVicino; +import bscv.BoSCoVicino; import net.minecraft.client.MainWindow; import net.minecraft.client.gui.screen.ChatScreen; import net.minecraft.util.math.vector.Vector2f; diff --git a/src/main/java/co/fantabos/bscv/tools/Text.java b/src/main/java/bscv/tools/Text.java similarity index 94% rename from src/main/java/co/fantabos/bscv/tools/Text.java rename to src/main/java/bscv/tools/Text.java index 8c8adb5..b366914 100644 --- a/src/main/java/co/fantabos/bscv/tools/Text.java +++ b/src/main/java/bscv/tools/Text.java @@ -1,10 +1,10 @@ -package co.fantabos.bscv.tools; +package bscv.tools; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.systems.RenderSystem; -import co.fantabos.bscv.BoSCoVicino; -import co.fantabos.bscv.tools.Anchor; +import bscv.BoSCoVicino; +import bscv.tools.Anchor; import net.minecraft.client.MainWindow; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.math.vector.Vector2f; diff --git a/src/main/java/co/fantabos/bscv/tools/Utils.java b/src/main/java/bscv/tools/Utils.java similarity index 88% rename from src/main/java/co/fantabos/bscv/tools/Utils.java rename to src/main/java/bscv/tools/Utils.java index 07d8355..ddfd75b 100644 --- a/src/main/java/co/fantabos/bscv/tools/Utils.java +++ b/src/main/java/bscv/tools/Utils.java @@ -1,4 +1,4 @@ -package co.fantabos.bscv.tools; +package bscv.tools; import java.util.function.Function; import java.util.function.Supplier;