refactor kerosene to library mod

This commit is contained in:
jane 2020-12-19 23:19:55 -05:00
parent 183c81258a
commit 2dea11d4db
81 changed files with 352 additions and 1376 deletions

View file

@ -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:

View file

@ -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.

View file

@ -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.

View file

@ -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;

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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;

View file

@ -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.

View file

@ -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.

View file

@ -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;
/**

View file

@ -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.

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.modules.bindings;
package pm.j4.kerosene.modules.bindings;
import net.minecraft.client.util.InputUtil;

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -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.

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.config;
package pm.j4.kerosene.util.config;
import java.util.Collections;

View file

@ -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.

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.config;
package pm.j4.kerosene.util.config;
/**
* The type Server config.

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.data;
package pm.j4.kerosene.util.data;
/**
* The type Button information.

View file

@ -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.

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.data;
package pm.j4.kerosene.util.data;
import java.util.Map;

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.data;
package pm.j4.kerosene.util.data;
import com.google.gson.JsonElement;

View file

@ -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.

View file

@ -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;

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.module.option;
package pm.j4.kerosene.util.module.option;
import com.google.gson.JsonElement;

View file

@ -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;

View file

@ -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.

View file

@ -1,4 +1,4 @@
package pm.j4.petroleum.util.module.option;
package pm.j4.kerosene.util.module.option;
import com.google.gson.JsonElement;

View file

@ -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;