Bump Forge, replace GoG grass loot table inject with loot modifier

Closes #3342
This commit is contained in:
Hubry committed 2020-07-05 21:03:51 +02:00
1 parent 50da75abb3
commit d85dbcfbf8
11 files changed
+112 -48

No files matched your search

@@ -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);
}
@@ -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<ItemStack> items;
protected AddRandomItemModifier(ILootCondition[] conditionsIn, List<ItemStack> items) {
super(conditionsIn);
this.items = items;
}
@Nonnull
@Override
protected List<ItemStack> doApply(List<ItemStack> generatedLoot, LootContext context) {
ItemStack stack = items.get(context.getRandom().nextInt(items.size()));
generatedLoot.add(stack.copy());
return generatedLoot;
}
public static class Serializer extends GlobalLootModifierSerializer<AddRandomItemModifier> {
@Override
public AddRandomItemModifier read(ResourceLocation location, JsonObject object, ILootCondition[] ailootcondition) {
JsonArray items = JSONUtils.getJsonArray(object, "items");
ImmutableList.Builder<ItemStack> builder = ImmutableList.builder();
for (JsonElement item : items) {
builder.add(CraftingHelper.getItemStack(item.getAsJsonObject(), true));
}
return new AddRandomItemModifier(ailootcondition, builder.build());
}
}
}
@@ -35,6 +35,7 @@ public class DisposeModifier extends LootModifier {
public static void register(RegistryEvent.Register<GlobalLootModifierSerializer<?>> evt) {
evt.getRegistry().register(new Serializer().setRegistryName(prefix("dispose")));
evt.getRegistry().register(new AddRandomItemModifier.Serializer().setRegistryName(prefix("add_item")));
}
@Nonnull
@@ -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)) {