Fix 'break and replace' exploits for gourmaryllis and spectrolus. Migrate all previous NBT-saving to vanilla's BlockEntityTag and loot tables

This commit is contained in:
Vincent Lee committed 2019-11-14 14:25:56 -06:00
1 parent 691e788473
commit bda4cc70b6
17 files changed
+233 -84

No files matched your search

@@ -48,7 +48,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
private static final String TAG_COLLECTOR_X = "collectorX";
private static final String TAG_COLLECTOR_Y = "collectorY";
private static final String TAG_COLLECTOR_Z = "collectorZ";
private static final String TAG_PASSIVE_DECAY_TICKS = "passiveDecayTicks";
public static final String TAG_PASSIVE_DECAY_TICKS = "passiveDecayTicks";
private int mana;
@@ -196,31 +196,6 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
return 1;
}
@Override
public List<ItemStack> getDrops(List<ItemStack> list, LootContext.Builder ctx) {
List<ItemStack> drops = super.getDrops(list, ctx);
populateDropStackNBTs(drops);
return drops;
}
public void populateDropStackNBTs(List<ItemStack> drops) {
if(isPassiveFlower() && ticksExisted > 0 && BotaniaAPI.internalHandler.getPassiveFlowerDecay() > 0) {
ItemStack drop = drops.get(0);
if(!drop.isEmpty()) {
drop.getOrCreateTag().putInt(TAG_PASSIVE_DECAY_TICKS, passiveDecayTicks);
}
}
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
super.onBlockPlacedBy(world, pos, state, entity, stack);
if(isPassiveFlower()) {
CompoundNBT cmp = stack.getOrCreateTag();
passiveDecayTicks = cmp.getInt(TAG_PASSIVE_DECAY_TICKS);
}
}
@Override
public boolean onWanded(PlayerEntity player, ItemStack wand) {
if(player == null)
@@ -35,8 +35,8 @@ public class SubTileGourmaryllis extends TileEntityGeneratingFlower {
private static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_DIGESTING_MANA = "digestingMana";
private static final String TAG_LAST_FOOD = "lastFood";
private static final String TAG_LAST_FOOD_COUNT = "lastFoodCount";
public static final String TAG_LAST_FOOD = "lastFood";
public static final String TAG_LAST_FOOD_COUNT = "lastFoodCount";
private static final int RANGE = 1;
private int cooldown = 0;
@@ -43,7 +43,7 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower {
public static TileEntityType<SubTileHydroangeas> TYPE;
private static final String TAG_BURN_TIME = "burnTime";
private static final String TAG_COOLDOWN = "cooldown";
public static final String TAG_COOLDOWN = "cooldown";
private static final BlockPos[] OFFSETS = { new BlockPos(0, 0, 1), new BlockPos(0, 0, -1), new BlockPos(1, 0, 0), new BlockPos(-1, 0, 0), new BlockPos(-1, 0, 1), new BlockPos(-1, 0, -1), new BlockPos(1, 0, 1), new BlockPos(1, 0, -1) };
@@ -167,23 +167,6 @@ public class SubTileHydroangeas extends TileEntityGeneratingFlower {
cooldown = cmp.getInt(TAG_COOLDOWN);
}
@Override
public void populateDropStackNBTs(List<ItemStack> drops) {
super.populateDropStackNBTs(drops);
int cooldown = this.cooldown;
if(burnTime > 0)
cooldown = getCooldown();
if(cooldown > 0)
ItemNBTHelper.setInt(drops.get(0), TAG_COOLDOWN, getCooldown());
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
super.onBlockPlacedBy(world, pos, state, entity, stack);
cooldown = ItemNBTHelper.getInt(stack, TAG_COOLDOWN, 0);
}
@Override
public boolean canGeneratePassively() {
return burnTime > 0;
@@ -36,7 +36,7 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":munchdew")
public static TileEntityType<SubTileMunchdew> TYPE;
private static final String TAG_COOLDOWN = "cooldown";
public static final String TAG_COOLDOWN = "cooldown";
private static final String TAG_ATE_ONCE = "ateOnce";
private static final int RANGE = 8;
@@ -128,20 +128,6 @@ public class SubTileMunchdew extends TileEntityGeneratingFlower {
ateOnce = cmp.getBoolean(TAG_ATE_ONCE);
}
@Override
public List<ItemStack> getDrops(List<ItemStack> list, LootContext.Builder ctx) {
List<ItemStack> drops = super.getDrops(list, ctx);
if(cooldown > 0)
ItemNBTHelper.setInt(drops.get(0), TAG_COOLDOWN, cooldown);
return drops;
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
super.onBlockPlacedBy(world, pos, state, entity, stack);
cooldown = ItemNBTHelper.getInt(stack, TAG_COOLDOWN, 0);
}
@Override
public int getColor() {
return 0x79C42F;
@@ -35,8 +35,8 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":rafflowsia")
public static TileEntityType<SubTileRafflowsia> TYPE;
private static final String TAG_LAST_FLOWER = "lastFlower";
private static final String TAG_LAST_FLOWER_TIMES = "lastFlowerTimes";
public static final String TAG_LAST_FLOWER = "lastFlower";
public static final String TAG_LAST_FLOWER_TIMES = "lastFlowerTimes";
@Nullable
private Block lastFlower;
@@ -99,26 +99,6 @@ public class SubTileRafflowsia extends TileEntityGeneratingFlower {
lastFlowerTimes = cmp.getInt(TAG_LAST_FLOWER_TIMES);
}
@Override
public void populateDropStackNBTs(List<ItemStack> drops) {
super.populateDropStackNBTs(drops);
ItemStack stack = drops.get(0);
if(lastFlower != null)
ItemNBTHelper.setString(stack, TAG_LAST_FLOWER, lastFlower.getRegistryName().toString());
ItemNBTHelper.setInt(stack, TAG_LAST_FLOWER_TIMES, lastFlowerTimes);
}
@Override
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
super.onBlockPlacedBy(world, pos, state, entity, stack);
ResourceLocation id = ResourceLocation.tryCreate(ItemNBTHelper.getString(stack, TAG_LAST_FLOWER, ""));
if(id != null)
lastFlower = ForgeRegistries.BLOCKS.getValue(id);
lastFlowerTimes = ItemNBTHelper.getInt(stack, TAG_LAST_FLOWER_TIMES, 0);
}
@Override
public RadiusDescriptor getRadius() {
return new RadiusDescriptor.Square(getPos(), RANGE);
@@ -45,7 +45,7 @@ public class SubTileSpectrolus extends TileEntityGeneratingFlower {
@ObjectHolder(LibMisc.MOD_ID + ":spectrolus")
public static TileEntityType<SubTileSpectrolus> TYPE;
private static final String TAG_NEXT_COLOR = "nextColor";
public static final String TAG_NEXT_COLOR = "nextColor";
private static final int WOOL_GEN = 1200;
private static final int SHEEP_GEN = 6400;
private static final int BABY_SHEEP_GEN = 1; // you are a monster
@@ -21,6 +21,7 @@ import net.minecraft.world.storage.loot.ConstantRange;
import net.minecraft.world.storage.loot.DynamicLootEntry;
import net.minecraft.world.storage.loot.ItemLootEntry;
import net.minecraft.world.storage.loot.LootEntry;
import net.minecraft.world.storage.loot.LootFunction;
import net.minecraft.world.storage.loot.LootParameterSets;
import net.minecraft.world.storage.loot.LootPool;
import net.minecraft.world.storage.loot.LootTable;
@@ -31,13 +32,21 @@ import net.minecraft.world.storage.loot.conditions.BlockStateProperty;
import net.minecraft.world.storage.loot.conditions.MatchTool;
import net.minecraft.world.storage.loot.conditions.SurvivesExplosion;
import net.minecraft.world.storage.loot.functions.CopyName;
import net.minecraft.world.storage.loot.functions.CopyNbt;
import net.minecraft.world.storage.loot.functions.ExplosionDecay;
import net.minecraft.world.storage.loot.functions.SetCount;
import net.minecraftforge.registries.ForgeRegistries;
import vazkii.botania.api.subtile.TileEntityGeneratingFlower;
import vazkii.botania.common.block.BlockAltGrass;
import vazkii.botania.common.block.BlockCacophonium;
import vazkii.botania.common.block.BlockModDoubleFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.block.ModSubtiles;
import vazkii.botania.common.block.subtile.generating.SubTileGourmaryllis;
import vazkii.botania.common.block.subtile.generating.SubTileHydroangeas;
import vazkii.botania.common.block.subtile.generating.SubTileMunchdew;
import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibBlockNames;
import vazkii.botania.common.lib.LibMisc;
@@ -90,6 +99,16 @@ public class BlockLootProvider implements IDataProvider {
tables.put(b.getRegistryName(), genRegular(Blocks.NOTE_BLOCK));
else if (b.getRegistryName().getPath().matches(LibBlockNames.METAMORPHIC_PREFIX + "\\w+" + "_stone"))
tables.put(b.getRegistryName(), genMetamorphicStone(b));
else if (b == ModSubtiles.munchdew || b == ModSubtiles.munchdewFloating)
tables.put(b.getRegistryName(), genCopyNbt(b, SubTileMunchdew.TAG_COOLDOWN));
else if (b == ModSubtiles.rafflowsia || b == ModSubtiles.rafflowsiaFloating)
tables.put(b.getRegistryName(), genCopyNbt(b, SubTileRafflowsia.TAG_LAST_FLOWER, SubTileRafflowsia.TAG_LAST_FLOWER_TIMES));
else if (b == ModSubtiles.hydroangeas || b == ModSubtiles.hydroangeasFloating)
tables.put(b.getRegistryName(), genCopyNbt(b, SubTileHydroangeas.TAG_COOLDOWN, TileEntityGeneratingFlower.TAG_PASSIVE_DECAY_TICKS));
else if (b == ModSubtiles.gourmaryllis || b == ModSubtiles.gourmaryllisFloating)
tables.put(b.getRegistryName(), genCopyNbt(b, SubTileGourmaryllis.TAG_LAST_FOOD, SubTileGourmaryllis.TAG_LAST_FOOD_COUNT));
else if (b == ModSubtiles.spectrolus || b == ModSubtiles.spectrolusFloating)
tables.put(b.getRegistryName(), genCopyNbt(b, SubTileSpectrolus.TAG_NEXT_COLOR));
else
tables.put(b.getRegistryName(), genRegular(b));
}
@@ -108,6 +127,16 @@ public class BlockLootProvider implements IDataProvider {
return LootTable.builder();
}
private static LootTable.Builder genCopyNbt(Block b, String... tags) {
LootEntry.Builder<?> entry = ItemLootEntry.builder(b);
LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry)
.acceptCondition(SurvivesExplosion.builder());
for (String tag : tags) {
pool = pool.acceptFunction(CopyNbt.func_215881_a(CopyNbt.Source.BLOCK_ENTITY).func_216056_a(tag, "BlockEntityTag." + tag));
}
return LootTable.builder().addLootPool(pool);
}
private static LootTable.Builder genCellBlock(Block b) {
ItemPredicate.Builder silkPred = ItemPredicate.Builder.create()
.enchantment(new EnchantmentPredicate(Enchantments.SILK_TOUCH, MinMaxBounds.IntBound.atLeast(1)));