hytale-modding/TieredRepairKits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

simplify config, remove fieldcrafting, implement default config

Browse Source
This commit is contained in:
Mike Justman
2026-03-27 16:55:57 -04:00
parent 69d1d2aa1e
commit 71c943f47d
6 changed files with 177 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/xyz/quickbasic/tieredrepairkits/RepairKitManager.java
View File

@@ -7,25 +7,16 @@ import java.util.Map;
// Manages repair-kit data for the plugin
public class RepairKitManager {
// Reference to the main plugin class
private final TieredRepairKits plugin;
// Cached tiers map for easy access
private Map<String, RepairTier> tiers;
// Constructor
public RepairKitManager(TieredRepairKits plugin) {
this.plugin = plugin;
// Load the config into local variables
loadConfig();
}
// Load config from TRKConfig
public void loadConfig() {
TRKConfig config = plugin.getConfig().get();
// Get all tiers from TRKConfig
tiers = config.getTiers();
// Log loaded tiers
@@ -33,20 +24,19 @@ public class RepairKitManager {
String tierName = entry.getKey();
RepairTier tier = entry.getValue();
TieredRepairKits.LOGGER.atInfo().log("Loaded tier: " + tierName);
TieredRepairKits.LOGGER.atInfo().log("Enabled: " + tier.isEnabled());
TieredRepairKits.LOGGER.atInfo().log("RepairPenalty: " + tier.getRepairPenalty());
TieredRepairKits.LOGGER.atInfo().log("FieldcraftingEnabled: " + tier.isFieldcraftingEnabled());
TieredRepairKits.LOGGER.atInfo().log("Recipe size: " + tier.getRecipe().size());
TieredRepairKits.LOGGER.atInfo().log(
"Tier " + tierName
+ ": enabled=" + tier.isEnabled()
+ " penalty=" + tier.getRepairPenalty()
+ " ingredients=" + tier.getRecipe().length
);
}
}
// Getter for all tiers
public Map<String, RepairTier> getTiers() {
return tiers;
}
// Optional: getter for a single tier
public RepairTier getTier(String name) {
return tiers.get(name);
}

108
src/main/java/xyz/quickbasic/tieredrepairkits/TRKConfig.java
View File

@@ -3,9 +3,13 @@ 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 {
@@ -69,9 +73,89 @@ public class TRKConfig {
// Cached map for runtime convenience
private Map<String, RepairTier> cachedMap;
public TRKConfig() {}
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)
));
}
// Returns a map of tier names -> RepairTier
public Map<String, RepairTier> getTiers() {
if (cachedMap == null) {
cachedMap = new LinkedHashMap<>();
@@ -101,7 +185,7 @@ public class TRKConfig {
public RepairTier getTierOnyxium() { return tierOnyxium; }
public RepairTier getTierPrisma() { return tierPrisma; }
// Individual tier setters (optional, also clears cached map)
// 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; }
@@ -112,4 +196,22 @@ public class TRKConfig {
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
}
}

4
src/main/java/xyz/quickbasic/tieredrepairkits/TieredRepairKits.java
View File

@@ -18,8 +18,8 @@ public class TieredRepairKits extends JavaPlugin {
private RepairKitManager repairKitManager;
// Config wrapper provided by the Hytale server API.
// This links the config file name ("MyConfig") with the codec defined in TRKConfig.
private final Config<TRKConfig> config = this.withConfig("MyConfig", TRKConfig.CODEC);
// 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() {

38
src/main/java/xyz/quickbasic/tieredrepairkits/config/RecipeIngredient.java
View File

@@ -8,23 +8,37 @@ public class RecipeIngredient {
public static final BuilderCodec<RecipeIngredient> CODEC =
BuilderCodec.builder(RecipeIngredient.class, RecipeIngredient::new)
.append(new KeyedCodec<String>("ItemId", Codec.STRING),
(obj, value) -> obj.itemId = value,
(obj) -> obj.itemId).add()
.append(new KeyedCodec<Integer>("Quantity", Codec.INTEGER),
(obj, value) -> obj.quantity = value,
(obj) -> obj.quantity).add()
.build();
.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 String getItemId() { return itemId; }
public RecipeIngredient(String itemId, int quantity) {
this.itemId = itemId;
this.quantity = quantity;
}
public int getQuantity() { return 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;
}
}

89
src/main/java/xyz/quickbasic/tieredrepairkits/config/RepairTier.java
View File

@@ -1,81 +1,64 @@
package xyz.quickbasic.tieredrepairkits.config;
import com.hypixel.hytale.codec.Codec;
import com.hypixel.hytale.codec.KeyedCodec;
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;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
public class RepairTier {
// We create an ArrayCodec and then convert it to/from a List
// We use the RecipeIngredient.CODEC and a constructor for the array type.
private static final Codec<List<RecipeIngredient>> INGREDIENT_LIST_CODEC = new Codec<List<RecipeIngredient>>() {
private final ArrayCodec<RecipeIngredient> arrayCodec = new ArrayCodec<>(RecipeIngredient.CODEC, RecipeIngredient[]::new);
@Override
public List<RecipeIngredient> decode(org.bson.BsonValue bsonValue, com.hypixel.hytale.codec.ExtraInfo extraInfo) {
RecipeIngredient[] arr = arrayCodec.decode(bsonValue, extraInfo);
return arr == null ? new ArrayList<>() : new ArrayList<>(Arrays.asList(arr));
}
@Override
public org.bson.BsonValue encode(List<RecipeIngredient> value, com.hypixel.hytale.codec.ExtraInfo extraInfo) {
return arrayCodec.encode(value.toArray(new RecipeIngredient[0]), extraInfo);
}
@Override
public com.hypixel.hytale.codec.schema.config.Schema toSchema(com.hypixel.hytale.codec.schema.SchemaContext context) {
return arrayCodec.toSchema(context);
}
};
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()
obj -> obj.enabled).add()
.append(new KeyedCodec<>("RepairPenalty", Codec.DOUBLE),
(obj, value) -> obj.repairPenalty = value,
(obj) -> obj.repairPenalty).add()
.append(new KeyedCodec<>("FieldcraftingEnabled", Codec.BOOLEAN),
(obj, value) -> obj.fieldcraftingEnabled = value,
(obj) -> obj.fieldcraftingEnabled).add()
.append(new KeyedCodec<>("FieldcraftingRecipe", INGREDIENT_LIST_CODEC),
(obj, value) -> obj.fieldcraftingRecipe = value,
(obj) -> obj.fieldcraftingRecipe).add()
.append(new KeyedCodec<>("Recipe", INGREDIENT_LIST_CODEC),
obj -> obj.repairPenalty).add()
.append(new KeyedCodec<>("Recipe", INGREDIENT_ARRAY_CODEC),
(obj, value) -> obj.recipe = value,
(obj) -> obj.recipe).add()
obj -> obj.recipe).add()
.build();
private boolean enabled = true;
private double repairPenalty = 0.0;
private boolean fieldcraftingEnabled = false;
private List<RecipeIngredient> fieldcraftingRecipe = new ArrayList<>();
private List<RecipeIngredient> recipe = new ArrayList<>();
private RecipeIngredient[] recipe = new RecipeIngredient[0];
public RepairTier() {}
// --- Getters ---
public boolean isEnabled() { return enabled; }
public double getRepairPenalty() { return repairPenalty; }
public boolean isFieldcraftingEnabled() { return fieldcraftingEnabled; }
public List<RecipeIngredient> getFieldcraftingRecipe() { return fieldcraftingRecipe; }
public List<RecipeIngredient> getRecipe() { return recipe; }
public RecipeIngredient[] getRecipe() { return recipe; }
// --- Setters ---
public void setEnabled(boolean enabled) { this.enabled = enabled; }
public void setRepairPenalty(double repairPenalty) { this.repairPenalty = repairPenalty; }
public void setFieldcraftingEnabled(boolean fieldcraftingEnabled) { this.fieldcraftingEnabled = fieldcraftingEnabled; }
public void setFieldcraftingRecipe(List<RecipeIngredient> fieldcraftingRecipe) { this.fieldcraftingRecipe = fieldcraftingRecipe; }
public void setRecipe(List<RecipeIngredient> recipe) { this.recipe = recipe; }
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);
}
}
}
}

4
src/main/resources/manifest.json
View File

@@ -1,6 +1,6 @@
{
"Group": "QuickBASIC",
"Name": "QuickBASIC.TieredRepairKits",
"Group": "xyz.quickbasic",
"Name": "TieredRepairKits",
"Version": "1.1.0",
"Main": "xyz.quickbasic.tieredrepairkits.TieredRepairKits",
"ServerVersion": "2026.03.26-89796e57b",