Compare commits
2 Commits
3df6b25723
...
add-config
| Author | SHA1 | Date | |
|---|---|---|---|
| 71c943f47d | |||
| 69d1d2aa1e |
@@ -0,0 +1,43 @@
|
||||
package xyz.quickbasic.tieredrepairkits;
|
||||
|
||||
import xyz.quickbasic.tieredrepairkits.config.RepairTier;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
// Manages repair-kit data for the plugin
|
||||
public class RepairKitManager {
|
||||
|
||||
private final TieredRepairKits plugin;
|
||||
private Map<String, RepairTier> tiers;
|
||||
|
||||
public RepairKitManager(TieredRepairKits plugin) {
|
||||
this.plugin = plugin;
|
||||
loadConfig();
|
||||
}
|
||||
|
||||
public void loadConfig() {
|
||||
TRKConfig config = plugin.getConfig().get();
|
||||
tiers = config.getTiers();
|
||||
|
||||
// Log loaded tiers
|
||||
for (var entry : tiers.entrySet()) {
|
||||
String tierName = entry.getKey();
|
||||
RepairTier tier = entry.getValue();
|
||||
|
||||
TieredRepairKits.LOGGER.atInfo().log(
|
||||
"Tier " + tierName
|
||||
+ ": enabled=" + tier.isEnabled()
|
||||
+ " penalty=" + tier.getRepairPenalty()
|
||||
+ " ingredients=" + tier.getRecipe().length
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public Map<String, RepairTier> getTiers() {
|
||||
return tiers;
|
||||
}
|
||||
|
||||
public RepairTier getTier(String name) {
|
||||
return tiers.get(name);
|
||||
}
|
||||
}
|
||||
217
src/main/java/xyz/quickbasic/tieredrepairkits/TRKConfig.java
Normal file
217
src/main/java/xyz/quickbasic/tieredrepairkits/TRKConfig.java
Normal file
@@ -0,0 +1,217 @@
|
||||
package xyz.quickbasic.tieredrepairkits;
|
||||
|
||||
import com.hypixel.hytale.codec.KeyedCodec;
|
||||
import com.hypixel.hytale.codec.builder.BuilderCodec;
|
||||
import xyz.quickbasic.tieredrepairkits.config.RepairTier;
|
||||
import xyz.quickbasic.tieredrepairkits.config.RecipeIngredient;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Arrays;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
// Main config class for TieredRepairKits
|
||||
public class TRKConfig {
|
||||
|
||||
public static final BuilderCodec<TRKConfig> CODEC = BuilderCodec.builder(TRKConfig.class, TRKConfig::new)
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierCopper", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierCopper = val,
|
||||
cfg -> cfg.tierCopper).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierIron", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierIron = val,
|
||||
cfg -> cfg.tierIron).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierSilver", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierSilver = val,
|
||||
cfg -> cfg.tierSilver).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierGold", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierGold = val,
|
||||
cfg -> cfg.tierGold).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierThorium", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierThorium = val,
|
||||
cfg -> cfg.tierThorium).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierCobalt", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierCobalt = val,
|
||||
cfg -> cfg.tierCobalt).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierAdamantite", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierAdamantite = val,
|
||||
cfg -> cfg.tierAdamantite).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierMithril", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierMithril = val,
|
||||
cfg -> cfg.tierMithril).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierOnyxium", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierOnyxium = val,
|
||||
cfg -> cfg.tierOnyxium).add()
|
||||
|
||||
.append(new KeyedCodec<RepairTier>("TierPrisma", RepairTier.CODEC),
|
||||
(cfg, val) -> cfg.tierPrisma = val,
|
||||
cfg -> cfg.tierPrisma).add()
|
||||
|
||||
.build();
|
||||
|
||||
// --- Tier fields ---
|
||||
private RepairTier tierCopper = new RepairTier();
|
||||
private RepairTier tierIron = new RepairTier();
|
||||
private RepairTier tierSilver = new RepairTier();
|
||||
private RepairTier tierGold = new RepairTier();
|
||||
private RepairTier tierThorium = new RepairTier();
|
||||
private RepairTier tierCobalt = new RepairTier();
|
||||
private RepairTier tierAdamantite = new RepairTier();
|
||||
private RepairTier tierMithril = new RepairTier();
|
||||
private RepairTier tierOnyxium = new RepairTier();
|
||||
private RepairTier tierPrisma = new RepairTier();
|
||||
|
||||
// Cached map for runtime convenience
|
||||
private Map<String, RepairTier> cachedMap;
|
||||
|
||||
public TRKConfig() {
|
||||
// Initialize all tiers with helper method
|
||||
tierCopper.setEnabled(true);
|
||||
tierCopper.setRepairPenalty(0.05);
|
||||
tierCopper.setRecipe(recipe(
|
||||
ing("Ingredient_Fibre", 2),
|
||||
ing("Ingredient_Bar_Copper", 4),
|
||||
ing("Ingredient_Stick", 2)
|
||||
));
|
||||
|
||||
tierIron.setEnabled(true);
|
||||
tierIron.setRepairPenalty(0);
|
||||
tierIron.setRecipe(recipe(
|
||||
ing("Ingredient_Fabric_Scrap_Linen", 2),
|
||||
ing("Ingredient_Bar_Iron", 8),
|
||||
ing("Ingredient_Leather_Light", 2)
|
||||
));
|
||||
|
||||
tierSilver.setEnabled(true);
|
||||
tierSilver.setRepairPenalty(-0.01);
|
||||
tierSilver.setRecipe(recipe(
|
||||
ing("Ingredient_Bolt_Wool", 4),
|
||||
ing("Ingredient_Bar_Silver", 16),
|
||||
ing("Ingredient_Fire_Essence", 4)
|
||||
));
|
||||
|
||||
tierGold.setEnabled(true);
|
||||
tierGold.setRepairPenalty(-0.01);
|
||||
tierGold.setRecipe(recipe(
|
||||
ing("Ingredient_Bolt_Wool", 4),
|
||||
ing("Ingredient_Bar_Gold", 16),
|
||||
ing("Ingredient_Fire_Essence", 4)
|
||||
));
|
||||
|
||||
tierThorium.setEnabled(true);
|
||||
tierThorium.setRepairPenalty(-0.025);
|
||||
tierThorium.setRecipe(recipe(
|
||||
ing("Ingredient_Chitin_Sturdy", 2),
|
||||
ing("Ingredient_Bar_Thorium", 16),
|
||||
ing("Ingredient_Sac_Venom", 2)
|
||||
));
|
||||
|
||||
tierCobalt.setEnabled(true);
|
||||
tierCobalt.setRepairPenalty(-0.05);
|
||||
tierCobalt.setRecipe(recipe(
|
||||
ing("Ingredient_Fabric_Scrap_Shadoweave", 4),
|
||||
ing("Ingredient_Bar_Cobalt", 16),
|
||||
ing("Ingredient_Ice_Essence", 4)
|
||||
));
|
||||
|
||||
tierAdamantite.setEnabled(true);
|
||||
tierAdamantite.setRepairPenalty(-0.075);
|
||||
tierAdamantite.setRecipe(recipe(
|
||||
ing("Ingredient_Crystal_Red", 4),
|
||||
ing("Ingredient_Bar_Adamantite", 16),
|
||||
ing("Ingredient_Fire_Essence", 4)
|
||||
));
|
||||
|
||||
tierMithril.setEnabled(true);
|
||||
tierMithril.setRepairPenalty(-0.1);
|
||||
tierMithril.setRecipe(recipe(
|
||||
ing("Ingredient_Voidheart", 4),
|
||||
ing("Ingredient_Bar_Mithril", 16),
|
||||
ing("Ingredient_Leather_Storm", 4)
|
||||
));
|
||||
|
||||
tierOnyxium.setEnabled(true);
|
||||
tierOnyxium.setRepairPenalty(-0.125);
|
||||
tierOnyxium.setRecipe(recipe(
|
||||
ing("Rock_Gem_Voidstone", 1),
|
||||
ing("Ingredient_Bar_Onyxium", 16),
|
||||
ing("Ingredient_Leather_Storm", 4)
|
||||
));
|
||||
|
||||
tierPrisma.setEnabled(true);
|
||||
tierPrisma.setRepairPenalty(-0.15);
|
||||
tierPrisma.setRecipe(recipe(
|
||||
ing("Rock_Gem_Diamond", 1),
|
||||
ing("Ingredient_Bar_Prisma", 16),
|
||||
ing("Ingredient_Leather_Storm", 4)
|
||||
));
|
||||
}
|
||||
|
||||
public Map<String, RepairTier> getTiers() {
|
||||
if (cachedMap == null) {
|
||||
cachedMap = new LinkedHashMap<>();
|
||||
cachedMap.put("TierCopper", tierCopper);
|
||||
cachedMap.put("TierIron", tierIron);
|
||||
cachedMap.put("TierSilver", tierSilver);
|
||||
cachedMap.put("TierGold", tierGold);
|
||||
cachedMap.put("TierThorium", tierThorium);
|
||||
cachedMap.put("TierCobalt", tierCobalt);
|
||||
cachedMap.put("TierAdamantite", tierAdamantite);
|
||||
cachedMap.put("TierMithril", tierMithril);
|
||||
cachedMap.put("TierOnyxium", tierOnyxium);
|
||||
cachedMap.put("TierPrisma", tierPrisma);
|
||||
}
|
||||
return cachedMap;
|
||||
}
|
||||
|
||||
// Individual tier getters
|
||||
public RepairTier getTierCopper() { return tierCopper; }
|
||||
public RepairTier getTierIron() { return tierIron; }
|
||||
public RepairTier getTierSilver() { return tierSilver; }
|
||||
public RepairTier getTierGold() { return tierGold; }
|
||||
public RepairTier getTierThorium() { return tierThorium; }
|
||||
public RepairTier getTierCobalt() { return tierCobalt; }
|
||||
public RepairTier getTierAdamantite() { return tierAdamantite; }
|
||||
public RepairTier getTierMithril() { return tierMithril; }
|
||||
public RepairTier getTierOnyxium() { return tierOnyxium; }
|
||||
public RepairTier getTierPrisma() { return tierPrisma; }
|
||||
|
||||
// Individual tier setters (also clears cached map)
|
||||
public void setTierCopper(RepairTier tier) { this.tierCopper = tier; cachedMap = null; }
|
||||
public void setTierIron(RepairTier tier) { this.tierIron = tier; cachedMap = null; }
|
||||
public void setTierSilver(RepairTier tier) { this.tierSilver = tier; cachedMap = null; }
|
||||
public void setTierGold(RepairTier tier) { this.tierGold = tier; cachedMap = null; }
|
||||
public void setTierThorium(RepairTier tier) { this.tierThorium = tier; cachedMap = null; }
|
||||
public void setTierCobalt(RepairTier tier) { this.tierCobalt = tier; cachedMap = null; }
|
||||
public void setTierAdamantite(RepairTier tier) { this.tierAdamantite = tier; cachedMap = null; }
|
||||
public void setTierMithril(RepairTier tier) { this.tierMithril = tier; cachedMap = null; }
|
||||
public void setTierOnyxium(RepairTier tier) { this.tierOnyxium = tier; cachedMap = null; }
|
||||
public void setTierPrisma(RepairTier tier) { this.tierPrisma = tier; cachedMap = null; }
|
||||
|
||||
// --- Helper methods ---
|
||||
private static RecipeIngredient ing(String id, int qty) {
|
||||
RecipeIngredient r = new RecipeIngredient();
|
||||
r.setItemId(id);
|
||||
r.setQuantity(qty);
|
||||
return r;
|
||||
}
|
||||
|
||||
@SafeVarargs
|
||||
private static <T> List<T> list(T... items) {
|
||||
return new ArrayList<>(Arrays.asList(items));
|
||||
}
|
||||
|
||||
@SafeVarargs
|
||||
private static RecipeIngredient[] recipe(RecipeIngredient... ingredients) {
|
||||
return ingredients; // Returns RecipeIngredient[] directly
|
||||
}
|
||||
}
|
||||
@@ -3,20 +3,45 @@ package xyz.quickbasic.tieredrepairkits;
|
||||
import com.hypixel.hytale.logger.HytaleLogger;
|
||||
import com.hypixel.hytale.server.core.plugin.JavaPlugin;
|
||||
import com.hypixel.hytale.server.core.plugin.JavaPluginInit;
|
||||
import com.hypixel.hytale.server.core.util.Config;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
|
||||
// Main plugin class. All Hytale Java plugins extend JavaPlugin.
|
||||
public class TieredRepairKits extends JavaPlugin {
|
||||
|
||||
// Logger instance for writing messages to the server console/logs
|
||||
public static final HytaleLogger LOGGER = HytaleLogger.forEnclosingClass();
|
||||
|
||||
// Manager class that will contain the logic related to repair kits
|
||||
private RepairKitManager repairKitManager;
|
||||
|
||||
// Config wrapper provided by the Hytale server API.
|
||||
// This links the config file name ("TieredRepairKits") with the codec defined in TRKConfig.
|
||||
private final Config<TRKConfig> config = this.withConfig("TieredRepairKits", TRKConfig.CODEC);
|
||||
|
||||
// Public getter so other classes (like managers) can access the plugin config
|
||||
public Config<TRKConfig> getConfig() {
|
||||
return config;
|
||||
}
|
||||
|
||||
// Constructor called by the Hytale server when the plugin is created
|
||||
public TieredRepairKits(@Nonnull JavaPluginInit init) {
|
||||
super(init);
|
||||
}
|
||||
|
||||
// Called by the server when the plugin is being set up
|
||||
@Override
|
||||
protected void setup() {
|
||||
// Register event listeners here - try using the "Hytale Devtools: Add new event listener" command
|
||||
|
||||
// Create the RepairKitManager and pass the plugin instance to it
|
||||
// This allows the manager to access config, logger, etc.
|
||||
repairKitManager = new RepairKitManager(this);
|
||||
|
||||
// Save the config file if it does not exist yet
|
||||
// This ensures defaults from TRKConfig are written to disk
|
||||
config.save();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package xyz.quickbasic.tieredrepairkits.config;
|
||||
|
||||
import com.hypixel.hytale.codec.Codec;
|
||||
import com.hypixel.hytale.codec.KeyedCodec;
|
||||
import com.hypixel.hytale.codec.builder.BuilderCodec;
|
||||
|
||||
public class RecipeIngredient {
|
||||
|
||||
public static final BuilderCodec<RecipeIngredient> CODEC =
|
||||
BuilderCodec.builder(RecipeIngredient.class, RecipeIngredient::new)
|
||||
.append(new KeyedCodec<>("ItemId", Codec.STRING),
|
||||
(obj, value) -> obj.itemId = value,
|
||||
obj -> obj.itemId).add()
|
||||
.append(new KeyedCodec<>("Quantity", Codec.INTEGER),
|
||||
(obj, value) -> obj.quantity = value,
|
||||
obj -> obj.quantity).add()
|
||||
.build();
|
||||
|
||||
private String itemId = "Ingredient_Fibre";
|
||||
private int quantity = 1;
|
||||
|
||||
public RecipeIngredient() {}
|
||||
|
||||
public RecipeIngredient(String itemId, int quantity) {
|
||||
this.itemId = itemId;
|
||||
this.quantity = quantity;
|
||||
}
|
||||
|
||||
public String getItemId() {
|
||||
return itemId;
|
||||
}
|
||||
|
||||
public int getQuantity() {
|
||||
return quantity;
|
||||
}
|
||||
|
||||
public void setItemId(String itemId) {
|
||||
this.itemId = itemId;
|
||||
}
|
||||
|
||||
public void setQuantity(int quantity) {
|
||||
this.quantity = quantity;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package xyz.quickbasic.tieredrepairkits.config;
|
||||
|
||||
import com.hypixel.hytale.codec.builder.BuilderCodec;
|
||||
import com.hypixel.hytale.codec.KeyedCodec;
|
||||
import com.hypixel.hytale.codec.Codec;
|
||||
import com.hypixel.hytale.codec.codecs.array.ArrayCodec;
|
||||
|
||||
public class RepairTier {
|
||||
|
||||
private static final Codec<RecipeIngredient[]> INGREDIENT_ARRAY_CODEC =
|
||||
new ArrayCodec<>(RecipeIngredient.CODEC, RecipeIngredient[]::new);
|
||||
|
||||
public static final BuilderCodec<RepairTier> CODEC =
|
||||
BuilderCodec.builder(RepairTier.class, RepairTier::new)
|
||||
.append(new KeyedCodec<>("Enabled", Codec.BOOLEAN),
|
||||
(obj, value) -> obj.enabled = value,
|
||||
obj -> obj.enabled).add()
|
||||
.append(new KeyedCodec<>("RepairPenalty", Codec.DOUBLE),
|
||||
(obj, value) -> obj.repairPenalty = value,
|
||||
obj -> obj.repairPenalty).add()
|
||||
.append(new KeyedCodec<>("Recipe", INGREDIENT_ARRAY_CODEC),
|
||||
(obj, value) -> obj.recipe = value,
|
||||
obj -> obj.recipe).add()
|
||||
.build();
|
||||
|
||||
private boolean enabled = true;
|
||||
private double repairPenalty = 0.0;
|
||||
private RecipeIngredient[] recipe = new RecipeIngredient[0];
|
||||
|
||||
public RepairTier() {}
|
||||
|
||||
public boolean isEnabled() { return enabled; }
|
||||
public double getRepairPenalty() { return repairPenalty; }
|
||||
public RecipeIngredient[] getRecipe() { return recipe; }
|
||||
|
||||
public void setEnabled(boolean enabled) { this.enabled = enabled; }
|
||||
public void setRepairPenalty(double repairPenalty) { this.repairPenalty = repairPenalty; }
|
||||
public void setRecipe(RecipeIngredient[] recipe) { this.recipe = recipe; }
|
||||
|
||||
public void validate(String tierName) {
|
||||
if (repairPenalty < -1.0 || repairPenalty > 1.0) {
|
||||
repairPenalty = 0;
|
||||
}
|
||||
validateRecipe(recipe);
|
||||
}
|
||||
|
||||
private void validateRecipe(RecipeIngredient[] ingredients) {
|
||||
if (ingredients == null) return;
|
||||
int maxIngredients = 5;
|
||||
if (ingredients.length > maxIngredients) {
|
||||
RecipeIngredient[] truncated = new RecipeIngredient[maxIngredients];
|
||||
System.arraycopy(ingredients, 0, truncated, 0, maxIngredients);
|
||||
recipe = truncated;
|
||||
}
|
||||
for (RecipeIngredient ing : ingredients) {
|
||||
if (ing.getItemId() == null || ing.getItemId().isBlank()) {
|
||||
ing.setItemId("Unknown");
|
||||
}
|
||||
if (ing.getQuantity() <= 0) {
|
||||
ing.setQuantity(1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,21 +1,30 @@
|
||||
{
|
||||
"Group": "QuickBASIC",
|
||||
"Name": "QuickBASIC.TieredRepairKits",
|
||||
"Version": "1.0.1",
|
||||
"ServerVersion": "2026.03.26-89796e57b",
|
||||
"Description": "Balanced tiered Repair Kits that can increase the maximum durability of items",
|
||||
"Authors": [
|
||||
{
|
||||
"Name": "QuickBASIC",
|
||||
"Email": "quickbasic@quickbasic.xyz",
|
||||
"Url": "https://git.quickbasic.xyz/hytale-modding"
|
||||
}
|
||||
],
|
||||
"Website": "https://git.quickbasic.xyz/hytale-modding/TieredRepairKits",
|
||||
"Dependencies": {},
|
||||
"OptionalDependencies": {},
|
||||
"LoadBefore": {},
|
||||
"DisabledByDefault": false,
|
||||
"IncludesAssetPack": false,
|
||||
"SubPlugins": []
|
||||
"Group": "xyz.quickbasic",
|
||||
"Name": "TieredRepairKits",
|
||||
"Version": "1.1.0",
|
||||
"Main": "xyz.quickbasic.tieredrepairkits.TieredRepairKits",
|
||||
"ServerVersion": "2026.03.26-89796e57b",
|
||||
"Description": "Balanced tiered Repair Kits that can increase the maximum durability of items",
|
||||
"Authors": [
|
||||
{
|
||||
"Name": "QuickBASIC",
|
||||
"Email": "quickbasic@quickbasic.xyz",
|
||||
"Url": "https://git.quickbasic.xyz/hytale-modding"
|
||||
}
|
||||
],
|
||||
"Website": "https://git.quickbasic.xyz/hytale-modding/TieredRepairKits",
|
||||
"Dependencies": {
|
||||
|
||||
},
|
||||
"OptionalDependencies": {
|
||||
|
||||
},
|
||||
"LoadBefore": {
|
||||
|
||||
},
|
||||
"DisabledByDefault": false,
|
||||
"IncludesAssetPack": true,
|
||||
"SubPlugins": [
|
||||
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user