MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Simplified TagAPI due to changes in 1.18.2

Browse source
This commit is contained in:
Frank 2022-05-18 22:25:37 +02:00
parent adfe267cd3
commit a8beba9196
13 changed files with 68 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/ru/betterend/blocks/EndstoneDustBlock.java
View file

@ -4,6 +4,7 @@ import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.BlockGetter;
@ -12,8 +13,9 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.FallingBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.loot.LootContext;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.api.tag.CommonBlockTags;
import ru.bclib.interfaces.TagProvider;
import ru.bclib.interfaces.tools.AddMineableShovel;
import ru.bclib.util.ColorUtil;
@ -44,7 +46,7 @@ public class EndstoneDustBlock extends FallingBlock implements TagProvider, AddM
}
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(NamedCommonBlockTags.END_STONES);
public void addTags(List<TagKey<Block>> blockTags, List<TagKey<Item>> itemTags) {
blockTags.add(CommonBlockTags.END_STONES);
}
}

6
src/main/java/ru/betterend/blocks/MossyGlowshroomCapBlock.java
View file

@ -1,6 +1,8 @@
package ru.betterend.blocks;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.level.block.Block;
@ -10,7 +12,7 @@ import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.material.Material;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.blocks.BaseBlock;
import ru.bclib.interfaces.TagProvider;
import ru.betterend.registry.EndBlocks;
@ -38,7 +40,7 @@ public class MossyGlowshroomCapBlock extends BaseBlock implements TagProvider {
}
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
public void addTags(List<TagKey<Block>> blockTags, List<TagKey<Item>> itemTags) {
blockTags.add(NamedMineableTags.AXE);
}
}

12
src/main/java/ru/betterend/blocks/ShadowGrassBlock.java
View file

@ -3,19 +3,21 @@ package ru.betterend.blocks;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.minecraft.core.BlockPos;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.api.tag.CommonBlockTags;
import ru.bclib.interfaces.TagProvider;
import ru.betterend.blocks.basis.EndTerrainBlock;
import ru.betterend.registry.EndParticles;
import java.util.List;
import java.util.Random;
import net.minecraft.util.RandomSource;
public class ShadowGrassBlock extends EndTerrainBlock implements TagProvider {
@ -40,7 +42,7 @@ public class ShadowGrassBlock extends EndTerrainBlock implements TagProvider {
}
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(NamedCommonBlockTags.END_STONES);
public void addTags(List<TagKey<Block>> blockTags, List<TagKey<Item>> itemTags) {
blockTags.add(CommonBlockTags.END_STONES);
}
}

10
src/main/java/ru/betterend/blocks/basis/EndTerrainBlock.java
View file

@ -1,11 +1,13 @@
package ru.betterend.blocks.basis;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.api.tag.CommonBlockTags;
import ru.bclib.blocks.BaseTerrainBlock;
import ru.bclib.interfaces.TagProvider;
import ru.betterend.interfaces.PottableTerrain;
@ -18,7 +20,7 @@ public class EndTerrainBlock extends BaseTerrainBlock implements PottableTerrain
}
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(NamedCommonBlockTags.END_STONES);
public void addTags(List<TagKey<Block>> blockTags, List<TagKey<Item>> itemTags) {
blockTags.add(CommonBlockTags.END_STONES);
}
}

8
src/main/java/ru/betterend/complexmaterials/MetalMaterial.java
View file

@ -13,10 +13,8 @@ import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.api.tag.*;
import ru.bclib.blocks.BaseBlock;
import ru.bclib.blocks.BaseChainBlock;
import ru.bclib.blocks.BaseDoorBlock;
@ -494,6 +492,6 @@ public class MetalMaterial {
TagAPI.addBlockTag(NamedBlockTags.ANVIL, anvilBlock);
TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, block);
TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, ingot);
TagAPI.addBlockTag(NamedCommonBlockTags.DRAGON_IMMUNE, ore, bars);
TagAPI.addBlockTag(CommonBlockTags.DRAGON_IMMUNE, ore, bars);
}
}

17
src/main/java/ru/betterend/complexmaterials/StoneMaterial.java
View file

@ -4,11 +4,8 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.NamedCommonItemTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.api.tag.*;
import ru.bclib.blocks.BaseBlock;
import ru.bclib.blocks.BaseFurnaceBlock;
import ru.bclib.blocks.BaseRotatedPillarBlock;
@ -183,18 +180,18 @@ public class StoneMaterial {
TagAPI.addItemTag(NamedItemTags.STONE_BRICKS, bricks);
TagAPI.addItemTag(NamedItemTags.STONE_CRAFTING_MATERIALS, stone);
TagAPI.addItemTag(NamedItemTags.STONE_TOOL_MATERIALS, stone);
TagAPI.addItemTag(NamedCommonItemTags.FURNACES, furnace);
TagAPI.addItemTag(CommonItemTags.FURNACES, furnace);
// Block Tags //
TagAPI.addBlockTag(NamedBlockTags.STONE_BRICKS, bricks);
TagAPI.addBlockTag(NamedBlockTags.WALLS, wall, brickWall);
TagAPI.addBlockTag(NamedBlockTags.SLABS, slab, brickSlab);
TagAPI.addBlockTags(pressurePlate, NamedBlockTags.PRESSURE_PLATES, NamedBlockTags.STONE_PRESSURE_PLATES);
TagAPI.addBlockTag(NamedCommonBlockTags.END_STONES, stone);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone);
TagAPI.addBlockTag(NamedCommonBlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall);
TagAPI.addBlockTag(CommonBlockTags.DRAGON_IMMUNE, stone, stairs, slab, wall);
TagAPI.addBlockTag(NamedCommonBlockTags.GEN_END_STONES, stone);
TagAPI.addBlockTag(NamedCommonBlockTags.END_STONES, stone);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, stone);
}
}

6
src/main/java/ru/betterend/integration/EnderscapeIntegration.java
View file

@ -6,7 +6,7 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
import ru.bclib.api.biomes.BiomeAPI;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.CommonBlockTags;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.integration.ModIntegration;
import ru.bclib.world.features.BCLFeature;
@ -44,7 +44,7 @@ public class EnderscapeIntegration extends ModIntegration {
}
});
TagAPI.addBlockTag(NamedCommonBlockTags.GEN_END_STONES, getBlock("nebulite_ore"));
TagAPI.addBlockTag(NamedCommonBlockTags.GEN_END_STONES, getBlock("shadow_quartz_ore"));
TagAPI.addBlockTag(CommonBlockTags.END_STONES, getBlock("nebulite_ore"));
TagAPI.addBlockTag(CommonBlockTags.END_STONES, getBlock("shadow_quartz_ore"));
}
}

11
src/main/java/ru/betterend/integration/NourishIntegration.java
View file

@ -1,8 +1,9 @@
package ru.betterend.integration;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.Item;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.integration.ModIntegration;
import ru.betterend.registry.EndItems;
@ -13,10 +14,10 @@ public class NourishIntegration extends ModIntegration {
@Override
public void init() {
TagLocation<Item> fats = TagLocation.of(getItemTag("fats"));
TagLocation<Item> fruit = TagLocation.of(getItemTag("fruit"));
TagLocation<Item> protein = TagLocation.of(getItemTag("protein"));
TagLocation<Item> sweets = TagLocation.of(getItemTag("sweets"));
TagKey<Item> fats = getItemTag("fats");
TagKey<Item> fruit = getItemTag("fruit");
TagKey<Item> protein = getItemTag("protein");
TagKey<Item> sweets = getItemTag("sweets");
TagAPI.addItemTag(fats, EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED);
TagAPI.addItemTag(

11
src/main/java/ru/betterend/item/tool/EndHammerItem.java
View file

@ -9,8 +9,8 @@ import net.fabricmc.api.Environment;
import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.util.Mth;
import net.minecraft.util.RandomSource;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.Attribute;
@ -25,11 +25,10 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.levelgen.LegacyRandomSource;
import net.minecraft.world.level.material.Material;
import ru.bclib.api.tag.CommonBlockTags;
import ru.bclib.api.tag.NamedCommonItemTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.api.tag.CommonItemTags;
import ru.bclib.client.models.ModelsHelper;
import ru.bclib.interfaces.ItemModelProvider;
import ru.bclib.interfaces.TagProvider;
@ -151,7 +150,7 @@ public class EndHammerItem extends DiggerItem implements ItemModelProvider, TagP
}
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
itemTags.add(NamedCommonItemTags.HAMMERS);
public void addTags(List<TagKey<Block>> blockTags, List<TagKey<Item>> itemTags) {
itemTags.add(CommonItemTags.HAMMERS);
}
}

2
src/main/java/ru/betterend/registry/EndBiomes.java
View file

@ -177,7 +177,7 @@ public class EndBiomes {
return biome;
}
public static BiomePicker.Entry getCaveBiome(int x, int z) {
public static BiomePicker.ActualBiome getCaveBiome(int x, int z) {
return caveBiomeMap.getBiome(x, 5, z);
}
}

17
src/main/java/ru/betterend/registry/EndTags.java
View file

@ -16,12 +16,7 @@ import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.world.level.material.Material;
import ru.bclib.api.BonemealAPI;
import ru.bclib.api.ComposterAPI;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedCommonBlockTags;
import ru.bclib.api.tag.NamedCommonItemTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI;
import ru.bclib.api.tag.*;
import ru.bclib.blocks.BaseVineBlock;
import ru.bclib.blocks.SimpleLeavesBlock;
import ru.betterend.BetterEnd;
@ -109,22 +104,22 @@ public class EndTags {
});
TagAPI.addBlockTag(
NamedCommonBlockTags.GEN_END_STONES,
CommonBlockTags.END_STONES,
EndBlocks.ENDER_ORE,
EndBlocks.BRIMSTONE
);
TagAPI.addBlockTag(NamedCommonBlockTags.END_STONES, EndBlocks.BRIMSTONE);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, EndBlocks.BRIMSTONE);
TagAPI.addBlockTag(NamedBlockTags.ANVIL, EndBlocks.AETERNIUM_ANVIL);
TagAPI.addBlockTag(NamedBlockTags.BEACON_BASE_BLOCKS, EndBlocks.AETERNIUM_BLOCK);
TagAPI.addItemTag(NamedItemTags.BEACON_PAYMENT_ITEMS, EndItems.AETERNIUM_INGOT);
TagAPI.addBlockTag(
NamedCommonBlockTags.DRAGON_IMMUNE,
CommonBlockTags.DRAGON_IMMUNE,
EndBlocks.ENDER_ORE,
EndBlocks.ETERNAL_PEDESTAL,
EndBlocks.FLAVOLITE_RUNED_ETERNAL,
EndBlocks.FLAVOLITE_RUNED
);
TagAPI.addItemTag(NamedCommonItemTags.IRON_INGOTS, EndBlocks.THALLASIUM.ingot);
TagAPI.addItemTag(CommonItemTags.IRON_INGOTS, EndBlocks.THALLASIUM.ingot);
TagAPI.addItemTag(ALLOYING_IRON, Items.IRON_ORE, Items.DEEPSLATE_IRON_ORE, Items.RAW_IRON);
TagAPI.addItemTag(ALLOYING_GOLD, Items.GOLD_ORE, Items.DEEPSLATE_GOLD_ORE, Items.RAW_GOLD);
@ -132,7 +127,7 @@ public class EndTags {
}
public static void addEndGround(Block bl){
TagAPI.addBlockTag(NamedCommonBlockTags.END_STONES, bl);
TagAPI.addBlockTag(CommonBlockTags.END_STONES, bl);
}
public static void addBiomeSurfaceToEndGroup(EndBiome b){

10
src/main/java/ru/betterend/world/features/terrain/caves/EndCaveFeature.java
View file

@ -29,7 +29,7 @@ import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import net.minecraft.util.RandomSource;
import java.util.Set;
@ -59,7 +59,7 @@ public abstract class EndCaveFeature extends DefaultFeature {
return false;
}
BiomePicker.Entry biome = EndBiomes.getCaveBiome(pos.getX(), pos.getZ());
BiomePicker.ActualBiome biome = EndBiomes.getCaveBiome(pos.getX(), pos.getZ());
Set<BlockPos> caveBlocks = generate(world, center, radius, random);
if (!caveBlocks.isEmpty()) {
if (biome != null) {
@ -151,12 +151,12 @@ public abstract class EndCaveFeature extends DefaultFeature {
return false;
}
protected void setBiomes(WorldGenLevel world, BiomePicker.Entry biome, Set<BlockPos> blocks) {
protected void setBiomes(WorldGenLevel world, BiomePicker.ActualBiome biome, Set<BlockPos> blocks) {
blocks.forEach((pos) -> setBiome(world, pos, biome));
}
protected void setBiome(WorldGenLevel world, BlockPos pos, BiomePicker.Entry biome) {
BiomeAPI.setBiome(world, pos, biome.actual);
protected void setBiome(WorldGenLevel world, BlockPos pos, BiomePicker.ActualBiome biome) {
BiomeAPI.setBiome(world, pos, biome.biome);
}
private BlockPos findPos(WorldGenLevel world, BlockPos pos, int radius, RandomSource random) {

10
src/main/java/ru/betterend/world/features/terrain/caves/TunelCaveFeature.java
View file

@ -29,7 +29,7 @@ import ru.betterend.world.biome.cave.EndCaveBiome;
import java.util.Map;
import java.util.Optional;
import java.util.Random;
import net.minecraft.util.RandomSource;
import java.util.Set;
import java.util.stream.IntStream;
@ -132,13 +132,13 @@ public class TunelCaveFeature extends EndCaveFeature {
return false;
}
Map<BiomePicker.Entry, Set<BlockPos>> floorSets = Maps.newHashMap();
Map<BiomePicker.Entry, Set<BlockPos>> ceilSets = Maps.newHashMap();
Map<BiomePicker.ActualBiome, Set<BlockPos>> floorSets = Maps.newHashMap();
Map<BiomePicker.ActualBiome, Set<BlockPos>> ceilSets = Maps.newHashMap();
MutableBlockPos mut = new MutableBlockPos();
Set<BlockPos> remove = Sets.newHashSet();
caveBlocks.forEach((bpos) -> {
mut.set(bpos);
BiomePicker.Entry bio = EndBiomes.getCaveBiome(bpos.getX(), bpos.getZ());
BiomePicker.ActualBiome bio = EndBiomes.getCaveBiome(bpos.getX(), bpos.getZ());
int height = world.getHeight(Types.WORLD_SURFACE, bpos.getX(), bpos.getZ());
if (mut.getY() >= height) {
remove.add(bpos);
@ -178,7 +178,7 @@ public class TunelCaveFeature extends EndCaveFeature {
ceilSets.forEach((biome, ceilPositions) -> {
placeCeil(world, (EndCaveBiome) biome.bclBiome, ceilPositions, random);
});
BiomePicker.Entry biome = EndBiomes.getCaveBiome(pos.getX(), pos.getZ());
BiomePicker.ActualBiome biome = EndBiomes.getCaveBiome(pos.getX(), pos.getZ());
placeWalls(world, (EndCaveBiome) biome.bclBiome, caveBlocks, random);
fixBlocks(world, caveBlocks);