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

Refactored Tag Constants (Pt II)

Browse source
This commit is contained in:
Frank 2022-01-23 21:35:48 +01:00
parent fffbc6acc2
commit 14fcb93e3b
28 changed files with 151 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ru/bclib/blocks/BaseDoorBlock.java
View file

@ -19,8 +19,9 @@ import net.minecraft.world.level.block.state.properties.DoorHingeSide;
import net.minecraft.world.level.block.state.properties.DoubleBlockHalf;
import net.minecraft.world.level.storage.loot.LootContext;
import org.jetbrains.annotations.Nullable;
import ru.bclib.api.TagAPI;
import ru.bclib.api.TagAPI.TagLocation;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.client.models.BasePatterns;
import ru.bclib.client.models.ModelsHelper;
import ru.bclib.client.models.PatternsHelper;
@ -151,8 +152,8 @@ public class BaseDoorBlock extends DoorBlock implements RenderLayerProvider, Blo
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(TagAPI.NAMED_BLOCK_DOORS);
itemTags.add(TagAPI.NAMED_ITEM_DOORS);
blockTags.add(NamedBlockTags.DOORS);
itemTags.add(NamedItemTags.DOORS);
}
protected enum DoorType implements StringRepresentable {

14
src/main/java/ru/bclib/blocks/BaseLeavesBlock.java
View file

@ -15,8 +15,10 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import ru.bclib.api.TagAPI;
import ru.bclib.api.TagAPI.TagLocation;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.client.render.BCLRenderLayer;
import ru.bclib.interfaces.BlockModelProvider;
import ru.bclib.interfaces.RenderLayerProvider;
@ -93,9 +95,9 @@ public class BaseLeavesBlock extends LeavesBlock implements BlockModelProvider,
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS);
blockTags.add(TagAPI.NAMED_MINEABLE_HOE);
blockTags.add(TagAPI.NAMED_BLOCK_LEAVES);
itemTags.add(TagAPI.NAMED_ITEM_LEAVES);
blockTags.add(NamedMineableTags.SHEARS);
blockTags.add(NamedMineableTags.HOE);
blockTags.add(NamedBlockTags.LEAVES);
itemTags.add(NamedItemTags.LEAVES);
}
}

8
src/main/java/ru/bclib/blocks/BasePlantBlock.java
View file

@ -32,8 +32,8 @@ import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable;
import ru.bclib.api.TagAPI;
import ru.bclib.api.TagAPI.TagLocation;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.client.models.BasePatterns;
import ru.bclib.client.models.ModelsHelper;
import ru.bclib.client.models.PatternsHelper;
@ -170,7 +170,7 @@ public abstract class BasePlantBlock extends BaseBlockNotFull implements RenderL
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS);
blockTags.add(TagAPI.NAMED_MINEABLE_HOE);
blockTags.add(NamedMineableTags.SHEARS);
blockTags.add(NamedMineableTags.HOE);
}
}

14
src/main/java/ru/bclib/blocks/SimpleLeavesBlock.java
View file

@ -7,8 +7,10 @@ import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import ru.bclib.api.TagAPI;
import ru.bclib.api.TagAPI.TagLocation;
import ru.bclib.api.tag.NamedBlockTags;
import ru.bclib.api.tag.NamedItemTags;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.client.render.BCLRenderLayer;
import ru.bclib.interfaces.RenderLayerProvider;
import ru.bclib.interfaces.TagProvider;
@ -56,9 +58,9 @@ public class SimpleLeavesBlock extends BaseBlockNotFull implements RenderLayerPr
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS);
blockTags.add(TagAPI.NAMED_MINEABLE_HOE);
blockTags.add(TagAPI.NAMED_BLOCK_LEAVES);
itemTags.add(TagAPI.NAMED_ITEM_LEAVES);
blockTags.add(NamedMineableTags.SHEARS);
blockTags.add(NamedMineableTags.HOE);
blockTags.add(NamedBlockTags.LEAVES);
itemTags.add(NamedItemTags.LEAVES);
}
}

8
src/main/java/ru/bclib/blocks/UnderwaterPlantBlock.java
View file

@ -31,8 +31,8 @@ import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.Vec3;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import ru.bclib.api.TagAPI;
import ru.bclib.api.TagAPI.TagLocation;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.client.render.BCLRenderLayer;
import ru.bclib.interfaces.RenderLayerProvider;
import ru.bclib.interfaces.TagProvider;
@ -161,7 +161,7 @@ public abstract class UnderwaterPlantBlock extends BaseBlockNotFull implements R
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS);
blockTags.add(TagAPI.NAMED_MINEABLE_HOE);
blockTags.add(NamedMineableTags.SHEARS);
blockTags.add(NamedMineableTags.HOE);
}
}

8
src/main/java/ru/bclib/blocks/UpDownPlantBlock.java
View file

@ -25,8 +25,8 @@ import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import ru.bclib.api.TagAPI;
import ru.bclib.api.TagAPI.TagLocation;
import ru.bclib.api.tag.NamedMineableTags;
import ru.bclib.api.tag.TagAPI.TagLocation;
import ru.bclib.client.render.BCLRenderLayer;
import ru.bclib.interfaces.RenderLayerProvider;
import ru.bclib.interfaces.TagProvider;
@ -107,7 +107,7 @@ public abstract class UpDownPlantBlock extends BaseBlockNotFull implements Rende
@Override
public void addTags(List<TagLocation<Block>> blockTags, List<TagLocation<Item>> itemTags) {
blockTags.add(TagAPI.NAMED_MINEABLE_SHEARS);
blockTags.add(TagAPI.NAMED_MINEABLE_HOE);
blockTags.add(NamedMineableTags.SHEARS);
blockTags.add(NamedMineableTags.HOE);
}
}