diff --git a/remappedSrc/pm/j4/petroleum/PetroleumMod.java b/remappedSrc/pm/j4/petroleum/PetroleumMod.java index ce543eb..1c82dfd 100644 --- a/remappedSrc/pm/j4/petroleum/PetroleumMod.java +++ b/remappedSrc/pm/j4/petroleum/PetroleumMod.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum; +package pm.j4.kerosene; import java.util.ArrayList; import java.util.Arrays; @@ -12,15 +12,15 @@ import net.fabricmc.loader.api.metadata.ModMetadata; import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.KeyBinding; import net.minecraft.server.integrated.IntegratedServer; -import pm.j4.petroleum.modules.ExampleModule; -import pm.j4.petroleum.modules.bindings.BindingManager; -import pm.j4.petroleum.modules.list.ModList; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.modules.splash.SplashText; -import pm.j4.petroleum.modules.xray.Xray; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.modules.ExampleModule; +import pm.j4.kerosene.modules.bindings.BindingManager; +import pm.j4.kerosene.modules.list.ModList; +import pm.j4.kerosene.modules.menu.ModMenu; +import pm.j4.kerosene.modules.splash.SplashText; +import pm.j4.kerosene.modules.xray.Xray; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; //TODO: diff --git a/remappedSrc/pm/j4/petroleum/gui/PModMenuScreen.java b/remappedSrc/pm/j4/petroleum/gui/PModMenuScreen.java index fbc9ec8..7384d63 100644 --- a/remappedSrc/pm/j4/petroleum/gui/PModMenuScreen.java +++ b/remappedSrc/pm/j4/petroleum/gui/PModMenuScreen.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import java.util.Map; @@ -9,10 +9,10 @@ import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.Category; +import pm.j4.kerosene.modules.menu.ModMenu; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.data.ButtonInformation; +import pm.j4.kerosene.util.data.Category; /** * The type P mod menu screen. diff --git a/remappedSrc/pm/j4/petroleum/gui/PModuleConfigEntry.java b/remappedSrc/pm/j4/petroleum/gui/PModuleConfigEntry.java index 3125ed1..19eb843 100644 --- a/remappedSrc/pm/j4/petroleum/gui/PModuleConfigEntry.java +++ b/remappedSrc/pm/j4/petroleum/gui/PModuleConfigEntry.java @@ -1,13 +1,13 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.widget.EntryListWidget; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; -import pm.j4.petroleum.util.module.option.ListOption; +import pm.j4.kerosene.util.module.option.BooleanOption; +import pm.j4.kerosene.util.module.option.ConfigurationOption; +import pm.j4.kerosene.util.module.option.ListOption; /** * The type P module config entry. diff --git a/remappedSrc/pm/j4/petroleum/gui/PModuleConfigPane.java b/remappedSrc/pm/j4/petroleum/gui/PModuleConfigPane.java index 31d6160..86cb421 100644 --- a/remappedSrc/pm/j4/petroleum/gui/PModuleConfigPane.java +++ b/remappedSrc/pm/j4/petroleum/gui/PModuleConfigPane.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/remappedSrc/pm/j4/petroleum/gui/PModuleConfigurationWidget.java b/remappedSrc/pm/j4/petroleum/gui/PModuleConfigurationWidget.java index 495da1c..180a2f6 100644 --- a/remappedSrc/pm/j4/petroleum/gui/PModuleConfigurationWidget.java +++ b/remappedSrc/pm/j4/petroleum/gui/PModuleConfigurationWidget.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import java.util.HashSet; @@ -13,8 +13,8 @@ import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Matrix4f; -import pm.j4.petroleum.mixin.EntryListWidgetAccessor; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.mixin.EntryListWidgetAccessor; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P module configuration widget. diff --git a/remappedSrc/pm/j4/petroleum/gui/PMovableButton.java b/remappedSrc/pm/j4/petroleum/gui/PMovableButton.java index 4ff84fa..3ec5cf8 100644 --- a/remappedSrc/pm/j4/petroleum/gui/PMovableButton.java +++ b/remappedSrc/pm/j4/petroleum/gui/PMovableButton.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import java.util.List; @@ -13,9 +13,9 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.TranslatableText; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Matrix4f; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.modules.menu.ModMenu; +import pm.j4.kerosene.util.data.ButtonInformation; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P movable button. diff --git a/remappedSrc/pm/j4/petroleum/gui/POptionEntry.java b/remappedSrc/pm/j4/petroleum/gui/POptionEntry.java index 4132848..260e029 100644 --- a/remappedSrc/pm/j4/petroleum/gui/POptionEntry.java +++ b/remappedSrc/pm/j4/petroleum/gui/POptionEntry.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; @@ -9,7 +9,7 @@ import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Language; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P option entry. diff --git a/remappedSrc/pm/j4/petroleum/gui/POptionsScreen.java b/remappedSrc/pm/j4/petroleum/gui/POptionsScreen.java index de409d6..00e028b 100644 --- a/remappedSrc/pm/j4/petroleum/gui/POptionsScreen.java +++ b/remappedSrc/pm/j4/petroleum/gui/POptionsScreen.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import java.util.ArrayList; @@ -18,9 +18,9 @@ import net.minecraft.text.LiteralText; import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P options screen. diff --git a/remappedSrc/pm/j4/petroleum/mixin/DebugHudMixin.java b/remappedSrc/pm/j4/petroleum/mixin/DebugHudMixin.java index 2a79bdd..e39ff53 100644 --- a/remappedSrc/pm/j4/petroleum/mixin/DebugHudMixin.java +++ b/remappedSrc/pm/j4/petroleum/mixin/DebugHudMixin.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import java.util.List; import java.util.Optional; @@ -9,9 +9,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import pm.j4.petroleum.modules.splash.SplashText; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.kerosene.modules.splash.SplashText; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; /** * The type Debug hud mixin. diff --git a/remappedSrc/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java b/remappedSrc/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java index eea68ab..8877beb 100644 --- a/remappedSrc/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java +++ b/remappedSrc/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import net.minecraft.client.gui.widget.EntryListWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/remappedSrc/pm/j4/petroleum/mixin/ModListMixin.java b/remappedSrc/pm/j4/petroleum/mixin/ModListMixin.java index 7ee7248..4972ddc 100644 --- a/remappedSrc/pm/j4/petroleum/mixin/ModListMixin.java +++ b/remappedSrc/pm/j4/petroleum/mixin/ModListMixin.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import java.util.List; @@ -15,10 +15,10 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import pm.j4.petroleum.modules.list.ModList; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.modules.list.ModList; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Mod list mixin. diff --git a/remappedSrc/pm/j4/petroleum/mixin/OptionsMenuMixin.java b/remappedSrc/pm/j4/petroleum/mixin/OptionsMenuMixin.java index be27f25..c27393a 100644 --- a/remappedSrc/pm/j4/petroleum/mixin/OptionsMenuMixin.java +++ b/remappedSrc/pm/j4/petroleum/mixin/OptionsMenuMixin.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.options.OptionsScreen; @@ -9,7 +9,7 @@ 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 pm.j4.petroleum.gui.POptionsScreen; +import pm.j4.kerosene.gui.POptionsScreen; /** * The type Options menu mixin. diff --git a/remappedSrc/pm/j4/petroleum/mixin/TitleScreenMixin.java b/remappedSrc/pm/j4/petroleum/mixin/TitleScreenMixin.java index e915a62..3172ec4 100644 --- a/remappedSrc/pm/j4/petroleum/mixin/TitleScreenMixin.java +++ b/remappedSrc/pm/j4/petroleum/mixin/TitleScreenMixin.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import java.util.Optional; import net.minecraft.client.gui.screen.Screen; @@ -10,9 +10,9 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import pm.j4.petroleum.modules.splash.SplashText; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; +import pm.j4.kerosene.modules.splash.SplashText; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; /** diff --git a/remappedSrc/pm/j4/petroleum/modules/ExampleModule.java b/remappedSrc/pm/j4/petroleum/modules/ExampleModule.java index 0bb285a..2a6bc15 100644 --- a/remappedSrc/pm/j4/petroleum/modules/ExampleModule.java +++ b/remappedSrc/pm/j4/petroleum/modules/ExampleModule.java @@ -1,11 +1,11 @@ -package pm.j4.petroleum.modules; +package pm.j4.kerosene.modules; import java.util.HashMap; import java.util.Map; import net.minecraft.client.MinecraftClient; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.BooleanOption; +import pm.j4.kerosene.util.module.option.ConfigurationOption; /** * The type Example module. diff --git a/remappedSrc/pm/j4/petroleum/modules/bindings/BindingInfo.java b/remappedSrc/pm/j4/petroleum/modules/bindings/BindingInfo.java index c147d8a..9d0e9f6 100644 --- a/remappedSrc/pm/j4/petroleum/modules/bindings/BindingInfo.java +++ b/remappedSrc/pm/j4/petroleum/modules/bindings/BindingInfo.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.modules.bindings; +package pm.j4.kerosene.modules.bindings; import net.minecraft.client.util.InputUtil; diff --git a/remappedSrc/pm/j4/petroleum/modules/bindings/BindingManager.java b/remappedSrc/pm/j4/petroleum/modules/bindings/BindingManager.java index c9af1ef..cdf170a 100644 --- a/remappedSrc/pm/j4/petroleum/modules/bindings/BindingManager.java +++ b/remappedSrc/pm/j4/petroleum/modules/bindings/BindingManager.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.modules.bindings; +package pm.j4.kerosene.modules.bindings; import java.util.*; import net.minecraft.client.MinecraftClient; @@ -7,12 +7,12 @@ import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.TranslatableText; import org.lwjgl.glfw.GLFW; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.config.GlobalConfig; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.KeybindOption; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.gui.PModuleConfigEntry; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.config.GlobalConfig; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.KeybindOption; /** * The type Binding manager. diff --git a/remappedSrc/pm/j4/petroleum/modules/list/ModList.java b/remappedSrc/pm/j4/petroleum/modules/list/ModList.java index 8c4bb9f..166204e 100644 --- a/remappedSrc/pm/j4/petroleum/modules/list/ModList.java +++ b/remappedSrc/pm/j4/petroleum/modules/list/ModList.java @@ -1,13 +1,13 @@ -package pm.j4.petroleum.modules.list; +package pm.j4.kerosene.modules.list; import java.util.ArrayList; import java.util.List; import java.util.Optional; import jdk.nashorn.internal.runtime.options.Option; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Mod list. diff --git a/remappedSrc/pm/j4/petroleum/modules/menu/ModMenu.java b/remappedSrc/pm/j4/petroleum/modules/menu/ModMenu.java index 7ed0500..d548a6a 100644 --- a/remappedSrc/pm/j4/petroleum/modules/menu/ModMenu.java +++ b/remappedSrc/pm/j4/petroleum/modules/menu/ModMenu.java @@ -1,14 +1,14 @@ -package pm.j4.petroleum.modules.menu; +package pm.j4.kerosene.modules.menu; import java.util.HashMap; import java.util.List; import java.util.Map; import net.minecraft.client.MinecraftClient; -import pm.j4.petroleum.gui.PModMenuScreen; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.Category; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.gui.PModMenuScreen; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.data.ButtonInformation; +import pm.j4.kerosene.util.data.Category; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Mod menu. diff --git a/remappedSrc/pm/j4/petroleum/modules/splash/SplashText.java b/remappedSrc/pm/j4/petroleum/modules/splash/SplashText.java index c5c60ae..0ffef84 100644 --- a/remappedSrc/pm/j4/petroleum/modules/splash/SplashText.java +++ b/remappedSrc/pm/j4/petroleum/modules/splash/SplashText.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.modules.splash; +package pm.j4.kerosene.modules.splash; import java.util.ArrayList; import java.util.HashMap; @@ -10,13 +10,13 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; -import pm.j4.petroleum.util.module.option.KeybindOption; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.gui.PModuleConfigEntry; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.BooleanOption; +import pm.j4.kerosene.util.module.option.ConfigurationOption; +import pm.j4.kerosene.util.module.option.KeybindOption; /** * The type Splash text. diff --git a/remappedSrc/pm/j4/petroleum/modules/xray/Xray.java b/remappedSrc/pm/j4/petroleum/modules/xray/Xray.java index 7e31116..2083f58 100644 --- a/remappedSrc/pm/j4/petroleum/modules/xray/Xray.java +++ b/remappedSrc/pm/j4/petroleum/modules/xray/Xray.java @@ -1,6 +1,6 @@ -package pm.j4.petroleum.modules.xray; +package pm.j4.kerosene.modules.xray; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Xray. diff --git a/remappedSrc/pm/j4/petroleum/util/config/Config.java b/remappedSrc/pm/j4/petroleum/util/config/Config.java index 695be65..af7beb9 100644 --- a/remappedSrc/pm/j4/petroleum/util/config/Config.java +++ b/remappedSrc/pm/j4/petroleum/util/config/Config.java @@ -1,9 +1,9 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.ArrayList; import java.util.List; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Config. diff --git a/remappedSrc/pm/j4/petroleum/util/config/ConfigHolder.java b/remappedSrc/pm/j4/petroleum/util/config/ConfigHolder.java index 531e90c..6b32159 100644 --- a/remappedSrc/pm/j4/petroleum/util/config/ConfigHolder.java +++ b/remappedSrc/pm/j4/petroleum/util/config/ConfigHolder.java @@ -1,10 +1,10 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Config holder. diff --git a/remappedSrc/pm/j4/petroleum/util/config/ConfigManager.java b/remappedSrc/pm/j4/petroleum/util/config/ConfigManager.java index f44e8b6..fcf0e8c 100644 --- a/remappedSrc/pm/j4/petroleum/util/config/ConfigManager.java +++ b/remappedSrc/pm/j4/petroleum/util/config/ConfigManager.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import com.google.common.reflect.TypeToken; import com.google.gson.*; @@ -6,13 +6,13 @@ import java.io.*; import java.lang.reflect.Type; import java.util.*; import net.fabricmc.loader.api.FabricLoader; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.modules.bindings.BindingInfo; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.ModuleConfig; -import pm.j4.petroleum.util.data.OptionSerializiable; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.modules.bindings.BindingInfo; +import pm.j4.kerosene.modules.menu.ModMenu; +import pm.j4.kerosene.util.data.ButtonInformation; +import pm.j4.kerosene.util.data.ModuleConfig; +import pm.j4.kerosene.util.data.OptionSerializiable; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Config manager. diff --git a/remappedSrc/pm/j4/petroleum/util/config/DefaultConfig.java b/remappedSrc/pm/j4/petroleum/util/config/DefaultConfig.java index f50bea2..b7d1dbd 100644 --- a/remappedSrc/pm/j4/petroleum/util/config/DefaultConfig.java +++ b/remappedSrc/pm/j4/petroleum/util/config/DefaultConfig.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.Collections; diff --git a/remappedSrc/pm/j4/petroleum/util/config/GlobalConfig.java b/remappedSrc/pm/j4/petroleum/util/config/GlobalConfig.java index 91d7b07..80999a4 100644 --- a/remappedSrc/pm/j4/petroleum/util/config/GlobalConfig.java +++ b/remappedSrc/pm/j4/petroleum/util/config/GlobalConfig.java @@ -1,15 +1,15 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.util.InputUtil; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.modules.bindings.BindingInfo; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.OptionSerializiable; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.ConfigurationOption; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.modules.bindings.BindingInfo; +import pm.j4.kerosene.util.data.ButtonInformation; +import pm.j4.kerosene.util.data.OptionSerializiable; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.ConfigurationOption; /** * The type Global config. diff --git a/remappedSrc/pm/j4/petroleum/util/config/ServerConfig.java b/remappedSrc/pm/j4/petroleum/util/config/ServerConfig.java index 9df6464..b2dd409 100644 --- a/remappedSrc/pm/j4/petroleum/util/config/ServerConfig.java +++ b/remappedSrc/pm/j4/petroleum/util/config/ServerConfig.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; /** * The type Server config. diff --git a/remappedSrc/pm/j4/petroleum/util/data/ButtonInformation.java b/remappedSrc/pm/j4/petroleum/util/data/ButtonInformation.java index e4ff031..30e40e1 100644 --- a/remappedSrc/pm/j4/petroleum/util/data/ButtonInformation.java +++ b/remappedSrc/pm/j4/petroleum/util/data/ButtonInformation.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; /** * The type Button information. diff --git a/remappedSrc/pm/j4/petroleum/util/data/Category.java b/remappedSrc/pm/j4/petroleum/util/data/Category.java index c2210a5..62945d8 100644 --- a/remappedSrc/pm/j4/petroleum/util/data/Category.java +++ b/remappedSrc/pm/j4/petroleum/util/data/Category.java @@ -1,11 +1,11 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.PetroleumMod; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Category. diff --git a/remappedSrc/pm/j4/petroleum/util/data/ModuleConfig.java b/remappedSrc/pm/j4/petroleum/util/data/ModuleConfig.java index 33c1365..3c97389 100644 --- a/remappedSrc/pm/j4/petroleum/util/data/ModuleConfig.java +++ b/remappedSrc/pm/j4/petroleum/util/data/ModuleConfig.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; import java.util.Map; diff --git a/remappedSrc/pm/j4/petroleum/util/data/OptionSerializiable.java b/remappedSrc/pm/j4/petroleum/util/data/OptionSerializiable.java index 197332f..8414edf 100644 --- a/remappedSrc/pm/j4/petroleum/util/data/OptionSerializiable.java +++ b/remappedSrc/pm/j4/petroleum/util/data/OptionSerializiable.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; import com.google.gson.JsonElement; diff --git a/remappedSrc/pm/j4/petroleum/util/module/ModuleBase.java b/remappedSrc/pm/j4/petroleum/util/module/ModuleBase.java index 514405c..3bab1fb 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/ModuleBase.java +++ b/remappedSrc/pm/j4/petroleum/util/module/ModuleBase.java @@ -1,13 +1,13 @@ -package pm.j4.petroleum.util.module; +package pm.j4.kerosene.util.module; import com.google.gson.JsonElement; import java.util.*; import net.minecraft.client.MinecraftClient; import net.minecraft.text.TranslatableText; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.option.ConfigurationOption; +import pm.j4.kerosene.gui.PModuleConfigEntry; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.option.ConfigurationOption; /** * The Basis for all mods, used so that modules all have a common activation point and settings. diff --git a/remappedSrc/pm/j4/petroleum/util/module/option/BooleanOption.java b/remappedSrc/pm/j4/petroleum/util/module/option/BooleanOption.java index 1a33c41..a59def5 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/option/BooleanOption.java +++ b/remappedSrc/pm/j4/petroleum/util/module/option/BooleanOption.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; diff --git a/remappedSrc/pm/j4/petroleum/util/module/option/ConfigurationOption.java b/remappedSrc/pm/j4/petroleum/util/module/option/ConfigurationOption.java index 629cc35..fa06aaf 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/option/ConfigurationOption.java +++ b/remappedSrc/pm/j4/petroleum/util/module/option/ConfigurationOption.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; diff --git a/remappedSrc/pm/j4/petroleum/util/module/option/IntegerOption.java b/remappedSrc/pm/j4/petroleum/util/module/option/IntegerOption.java index b39718d..f48a1e9 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/option/IntegerOption.java +++ b/remappedSrc/pm/j4/petroleum/util/module/option/IntegerOption.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; diff --git a/remappedSrc/pm/j4/petroleum/util/module/option/KeybindOption.java b/remappedSrc/pm/j4/petroleum/util/module/option/KeybindOption.java index b39f6ab..9e27882 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/option/KeybindOption.java +++ b/remappedSrc/pm/j4/petroleum/util/module/option/KeybindOption.java @@ -1,11 +1,11 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import net.minecraft.client.options.KeyBinding; -import pm.j4.petroleum.modules.bindings.BindingInfo; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.config.GlobalConfig; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.modules.bindings.BindingInfo; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.config.GlobalConfig; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Keybind value. diff --git a/remappedSrc/pm/j4/petroleum/util/module/option/ListOption.java b/remappedSrc/pm/j4/petroleum/util/module/option/ListOption.java index 2b37c29..48a2c1a 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/option/ListOption.java +++ b/remappedSrc/pm/j4/petroleum/util/module/option/ListOption.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; diff --git a/remappedSrc/pm/j4/petroleum/util/module/option/StringOption.java b/remappedSrc/pm/j4/petroleum/util/module/option/StringOption.java index 174d056..a3e347d 100644 --- a/remappedSrc/pm/j4/petroleum/util/module/option/StringOption.java +++ b/remappedSrc/pm/j4/petroleum/util/module/option/StringOption.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; diff --git a/src/main/java/pm/j4/petroleum/PetroleumMod.java b/src/main/java/pm/j4/kerosene/KeroseneMod.java similarity index 60% rename from src/main/java/pm/j4/petroleum/PetroleumMod.java rename to src/main/java/pm/j4/kerosene/KeroseneMod.java index ce543eb..4dd231d 100644 --- a/src/main/java/pm/j4/petroleum/PetroleumMod.java +++ b/src/main/java/pm/j4/kerosene/KeroseneMod.java @@ -1,7 +1,6 @@ -package pm.j4.petroleum; +package pm.j4.kerosene; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Optional; import net.fabricmc.api.ModInitializer; @@ -12,33 +11,18 @@ import net.fabricmc.loader.api.metadata.ModMetadata; import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.KeyBinding; import net.minecraft.server.integrated.IntegratedServer; -import pm.j4.petroleum.modules.ExampleModule; -import pm.j4.petroleum.modules.bindings.BindingManager; -import pm.j4.petroleum.modules.list.ModList; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.modules.splash.SplashText; -import pm.j4.petroleum.modules.xray.Xray; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.modules.ExampleModule; +import pm.j4.kerosene.modules.bindings.BindingManager; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; -//TODO: -// petroleum module checklist -// [ ] xray (lol) -// [ ] combat stuff. killaura, anti knockback, etc -// [ ] render stuff. tracers, nametags -// [ ] wurst taco. but a fish -// [ ] elytra fly -// [ ] movement stuff. nofall, jesus, speed -// [ ] elytra bhop -// [ ] boatfly -// [ ] anti anti cheat /** - * The type Petroleum mod. + * The type Kerosene mod. */ -public class PetroleumMod implements ModInitializer { +public class KeroseneMod implements ModInitializer { /** * The Mod data. */ @@ -50,14 +34,14 @@ public class PetroleumMod implements ModInitializer { /** * The constant activeMods. */ - private static final List activeMods = Arrays.asList( - new SplashText(), - new ModMenu(), - new ModList(), - new BindingManager(), - new ExampleModule(), - new Xray() - ); + private static List registeredMods = new ArrayList<>(); + + public static void registerMod(Class mod) throws IllegalAccessException, InstantiationException { + ModuleBase base = mod.newInstance(); + if(!registeredMods.contains(base)) { + registeredMods.add(base); + } + } /** * Is active boolean. @@ -66,7 +50,7 @@ public class PetroleumMod implements ModInitializer { * @return the boolean */ public static boolean isActive(String modName) { - return activeMods.stream().anyMatch(mod -> mod.getModuleName().equals(modName)); + return registeredMods.stream().anyMatch(mod -> mod.getModuleName().equals(modName)); } /** @@ -76,7 +60,7 @@ public class PetroleumMod implements ModInitializer { * @return the mod */ public static Optional getMod(String modName) { - return activeMods.stream().filter(mod -> mod.getModuleName().equals(modName)).findFirst(); + return registeredMods.stream().filter(mod -> mod.getModuleName().equals(modName)).findFirst(); } /** @@ -84,8 +68,8 @@ public class PetroleumMod implements ModInitializer { * * @return the active mods */ - public static List getActiveMods() { - return activeMods; + public static List getRegisteredMods() { + return registeredMods; } /** @@ -108,7 +92,9 @@ public class PetroleumMod implements ModInitializer { * @param b the b */ public static void removeBind(KeyBinding b) { - registeredBinds.remove(b); + if(registeredBinds.contains(b)) { + registeredBinds.remove(b); + } } /** @@ -141,24 +127,32 @@ public class PetroleumMod implements ModInitializer { @Override public void onInitialize() { - ConfigManager.initConfig(); + ConfigManager.initConfig("kerosene"); // always update mod data - Optional modContainer = FabricLoader.getInstance().getModContainer("petroleum"); + Optional modContainer = FabricLoader.getInstance().getModContainer("kerosene"); modContainer.ifPresent(container -> modData = container.getMetadata()); - Optional conf = ConfigManager.getConfig(); + Optional conf = ConfigManager.getConfig("kerosene"); + + try { + this.registerMod(ExampleModule.class); + this.registerMod(BindingManager.class); + } + catch (Exception e) { + System.out.println(e); + } //initialize any keybinds, data, etc. - activeMods.forEach(ModuleBase::init); + registeredMods.forEach(ModuleBase::init); //initialize keybind handler conf.ifPresent(configHolder -> ClientTickEvents.END_CLIENT_TICK.register(client -> { - if (PetroleumMod.client != client) { - PetroleumMod.client = client; + if (KeroseneMod.client != client) { + KeroseneMod.client = client; } - for (KeyBinding b : PetroleumMod.getActiveKeybinds()) { + for (KeyBinding b : KeroseneMod.getActiveKeybinds()) { while (b.wasPressed()) { configHolder.globalConfig.bindings.get(b).activate(client); } diff --git a/src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java b/src/main/java/pm/j4/kerosene/gui/PModuleConfigEntry.java similarity index 93% rename from src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java rename to src/main/java/pm/j4/kerosene/gui/PModuleConfigEntry.java index 0d99ed0..a16baf2 100644 --- a/src/main/java/pm/j4/petroleum/gui/PModuleConfigEntry.java +++ b/src/main/java/pm/j4/kerosene/gui/PModuleConfigEntry.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import java.util.ArrayList; import java.util.List; @@ -12,12 +12,12 @@ import net.minecraft.client.options.KeyBinding; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; -import pm.j4.petroleum.util.module.option.KeybindOption; -import pm.j4.petroleum.util.module.option.ListOption; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.option.BooleanOption; +import pm.j4.kerosene.util.module.option.ConfigurationOption; +import pm.j4.kerosene.util.module.option.KeybindOption; +import pm.j4.kerosene.util.module.option.ListOption; /** * The type P module config entry. @@ -156,9 +156,9 @@ public class PModuleConfigEntry extends ElementListWidget.Entry config = ConfigManager.getConfig(); + Optional config = ConfigManager.getConfig(option.getParent().getParent()); assert config.isPresent(); config.get().globalConfig.setBinding(bind, option.getParent()); option = newValue; diff --git a/src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java b/src/main/java/pm/j4/kerosene/gui/PModuleConfigPane.java similarity index 96% rename from src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java rename to src/main/java/pm/j4/kerosene/gui/PModuleConfigPane.java index a5242fd..a4a521d 100644 --- a/src/main/java/pm/j4/petroleum/gui/PModuleConfigPane.java +++ b/src/main/java/pm/j4/kerosene/gui/PModuleConfigPane.java @@ -1,11 +1,9 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; import net.minecraft.client.gui.widget.ElementListWidget; -import net.minecraft.client.gui.widget.EntryListWidget; import net.minecraft.client.render.BufferBuilder; import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; diff --git a/src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java b/src/main/java/pm/j4/kerosene/gui/PModuleConfigurationWidget.java similarity index 98% rename from src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java rename to src/main/java/pm/j4/kerosene/gui/PModuleConfigurationWidget.java index 495da1c..180a2f6 100644 --- a/src/main/java/pm/j4/petroleum/gui/PModuleConfigurationWidget.java +++ b/src/main/java/pm/j4/kerosene/gui/PModuleConfigurationWidget.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import java.util.HashSet; @@ -13,8 +13,8 @@ import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Matrix4f; -import pm.j4.petroleum.mixin.EntryListWidgetAccessor; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.mixin.EntryListWidgetAccessor; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P module configuration widget. diff --git a/src/main/java/pm/j4/petroleum/gui/POptionEntry.java b/src/main/java/pm/j4/kerosene/gui/POptionEntry.java similarity index 96% rename from src/main/java/pm/j4/petroleum/gui/POptionEntry.java rename to src/main/java/pm/j4/kerosene/gui/POptionEntry.java index 4132848..260e029 100644 --- a/src/main/java/pm/j4/petroleum/gui/POptionEntry.java +++ b/src/main/java/pm/j4/kerosene/gui/POptionEntry.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.MinecraftClient; @@ -9,7 +9,7 @@ import net.minecraft.text.StringVisitable; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; import net.minecraft.util.Language; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P option entry. diff --git a/src/main/java/pm/j4/petroleum/gui/POptionsScreen.java b/src/main/java/pm/j4/kerosene/gui/POptionsScreen.java similarity index 94% rename from src/main/java/pm/j4/petroleum/gui/POptionsScreen.java rename to src/main/java/pm/j4/kerosene/gui/POptionsScreen.java index 6384ac7..1b80680 100644 --- a/src/main/java/pm/j4/petroleum/gui/POptionsScreen.java +++ b/src/main/java/pm/j4/kerosene/gui/POptionsScreen.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.gui; +package pm.j4.kerosene.gui; import com.mojang.blaze3d.systems.RenderSystem; import java.util.ArrayList; @@ -15,9 +15,9 @@ import net.minecraft.client.render.Tessellator; import net.minecraft.client.render.VertexFormats; import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.*; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type P options screen. @@ -99,11 +99,9 @@ public class POptionsScreen extends Screen { this.configPane.setLeftPos(paneWidth); this.children.add(this.configPane); List configurableModules = new ArrayList<>(); - if (ConfigManager.getConfig().isPresent()) { - configurableModules.addAll(PetroleumMod.getActiveMods() - .stream().filter(ModuleBase::configurable) - .collect(Collectors.toList())); - } + configurableModules.addAll(KeroseneMod.getRegisteredMods() + .stream().filter(ModuleBase::configurable) + .collect(Collectors.toList())); configurableModules.forEach(module -> this.modules.addEntry(new POptionEntry(module, this.modules))); this.addButton(new ButtonWidget(this.width / 2 - 75, this.height - 30, 150, 20, ScreenTexts.DONE, (buttonWidget) -> { ConfigManager.saveAllModules(); diff --git a/src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java b/src/main/java/pm/j4/kerosene/mixin/EntryListWidgetAccessor.java similarity index 92% rename from src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java rename to src/main/java/pm/j4/kerosene/mixin/EntryListWidgetAccessor.java index eea68ab..8877beb 100644 --- a/src/main/java/pm/j4/petroleum/mixin/EntryListWidgetAccessor.java +++ b/src/main/java/pm/j4/kerosene/mixin/EntryListWidgetAccessor.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import net.minecraft.client.gui.widget.EntryListWidget; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java b/src/main/java/pm/j4/kerosene/mixin/OptionsMenuMixin.java similarity index 86% rename from src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java rename to src/main/java/pm/j4/kerosene/mixin/OptionsMenuMixin.java index be27f25..3791680 100644 --- a/src/main/java/pm/j4/petroleum/mixin/OptionsMenuMixin.java +++ b/src/main/java/pm/j4/kerosene/mixin/OptionsMenuMixin.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.mixin; +package pm.j4.kerosene.mixin; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.options.OptionsScreen; @@ -9,7 +9,7 @@ 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 pm.j4.petroleum.gui.POptionsScreen; +import pm.j4.kerosene.gui.POptionsScreen; /** * The type Options menu mixin. @@ -34,7 +34,7 @@ public class OptionsMenuMixin extends Screen { @Inject(at = @At(value = "TAIL"), method = "init()V") protected void init(CallbackInfo ci) { - this.addButton(new ButtonWidget(this.width / 2 - 75, this.height / 6 + 140, 150, 20, new TranslatableText("petroleum.options"), (buttonWidget) -> { + this.addButton(new ButtonWidget(this.width / 2 - 75, this.height / 6 + 140, 150, 20, new TranslatableText("kerosene.options"), (buttonWidget) -> { assert this.client != null; this.client.openScreen(new POptionsScreen(this)); })); diff --git a/src/main/java/pm/j4/kerosene/modules/ExampleModule.java b/src/main/java/pm/j4/kerosene/modules/ExampleModule.java new file mode 100644 index 0000000..21d4cb9 --- /dev/null +++ b/src/main/java/pm/j4/kerosene/modules/ExampleModule.java @@ -0,0 +1,38 @@ +package pm.j4.kerosene.modules; + +import java.util.ArrayList; +import java.util.List; +import net.minecraft.client.MinecraftClient; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.BooleanOption; +import pm.j4.kerosene.util.module.option.ConfigurationOption; + +/** + * The type Example module. + */ +public class ExampleModule extends ModuleBase { + /** + * example mod + */ + public ExampleModule() { + super("kerosene", + "kerosene.example", + "kerosene.misc", + true, + false, + true); + } + + @Override + public List getDefaultConfig() { + List options = new ArrayList<>(); + options.add(new BooleanOption("kerosene.example.b_one","example", this)); + options.add(new BooleanOption("kerosene.example.b_two","example", this)); + return options; + } + + @Override + public void activate(MinecraftClient client) { + System.out.println("Example Mod Keybind Activate"); + } +} diff --git a/src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java b/src/main/java/pm/j4/kerosene/modules/bindings/BindingInfo.java similarity index 90% rename from src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java rename to src/main/java/pm/j4/kerosene/modules/bindings/BindingInfo.java index c147d8a..9d0e9f6 100644 --- a/src/main/java/pm/j4/petroleum/modules/bindings/BindingInfo.java +++ b/src/main/java/pm/j4/kerosene/modules/bindings/BindingInfo.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.modules.bindings; +package pm.j4.kerosene.modules.bindings; import net.minecraft.client.util.InputUtil; diff --git a/src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java b/src/main/java/pm/j4/kerosene/modules/bindings/BindingManager.java similarity index 64% rename from src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java rename to src/main/java/pm/j4/kerosene/modules/bindings/BindingManager.java index 33d4c39..904cf93 100644 --- a/src/main/java/pm/j4/petroleum/modules/bindings/BindingManager.java +++ b/src/main/java/pm/j4/kerosene/modules/bindings/BindingManager.java @@ -1,20 +1,18 @@ -package pm.j4.petroleum.modules.bindings; +package pm.j4.kerosene.modules.bindings; import java.util.*; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.util.InputUtil; -import net.minecraft.client.util.math.MatrixStack; import net.minecraft.text.TranslatableText; import org.lwjgl.glfw.GLFW; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.gui.PModuleConfigPane; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.config.GlobalConfig; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.ConfigurationOption; -import pm.j4.petroleum.util.module.option.KeybindOption; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.gui.PModuleConfigEntry; +import pm.j4.kerosene.gui.PModuleConfigPane; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.config.GlobalConfig; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.KeybindOption; /** * The type Binding manager. @@ -25,8 +23,9 @@ public class BindingManager extends ModuleBase { * Parameters should be constant across restarts. */ public BindingManager() { - super("petroleum.bindings", - "petroleum.misc", + super("kerosene", + "kerosene.bindings", + "kerosene.misc", false, true, true); @@ -47,8 +46,9 @@ public class BindingManager extends ModuleBase { List entries = new ArrayList<>(); Map mapped = new HashMap<>(); - if (ConfigManager.getConfig().isPresent()) { - Map binds = ConfigManager.getConfig().get().globalConfig.bindings; + Optional config = ConfigManager.getConfig(this.getParent()); + if (config.isPresent()) { + Map binds = config.get().globalConfig.bindings; binds.forEach((key, func) -> { KeybindOption option = new KeybindOption(func.getModuleName() + " " + func.getCategory(), func.getModuleName() + " " + func.getCategory(), func); @@ -67,11 +67,12 @@ public class BindingManager extends ModuleBase { * Register bindings. */ private void registerBindings() { - if (!ConfigManager.getConfig().isPresent()) { + Optional config = ConfigManager.getConfig(this.getParent()); + if (!config.isPresent()) { return; } - GlobalConfig c = ConfigManager.getConfig().get().globalConfig; - Optional mod = PetroleumMod.getMod("petroleum.modmenu"); + GlobalConfig c = config.get().globalConfig; + Optional mod = KeroseneMod.getMod("petroleum.modmenu"); if (mod.isPresent() && !c.isBound(mod.get())) { //TODO // the only explicit keybinding (for now.) @@ -83,7 +84,7 @@ public class BindingManager extends ModuleBase { GLFW.GLFW_KEY_RIGHT_CONTROL, "category.petroleum" ); - ConfigManager.getConfig().get().globalConfig.setBinding(binding, mod.get()); + config.get().globalConfig.setBinding(binding, mod.get()); } } } diff --git a/src/main/java/pm/j4/petroleum/util/config/Config.java b/src/main/java/pm/j4/kerosene/util/config/Config.java similarity index 66% rename from src/main/java/pm/j4/petroleum/util/config/Config.java rename to src/main/java/pm/j4/kerosene/util/config/Config.java index 695be65..a527854 100644 --- a/src/main/java/pm/j4/petroleum/util/config/Config.java +++ b/src/main/java/pm/j4/kerosene/util/config/Config.java @@ -1,9 +1,9 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.ArrayList; import java.util.List; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Config. @@ -31,8 +31,8 @@ public abstract class Config { * @param mod the mod */ public void disableModule(String mod) { - if (isEnabled(mod) && PetroleumMod.isActive(mod) && PetroleumMod.getMod(mod).isPresent()) { - ModuleBase moduleInfo = PetroleumMod.getMod(mod).get(); + if (isEnabled(mod) && KeroseneMod.isActive(mod) && KeroseneMod.getMod(mod).isPresent()) { + ModuleBase moduleInfo = KeroseneMod.getMod(mod).get(); if (moduleInfo.isActivatable()) { enabledModules.remove(mod); } @@ -45,8 +45,8 @@ public abstract class Config { * @param mod the mod */ public void toggleModule(String mod) { - if (PetroleumMod.isActive(mod) && PetroleumMod.getMod(mod).isPresent()) { - ModuleBase moduleInfo = PetroleumMod.getMod(mod).get(); + if (KeroseneMod.isActive(mod) && KeroseneMod.getMod(mod).isPresent()) { + ModuleBase moduleInfo = KeroseneMod.getMod(mod).get(); if (moduleInfo.isActivatable()) { if (isEnabled(mod)) { enabledModules.remove(mod); diff --git a/src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java b/src/main/java/pm/j4/kerosene/util/config/ConfigHolder.java similarity index 87% rename from src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java rename to src/main/java/pm/j4/kerosene/util/config/ConfigHolder.java index f4a68ba..89bc8cd 100644 --- a/src/main/java/pm/j4/petroleum/util/config/ConfigHolder.java +++ b/src/main/java/pm/j4/kerosene/util/config/ConfigHolder.java @@ -1,10 +1,10 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Config holder. @@ -27,7 +27,7 @@ public class ConfigHolder { */ public boolean isModuleEnabled(String module) { - if (!PetroleumMod.isActive(module)) { + if (!KeroseneMod.isActive(module)) { return false; } if (globalConfig.isEnabled(module)) { @@ -46,7 +46,7 @@ public class ConfigHolder { * @return the enabled modules */ public List getEnabledModules() { - List modules = PetroleumMod.getActiveMods(); + List modules = KeroseneMod.getRegisteredMods(); return modules.stream().filter(module -> isModuleEnabled(module.getModuleName()) ).collect(Collectors.toList()); @@ -58,7 +58,7 @@ public class ConfigHolder { * @return the server */ public String getServer() { - return PetroleumMod.getServerAddress(); + return KeroseneMod.getServerAddress(); } /** diff --git a/src/main/java/pm/j4/petroleum/util/config/ConfigManager.java b/src/main/java/pm/j4/kerosene/util/config/ConfigManager.java similarity index 76% rename from src/main/java/pm/j4/petroleum/util/config/ConfigManager.java rename to src/main/java/pm/j4/kerosene/util/config/ConfigManager.java index f44e8b6..f39bb1e 100644 --- a/src/main/java/pm/j4/petroleum/util/config/ConfigManager.java +++ b/src/main/java/pm/j4/kerosene/util/config/ConfigManager.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import com.google.common.reflect.TypeToken; import com.google.gson.*; @@ -6,13 +6,11 @@ import java.io.*; import java.lang.reflect.Type; import java.util.*; import net.fabricmc.loader.api.FabricLoader; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.modules.bindings.BindingInfo; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.ModuleConfig; -import pm.j4.petroleum.util.data.OptionSerializiable; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.modules.bindings.BindingInfo; +import pm.j4.kerosene.util.data.ModuleConfig; +import pm.j4.kerosene.util.data.OptionSerializiable; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Config manager. @@ -28,7 +26,7 @@ public class ConfigManager { /** * The constant config. */ - private static ConfigHolder config; + private static Map configs = new HashMap<>(); /** * Prepare config file. @@ -48,25 +46,25 @@ public class ConfigManager { /** * Init config. */ - public static void initConfig() { - if (config != null) { + public static void initConfig(String moduleName) { + if (configs.containsKey(moduleName)) { return; } - config = new ConfigHolder(); + ConfigHolder config = new ConfigHolder(); config.globalConfig = new DefaultConfig(); config.serverConfigs = new HashMap<>(); - config = load("petroleum/", "petroleum.json", ConfigHolder.class); - initModules(); + config = load(moduleName + "/", moduleName +".json", ConfigHolder.class); + initModules(moduleName); } /** * Init modules. */ - public static void initModules() { - PetroleumMod.getActiveMods().forEach(module -> { - ModuleConfig options = load("petroleum/modules/", module.getModuleName() + ".json", ModuleConfig.class); + public static void initModules(String moduleName) { + KeroseneMod.getRegisteredMods().forEach(module -> { + ModuleConfig options = load(moduleName + "/modules/", module.getModuleName() + ".json", ModuleConfig.class); if (options != null && options.options != null) { options.options.forEach((key, option) -> { if (module.hasOption(option.key)) { @@ -150,25 +148,29 @@ public class ConfigManager { * * @param b the b */ - public static void saveModule(ModuleBase b) { + public static void saveModule(String modName, ModuleBase b) { ModuleConfig c = new ModuleConfig(); c.options = GlobalConfig.serializeModuleConfiguration(b); - save("petroleum/modules/", b.getModuleName() + ".json", c); + save(modName + "/modules/", b.getModuleName() + ".json", c); } /** * Save all modules. */ public static void saveAllModules() { - List mods = PetroleumMod.getActiveMods(); - mods.forEach(ConfigManager::saveModule); + List mods = KeroseneMod.getRegisteredMods(); + mods.forEach((module) -> { + ConfigManager.saveModule(module.getParent(), module); + }); } /** * Save global config. */ - public static void saveGlobalConfig() { - save("petroleum/", "petroleum.json", config); + public static void saveGlobalConfig(String modName) { + if(configs.containsKey(modName)) { + save(modName + "/", modName + ".json", configs.get(modName)); + } } /** @@ -176,11 +178,11 @@ public class ConfigManager { * * @return the config */ - public static Optional getConfig() { - if (config == null) { - return Optional.empty(); + public static Optional getConfig(String modName) { + if (configs.containsKey(modName)) { + return Optional.of(configs.get(modName)); } - return Optional.of(config); + return Optional.empty(); } } @@ -201,12 +203,6 @@ class SerializationHelper { JsonArray modules = ctx.serialize(src.enabledModules).getAsJsonArray(); jsonConfig.add("enabled_modules", modules); - JsonObject tabCoordinates = new JsonObject(); - ModMenu.getButtons().forEach((category, coordinates) -> { - tabCoordinates.add(category, ctx.serialize(coordinates)); - }); - jsonConfig.add("button_coordinates", tabCoordinates); - return jsonConfig; }; @@ -233,14 +229,7 @@ class SerializationHelper { } else { options = new HashMap<>(); } - if (obj.has("button_coordinates")) { - obj.get("button_coordinates").getAsJsonObject().entrySet().forEach( - value -> { - cfg.setButton(value.getKey(), ctx.deserialize(value.getValue(), ButtonInformation.class)); - } - ); - } - PetroleumMod.getActiveMods().forEach(module -> { + KeroseneMod.getRegisteredMods().forEach(module -> { if (options.containsKey(module.getModuleName())) { cfg.deserializeModuleConfiguration(options.get(module.getModuleName()), module); } diff --git a/src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java b/src/main/java/pm/j4/kerosene/util/config/DefaultConfig.java similarity index 88% rename from src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java rename to src/main/java/pm/j4/kerosene/util/config/DefaultConfig.java index f50bea2..b7d1dbd 100644 --- a/src/main/java/pm/j4/petroleum/util/config/DefaultConfig.java +++ b/src/main/java/pm/j4/kerosene/util/config/DefaultConfig.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.Collections; diff --git a/src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java b/src/main/java/pm/j4/kerosene/util/config/GlobalConfig.java similarity index 70% rename from src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java rename to src/main/java/pm/j4/kerosene/util/config/GlobalConfig.java index 97a5d16..6021107 100644 --- a/src/main/java/pm/j4/petroleum/util/config/GlobalConfig.java +++ b/src/main/java/pm/j4/kerosene/util/config/GlobalConfig.java @@ -1,16 +1,15 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import net.minecraft.client.options.KeyBinding; import net.minecraft.client.util.InputUtil; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.modules.bindings.BindingInfo; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.OptionSerializiable; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.ConfigurationOption; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.modules.bindings.BindingInfo; +import pm.j4.kerosene.util.data.OptionSerializiable; +import pm.j4.kerosene.util.module.ModuleBase; +import pm.j4.kerosene.util.module.option.ConfigurationOption; /** * The type Global config. @@ -48,7 +47,7 @@ public class GlobalConfig extends Config { if (bindings.containsValue(func)) { bindings.forEach((key, binding) -> { if (binding.equals(func)) { - PetroleumMod.removeBind(key); + KeroseneMod.removeBind(key); match.set(key); } }); @@ -58,8 +57,8 @@ public class GlobalConfig extends Config { bindings.remove(match.get()); } - if (PetroleumMod.isActive(func.getModuleName())) { - PetroleumMod.addBind(bind); + if (KeroseneMod.isActive(func.getModuleName())) { + KeroseneMod.addBind(bind); bindings.put(bind, func); } } @@ -70,7 +69,7 @@ public class GlobalConfig extends Config { * @param info the info */ private void convertBinding(BindingInfo info) { - Optional match = PetroleumMod.getMod(info.attachedModuleName); + Optional match = KeroseneMod.getMod(info.attachedModuleName); match.ifPresent(moduleBase -> setBinding(reconstructBinding(info), moduleBase)); } @@ -158,38 +157,5 @@ public class GlobalConfig extends Config { } }); } - - /** - * The Button locations. - */ - private final Map buttonLocations = new HashMap<>(); - - /** - * Sets button. - * - * @param category the category - * @param buttonInformation the button information - */ - public void setButton(String category, ButtonInformation buttonInformation) { - if (buttonLocations.containsKey(category)) { - buttonLocations.replace(category, buttonInformation); - } else { - buttonLocations.put(category, buttonInformation); - } - } - - /** - * Gets button. - * - * @param category the category - * @return the button - */ - public ButtonInformation getButton(String category) { - if (buttonLocations.containsKey(category)) { - return buttonLocations.get(category); - } - System.out.println("Could not find button of category " + category); - return null; - } } diff --git a/src/main/java/pm/j4/petroleum/util/config/ServerConfig.java b/src/main/java/pm/j4/kerosene/util/config/ServerConfig.java similarity index 78% rename from src/main/java/pm/j4/petroleum/util/config/ServerConfig.java rename to src/main/java/pm/j4/kerosene/util/config/ServerConfig.java index 9df6464..b2dd409 100644 --- a/src/main/java/pm/j4/petroleum/util/config/ServerConfig.java +++ b/src/main/java/pm/j4/kerosene/util/config/ServerConfig.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.config; +package pm.j4.kerosene.util.config; /** * The type Server config. diff --git a/src/main/java/pm/j4/petroleum/util/data/Category.java b/src/main/java/pm/j4/kerosene/util/data/Category.java similarity index 85% rename from src/main/java/pm/j4/petroleum/util/data/Category.java rename to src/main/java/pm/j4/kerosene/util/data/Category.java index c2210a5..f055661 100644 --- a/src/main/java/pm/j4/petroleum/util/data/Category.java +++ b/src/main/java/pm/j4/kerosene/util/data/Category.java @@ -1,11 +1,11 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.KeroseneMod; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Category. @@ -17,7 +17,7 @@ public class Category { * @return the category map */ public static Map> getCategoryMap() { - List modules = PetroleumMod.getActiveMods(); + List modules = KeroseneMod.getRegisteredMods(); Map> categoryMap = new HashMap<>(); modules.forEach(module -> { if (!categoryMap.containsKey(module.getCategory())) { diff --git a/src/main/java/pm/j4/petroleum/util/data/ModuleConfig.java b/src/main/java/pm/j4/kerosene/util/data/ModuleConfig.java similarity index 82% rename from src/main/java/pm/j4/petroleum/util/data/ModuleConfig.java rename to src/main/java/pm/j4/kerosene/util/data/ModuleConfig.java index 33c1365..3c97389 100644 --- a/src/main/java/pm/j4/petroleum/util/data/ModuleConfig.java +++ b/src/main/java/pm/j4/kerosene/util/data/ModuleConfig.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; import java.util.Map; diff --git a/src/main/java/pm/j4/petroleum/util/data/OptionSerializiable.java b/src/main/java/pm/j4/kerosene/util/data/OptionSerializiable.java similarity index 92% rename from src/main/java/pm/j4/petroleum/util/data/OptionSerializiable.java rename to src/main/java/pm/j4/kerosene/util/data/OptionSerializiable.java index 197332f..8414edf 100644 --- a/src/main/java/pm/j4/petroleum/util/data/OptionSerializiable.java +++ b/src/main/java/pm/j4/kerosene/util/data/OptionSerializiable.java @@ -1,4 +1,4 @@ -package pm.j4.petroleum.util.data; +package pm.j4.kerosene.util.data; import com.google.gson.JsonElement; diff --git a/src/main/java/pm/j4/petroleum/util/module/ModuleBase.java b/src/main/java/pm/j4/kerosene/util/module/ModuleBase.java similarity index 89% rename from src/main/java/pm/j4/petroleum/util/module/ModuleBase.java rename to src/main/java/pm/j4/kerosene/util/module/ModuleBase.java index 012d550..e9f69ea 100644 --- a/src/main/java/pm/j4/petroleum/util/module/ModuleBase.java +++ b/src/main/java/pm/j4/kerosene/util/module/ModuleBase.java @@ -1,14 +1,14 @@ -package pm.j4.petroleum.util.module; +package pm.j4.kerosene.util.module; import com.google.gson.JsonElement; import java.util.*; import net.minecraft.client.MinecraftClient; import net.minecraft.text.TranslatableText; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.gui.PModuleConfigPane; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.option.ConfigurationOption; +import pm.j4.kerosene.gui.PModuleConfigEntry; +import pm.j4.kerosene.gui.PModuleConfigPane; +import pm.j4.kerosene.util.config.ConfigHolder; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.module.option.ConfigurationOption; /** * The Basis for all mods, used so that modules all have a common activation point and settings. @@ -25,7 +25,8 @@ public abstract class ModuleBase { * @param hidden Whether the module will show up in @link pm.j4.petroleum.modules.menu.ModMenu or the active module list * @param hasConfigMenu whether a button in the configuration menu will show */ - public ModuleBase(String name, String category, boolean activatable, boolean hidden, boolean hasConfigMenu) { + public ModuleBase(String parent, String name, String category, boolean activatable, boolean hidden, boolean hasConfigMenu) { + this.parent = parent; this.moduleName = name; this.category = category; this.readableName = new TranslatableText(name); @@ -55,10 +56,15 @@ public abstract class ModuleBase { * Toggle mod. */ public void toggle() { - Optional config = ConfigManager.getConfig(); + Optional config = ConfigManager.getConfig(this.getParent()); config.ifPresent(configHolder -> configHolder.toggleModule(this.moduleName)); } + + private final String parent; + public String getParent() { + return this.parent; + } /** * The Module's name. */ diff --git a/src/main/java/pm/j4/petroleum/util/module/option/BooleanOption.java b/src/main/java/pm/j4/kerosene/util/module/option/BooleanOption.java similarity index 89% rename from src/main/java/pm/j4/petroleum/util/module/option/BooleanOption.java rename to src/main/java/pm/j4/kerosene/util/module/option/BooleanOption.java index c68e08a..885c3b9 100644 --- a/src/main/java/pm/j4/petroleum/util/module/option/BooleanOption.java +++ b/src/main/java/pm/j4/kerosene/util/module/option/BooleanOption.java @@ -1,8 +1,8 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Boolean value. diff --git a/src/main/java/pm/j4/petroleum/util/module/option/ConfigurationOption.java b/src/main/java/pm/j4/kerosene/util/module/option/ConfigurationOption.java similarity index 92% rename from src/main/java/pm/j4/petroleum/util/module/option/ConfigurationOption.java rename to src/main/java/pm/j4/kerosene/util/module/option/ConfigurationOption.java index 31005db..29a747b 100644 --- a/src/main/java/pm/j4/petroleum/util/module/option/ConfigurationOption.java +++ b/src/main/java/pm/j4/kerosene/util/module/option/ConfigurationOption.java @@ -1,7 +1,7 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Configuration option. diff --git a/src/main/java/pm/j4/petroleum/util/module/option/IntegerOption.java b/src/main/java/pm/j4/kerosene/util/module/option/IntegerOption.java similarity index 88% rename from src/main/java/pm/j4/petroleum/util/module/option/IntegerOption.java rename to src/main/java/pm/j4/kerosene/util/module/option/IntegerOption.java index ea938e6..60ba90e 100644 --- a/src/main/java/pm/j4/petroleum/util/module/option/IntegerOption.java +++ b/src/main/java/pm/j4/kerosene/util/module/option/IntegerOption.java @@ -1,8 +1,8 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Integer value. diff --git a/src/main/java/pm/j4/petroleum/util/module/option/KeybindOption.java b/src/main/java/pm/j4/kerosene/util/module/option/KeybindOption.java similarity index 83% rename from src/main/java/pm/j4/petroleum/util/module/option/KeybindOption.java rename to src/main/java/pm/j4/kerosene/util/module/option/KeybindOption.java index 7fe2d6e..e99a8b7 100644 --- a/src/main/java/pm/j4/petroleum/util/module/option/KeybindOption.java +++ b/src/main/java/pm/j4/kerosene/util/module/option/KeybindOption.java @@ -1,11 +1,11 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import net.minecraft.client.options.KeyBinding; -import pm.j4.petroleum.modules.bindings.BindingInfo; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.config.GlobalConfig; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.modules.bindings.BindingInfo; +import pm.j4.kerosene.util.config.ConfigManager; +import pm.j4.kerosene.util.config.GlobalConfig; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type Keybind value. diff --git a/src/main/java/pm/j4/petroleum/util/module/option/ListOption.java b/src/main/java/pm/j4/kerosene/util/module/option/ListOption.java similarity index 85% rename from src/main/java/pm/j4/petroleum/util/module/option/ListOption.java rename to src/main/java/pm/j4/kerosene/util/module/option/ListOption.java index 204eed6..ff1d87b 100644 --- a/src/main/java/pm/j4/petroleum/util/module/option/ListOption.java +++ b/src/main/java/pm/j4/kerosene/util/module/option/ListOption.java @@ -1,7 +1,7 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type List option. diff --git a/src/main/java/pm/j4/petroleum/util/module/option/StringOption.java b/src/main/java/pm/j4/kerosene/util/module/option/StringOption.java similarity index 88% rename from src/main/java/pm/j4/petroleum/util/module/option/StringOption.java rename to src/main/java/pm/j4/kerosene/util/module/option/StringOption.java index 590a5de..b444708 100644 --- a/src/main/java/pm/j4/petroleum/util/module/option/StringOption.java +++ b/src/main/java/pm/j4/kerosene/util/module/option/StringOption.java @@ -1,8 +1,8 @@ -package pm.j4.petroleum.util.module.option; +package pm.j4.kerosene.util.module.option; import com.google.gson.JsonElement; import com.google.gson.JsonPrimitive; -import pm.j4.petroleum.util.module.ModuleBase; +import pm.j4.kerosene.util.module.ModuleBase; /** * The type String value. diff --git a/src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java b/src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java deleted file mode 100644 index 4ea2711..0000000 --- a/src/main/java/pm/j4/petroleum/gui/PModMenuScreen.java +++ /dev/null @@ -1,69 +0,0 @@ -package pm.j4.petroleum.gui; - -import com.mojang.blaze3d.systems.RenderSystem; -import java.util.Map; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormats; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TranslatableText; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.Category; - -/** - * The type P mod menu screen. - */ -public class PModMenuScreen extends Screen { - /** - * Instantiates a new P mod menu screen. - */ - public PModMenuScreen() { - super(new TranslatableText("petroleum.modmenu")); - } - - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - super.render(matrices, mouseX, mouseY, delta); - } - - @Override - protected void init() { - Map coordinateMap = ModMenu.getButtons(); - coordinateMap.forEach((category, coord) -> { - this.addButton(new PMovableButton((int) (coord.x * this.width), - (int) (coord.y * this.height), - category, - Category.getByCategory(category), - coord.open, - this)); - }); - } - - @Override - public void onClose() { - if (ConfigManager.getConfig().isPresent()) { - ConfigManager.getConfig().get().disableModule("petroleum.modmenu"); - this.buttons.forEach(button -> ((PMovableButton) button).updateCoordinate()); - ConfigManager.saveGlobalConfig(); - } - super.onClose(); - } - - @Override - public void renderBackground(MatrixStack matrices) { - Tessellator t_1 = Tessellator.getInstance(); - BufferBuilder buffer = t_1.getBuffer(); - RenderSystem.enableBlend(); - buffer.begin(7, VertexFormats.POSITION_COLOR); - buffer.vertex(0, this.height, 0.0D).color(0.1F, 0.1F, 0.1F, 0.3F).next(); - buffer.vertex(this.width, this.height, 0.0D).color(0.1F, 0.1F, 0.1F, 0.3F).next(); - buffer.vertex(this.width, 0, 0.0D).color(0.1F, 0.1F, 0.1F, 0.3F).next(); - buffer.vertex(0, 0, 0.0D).color(0.1F, 0.1F, 0.1F, 0.3F).next(); - t_1.draw(); - RenderSystem.disableBlend(); - } -} diff --git a/src/main/java/pm/j4/petroleum/gui/PMovableButton.java b/src/main/java/pm/j4/petroleum/gui/PMovableButton.java deleted file mode 100644 index abcb8b3..0000000 --- a/src/main/java/pm/j4/petroleum/gui/PMovableButton.java +++ /dev/null @@ -1,388 +0,0 @@ -package pm.j4.petroleum.gui; - -import com.mojang.blaze3d.systems.RenderSystem; -import java.util.List; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.widget.AbstractButtonWidget; -import net.minecraft.client.render.BufferBuilder; -import net.minecraft.client.render.Tessellator; -import net.minecraft.client.render.VertexFormats; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.Matrix4f; -import pm.j4.petroleum.modules.menu.ModMenu; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.module.ModuleBase; - -/** - * The type P movable button. - */ -public class PMovableButton extends AbstractButtonWidget { - /** - * The Expanded. - */ - private boolean expanded; - /** - * The Collapsed width. - */ - private final int collapsedWidth; - /** - * The Expanded width. - */ - private int expandedWidth; - /** - * The Collapsed height. - */ - private final int collapsedHeight; - /** - * The Expanded height. - */ - private int expandedHeight; - /** - * The Module height. - */ - private final int moduleHeight; - /** - * The Modules. - */ - private final List modules; - - /** - * The Stored x. - */ - private int storedX; - /** - * The Stored y. - */ - private int storedY; - - /** - * The Spin. - */ - private double spin; - - /** - * The Arrow size. - */ - private final int arrowSize = 10; - - - /** - * The Category. - */ - private final String category; - - /** - * The Parent. - */ - private final PModMenuScreen parent; - - /** - * Instantiates a new P movable button. - * - * @param x the x - * @param y the y - * @param categoryName the category name - * @param modules the modules - * @param open the open - * @param parent the parent - */ - public PMovableButton(int x, int y, String categoryName, List modules, boolean open, PModMenuScreen parent) { - super(x, y, 0, 0, new TranslatableText(categoryName)); - this.category = categoryName; - int w = MinecraftClient.getInstance().textRenderer.getWidth(new TranslatableText(categoryName)) + 8; - int h = MinecraftClient.getInstance().textRenderer.fontHeight + 8; - this.width = w; - this.collapsedWidth = w; - this.expandedWidth = 0; - this.height = h; - this.collapsedHeight = h; - this.expandedHeight = 0; - this.moduleHeight = h; - this.expanded = open; - this.modules = modules; - this.parent = parent; - } - - @Override - public void onClick(double mouseX, double mouseY) { - this.storedX = (int) mouseX; - this.storedY = (int) mouseY; - super.onClick(mouseX, mouseY); - } - - /** - * On extra click. - * - * @param mouseX the mouse x - * @param mouseY the mouse y - */ - private void onExtraClick(double mouseX, double mouseY) { - System.out.println("extra click"); - int increment = this.moduleHeight + 4; - int location = (int)mouseY - (this.y + this.collapsedHeight); - int index = location / increment; - System.out.println("index: " + index); - if(modules.size() >= index) { - ModuleBase affectedModule = modules.get(index); - System.out.println("module: " + affectedModule); - if(affectedModule.isActivatable()) { - System.out.println("toggling"); - affectedModule.toggle(); - } - } - else { - System.out.println("index too great"); - } - //TODO module things - } - - @Override - public void onRelease(double mouseX, double mouseY) { - int mx = (int) mouseX; - int my = (int) mouseY; - /** - * The Padding. - */ - int padding = 5; - if (storedX + padding > mx && storedX - padding < mx && - storedY + padding > my && storedY - padding < my) { - this.expanded = !this.expanded; - } - } - - @Override - protected void onDrag(double mouseX, double mouseY, double deltaX, double deltaY) { - this.x += (int) deltaX; - this.y += (int) deltaY; - - // i really hate to do it but nowhere else will it properly save - this.updateCoordinate(); - } - - /** - * Update coordinate. - */ - public void updateCoordinate() { - ModMenu.updateCoord(this.category, new ButtonInformation((this.x / (double) parent.width), (this.y / (double) parent.height), this.expanded)); - } - - // fuck click sounds - @Override - public boolean mouseClicked(double mouseX, double mouseY, int button) { - if (this.active && this.visible) { - if (this.isValidClickButton(button)) { - boolean bl = this.clicked(mouseX, mouseY); - if (bl && mouseY > this.y + this.collapsedHeight && mouseY < this.y + this.expandedHeight) { - this.onExtraClick(mouseX, mouseY); - return true; - } else if (bl) { - this.onClick(mouseX, mouseY); - return true; - } - } - - } - return false; - } - - /** - * Transition max width. - * - * @param width the width - */ - private void transitionMaxWidth(int width) { - double increment = ((width - this.width) / 20.0); - int sign = (width > this.width) ? 1 : -1; - if (increment == 0) { - this.width = width; - } else if (increment < 1 && increment > -1) { - this.width += sign; - } else { - this.width += (int) increment; - } - } - - /** - * Transition max height. - * - * @param height the height - */ - private void transitionMaxHeight(int height) { - double increment = ((height - this.height) / 20.0); - int sign = (height > this.height) ? 1 : -1; - if (increment == 0) { - this.height = height; - } else if (increment < 1 && increment > -1) { - this.height += sign; - } else { - this.height += (int) increment; - } - } - - @Override - public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float delta) { - - if (this.expandedWidth == 0 || this.expandedHeight == 0) { - this.expandedHeight = this.collapsedHeight + ((this.moduleHeight + 4) * modules.size()); - modules.forEach(module -> { - this.expandedWidth = this.width; - int w = MinecraftClient.getInstance().textRenderer.getWidth(module.getReadableName()) + arrowSize + 8; - if (w > this.expandedWidth) { - this.expandedWidth = w; - } - }); - // this should only run when opening the screen for the first time - if (this.expanded) { - this.height = expandedHeight; - this.width = expandedWidth; - } - } - - MinecraftClient minecraftClient = MinecraftClient.getInstance(); - TextRenderer textRenderer = minecraftClient.textRenderer; - minecraftClient.getTextureManager().bindTexture(WIDGETS_LOCATION); - RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha); - - RenderSystem.disableTexture(); - RenderSystem.defaultBlendFunc(); - float brightness = this.isFocused() ? 1.0F : 0.5F; - RenderSystem.color4f(brightness, brightness, brightness, 1.0F); - Matrix4f matrix = matrices.peek().getModel(); - - int buttonLeft = this.x; - int buttonRight = this.x + width + 2; - int buttonTop = this.y; - int buttonBottom = this.y + this.collapsedHeight; - int buttonExpandedBottom = this.y + this.height; - Tessellator t_1 = Tessellator.getInstance(); - BufferBuilder buffer = t_1.getBuffer(); - - RenderSystem.color4f(0.5F, 0.5F, 0.5F, 0.5F); - drawBox(t_1, buffer, matrix, buttonLeft, buttonRight, buttonTop - 2, buttonBottom + 2); - - RenderSystem.color4f(0.0F, 0.0F, 0.0F, 0.3F); - drawBox(t_1, buffer, matrix, buttonLeft + 1, buttonRight - 1, buttonTop - 1, buttonBottom + 1); - - RenderSystem.color4f(1.0F, 1.0F, 1.0F, 0.9F); - drawEquilateralTriangle(t_1, buffer, matrix, 40, 40, 180, arrowSize); - drawEquilateralTriangle(t_1, buffer, matrix, 60, 60, 0, arrowSize); - drawEquilateralTriangle(t_1, buffer, matrix, 40, 60, 90, arrowSize); - drawEquilateralTriangle(t_1, buffer, matrix, 60, 40, 360, arrowSize); - drawEquilateralTriangle(t_1, buffer, matrix, 80, 40, 270, arrowSize); - drawEquilateralTriangle(t_1, buffer, matrix, 80, 60, 120, arrowSize); - - int j = this.active ? 16777215 : 10526880; - if (this.expanded) { - if (this.width != this.expandedWidth || this.height != this.expandedHeight) { - transitionMaxWidth(this.expandedWidth); - transitionMaxHeight(this.expandedHeight); - RenderSystem.color4f(0.5F, 0.5F, 0.5F, 0.5F); - drawBox(t_1, buffer, matrix, buttonLeft, buttonRight, buttonBottom + 1, buttonExpandedBottom + 2); - - RenderSystem.color4f(0.0F, 0.0F, 0.0F, 0.3F); - drawBox(t_1, buffer, matrix, buttonLeft + 1, buttonRight - 1, buttonBottom + 2, buttonExpandedBottom + 1); - if ((this.height - 8) / 2 > (this.collapsedHeight)) { - drawCenteredText(matrices, textRenderer, new LiteralText("..."), this.x + this.width / 2, this.y + (this.height - 8) / 2, j | MathHelper.ceil(this.alpha * 255.0F) << 24); - } - } else { - for (int i = 0; i < modules.size(); i++) { - int adjustedIndex = i + 1; - int previousBottom = buttonBottom + (i * (this.moduleHeight + 4)); - int currentBottom = buttonBottom + ((i + 1) * (this.moduleHeight + 4)); - - RenderSystem.defaultBlendFunc(); - RenderSystem.color4f(0.5F, 0.5F, 0.5F, 0.5F); - drawBox(t_1, buffer, matrix, buttonLeft, buttonRight, previousBottom + 1, currentBottom + 2); - - RenderSystem.color4f(0.0F, 0.0F, 0.0F, 0.3F); - drawBox(t_1, buffer, matrix, buttonLeft + 1, buttonRight - 1, previousBottom + 2, currentBottom + 1); - - drawCenteredText(matrices, - textRenderer, - modules.get(i).getReadableName(), - this.x + this.width / 2, - this.y + ((this.collapsedHeight - 8) / 2 + ((moduleHeight + 4) * adjustedIndex)), - j | MathHelper.ceil(this.alpha * 255.0F) << 24); - } - } - } else { - if (this.width != this.collapsedWidth || this.height != this.collapsedHeight) { - transitionMaxWidth(this.collapsedWidth); - transitionMaxHeight(this.collapsedHeight); - RenderSystem.color4f(0.5F, 0.5F, 0.5F, 0.5F); - drawBox(t_1, buffer, matrix, buttonLeft, buttonRight, buttonBottom + 1, buttonExpandedBottom + 2); - - RenderSystem.color4f(0.0F, 0.0F, 0.0F, 0.3F); - drawBox(t_1, buffer, matrix, buttonLeft + 1, buttonRight - 1, buttonBottom + 2, buttonExpandedBottom + 1); - if ((this.height - 8) / 2 > (this.collapsedHeight)) { - drawCenteredText(matrices, textRenderer, new LiteralText("..."), this.x + this.width / 2, this.y + (this.height - 8) / 2, j | MathHelper.ceil(this.alpha * 255.0F) << 24); - } - } - } - RenderSystem.enableTexture(); - drawCenteredText(matrices, textRenderer, this.getMessage(), this.x + this.width / 2, this.y + (this.collapsedHeight - 8) / 2, j | MathHelper.ceil(this.alpha * 255.0F) << 24); - } - - /** - * Draw equilateral triangle. - * - * @param t_1 the t 1 - * @param buffer the buffer - * @param matrix the matrix - * @param centerX the center x - * @param centerY the center y - * @param rotation the rotation - * @param distance the distance - */ - private void drawEquilateralTriangle(Tessellator t_1, BufferBuilder buffer, Matrix4f matrix, int centerX, int centerY, double rotation, int distance) { - double rotation2 = rotation + 120; - double rotation3 = rotation + 240; - int point1X = (int)(distance * Math.cos(Math.toRadians(rotation))) + centerX; - int point1Y = (int)(distance * Math.sin(Math.toRadians(rotation))) + centerY; - int point2X = (int)(distance * Math.cos(Math.toRadians(rotation2))) + centerX; - int point2Y = (int)(distance * Math.sin(Math.toRadians(rotation2))) + centerY; - int point3X = (int)(distance * Math.cos(Math.toRadians(rotation3))) + centerX; - int point3Y = (int)(distance * Math.sin(Math.toRadians(rotation3))) + centerY; - - //RenderSystem.enableBlend(); - RenderSystem.disableBlend(); - buffer.begin(7, VertexFormats.POSITION_COLOR); - buffer.vertex(matrix, centerX, centerY, 0.0F).color(0.0F, 1.0F, 1.0F, 1.0F).next(); - buffer.vertex(matrix, centerX, point1Y, 0.0F).color(0.0F, 1.0F, 1.0F, 1.0F).next(); - buffer.vertex(matrix, point1X, point1Y, 0.0F).color(0.0F, 1.0F, 1.0F, 1.0F).next(); - - buffer.vertex(matrix, centerX, centerY, 0.0F).color(0.5F, 1.0F, 1.0F, 1.0F).next(); - buffer.vertex(matrix, centerX, point2Y, 0.0F).color(0.5F, 1.0F, 1.0F, 1.0F).next(); - buffer.vertex(matrix, point2X, point2Y, 0.0F).color(0.5F, 1.0F, 1.0F, 1.0F).next(); - - buffer.vertex(matrix, centerX, centerY, 0.0F).color(1.0F, 0.0F, 1.0F, 1.0F).next(); - buffer.vertex(matrix, centerX, point3Y, 0.0F).color(1.0F, 0.0F, 1.0F, 1.0F).next(); - buffer.vertex(matrix, point3X, point3Y, 0.0F).color(1.0F, 0.0F, 1.0F, 1.0F).next(); - t_1.draw(); - } - - /** - * Draw box. - * - * @param t_1 the t 1 - * @param buffer the buffer - * @param matrix the matrix - * @param buttonLeft the button left - * @param buttonRight the button right - * @param buttonTop the button top - * @param buttonBottom the button bottom - */ - private void drawBox(Tessellator t_1, BufferBuilder buffer, Matrix4f matrix, int buttonLeft, int buttonRight, int buttonTop, int buttonBottom) { - RenderSystem.enableBlend(); - buffer.begin(7, VertexFormats.POSITION); - buffer.vertex(matrix, buttonLeft, buttonBottom, 0.0F).next(); - buffer.vertex(matrix, buttonRight, buttonBottom, 0.0F).next(); - buffer.vertex(matrix, buttonRight, buttonTop, 0.0F).next(); - buffer.vertex(matrix, buttonLeft, buttonTop, 0.0F).next(); - t_1.draw(); - } -} diff --git a/src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java b/src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java deleted file mode 100644 index 2a79bdd..0000000 --- a/src/main/java/pm/j4/petroleum/mixin/DebugHudMixin.java +++ /dev/null @@ -1,38 +0,0 @@ -package pm.j4.petroleum.mixin; - -import java.util.List; -import java.util.Optional; -import net.minecraft.client.gui.hud.DebugHud; -import net.minecraft.client.util.math.MatrixStack; -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 org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import pm.j4.petroleum.modules.splash.SplashText; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; - -/** - * The type Debug hud mixin. - */ -@Mixin(DebugHud.class) -public class DebugHudMixin { - /** - * Render text right. - * - * @param matrices the matrices - * @param ci the ci - * @param list the list - */ - @Inject(method = "renderLeftText", - at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/client/gui/hud/DebugHud;getLeftText()Ljava/util/List;"), - locals = LocalCapture.CAPTURE_FAILSOFT) - protected void renderTextRight(MatrixStack matrices, CallbackInfo ci, List list) { - Optional config = ConfigManager.getConfig(); - if (config.isPresent() && config.get().isModuleEnabled("petroleum.splashtext")) { - list.add("[Petroleum] " + SplashText.get() + " loaded"); - } - - } -} diff --git a/src/main/java/pm/j4/petroleum/mixin/ModListMixin.java b/src/main/java/pm/j4/petroleum/mixin/ModListMixin.java deleted file mode 100644 index 7ee7248..0000000 --- a/src/main/java/pm/j4/petroleum/mixin/ModListMixin.java +++ /dev/null @@ -1,89 +0,0 @@ -package pm.j4.petroleum.mixin; - - -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.font.TextRenderer; -import net.minecraft.client.gui.DrawableHelper; -import net.minecraft.client.gui.hud.InGameHud; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.TranslatableText; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import pm.j4.petroleum.modules.list.ModList; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; - -/** - * The type Mod list mixin. - */ -@Mixin(InGameHud.class) -public abstract class ModListMixin extends DrawableHelper { - /** - * The Scaled height. - */ - @Shadow - private int scaledHeight; - /** - * The Client. - */ - private final MinecraftClient client; - - /** - * Gets font renderer. - * - * @return the font renderer - */ - @Shadow - public abstract TextRenderer getFontRenderer(); - - - /** - * Instantiates a new Mod list mixin. - * - * @param client the client - */ - public ModListMixin(MinecraftClient client) { - this.client = client; - } - - /** - * Render. - * - * @param matrices the matrices - * @param tickDelta the tick delta - * @param ci the ci - */ - @Inject(method = "render(Lnet/minecraft/client/util/math/MatrixStack;F)V", - at = @At("HEAD")) - public void render(MatrixStack matrices, float tickDelta, CallbackInfo ci) { - Optional config = ConfigManager.getConfig(); - if (config.isPresent() && - config.get().isModuleEnabled("petroleum.modlist") && - !this.client.options.hudHidden && - !this.client.options.debugEnabled) { - renderModuleList(matrices); - } - } - - /** - * Render module list. - * - * @param matrices the matrices - */ - private void renderModuleList(MatrixStack matrices) { - List modules = ModList.getActive(); - List activeModuleList = modules.stream().map(module -> module.getReadableName()).collect(Collectors.toList()); - int fontHeight = this.getFontRenderer().fontHeight; - int startHeight = this.scaledHeight - (activeModuleList.size() * (fontHeight + 4)); - for (int i = 0; i < activeModuleList.size(); i++) { - this.getFontRenderer().drawWithShadow(matrices, activeModuleList.get(i), 10, 10 + (i * (fontHeight + 4)), -1); - } - } -} diff --git a/src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java b/src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java deleted file mode 100644 index e8a7b45..0000000 --- a/src/main/java/pm/j4/petroleum/mixin/TitleScreenMixin.java +++ /dev/null @@ -1,141 +0,0 @@ -package pm.j4.petroleum.mixin; - -import java.util.Optional; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.TitleScreen; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.Text; -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 org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.modules.splash.SplashText; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; - - -/** - * Mixin attached to the TitleScreen. - * Currently, it is only used to display a string of text with the mod's version. - * Any other modules will likely extend the options screen or pause screen, - * so the module is unlikely to be used elsewhere. - */ -@Mixin(TitleScreen.class) -public class TitleScreenMixin extends Screen { - /** - * The Opacity. - */ - private double opacity = 0; - /** - * The Ascending. - */ - private boolean ascending = false; - - /** - * Stub method. - * Since the mixin injects itself into the *actual* TitleScreen used by the game, - * this should never run. - * - * @param title the title - */ - protected TitleScreenMixin(Text title) { - super(title); - } - - /** - * Mixin injection into the render method. - * It captures locals so that the text can be rendered alongside the - * screen fade-in. - * It injects before the call to @link com.mojang.bridge.game.GameVersion#getName() using INVOKE_ASSIGN, - * because attempting to use a regular invoke statement on @link net.minecraft.client.gui.DrawHelper#drawStringWithShadow() - * repeatedly failed. - *

- * - * @param matrices the matrices - * @param mouseX the mouse x - * @param mouseY the mouse y - * @param delta the delta - * @param ci the ci - * @param f the f - * @param i the - * @param j the j - * @param g the g - * @param l the l - */ - @Inject(method = "render", - at = @At( - value = "INVOKE_ASSIGN", - target = "Lcom/mojang/bridge/game/GameVersion;getName()Ljava/lang/String;", - ordinal = 0), - locals = LocalCapture.CAPTURE_FAILSOFT) - private void render(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci, float f, int i, int j, float g, int l) { - Optional config = ConfigManager.getConfig(); - Optional splashText = PetroleumMod.getMod("petroleum.splashtext"); - if (config.isPresent() && config.get().isModuleEnabled("petroleum.splashtext") - && splashText.isPresent()) { - Optional isActive = splashText.get().getConfigOption("petroleum.splashtext.active"); - if(isActive.isPresent() && ((BooleanOption)isActive.get()).getValue()) { - drawStringWithShadow(matrices, this.textRenderer, SplashText.get(), 2, this.height - 20, blink(13108374) | l); - } - } - } - - /** - * fades an integer color based on the values declared at the top of the class. - * - * @param color the integer representation of the color to fade. this should generally remain constant. - * @return the color, adjusted for "opacity". It's RGB and not RGBA, so it just lowers all color values. - */ - @SuppressWarnings("SameParameterValue") - private int blink(int color) { - /* - The Speed. - */ - int speed = 3; - /* - The Opacity max. - */ - double opacity_max = 1000; - if (ascending) { - opacity += speed; - if (opacity > opacity_max) { - opacity = opacity_max; - ascending = false; - } - } else { - opacity -= speed; - /* - The Opacity min. - */ - double opacity_min = 500; - if (opacity < opacity_min) { - opacity = opacity_min; - ascending = true; - } - } - double opacityD = (opacity / opacity_max); - /* - The R mask. - */ - int r_mask = 16711680; - int r = ((color & r_mask) / Integer.parseInt("010000", 16)); - /* - The G mask. - */ - int g_mask = 65280; - int g = ((color & g_mask) / Integer.parseInt("000100", 16)); - /* - The B mask. - */ - int b_mask = 255; - int b = ((color & b_mask)); - return ((int) (r * opacityD) * Integer.parseInt("010000", 16)) | - ((int) (g * opacityD) * Integer.parseInt("000100", 16)) | - ((int) (b * opacityD)); - } -} diff --git a/src/main/java/pm/j4/petroleum/modules/ExampleModule.java b/src/main/java/pm/j4/petroleum/modules/ExampleModule.java deleted file mode 100644 index eceefac..0000000 --- a/src/main/java/pm/j4/petroleum/modules/ExampleModule.java +++ /dev/null @@ -1,42 +0,0 @@ -package pm.j4.petroleum.modules; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.client.MinecraftClient; -import net.minecraft.text.LiteralText; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.gui.PModuleConfigPane; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; - -/** - * The type Example module. - */ -public class ExampleModule extends ModuleBase { - /** - * example mod - */ - public ExampleModule() { - super("petroleum.example", - "petroleum.misc", - true, - false, - true); - } - - @Override - public List getDefaultConfig() { - List options = new ArrayList<>(); - options.add(new BooleanOption("petroleum.example.b_one","example", this)); - options.add(new BooleanOption("petroleum.example.b_two","example", this)); - return options; - } - - @Override - public void activate(MinecraftClient client) { - System.out.println("Example Mod Keybind Activate"); - } -} diff --git a/src/main/java/pm/j4/petroleum/modules/list/ModList.java b/src/main/java/pm/j4/petroleum/modules/list/ModList.java deleted file mode 100644 index cc473b3..0000000 --- a/src/main/java/pm/j4/petroleum/modules/list/ModList.java +++ /dev/null @@ -1,40 +0,0 @@ -package pm.j4.petroleum.modules.list; - -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import pm.j4.petroleum.util.config.ConfigHolder; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.module.ModuleBase; - -/** - * The type Mod list. - */ -public class ModList extends ModuleBase { - /** - * Instantiates a new Mod list. - */ - public ModList() { - super("petroleum.modlist", - "petroleum.misc", - true, - true, - true); - } - - /** - * Gets active. - * - * @return the active - */ - public static List getActive() { - List result = new ArrayList<>(); - Optional config = ConfigManager.getConfig(); - config.ifPresent(configHolder -> configHolder.getEnabledModules().forEach((mod) -> { - if (!mod.isHidden()) { - result.add(mod); - } - })); - return result; - } -} diff --git a/src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java b/src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java deleted file mode 100644 index 7ed0500..0000000 --- a/src/main/java/pm/j4/petroleum/modules/menu/ModMenu.java +++ /dev/null @@ -1,98 +0,0 @@ -package pm.j4.petroleum.modules.menu; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import net.minecraft.client.MinecraftClient; -import pm.j4.petroleum.gui.PModMenuScreen; -import pm.j4.petroleum.util.config.ConfigManager; -import pm.j4.petroleum.util.data.ButtonInformation; -import pm.j4.petroleum.util.data.Category; -import pm.j4.petroleum.util.module.ModuleBase; - -/** - * The type Mod menu. - */ -public class ModMenu extends ModuleBase { - - /** - * The constant coordinates. - */ - private static final Map coordinates = new HashMap<>(); - - /** - * Instantiates a new Mod menu. - */ - public ModMenu() { - super("petroleum.modmenu", - "petroleum.misc", - true, - true, - true); - } - - // TODO figure out resizing - // the number itself changes, so it should just be probably like some onResize bullshit in PModMenuScreen - @Override - public void init() { - Map> categories = Category.getCategoryMap(); - final double[] h = {.1}; - categories.forEach((category, moduleList) -> { - ButtonInformation conf = ConfigManager.getConfig().isPresent() ? - ConfigManager.getConfig().get().globalConfig.getButton(category) : - null; - ButtonInformation coord = conf != null ? conf : new ButtonInformation(.1, h[0], false); - h[0] += .01; - coordinates.put(category, coord); - if (ConfigManager.getConfig().isPresent()) { - ConfigManager.getConfig().get().globalConfig.setButton(category, coord); - } - }); - } - - /** - * Update coord. - * - * @param b the b - * @param c the c - */ - public static void updateCoord(String b, ButtonInformation c) { - if (c.x < 0.05) { - c.x = 0.05; - } - if (c.x > .95) { - c.x = .95; - } - if (c.y < 0.05) { - c.y = 0.05; - } - if (c.y > .95) { - c.y = .95; - } - if (coordinates.containsKey(b)) { - coordinates.replace(b, c); - if (ConfigManager.getConfig().isPresent()) { - ConfigManager.getConfig().get().globalConfig.setButton(b, c); - } - } - } - - @Override - public void activate(MinecraftClient client) { - this.toggle(); - if (ConfigManager.getConfig().get().isModuleEnabled(this.getModuleName())) { - client.openScreen(new PModMenuScreen()); - } else { - client.openScreen(null); - } - } - - /** - * Gets buttons. - * - * @return the buttons - */ - public static Map getButtons() { - return coordinates; - } -} \ No newline at end of file diff --git a/src/main/java/pm/j4/petroleum/modules/splash/SplashText.java b/src/main/java/pm/j4/petroleum/modules/splash/SplashText.java deleted file mode 100644 index c5b6f88..0000000 --- a/src/main/java/pm/j4/petroleum/modules/splash/SplashText.java +++ /dev/null @@ -1,46 +0,0 @@ -package pm.j4.petroleum.modules.splash; - -import java.util.ArrayList; -import java.util.List; -import net.minecraft.text.LiteralText; -import pm.j4.petroleum.PetroleumMod; -import pm.j4.petroleum.gui.PModuleConfigEntry; -import pm.j4.petroleum.gui.PModuleConfigPane; -import pm.j4.petroleum.util.module.ModuleBase; -import pm.j4.petroleum.util.module.option.BooleanOption; -import pm.j4.petroleum.util.module.option.ConfigurationOption; - -/** - * The type Splash text. - */ -public class SplashText extends ModuleBase { - /** - * Instantiates a new Splash text. - */ - public SplashText() { - super("petroleum.splashtext", - "petroleum.misc", - false, - true, - true); - } - - @Override - public List getDefaultConfig() { - List options = new ArrayList<>(); - options.add(new BooleanOption("petroleum.splashtext.active", "Show the main menu version text.", this)); - return options; - } - - /** - * Get string. - * - * @return the string - */ - public static String get() { - if (PetroleumMod.modData != null) { - return "Petroleum v" + PetroleumMod.modData.getVersion().getFriendlyString(); - } - return "Petroleum vUnknown"; - } -} diff --git a/src/main/java/pm/j4/petroleum/modules/xray/Xray.java b/src/main/java/pm/j4/petroleum/modules/xray/Xray.java deleted file mode 100644 index 7e31116..0000000 --- a/src/main/java/pm/j4/petroleum/modules/xray/Xray.java +++ /dev/null @@ -1,19 +0,0 @@ -package pm.j4.petroleum.modules.xray; - -import pm.j4.petroleum.util.module.ModuleBase; - -/** - * The type Xray. - */ -public class Xray extends ModuleBase { - /** - * Instantiates a new Xray. - */ - public Xray() { - super("petroleum.xray", - "petroleum.render", - true, - false, - true); - } -} diff --git a/src/main/java/pm/j4/petroleum/util/data/ButtonInformation.java b/src/main/java/pm/j4/petroleum/util/data/ButtonInformation.java deleted file mode 100644 index 3eb4834..0000000 --- a/src/main/java/pm/j4/petroleum/util/data/ButtonInformation.java +++ /dev/null @@ -1,32 +0,0 @@ -package pm.j4.petroleum.util.data; - -/** - * The type Button information. - */ -public class ButtonInformation { - /** - * The X. - */ - public double x; - /** - * The Y. - */ - public double y; - /** - * The Open. - */ - public final boolean open; - - /** - * Instantiates a new Button information. - * - * @param x the x - * @param y the y - * @param open the open - */ - public ButtonInformation(double x, double y, boolean open) { - this.x = x; - this.y = y; - this.open = open; - } -} diff --git a/src/main/resources/assets/petroleum/icon.png b/src/main/resources/assets/kerosene/icon.png similarity index 100% rename from src/main/resources/assets/petroleum/icon.png rename to src/main/resources/assets/kerosene/icon.png diff --git a/src/main/resources/assets/kerosene/lang/en_us.json b/src/main/resources/assets/kerosene/lang/en_us.json new file mode 100644 index 0000000..07f67a8 --- /dev/null +++ b/src/main/resources/assets/kerosene/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "kerosene.bindings": "Binding Manager", + "kerosene.options": "Kerosene Options" +} \ No newline at end of file diff --git a/src/main/resources/assets/petroleum/textures/options_background.png b/src/main/resources/assets/kerosene/textures/options_background.png similarity index 100% rename from src/main/resources/assets/petroleum/textures/options_background.png rename to src/main/resources/assets/kerosene/textures/options_background.png diff --git a/src/main/resources/assets/petroleum/lang/en_us.json b/src/main/resources/assets/petroleum/lang/en_us.json deleted file mode 100644 index 4c689ba..0000000 --- a/src/main/resources/assets/petroleum/lang/en_us.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "petroleum.bindings": "Binding Manager", - "petroleum.example": "Test Module", - "petroleum.splashtext": "Splash Text", - "petroleum.modlist": "Module List", - "petroleum.modmenu": "Mod Menu", - - "petroleum.xray": "X-ray", - - "petroleum.misc": "Miscellaneous", - "petroleum.render": "Render", - "petroleum.options": "Petroleum Options" -} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index c246645..5f05137 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,27 +1,27 @@ { "schemaVersion": 1, - "id": "petroleum", + "id": "kerosene", "version": "${version}", - "name": "Petroleum", - "description": "Burn it down.", + "name": "Kerosene", + "description": "Shared library", "authors": [ "janeptrv" ], "contact": { "homepage": "https://j4.pm/", - "sources": "https://gitdab.com/jane/petroleum" + "sources": "https://gitdab.com/jane/kerosene" }, "license": "WTFPL", - "icon": "assets/petroleum/icon.png", + "icon": "assets/kerosene/icon.png", "environment": "*", "entrypoints": { "main": [ - "pm.j4.petroleum.PetroleumMod" + "pm.j4.kerosene.KeroseneMod" ] }, "mixins": [ - "petroleum.mixins.json" + "kerosene.mixins.json" ], "depends": { "fabricloader": ">=0.7.4", diff --git a/src/main/resources/petroleum.mixins.json b/src/main/resources/kerosene.mixins.json similarity index 60% rename from src/main/resources/petroleum.mixins.json rename to src/main/resources/kerosene.mixins.json index 1601ae6..b498c12 100644 --- a/src/main/resources/petroleum.mixins.json +++ b/src/main/resources/kerosene.mixins.json @@ -1,16 +1,13 @@ { "required": true, "minVersion": "0.8", - "package": "pm.j4.petroleum.mixin", + "package": "pm.j4.kerosene.mixin", "compatibilityLevel": "JAVA_8", "mixins": [ ], "client": [ - "DebugHudMixin", "EntryListWidgetAccessor", - "ModListMixin", - "OptionsMenuMixin", - "TitleScreenMixin" + "OptionsMenuMixin" ], "injectors": { "defaultRequire": 1