From d85dbcfbf8290525abae0b58fdc010a7287e911d Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 5 Jul 2020 20:46:49 +0200 Subject: [PATCH] Bump Forge, replace GoG grass loot table inject with loot modifier Closes #3342 --- build.gradle | 2 +- garden_of_glass/build.gradle | 2 +- .../src/main/resources/META-INF/mods.toml | 2 +- .../loot_modifiers/global_loot_modifiers.json | 6 ++ .../java/vazkii/botania/common/Botania.java | 1 - .../core/loot/AddRandomItemModifier.java | 56 +++++++++++++++++++ .../common/core/loot/DisposeModifier.java | 1 + .../common/world/SkyblockWorldEvents.java | 8 --- .../data/botania/loot_modifiers/dispose.json | 2 +- .../loot_modifiers/skyblock_seeds.json | 45 +++++++++++++++ .../botania/loot_tables/inject/gog_grass.json | 35 ------------ 11 files changed, 112 insertions(+), 48 deletions(-) create mode 100644 garden_of_glass/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json create mode 100644 src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java create mode 100644 src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json delete mode 100644 src/main/resources/data/botania/loot_tables/inject/gog_grass.json diff --git a/build.gradle b/build.gradle index 5de4e4c5f..ca4db5050 100644 --- a/build.gradle +++ b/build.gradle @@ -102,7 +102,7 @@ test { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-31.2.22" + minecraft "net.minecraftforge:forge:${mc_version}-31.2.30" compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-35.185:api") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.15.2-1.2-35.185") diff --git a/garden_of_glass/build.gradle b/garden_of_glass/build.gradle index 40e9b93a8..0c227868a 100644 --- a/garden_of_glass/build.gradle +++ b/garden_of_glass/build.gradle @@ -27,7 +27,7 @@ def parseConfig(File config) { ext.config = parseConfig(file('../build.properties')) -version = '1.2' +version = '1.3' group = 'vazkii.botania' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'gardenofglass' diff --git a/garden_of_glass/src/main/resources/META-INF/mods.toml b/garden_of_glass/src/main/resources/META-INF/mods.toml index ee7b967a6..a5a00f162 100644 --- a/garden_of_glass/src/main/resources/META-INF/mods.toml +++ b/garden_of_glass/src/main/resources/META-INF/mods.toml @@ -15,7 +15,7 @@ An extension to Botania that adds skyblock like gameplay.''' [[dependencies.gardenofglass]] modId="botania" - versionRange="NONE" + versionRange="[r1.15-387,)" mandatory=true ordering="AFTER" side="BOTH" diff --git a/garden_of_glass/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/garden_of_glass/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 000000000..ab59c791e --- /dev/null +++ b/garden_of_glass/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "entries": [ + "botania:skyblock_seeds" + ] +} diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 81c9f4182..e511e9329 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -212,7 +212,6 @@ public class Botania { CorporeaHelper.instance().registerRequestMatcher(prefix("item_stack"), CorporeaItemStackMatcher.class, CorporeaItemStackMatcher::createFromNBT); if (Botania.gardenOfGlassLoaded) { - MinecraftForge.EVENT_BUS.addListener(SkyblockWorldEvents::loadLoot); MinecraftForge.EVENT_BUS.addListener(SkyblockWorldEvents::onPlayerUpdate); MinecraftForge.EVENT_BUS.addListener(SkyblockWorldEvents::onPlayerInteract); } diff --git a/src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java b/src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java new file mode 100644 index 000000000..1936275b7 --- /dev/null +++ b/src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java @@ -0,0 +1,56 @@ +/* + * This class is distributed as part of the Botania Mod. + * Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ +package vazkii.botania.common.core.loot; + +import com.google.common.collect.ImmutableList; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.JSONUtils; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.storage.loot.LootContext; +import net.minecraft.world.storage.loot.conditions.ILootCondition; +import net.minecraftforge.common.crafting.CraftingHelper; +import net.minecraftforge.common.loot.GlobalLootModifierSerializer; +import net.minecraftforge.common.loot.LootModifier; + +import javax.annotation.Nonnull; + +import java.util.List; + +public class AddRandomItemModifier extends LootModifier { + private final List items; + + protected AddRandomItemModifier(ILootCondition[] conditionsIn, List items) { + super(conditionsIn); + this.items = items; + } + + @Nonnull + @Override + protected List doApply(List generatedLoot, LootContext context) { + ItemStack stack = items.get(context.getRandom().nextInt(items.size())); + generatedLoot.add(stack.copy()); + return generatedLoot; + } + + public static class Serializer extends GlobalLootModifierSerializer { + @Override + public AddRandomItemModifier read(ResourceLocation location, JsonObject object, ILootCondition[] ailootcondition) { + JsonArray items = JSONUtils.getJsonArray(object, "items"); + ImmutableList.Builder builder = ImmutableList.builder(); + for (JsonElement item : items) { + builder.add(CraftingHelper.getItemStack(item.getAsJsonObject(), true)); + } + return new AddRandomItemModifier(ailootcondition, builder.build()); + } + } +} diff --git a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java index 35a0e3218..7dcf5845a 100644 --- a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java +++ b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java @@ -35,6 +35,7 @@ public class DisposeModifier extends LootModifier { public static void register(RegistryEvent.Register> evt) { evt.getRegistry().register(new Serializer().setRegistryName(prefix("dispose"))); + evt.getRegistry().register(new AddRandomItemModifier.Serializer().setRegistryName(prefix("add_item"))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index caea97a38..eeff12242 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -123,14 +123,6 @@ public final class SkyblockWorldEvents { } } - private static final ResourceLocation TARGET_LOOT_TABLE = new ResourceLocation("blocks/grass"); - - public static void loadLoot(LootTableLoadEvent event) { - if (Botania.gardenOfGlassLoaded && event.getName().equals(TARGET_LOOT_TABLE)) { - event.getTable().addPool(LootHandler.getInjectPool("gog_grass")); - } - } - public static void spawnPlayer(PlayerEntity player, BlockPos pos, boolean fabricated) { CompoundNBT data = player.getPersistentData(); if (!data.contains(PlayerEntity.PERSISTED_NBT_TAG)) { diff --git a/src/main/resources/data/botania/loot_modifiers/dispose.json b/src/main/resources/data/botania/loot_modifiers/dispose.json index 7bfd8d131..85a37391c 100644 --- a/src/main/resources/data/botania/loot_modifiers/dispose.json +++ b/src/main/resources/data/botania/loot_modifiers/dispose.json @@ -1,4 +1,4 @@ { "conditions": [], - "function": "botania:dispose" + "type": "botania:dispose" } diff --git a/src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json b/src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json new file mode 100644 index 000000000..7086332f9 --- /dev/null +++ b/src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json @@ -0,0 +1,45 @@ +{ + "conditions": [ + { + "condition": "minecraft:alternative", + "terms": [ + { + "condition": "minecraft:block_state_property", + "block": "minecraft:grass" + }, + { + "condition": "minecraft:block_state_property", + "block": "minecraft:tall_grass", + "properties": { + "half": "lower" + } + } + ] + }, + { + "condition": "minecraft:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.03125 + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } + } + } + ], + "type": "botania:add_item", + "items": [ + { + "item": "minecraft:melon_seeds" + }, + { + "item": "minecraft:pumpkin_seeds" + } + ] +} diff --git a/src/main/resources/data/botania/loot_tables/inject/gog_grass.json b/src/main/resources/data/botania/loot_tables/inject/gog_grass.json deleted file mode 100644 index 0ff1a7ffb..000000000 --- a/src/main/resources/data/botania/loot_tables/inject/gog_grass.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "__comment": "This table is injected as its own pool into minecraft:blocks/grass if Garden of Glass is loaded", - "type": "minecraft:block", - "pools": [ - { - "name": "main", - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:melon_seeds" - }, - { - "type": "minecraft:item", - "name": "minecraft:pumpkin_seeds" - } - ], - "conditions": [ - { - "condition": "minecraft:random_chance", - "chance": 0.03125 - }, - { - "condition": "minecraft:inverted", - "term": { - "condition": "minecraft:match_tool", - "predicate": { - "item": "minecraft:shears" - } - } - } - ] - } - ] -} \ No newline at end of file