From e71a62f0f8f62cec49d1740a2accb07f1d1e2e20 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 14 Jul 2020 10:15:09 -0500 Subject: [PATCH] Bump forge, reorganize gog seed inject so the table is separate from the loot modifier --- build.gradle | 2 +- .../loot_modifiers/global_loot_modifiers.json | 2 +- .../loot_modifiers/skyblock_seeds.json | 22 +++++++++ .../loot_tables/extra_seeds.json | 37 +++++++++++++++ .../block/decor/panes/BlockModPane.java | 7 --- .../functional/SubTileMarimorphosis.java | 3 +- .../subtile/functional/SubTileOrechid.java | 2 +- ...emModifier.java => CallTableModifier.java} | 32 ++++++------- .../common/core/loot/DisposeModifier.java | 2 +- .../common/entity/EntityEnderAirBottle.java | 3 +- .../loot_modifiers/skyblock_seeds.json | 45 ------------------- 11 files changed, 79 insertions(+), 78 deletions(-) create mode 100644 garden_of_glass/src/main/resources/data/gardenofglass/loot_modifiers/skyblock_seeds.json create mode 100644 garden_of_glass/src/main/resources/data/gardenofglass/loot_tables/extra_seeds.json rename src/main/java/vazkii/botania/common/core/loot/{AddRandomItemModifier.java => CallTableModifier.java} (50%) delete mode 100644 src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json diff --git a/build.gradle b/build.gradle index aa7600e2d..0410a3f70 100644 --- a/build.gradle +++ b/build.gradle @@ -101,7 +101,7 @@ test { } dependencies { - minecraft "net.minecraftforge:forge:${mc_version}-32.0.32" + minecraft "net.minecraftforge:forge:${mc_version}-32.0.66" compileOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-38:api") runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:1.16-38") 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 index ab59c791e..d18359015 100644 --- 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 @@ -1,6 +1,6 @@ { "replace": false, "entries": [ - "botania:skyblock_seeds" + "gardenofglass:skyblock_seeds" ] } diff --git a/garden_of_glass/src/main/resources/data/gardenofglass/loot_modifiers/skyblock_seeds.json b/garden_of_glass/src/main/resources/data/gardenofglass/loot_modifiers/skyblock_seeds.json new file mode 100644 index 000000000..0f728a15d --- /dev/null +++ b/garden_of_glass/src/main/resources/data/gardenofglass/loot_modifiers/skyblock_seeds.json @@ -0,0 +1,22 @@ +{ + "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" + } + } + ] + } + ], + "type": "botania:call_table", + "table": "gardenofglass:extra_seeds" +} diff --git a/garden_of_glass/src/main/resources/data/gardenofglass/loot_tables/extra_seeds.json b/garden_of_glass/src/main/resources/data/gardenofglass/loot_tables/extra_seeds.json new file mode 100644 index 000000000..06eea3926 --- /dev/null +++ b/garden_of_glass/src/main/resources/data/gardenofglass/loot_tables/extra_seeds.json @@ -0,0 +1,37 @@ +{ + "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:survives_explosion" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.03125 + }, + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:match_tool", + "predicate": { + "item": "minecraft:shears" + } + } + } + ] + } + ] +} diff --git a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java index 6efc9cc9d..b009c7429 100644 --- a/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java +++ b/src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java @@ -22,11 +22,4 @@ public class BlockModPane extends PaneBlock { public BlockModPane(Properties props) { super(props); } - - @Override - public boolean canBeConnectedTo(BlockState state, IBlockReader world, BlockPos pos, Direction facing) { - Block block = world.getBlockState(pos.offset(facing)).getBlock(); - return block == ModBlocks.elfGlass || block == ModBlocks.manaGlass || block == ModBlocks.bifrostPerm - || super.canBeConnectedTo(state, world, pos, facing); - } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 89cd3392e..025976a95 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -126,11 +126,10 @@ public class SubTileMarimorphosis extends TileEntityFunctionalFlower { int range = getRange(); int rangeY = getRangeY(); - BlockStateMatcher matcher = BlockStateMatcher.forBlock(Blocks.STONE); for (BlockPos pos : BlockPos.getAllInBoxMutable(getEffectivePos().add(-range, -rangeY, -range), getEffectivePos().add(range, rangeY, range))) { BlockState state = getWorld().getBlockState(pos); - if (state.getBlock().isReplaceableOreGen(state, getWorld(), pos, matcher)) { + if (state.getBlock() == Blocks.STONE) { possibleCoords.add(pos.toImmutable()); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index ffd0d5969..67df73ca2 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -107,7 +107,7 @@ public class SubTileOrechid extends TileEntityFunctionalFlower { for (BlockPos pos : BlockPos.getAllInBoxMutable(getEffectivePos().add(-RANGE, -RANGE_Y, -RANGE), getEffectivePos().add(RANGE, RANGE_Y, RANGE))) { BlockState state = getWorld().getBlockState(pos); - if (state.getBlock().isReplaceableOreGen(state, getWorld(), pos, getReplaceMatcher())) { + if (getReplaceMatcher().test(state)) { possibleCoords.add(pos.toImmutable()); } } diff --git a/src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java b/src/main/java/vazkii/botania/common/core/loot/CallTableModifier.java similarity index 50% rename from src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java rename to src/main/java/vazkii/botania/common/core/loot/CallTableModifier.java index 6afe56229..1caaabea0 100644 --- a/src/main/java/vazkii/botania/common/core/loot/AddRandomItemModifier.java +++ b/src/main/java/vazkii/botania/common/core/loot/CallTableModifier.java @@ -8,17 +8,14 @@ */ 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.loot.LootContext; +import net.minecraft.loot.LootTable; import net.minecraft.loot.conditions.ILootCondition; import net.minecraft.util.JSONUtils; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.crafting.CraftingHelper; import net.minecraftforge.common.loot.GlobalLootModifierSerializer; import net.minecraftforge.common.loot.LootModifier; @@ -26,31 +23,30 @@ import javax.annotation.Nonnull; import java.util.List; -public class AddRandomItemModifier extends LootModifier { - private final List items; +/** + * Global loot modifier that calls another loot table and appends all of the yielded stacks to the existing loot + */ +public class CallTableModifier extends LootModifier { + private final ResourceLocation tableId; - protected AddRandomItemModifier(ILootCondition[] conditionsIn, List items) { + protected CallTableModifier(ILootCondition[] conditionsIn, ResourceLocation table) { super(conditionsIn); - this.items = items; + this.tableId = table; } @Nonnull @Override protected List doApply(List generatedLoot, LootContext context) { - ItemStack stack = items.get(context.getRandom().nextInt(items.size())); - generatedLoot.add(stack.copy()); + LootTable table = context.getWorld().getServer().getLootTableManager().getLootTableFromLocation(tableId); + table.generate(context, generatedLoot::add); return generatedLoot; } - public static class Serializer extends GlobalLootModifierSerializer { + 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()); + public CallTableModifier read(ResourceLocation location, JsonObject object, ILootCondition[] ailootcondition) { + String table = JSONUtils.getString(object, "table"); + return new CallTableModifier(ailootcondition, new ResourceLocation(table)); } } } 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 5a8595ae4..b40fd424b 100644 --- a/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java +++ b/src/main/java/vazkii/botania/common/core/loot/DisposeModifier.java @@ -35,7 +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"))); + evt.getRegistry().register(new CallTableModifier.Serializer().setRegistryName(prefix("call_table"))); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 43430be61..992cf3d48 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -72,8 +72,7 @@ public class EntityEnderAirBottle extends ThrowableEntity implements IRendersAsI for (BlockPos bPos : BlockPos.getAllInBoxMutable(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { BlockState state = world.getBlockState(bPos); - Block block = state.getBlock(); - if (block.isReplaceableOreGen(state, world, bPos, BlockStateMatcher.forBlock(Blocks.STONE))) { + if (state.getBlock() == Blocks.STONE) { possibleCoords.add(bPos.toImmutable()); } } diff --git a/src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json b/src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json deleted file mode 100644 index 7086332f9..000000000 --- a/src/main/resources/data/botania/loot_modifiers/skyblock_seeds.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "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" - } - ] -}