diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d63b93..9a2db3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,14 +26,24 @@ jobs: - name: mc-publish uses: Kir-Antipov/mc-publish@v3.3.0 with: - modrinth-id: iRE67WIn - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} curseforge-id: 657831 curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} files-primary: build/libs/!(*-@(javadoc|sources)).jar version-type: release loaders: neoforge - game-versions: 1.20.6 + game-versions: 1.21 + java: 21 + name: "" + changelog-file: changelog-1.21.* + - name: mc-publish + uses: Kir-Antipov/mc-publish@v3.3.0 + with: + modrinth-id: iRE67WIn + modrinth-token: ${{ secrets.MODRINTH_TOKEN }} + files-primary: build/libs/!(*-@(javadoc|sources)).jar + version-type: release + loaders: neoforge + game-versions: 1.21 java: 21 name: "" - changelog-file: changelog-1.20.6.* \ No newline at end of file + changelog-file: changelog-1.21.* \ No newline at end of file diff --git a/changelog-1.20.6.txt b/changelog-1.20.6.txt deleted file mode 100644 index 2343647..0000000 --- a/changelog-1.20.6.txt +++ /dev/null @@ -1,44 +0,0 @@ -- Piglin Traveler - - A new piglin variant who can be found in camps or just wandering around the nether - - Traveler Camps - - A common new structure where the Piglin Traveler can be found, consisting of a Fire Ring and a slab for sitting down - - Spawns in all nether biomes except for basalt deltas (due to jankiness) - - Generates as a 'camp gathering' in the Crimson Forest instead, with 3 Piglin Travelers and a 'fallen log' - - Barter with the Traveler to get items that help you explore the nether, including their very own compass! - - Traveler's Compass - - Points to a random biome or structure in the nether - - Shows its coordinates in the item description - - Can be duplicated by combining it with a normal compass in the crafting table - - NOTE: Travelers can't give you a duplicate compass for 20 minutes after you first got it; you'll always get new locations if you do all your bartering within that timeframe - - Has a head block just like the other piglin variants -- Fire Rings - - A cheaper variant of the campfire that takes twice as long to cook items and gives off half as much light - - Using a potion (splash or lingering too) on a Fire Ring applies all of the potion's effects to surrounding areas for as long as its duration (e.g. 8 minute Potion of Swiftness will last on a Fire Ring for 8 minutes) - - Potions can be added with a Dispenser - - Soul Fire Rings have half the range but double the temporary effect time (i.e. an entity leaving the range of a Soul Fire Ring will keep its effects for 20 seconds afterwards instead of 10) - - Comes in Stone, Deepslate, Blackstone, Netherrack and Endstone variants - - Crafted with 3 of a valid stone type and a piece of coal - - NOTE: Stone and Deepslate Fire Rings are crafted with their cobbled stone variants -- Buckler changes - - Doubled durability to 128 - - Improved description - - Reworded to increase clarity - - In order to show the full description, you now have to hold down the sneak key while hovering over a Buckler - - Enchantment buffs - - Turning now has 5 levels; each level increases your turning speed but reduces the attack damage from hitting an entity with a Buckler - - Turning V gives you full turn control like before, but now 1-2 bash damage as well - - Bang decreases your durability much less than before (2-6 depending on bang level rather than 5-15) -- Redesigned Piglin Alchemist loot table to be more related to brewing and alchemy -- Zombified Piglins can now use any ranged weapons they're holding to attack you... even more reason not to anger them! -- Parrots can now imitate Piglin Alchemists and Piglin Travelers -- Added new language translations - - French - - German - - Spanish - - British English (just changes Traveler to Traveller) - - NOTE: Translation help is wanted, please contact us if you're willing!! In particular, Spanish needs proofreading as we couldn't verify it with a native speaker, and Russian, Ukrainian and Vietnamese are very incomplete -- Bugfixes - - Piglin Head variants now drop themselves when broken - - Fixed crash when piglin brute drops a Buckler -- Many internal code improvements -- Port to NeoForge 1.20.6 diff --git a/changelog-1.21.txt b/changelog-1.21.txt new file mode 100644 index 0000000..bf7cca6 --- /dev/null +++ b/changelog-1.21.txt @@ -0,0 +1,2 @@ +- Port to 1.21 +- Modded piglin variants spawning config has now been transformed into a data driven data map for different chances \ No newline at end of file diff --git a/src/main/java/tallestred/piglinproliferation/configuration/PPConfig.java b/src/main/java/tallestred/piglinproliferation/configuration/PPConfig.java index f712e83..194d879 100644 --- a/src/main/java/tallestred/piglinproliferation/configuration/PPConfig.java +++ b/src/main/java/tallestred/piglinproliferation/configuration/PPConfig.java @@ -33,7 +33,6 @@ public static class CommonConfig { public final ModConfigSpec.BooleanValue BangBlockDestruction; public final ModConfigSpec.IntValue alchemistWeightInBastions; public final ModConfigSpec.DoubleValue healingArrowChances; - public final ModConfigSpec.DoubleValue piglinVariantChances; public final ModConfigSpec.DoubleValue zombifiedPiglinDefaultChance; public final ModConfigSpec.DoubleValue zombifiedBruteChance; public final ModConfigSpec.DoubleValue zombifiedAlchemistChance; @@ -48,7 +47,6 @@ public static class CommonConfig { public final ModConfigSpec.IntValue minBucklerChargeTime; public final ModConfigSpec.IntValue maxBucklerChargeTime; public final ModConfigSpec.DoubleValue turningBucklerLaunchStrength; - public final ModConfigSpec.ConfigValue> zombifiedPiglinTypeList; public final ModConfigSpec.ConfigValue> mobsThatCanAlsoUseBuckler; public CommonConfig(ModConfigSpec.Builder builder) { builder.push("Vanilla Changes"); @@ -64,8 +62,6 @@ public CommonConfig(ModConfigSpec.Builder builder) { zombifiedBruteChance = builder.defineInRange("Chance of zombified piglins spawning with brute clothing (including items)", 0.015F, 0.0F, 9000.0F); zombifiedAlchemistChance = builder.defineInRange("Chance of zombified piglins spawning with alchemist clothing (including items)", 0.10F, 0.0F, 9000.0F); zombifiedTravelerChance = builder.defineInRange("Chance of zombified piglins spawning with traveler clothing ", 0.10F, 0.0F, 9000.0F); - piglinVariantChances = builder.defineInRange("Chance of zombified piglin variants spawning from the list below", 0.50F, 0.0F, 9000.0F); - zombifiedPiglinTypeList = builder.comment("List of variants a zombified piglin has a 50% of turning into when spawning.", "Keep in mind they will still spawn with golden swords, this will be changed in the future.").defineList("List of piglin variants to use", ImmutableList.of(), obj -> true); builder.pop(); builder.push("Buckler"); mobsThatCanAlsoUseBuckler = builder.define("Mobs that can also use the buckler", Lists.newArrayList("guardvillagers:guard")); diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml index 3a3af40..5e1e081 100644 --- a/src/main/resources/META-INF/neoforge.mods.toml +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -21,7 +21,7 @@ version="${mod_version}" #mandatory # A display name for the mod displayName="${mod_name}" #mandatory authors="${mod_authors}" -updateJSONURL="https://raw.githubusercontent.com/seymourimadeit/Piglin-Proliferation/main/update.json" #optional +updateJSONURL="https://api.modrinth.com/updates/piglin-proliferation|iRE67WIn}/forge_updates.json" #optional logoFile="piglinproliferation.png" credits="Vivi for Buckler art, flowerfugue's friends Leo and Paula for translation help" #optional description='''