Update libs and use libs.versions.toml for dep management

2026-06-18 14:50:56 +00:00 · 2022-08-21 12:21:12 -05:00
parent 5d5408e142
commit b627ce6e58
45 changed files with 394 additions and 893 deletions
@@ -2,10 +2,4 @@ version = version("1.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.biome.image.lib.jafama")
 }
@@ -2,11 +2,4 @@ version = version("1.0.1")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.biome.pipeline.lib.jafama")
 }
@@ -2,11 +2,4 @@ version = version("1.1.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.chunkgenerator.lib.jafama")
 }
@@ -2,11 +2,4 @@ version = version("1.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.feature.distributor.lib.jafama")
 }
@@ -2,10 +2,4 @@ version = version("1.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.flora.lib.jafama")
 }
@@ -2,11 +2,4 @@ version = version("1.1.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.feature.locator.lib.jafama")
 }
@@ -4,13 +4,4 @@ version = version("1.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    api("com.dfsek", "paralithic", Versions.Libraries.paralithic)
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("com.dfsek.paralithic", "com.dfsek.terra.addons.noise.lib.paralithic")
-    relocate("net.jafama", "com.dfsek.terra.addons.noise.lib.jafama")
 }
@@ -2,11 +2,5 @@ version = version("1.0.0")

 dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
    compileOnlyApi(project(":common:addons:config-noise-function"))
 }
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.ore.lib.jafama")
-}
@@ -1,13 +1,5 @@
 version = version("1.0.0")

 dependencies {
-    api("com.googlecode.json-simple:json-simple:1.1.1")
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addons.structure.lib.jafama")
-}
+}
@@ -1,109 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot;
-
-import net.jafama.FastMath;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.addons.structure.structures.loot.functions.AmountFunction;
-import com.dfsek.terra.addons.structure.structures.loot.functions.DamageFunction;
-import com.dfsek.terra.addons.structure.structures.loot.functions.EnchantFunction;
-import com.dfsek.terra.addons.structure.structures.loot.functions.LootFunction;
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.inventory.Item;
-import com.dfsek.terra.api.inventory.ItemStack;
-
-
-/**
- * Representation of a single item entry within a Loot Table pool.
- */
-public class Entry {
-    private final Item item;
-    private final long weight;
-    private final List<LootFunction> functions = new ArrayList<>();
-    
-    /**
-     * Instantiates an Entry from a JSON representation.
-     *
-     * @param entry The JSON Object to instantiate from.
-     */
-    public Entry(JSONObject entry, Platform platform) {
-        String id = entry.get("name").toString();
-        this.item = platform.getItemHandle().createItem(id);
-        
-        long weight1;
-        try {
-            weight1 = (long) entry.get("weight");
-        } catch(NullPointerException e) {
-            weight1 = 1;
-        }
-        
-        this.weight = weight1;
-        if(entry.containsKey("functions")) {
-            for(Object function : (JSONArray) entry.get("functions")) {
-                switch(((String) ((JSONObject) function).get("function"))) {
-                    case "minecraft:set_count", "set_count" -> {
-                        Object loot = ((JSONObject) function).get("count");
-                        long max, min;
-                        if(loot instanceof Long) {
-                            max = (Long) loot;
-                            min = (Long) loot;
-                        } else {
-                            max = (long) ((JSONObject) loot).get("max");
-                            min = (long) ((JSONObject) loot).get("min");
-                        }
-                        functions.add(new AmountFunction(FastMath.toIntExact(min), FastMath.toIntExact(max)));
-                    }
-                    case "minecraft:set_damage", "set_damage" -> {
-                        long maxDamage = (long) ((JSONObject) ((JSONObject) function).get("damage")).get("max");
-                        long minDamage = (long) ((JSONObject) ((JSONObject) function).get("damage")).get("min");
-                        functions.add(new DamageFunction(FastMath.toIntExact(minDamage), FastMath.toIntExact(maxDamage)));
-                    }
-                    case "minecraft:enchant_with_levels", "enchant_with_levels" -> {
-                        long maxEnchant = (long) ((JSONObject) ((JSONObject) function).get("levels")).get("max");
-                        long minEnchant = (long) ((JSONObject) ((JSONObject) function).get("levels")).get("min");
-                        JSONArray disabled = null;
-                        if(((JSONObject) function).containsKey("disabled_enchants"))
-                            disabled = (JSONArray) ((JSONObject) function).get("disabled_enchants");
-                        functions.add(
-                                new EnchantFunction(FastMath.toIntExact(minEnchant), FastMath.toIntExact(maxEnchant), disabled, platform));
-                    }
-                }
-            }
-        }
-    }
-    
-    /**
-     * Fetches a single ItemStack from the Entry, applying all functions to it.
-     *
-     * @param r The RandomGenerator instance to apply functions with
-     *
-     * @return ItemStack - The ItemStack with all functions applied.
-     */
-    public ItemStack getItem(RandomGenerator r) {
-        ItemStack item = this.item.newItemStack(1);
-        for(LootFunction f : functions) {
-            item = f.apply(item, r);
-        }
-        return item;
-    }
-    
-    /**
-     * Gets the weight attribute of the Entry.
-     *
-     * @return long - The weight of the Entry.
-     */
-    public long getWeight() {
-        return this.weight;
-    }
-}
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot;
-
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.inventory.Inventory;
-import com.dfsek.terra.api.inventory.ItemStack;
-
-
-/**
- * Class representation of a Loot Table to populate chest loot.
- */
-public class LootTableImpl implements com.dfsek.terra.api.structure.LootTable {
-    private final List<Pool> pools = new ArrayList<>();
-    
-    /**
-     * Instantiates a LootTable from a JSON String.
-     *
-     * @param json The JSON String representing the loot table.
-     *
-     * @throws ParseException if malformed JSON is passed.
-     */
-    public LootTableImpl(String json, Platform platform) throws ParseException {
-        JSONParser jsonParser = new JSONParser();
-        Object tableJSON = jsonParser.parse(json);
-        JSONArray poolArray = (JSONArray) ((JSONObject) tableJSON).get("pools");
-        for(Object pool : poolArray) {
-            pools.add(new Pool((JSONObject) pool, platform));
-        }
-    }
-    
-    @Override
-    public void fillInventory(Inventory i, RandomGenerator r) {
-        List<ItemStack> loot = getLoot(r);
-        for(ItemStack stack : loot) {
-            int attempts = 0;
-            while(stack.getAmount() != 0 && attempts < 10) {
-                ItemStack newStack = stack.getType().newItemStack(stack.getAmount());
-                newStack.setItemMeta(stack.getItemMeta());
-                newStack.setAmount(1);
-                int slot = r.nextInt(i.getSize());
-                ItemStack slotItem = i.getItem(slot);
-                if(slotItem == null) {
-                    i.setItem(slot, newStack);
-                    stack.setAmount(stack.getAmount() - 1);
-                } else if(slotItem.getType().equals(newStack.getType())) {
-                    ItemStack dep = newStack.getType().newItemStack(newStack.getAmount());
-                    dep.setItemMeta(newStack.getItemMeta());
-                    dep.setAmount(newStack.getAmount() + slotItem.getAmount());
-                    i.setItem(slot, dep);
-                    stack.setAmount(stack.getAmount() - 1);
-                }
-                attempts++;
-            }
-        }
-    }
-    
-    @Override
-    public List<ItemStack> getLoot(RandomGenerator r) {
-        List<ItemStack> itemList = new ArrayList<>();
-        for(Pool pool : pools) {
-            itemList.addAll(pool.getItems(r));
-        }
-        return itemList;
-    }
-}
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot;
-
-import net.jafama.FastMath;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.inventory.ItemStack;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
-
-
-/**
- * Representation of a Loot Table pool, or a set of items to be fetched independently.
- */
-public class Pool {
-    private final int max;
-    private final int min;
-    private final ProbabilityCollection<Entry> entries;
-    
-    /**
-     * Instantiates a Pool from a JSON representation.
-     *
-     * @param pool The JSON Object to instantiate from.
-     */
-    public Pool(JSONObject pool, Platform platform) {
-        entries = new ProbabilityCollection<>();
-        Object amount = pool.get("rolls");
-        if(amount instanceof Long) {
-            max = FastMath.toIntExact((Long) amount);
-            min = FastMath.toIntExact((Long) amount);
-        } else {
-            max = FastMath.toIntExact((Long) ((JSONObject) amount).get("max"));
-            min = FastMath.toIntExact((Long) ((JSONObject) amount).get("min"));
-        }
-        
-        for(Object entryJSON : (JSONArray) pool.get("entries")) {
-            Entry entry = new Entry((JSONObject) entryJSON, platform);
-            entries.add(entry, FastMath.toIntExact(entry.getWeight()));
-        }
-    }
-    
-    /**
-     * Fetches a list of items from the pool using the provided RandomGenerator instance.
-     *
-     * @param r The RandomGenerator instance to use.
-     *
-     * @return List&lt;ItemStack&gt; - The list of items fetched.
-     */
-    public List<ItemStack> getItems(RandomGenerator r) {
-        
-        int rolls = r.nextInt(max - min + 1) + min;
-        List<ItemStack> items = new ArrayList<>();
-        for(int i = 0; i < rolls; i++) {
-            items.add(entries.get(r).getItem(r));
-        }
-        return items;
-    }
-}
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot.functions;
-
-
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.api.inventory.ItemStack;
-
-
-/**
- * Loot LootFunction fot setting the amount of an item.
- */
-public class AmountFunction implements LootFunction {
-    private final int max;
-    private final int min;
-    
-    /**
-     * Instantiates an AmountFunction.
-     *
-     * @param min Minimum amount.
-     * @param max Maximum amount.
-     */
-    public AmountFunction(int min, int max) {
-        this.min = min;
-        this.max = max;
-    }
-    
-    /**
-     * Applies the function to an ItemStack.
-     *
-     * @param original The ItemStack on which to apply the function.
-     * @param r        The RandomGenerator instance to use.
-     *
-     * @return - ItemStack - The mutated ItemStack.
-     */
-    @Override
-    public ItemStack apply(ItemStack original, RandomGenerator r) {
-        original.setAmount(r.nextInt(max - min + 1) + min);
-        return original;
-    }
-}
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot.functions;
-
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.api.inventory.ItemStack;
-import com.dfsek.terra.api.inventory.item.Damageable;
-import com.dfsek.terra.api.inventory.item.ItemMeta;
-
-
-/**
- * Loot LootFunction for setting the damage on items in Loot Tables
- */
-public class DamageFunction implements LootFunction {
-    private final int max;
-    private final int min;
-    
-    /**
-     * Instantiates a DamageFunction.
-     *
-     * @param min Minimum amount of damage (percentage, out of 100)
-     * @param max Maximum amount of damage (percentage, out of 100)
-     */
-    public DamageFunction(int min, int max) {
-        this.min = min;
-        this.max = max;
-    }
-    
-    /**
-     * Applies the function to an ItemStack.
-     *
-     * @param original The ItemStack on which to apply the function.
-     * @param r        The RandomGenerator instance to use.
-     *
-     * @return - ItemStack - The mutated ItemStack.
-     */
-    @Override
-    public ItemStack apply(ItemStack original, RandomGenerator r) {
-        if(original == null) return null;
-        if(!original.isDamageable()) return original;
-        ItemMeta meta = original.getItemMeta();
-        double itemDurability = (r.nextDouble() * (max - min)) + min;
-        Damageable damage = (Damageable) meta;
-        damage.setDamage((int) (original.getType().getMaxDurability() - (itemDurability / 100) * original.getType().getMaxDurability()));
-        original.setItemMeta((ItemMeta) damage);
-        return original;
-    }
-}
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot.functions;
-
-import net.jafama.FastMath;
-import org.json.simple.JSONArray;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.api.Platform;
-import com.dfsek.terra.api.inventory.ItemStack;
-import com.dfsek.terra.api.inventory.item.Enchantment;
-import com.dfsek.terra.api.inventory.item.ItemMeta;
-
-
-public class EnchantFunction implements LootFunction {
-    private static final Logger LOGGER = LoggerFactory.getLogger(EnchantFunction.class);
-    private final int min;
-    private final int max;
-    private final JSONArray disabled;
-    private final Platform platform;
-    
-    
-    public EnchantFunction(int min, int max, JSONArray disabled, Platform platform) {
-        this.max = max;
-        this.min = min;
-        this.disabled = disabled;
-        this.platform = platform;
-    }
-    
-    /**
-     * Applies the function to an ItemStack.
-     *
-     * @param original The ItemStack on which to apply the function.
-     * @param r        The RandomGenerator instance to use.
-     *
-     * @return - ItemStack - The mutated ItemStack.
-     */
-    @Override
-    public ItemStack apply(ItemStack original, RandomGenerator r) {
-        if(original.getItemMeta() == null) return original;
-        
-        double enchant = (r.nextDouble() * (max - min)) + min;
-        List<Enchantment> possible = new ArrayList<>();
-        for(Enchantment ench : platform.getItemHandle().getEnchantments()) {
-            if(ench.canEnchantItem(original) && (disabled == null || !this.disabled.contains(ench.getID()))) {
-                possible.add(ench);
-            }
-        }
-        int numEnchant = (r.nextInt((int) FastMath.abs(enchant)) / 10 + 1);
-        Collections.shuffle(possible);
-        ItemMeta meta = original.getItemMeta();
-        iter:
-        for(int i = 0; i < numEnchant && i < possible.size(); i++) {
-            Enchantment chosen = possible.get(i);
-            for(Enchantment ench : meta.getEnchantments().keySet()) {
-                if(chosen.conflictsWith(ench)) continue iter;
-            }
-            int lvl = r.nextInt(1 + (int) (((enchant / 40 > 1) ? 1 : enchant / 40) * (chosen.getMaxLevel())));
-            try {
-                meta.addEnchantment(chosen, FastMath.max(lvl, 1));
-            } catch(IllegalArgumentException e) {
-                LOGGER.warn(
-                        "Attempted to enchant {} with {} at level {}, but an unexpected exception occurred! Usually this is caused by a " +
-                        "misbehaving enchantment plugin.",
-                        original.getType(), chosen, FastMath.max(lvl, 1));
-            }
-        }
-        original.setItemMeta(meta);
-        return original;
-    }
-}
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2020-2021 Polyhedral Development
- *
- * The Terra Core Addons are licensed under the terms of the MIT License. For more details,
- * reference the LICENSE file in this module's root directory.
- */
-
-package com.dfsek.terra.addons.structure.structures.loot.functions;
-
-
-import java.util.random.RandomGenerator;
-
-import com.dfsek.terra.api.inventory.ItemStack;
-
-
-/**
- * Interface for mutating items in Loot Tables.
- */
-public interface LootFunction {
-    /**
-     * Applies the function to an ItemStack.
-     *
-     * @param original The ItemStack on which to apply the function.
-     * @param r        The RandomGenerator instance to use.
-     *
-     * @return - ItemStack - The mutated ItemStack.
-     */
-    ItemStack apply(ItemStack original, RandomGenerator r);
-}
@@ -1,6 +1,6 @@
 version = version("1.0.0")

 dependencies {
-    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    implementation(libs.libraries.tectonic.yaml)
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
 }
@@ -1,8 +1,8 @@
 version = version("1.0.0")

 dependencies {
-    api("commons-io:commons-io:2.7")
-    implementation("com.dfsek.tectonic:yaml:${Versions.Libraries.tectonic}")
+    api(libs.libraries.internal.apache.io)
+    implementation(libs.libraries.tectonic.yaml)
 }

 tasks.withType<Jar> {
@@ -1,15 +1,6 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
-
 version = version("1.1.0")

 dependencies {
-    api("commons-io:commons-io:2.7")
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<ShadowJar>("shadowJar") {
-    relocate("org.apache.commons", "com.dfsek.terra.addons.terrascript.lib.commons")
-    relocate("net.jafama", "com.dfsek.terra.addons.terrascript.lib.jafama")
+    api(libs.libraries.internal.apache.io)
 }
@@ -4,11 +4,4 @@ dependencies {
    compileOnlyApi(project(":common:addons:manifest-addon-loader"))
    compileOnlyApi(project(":common:addons:chunk-generator-noise-3d"))
    compileOnlyApi(project(":common:addons:structure-terrascript-loader"))
-    
-    implementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-    testImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
-tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
-    relocate("net.jafama", "com.dfsek.terra.addon.terrascript.check.lib.jafama")
 }