MinecraftMods/Arias-Essentials
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Add changed files

Browse source
This commit is contained in:
zontreck 2024-10-10 02:17:15 -07:00
parent 728b2467a3
commit 9653e273e4
499 changed files with 108 additions and 24346 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/dev/zontreck/essentials/AriasEssentials.java
View file

@ -105,7 +105,6 @@ public class AriasEssentials {
ModItems.register(bus);
ModBlocks.register(bus);
ModEntities.register(bus);
CreativeModeTabs.register(bus);
}

16
src/main/java/dev/zontreck/essentials/blocks/BlockCustomVoxels.java Normal file
View file

@ -0,0 +1,16 @@
package dev.zontreck.essentials.blocks;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.phys.shapes.VoxelShape;
public class BlockCustomVoxels extends Block {
VoxelShape shape;
public BlockCustomVoxels(Properties pProperties, VoxelShape shape) {
super(pProperties);
this.shape=shape;
}
public VoxelShape getShape() {
return shape;
}
}

55
src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java
View file

@ -1,14 +1,7 @@
package dev.zontreck.essentials.blocks;
import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.blocks.logicgates.TFlipFlopBlock;
import dev.zontreck.essentials.items.CreativeModeTabs;
import dev.zontreck.libzontreck.blocks.BlockCustomVoxels;
import dev.zontreck.libzontreck.blocks.PartialTransparentBlock;
import dev.zontreck.libzontreck.blocks.PartialTransparentSlabBlock;
import dev.zontreck.libzontreck.blocks.RotatableBlockCustomVoxels;
import dev.zontreck.libzontreck.edlibmc.Auxiliaries;
import dev.zontreck.libzontreck.edlibmc.StandardBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.BlockItem;
@ -19,18 +12,11 @@ import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.ShulkerBoxBlockEntity;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.shapes.BooleanOp;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.stream.Stream;
public class ModBlocks {
private static BlockBehaviour.StatePredicate shulkerState = (p_152653_, p_152654_, p_152655_) -> {
@ -67,7 +53,7 @@ public class ModBlocks {
private static BlockBehaviour.Properties standardBehavior()
{
return BlockBehaviour.Properties.of().requiresCorrectToolForDrops().strength(7F).destroyTime(6).isValidSpawn(ModBlocks::neverSpawn);
return BlockBehaviour.Properties.copy(Blocks.STONE).requiresCorrectToolForDrops().strength(7F).destroyTime(6).isValidSpawn(ModBlocks::neverSpawn);
}
private static BlockBehaviour.Properties gratingBlock()
{
@ -128,29 +114,7 @@ public class ModBlocks {
*/
public static final RegistryObject<Block> CLINKER_BRICK_BLOCK = registerWithItem(BLOCKS.register("clinker_brick_block", ()->new StandardBlocks.BaseBlock(
StandardBlocks.CFG_DEFAULT,
BlockBehaviour.Properties.of().strength(0.5f, 7f).sound(SoundType.STONE)
)), new Item.Properties());
public static final RegistryObject<Block> CLINKER_BRICK_RECESSED = registerWithItem(BLOCKS.register("clinker_brick_recessed", ()->new StandardBlocks.HorizontalWaterLoggable(
StandardBlocks.CFG_CUTOUT|StandardBlocks.CFG_HORIZIONTAL|StandardBlocks.CFG_LOOK_PLACEMENT,
BlockBehaviour.Properties.of().strength(0.5f, 7f).sound(SoundType.STONE),
new AABB[] {
Auxiliaries.getPixeledAABB( 3,0, 0, 13,16, 1),
Auxiliaries.getPixeledAABB( 0,0, 1, 16,16,11),
Auxiliaries.getPixeledAABB( 4,0,11, 12,16,13)
}
)), new Item.Properties());
public static final RegistryObject<Block> CLINKER_BRICK_VERTICALLY_SLIT = registerWithItem(BLOCKS.register("clinker_brick_vertically_slit", ()->new StandardBlocks.HorizontalWaterLoggable(
StandardBlocks.CFG_CUTOUT|StandardBlocks.CFG_HORIZIONTAL|StandardBlocks.CFG_LOOK_PLACEMENT,
BlockBehaviour.Properties.of().strength(0.5f, 7f).sound(SoundType.STONE),
new AABB[] {
Auxiliaries.getPixeledAABB( 3,0, 0, 13,16, 1),
Auxiliaries.getPixeledAABB( 3,0,15, 13,16,16),
Auxiliaries.getPixeledAABB( 0,0, 1, 16,16,15)
}
public static final RegistryObject<Block> CLINKER_BRICK_BLOCK = registerWithItem(BLOCKS.register("clinker_brick_block", ()->new Block(standardBehavior().strength(0.5f, 7f).sound(SoundType.STONE)
)), new Item.Properties());
public static final RegistryObject<Block> CLINKER_BRICK_SLAB = registerWithItem(BLOCKS.register("clinker_brick_slab", ()->new SlabBlock(BlockBehaviour.Properties.copy(Blocks.STONE_SLAB))), new Item.Properties());
@ -200,9 +164,9 @@ public class ModBlocks {
BlockBehaviour.Properties.of().strength(1.0f, 2000f).sound(SoundType.STONE).isValidSpawn(ModBlocks::neverSpawn)
)), new Item.Properties());*/
public static final RegistryObject<Block> PANZER_GLASS_BLOCK = registerWithItem(BLOCKS.register("panzerglass_block", ()-> new PartialTransparentBlock(BlockBehaviour.Properties.of().noOcclusion().strength(0.5f, 2000f).isValidSpawn(ModBlocks::neverSpawn).sound(SoundType.METAL))), new Item.Properties());
public static final RegistryObject<Block> PANZER_GLASS_BLOCK = registerWithItem(BLOCKS.register("panzerglass_block", ()-> new Block(noViewBlocking().noOcclusion().strength(0.5f, 2000f).isValidSpawn(ModBlocks::neverSpawn).sound(SoundType.METAL))), new Item.Properties());
public static final RegistryObject<Block> PANZER_GLASS_SLAB = registerWithItem(BLOCKS.register("panzerglass_slab", ()-> new PartialTransparentSlabBlock(BlockBehaviour.Properties.of().noOcclusion().strength(0.5f, 2000f).isValidSpawn(ModBlocks::neverSpawn).sound(SoundType.METAL))), new Item.Properties());
public static final RegistryObject<Block> PANZER_GLASS_SLAB = registerWithItem(BLOCKS.register("panzerglass_slab", ()-> new SlabBlock(noViewBlocking().noOcclusion().strength(0.5f, 2000f).isValidSpawn(ModBlocks::neverSpawn).sound(SoundType.METAL))), new Item.Properties());
public static final RegistryObject<Block> OLD_INDUSTRIAL_WOOD_PLANKS = registerWithItem(BLOCKS.register("old_industrial_wood_planks", ()-> new Block(BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS).strength(0.5f, 6f).sound(SoundType.WOOD))), new Item.Properties());
@ -210,7 +174,9 @@ public class ModBlocks {
public static final RegistryObject<Block> OLD_INDUSTRIAL_WOOD_STAIRS = registerWithItem(BLOCKS.register("old_industrial_wood_stairs", ()-> new StairBlock(ModBlocks.OLD_INDUSTRIAL_WOOD_PLANKS.get()::defaultBlockState, BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS).strength(0.5f, 6f).sound(SoundType.WOOD))), new Item.Properties());
public static final RegistryObject<Block> OLD_INDUSTRIAL_WOOD_DOOR = registerWithItem(BLOCKS.register("old_industrial_wood_door", ()-> new DoorBlock(BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS).strength(0.5f, 6f).noOcclusion(), BlockSetType.DARK_OAK)), new Item.Properties());
public static final RegistryObject<Block> OLD_INDUSTRIAL_WOOD_DOOR = registerWithItem(BLOCKS.register("old_industrial_wood_door", ()-> new DoorBlock(BlockBehaviour.Properties.copy(Blocks.OAK_PLANKS).strength(0.5f, 6f).noOcclusion().sound(SoundType.WOOD))), new Item.Properties());
/*
public static final RegistryObject<Block> STEEL_CATWALK = registerWithItem(BLOCKS.register("steel_catwalk", ()-> new BlockCustomVoxels(gratingBlock, Block.box(0, 0, 0, 16, 2, 16))), new Item.Properties());
@ -322,9 +288,16 @@ public class ModBlocks {
public static final RegistryObject<Block> STEEL_CATWALK_BLOCK = registerWithItem(BLOCKS.register("steel_catwalk_block", ()-> new Block(gratingBlock)), new Item.Properties());
*/
/*
public static final VoxelShape SHAPE_T_FLIPFLOP = Block.box(0, 0, 0, 16, 1, 16);
public static final RegistryObject<Block> TFLIPFLOP_BLOCK = registerWithItem(BLOCKS.register("tflipflop", () -> new TFlipFlopBlock(noViewBlocking().noOcclusion().noCollission())), new Item.Properties());
*/
}

55
src/main/java/dev/zontreck/essentials/blocks/logicgates/TFlipFlopBlock.java
View file

@ -1,55 +0,0 @@
package dev.zontreck.essentials.blocks.logicgates;
import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.blocks.ModBlocks;
import dev.zontreck.libzontreck.blocks.RedstoneBlock;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.nbt.NbtUtils;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
public class TFlipFlopBlock extends RedstoneBlock
{
public TFlipFlopBlock(Properties p_49795_) {
super(p_49795_, Direction.NORTH, Direction.SOUTH);
}
@Override
public boolean propagatesSkylightDown(BlockState p_49928_, BlockGetter p_49929_, BlockPos p_49930_) {
return true;
}
@Override
public VoxelShape getShape(BlockState p_60555_, BlockGetter p_60556_, BlockPos p_60557_, CollisionContext p_60558_) {
return ModBlocks.SHAPE_T_FLIPFLOP;
}
@Override
protected void onRedstone(LevelReader levelReader, BlockPos blockPos, boolean b) {
}
@Override
protected void onRedstoneInputChanged(LevelReader levelReader, BlockPos blockPos, boolean b) {
BlockState state = levelReader.getBlockState(blockPos);
AriasEssentials.LOGGER.info("Redstone connected to TFlipFlop block, B : " + b + "; INP:" + state.getValue(INPUT_POWER) + "; POW:" + state.getValue(POWERED));
if (b) {
if (state.getValue(POWERED)) {
state.setValue(POWERED, false);
} else {
state.setValue(POWERED, true);
}
}
}
@Override
public int getSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
int signal = super.getSignal(state, level, pos, direction);
return state.getValue(FACING) == direction ? signal : 0;
}
}

15
src/main/java/dev/zontreck/essentials/client/renderer/HeartsRenderer.java
View file

@ -17,7 +17,6 @@ import dev.zontreck.essentials.configs.client.AEClientConfig;
import net.minecraft.Util;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.effect.MobEffectInstance;
@ -67,8 +66,8 @@ public class HeartsRenderer {
* @param width Width to draw
* @param height Height to draw
*/
private void blit(GuiGraphics matrixStack, int x, int y, int textureX, int textureY, int width, int height, ResourceLocation resource) {
matrixStack.blit(resource, x, y, textureX, textureY, width, height);
private void blit(PoseStack matrixStack, int x, int y, int textureX, int textureY, int width, int height, ResourceLocation resource) {
blit(matrixStack, x, y, textureX, textureY, width, height, resource);
}
/* HUD */
@ -178,7 +177,7 @@ public class HeartsRenderer {
MARGIN += 72;
float absorbRemaining = absorb;
GuiGraphics matrixStack = event.getGuiGraphics();
PoseStack matrixStack = event.getPoseStack();
for (int i = Mth.ceil((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) {
int row = Mth.ceil((float) (i + 1) / 10.0F) - 1;
int x = left + i % 10 * 8;
@ -229,7 +228,7 @@ public class HeartsRenderer {
RenderSystem.disableBlend();
this.mc.getProfiler().pop();
MinecraftForge.EVENT_BUS
.post(new RenderGuiOverlayEvent.Post(mc.getWindow(), event.getGuiGraphics(), event.getPartialTick(), ActualOverlay));
.post(new RenderGuiOverlayEvent.Post(mc.getWindow(), event.getPoseStack(), event.getPartialTick(), ActualOverlay));
}
/**
@ -263,7 +262,7 @@ public class HeartsRenderer {
* @param yBasePos Health bar top corner
* @param player Player instance
*/
private void renderExtraHearts(GuiGraphics matrixStack, int xBasePos, int yBasePos, Player player) {
private void renderExtraHearts(PoseStack matrixStack, int xBasePos, int yBasePos, Player player) {
int potionOffset = this.getPotionOffset(player);
// Extra hearts
@ -280,7 +279,7 @@ public class HeartsRenderer {
* @param yBasePos Health bar top corner
* @param player Player instance
*/
private void renderExtraAbsorption(GuiGraphics matrixStack, int xBasePos, int yBasePos, Player player) {
private void renderExtraAbsorption(PoseStack matrixStack, int xBasePos, int yBasePos, Player player) {
int potionOffset = this.getPotionOffset(player);
// Extra hearts
@ -309,7 +308,7 @@ public class HeartsRenderer {
* @param count Number to render
* @param absorb If true, render absorption hearts
*/
private void renderCustomHearts(GuiGraphics matrixStack, int xBasePos, int yBasePos, int potionOffset, int count,
private void renderCustomHearts(PoseStack matrixStack, int xBasePos, int yBasePos, int potionOffset, int count,
boolean absorb) {
int regenOffset = absorb ? 10 : 0;
for (int iter = 0; iter < count / 20; iter++) {

35
src/main/java/dev/zontreck/essentials/client/renderer/TimeBoostEntityRenderer.java
View file

@ -1,16 +1,16 @@
package dev.zontreck.essentials.client.renderer;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Axis;
import com.mojang.math.Quaternion;
import com.mojang.math.Vector3f;
import dev.zontreck.essentials.entities.TimeBoostEntity;
import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.renderer.MultiBufferSource;
import net.minecraft.client.renderer.entity.EntityRenderer;
import net.minecraft.client.renderer.entity.EntityRendererProvider;
import net.minecraft.resources.ResourceLocation;
import org.joml.Quaternionf;
import org.joml.Vector3f;
public class TimeBoostEntityRenderer extends EntityRenderer<TimeBoostEntity>
{
@ -25,12 +25,13 @@ public class TimeBoostEntityRenderer extends EntityRenderer<TimeBoostEntity>
public void render(TimeBoostEntity entity, float entityYaw, float partialTicks, PoseStack matrixStack, MultiBufferSource bufferIn, int packedLightIn) {
String timeRate = "x" + 2 * entity.getTimeRate();
float paddingLeftRight = 2 * entity.getTimeRate() < 10 ? 0.11F : 0.19F;
drawText(matrixStack, bufferIn, timeRate, new Vector3f(-paddingLeftRight, 0.064F, 0.51F), Axis.YP.rotationDegrees(0), ChatFormatting.WHITE.getColor()); // Front
drawText(matrixStack, bufferIn, timeRate, new Vector3f(paddingLeftRight, 0.064F, -0.51F), Axis.YP.rotationDegrees(180F), ChatFormatting.WHITE.getColor()); // Back
drawText(matrixStack, bufferIn, timeRate, new Vector3f(0.51F, 0.064F, paddingLeftRight), Axis.YP.rotationDegrees(90F), ChatFormatting.WHITE.getColor()); // Right
drawText(matrixStack, bufferIn, timeRate, new Vector3f(-0.51F, 0.064F, -paddingLeftRight), Axis.YP.rotationDegrees(-90F), ChatFormatting.WHITE.getColor()); // Left
drawText(matrixStack, bufferIn, timeRate, new Vector3f(-paddingLeftRight, 0.51F, -0.064F), Axis.XP.rotationDegrees(90F), ChatFormatting.WHITE.getColor()); // Top
drawText(matrixStack, bufferIn, timeRate, new Vector3f(-paddingLeftRight, -0.51F, 0.064F), Axis.XP.rotationDegrees(-90F), ChatFormatting.WHITE.getColor()); // Bottom
drawText(matrixStack, timeRate, new Vector3f(-paddingLeftRight, 0.064F, 0.51F), Vector3f.YP.rotationDegrees(0), ChatFormatting.WHITE.getColor()); // Front
drawText(matrixStack, timeRate, new Vector3f(paddingLeftRight, 0.064F, -0.51F), Vector3f.YP.rotationDegrees(180F), ChatFormatting.WHITE.getColor()); // Back
drawText(matrixStack, timeRate, new Vector3f(0.51F, 0.064F, paddingLeftRight), Vector3f.YP.rotationDegrees(90F), ChatFormatting.WHITE.getColor()); // Right
drawText(matrixStack, timeRate, new Vector3f(-0.51F, 0.064F, -paddingLeftRight), Vector3f.YP.rotationDegrees(-90F), ChatFormatting.WHITE.getColor()); // Left
drawText(matrixStack, timeRate, new Vector3f(-paddingLeftRight, 0.51F, -0.064F), Vector3f.XP.rotationDegrees(90F), ChatFormatting.WHITE.getColor()); // Top
drawText(matrixStack, timeRate, new Vector3f(-paddingLeftRight, -0.51F, 0.064F), Vector3f.XP.rotationDegrees(-90F), ChatFormatting.WHITE.getColor()); // Bottom
}
@Override
@ -38,23 +39,13 @@ public class TimeBoostEntityRenderer extends EntityRenderer<TimeBoostEntity>
return null;
}
private void drawText(PoseStack matrixStack, MultiBufferSource source, String text, Vector3f translateVector, Quaternionf rotate, int color) {
private void drawText(PoseStack matrixStack, String text, Vector3f translateVector, Quaternion rotate, int color) {
matrixStack.pushPose();
matrixStack.translate(translateVector.x(), translateVector.y(), translateVector.z());
matrixStack.scale(0.02F, -0.02F, 0.02F);
matrixStack.mulPose(rotate);
getFont().drawInBatch(
text,
0,
0,
-1,
false,
matrixStack.last().pose(),
source,
Font.DisplayMode.NORMAL,
0,
color
);
Font fontRenderer = Minecraft.getInstance().gui.getFont();
fontRenderer.draw(matrixStack, text, 0, 0, color);
matrixStack.popPose();
}
}

6
src/main/java/dev/zontreck/essentials/commands/homes/SetHomeCommand.java
View file

@ -60,7 +60,7 @@ public class SetHomeCommand {
p = ctx.getPlayerOrException();
if(TeleportActioner.isBlacklistedDimension(p.serverLevel()))
if(TeleportActioner.isBlacklistedDimension(p.getLevel()))
{
ChatHelpers.broadcastTo(p, ChatHelpers.macro(Messages.ESSENTIALS_PREFIX + AEServerConfig.getInstance().messages.BlacklistedDimensionError), p.server);
@ -70,8 +70,8 @@ public class SetHomeCommand {
Vec3 position = p.position();
Vec2 rot = p.getRotationVector();
TeleportDestination dest = new TeleportDestination(new Vector3d(position), new Vector2f(rot), p.serverLevel());
BlockState bs = p.serverLevel().getBlockState(dest.Position.moveDown().asBlockPos());
TeleportDestination dest = new TeleportDestination(new Vector3d(position), new Vector2f(rot), p.getLevel());
BlockState bs = p.getLevel().getBlockState(dest.Position.moveDown().asBlockPos());
Home newhome = new Home(p, homeName, dest, new ItemStack(p.getBlockStateOn().getBlock().asItem()));
AriasEssentials.player_homes.get(p.getUUID()).add(newhome);

2
src/main/java/dev/zontreck/essentials/commands/teleport/RTPCommand.java
View file

@ -58,7 +58,7 @@ public class RTPCommand {
Vec3 pos = pla.position();
//boolean found_place= false;
RandomPositionFactory.beginRTP(pla, pla.serverLevel());
RandomPositionFactory.beginRTP(pla, pla.getLevel());
}

4
src/main/java/dev/zontreck/essentials/commands/teleport/SpawnCommand.java
View file

@ -36,10 +36,10 @@ public class SpawnCommand {
ChatHelpers.broadcastTo(p.getUUID(), ChatHelpers.macro(Messages.RESPAWNING), p.server);
BlockPos spawn = p.serverLevel().getSharedSpawnPos();
BlockPos spawn = p.getLevel().getSharedSpawnPos();
TeleportActioner.ApplyTeleportEffect(p);
TeleportContainer cont = new TeleportContainer(p, new Vec3(spawn.getX(), spawn.getY(), spawn.getZ()), Vec2.ZERO, p.serverLevel());
TeleportContainer cont = new TeleportContainer(p, new Vec3(spawn.getX(), spawn.getY(), spawn.getZ()), Vec2.ZERO, p.getLevel());
TeleportActioner.PerformTeleport(cont, false);

2
src/main/java/dev/zontreck/essentials/commands/teleport/TPAcceptCommand.java
View file

@ -54,7 +54,7 @@ public class TPAcceptCommand {
cont.PlayerInst = from;
cont.Position = to.position();
cont.Rotation = to.getRotationVector();
cont.Dimension = to.serverLevel();
cont.Dimension = to.getLevel();
TeleportActioner.ApplyTeleportEffect(from);
TeleportActioner.PerformTeleport(cont, false);

3
src/main/java/dev/zontreck/essentials/commands/teleport/TeleportActioner.java
View file

@ -4,7 +4,6 @@ import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.configs.server.AEServerConfig;
import dev.zontreck.libzontreck.vectors.Vector3d;
import dev.zontreck.libzontreck.vectors.WorldPosition;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.commands.EffectCommands;
import net.minecraft.server.level.ServerLevel;
@ -30,7 +29,7 @@ public class TeleportActioner
}
public static void ApplyTeleportEffect(ServerPlayer player){
if(isBlacklistedDimension(player.serverLevel())){
if(isBlacklistedDimension(player.getLevel())){
return;
}
// 10/05/2022 - Thinking ahead here to future proof it so i can do things in threads safely

2
src/main/java/dev/zontreck/essentials/commands/warps/RTPWarpCommand.java
View file

@ -51,7 +51,7 @@ public class RTPWarpCommand {
Vec3 position = p.position();
Vec2 rot = p.getRotationVector();
TeleportDestination dest = new TeleportDestination(new Vector3d(position), new Vector2f(rot), p.serverLevel());
TeleportDestination dest = new TeleportDestination(new Vector3d(position), new Vector2f(rot), p.getLevel());
Warp warp = new Warp(p.getUUID(), string, true, true, dest, new ItemStack(p.getFeetBlockState().getBlock().asItem()));
WarpCreatedEvent event = new WarpCreatedEvent(warp);
if(MinecraftForge.EVENT_BUS.post(event))

4
src/main/java/dev/zontreck/essentials/commands/warps/SetWarpCommand.java
View file

@ -53,8 +53,8 @@ public class SetWarpCommand {
Vec3 position = p.position();
Vec2 rot = p.getRotationVector();
TeleportDestination dest = new TeleportDestination(new Vector3d(position), new Vector2f(rot), p.serverLevel());
BlockState bs = p.serverLevel().getBlockState(dest.Position.moveDown().asBlockPos());
TeleportDestination dest = new TeleportDestination(new Vector3d(position), new Vector2f(rot), p.getLevel());
BlockState bs = p.getLevel().getBlockState(dest.Position.moveDown().asBlockPos());
Warp w = new Warp(p.getUUID(), string, false, true, dest, new ItemStack(bs.getBlock().asItem()));
WarpCreatedEvent event = new WarpCreatedEvent(w);

16
src/main/java/dev/zontreck/essentials/data/ModBlockStatesProvider.java
View file

@ -3,7 +3,7 @@ package dev.zontreck.essentials.data;
import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.blocks.ModBlocks;
import net.minecraft.core.Direction;
import net.minecraft.data.PackOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.state.properties.*;
@ -18,7 +18,7 @@ import net.minecraftforge.registries.RegistryObject;
import java.util.concurrent.atomic.AtomicReference;
public class ModBlockStatesProvider extends BlockStateProvider {
public ModBlockStatesProvider(PackOutput output, ExistingFileHelper existingFileHelper) {
public ModBlockStatesProvider(DataGenerator output, ExistingFileHelper existingFileHelper) {
super(output, AriasEssentials.MODID, existingFileHelper);
}
@ -125,6 +125,7 @@ public class ModBlockStatesProvider extends BlockStateProvider {
customStairBlock(ModBlocks.OLD_INDUSTRIAL_WOOD_STAIRS, oldIndustrialWood);
doorBlock(ModBlocks.OLD_INDUSTRIAL_WOOD_DOOR, new ResourceLocation(AriasEssentials.MODID, "block/engineersdecor/door/old_industrial_door_texture_bottom"), new ResourceLocation(AriasEssentials.MODID, "block/engineersdecor/door/old_industrial_door_texture_top"));
/*
blockWithExistingModel(ModBlocks.STEEL_GRATING, "block/engineersdecor/furniture/steel_floor_grating", false);
blockWithExistingModel(ModBlocks.STEEL_GRATING_TOP, "block/engineersdecor/furniture/steel_floor_grating_top", false);
blockWithExistingModel(ModBlocks.STEEL_TABLE, "block/engineersdecor/furniture/steel_table", false);
@ -140,6 +141,8 @@ public class ModBlockStatesProvider extends BlockStateProvider {
blockWithExistingModel(ModBlocks.TFLIPFLOP_BLOCK, "block/logicgates/tflipflop", true);
*/
}
private void blockWithExistingModel(RegistryObject<Block> blk, String model, boolean rotatable)
@ -170,11 +173,13 @@ public class ModBlockStatesProvider extends BlockStateProvider {
}
private void blockWithItem(RegistryObject<Block> blockRegistryObject) {
simpleBlockWithItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
simpleBlock(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
simpleBlockItem(blockRegistryObject.get(), cubeAll(blockRegistryObject.get()));
}
private void blockWithItem(RegistryObject<Block> blockRegistryObject, ModelFile model) {
simpleBlockWithItem(blockRegistryObject.get(), model);
simpleBlock(blockRegistryObject.get(), model);
simpleBlockItem(blockRegistryObject.get(), model);
}
private void stairBlock(RegistryObject<Block> blk, RegistryObject<Block> texture) {
@ -183,7 +188,8 @@ public class ModBlockStatesProvider extends BlockStateProvider {
}
private void carpetBlock(RegistryObject<Block> blk, RegistryObject<Block> texture) {
simpleBlockWithItem(blk.get(), carpetModel(blk.get(), texture.get()));
simpleBlock(blk.get(), carpetModel(blk.get(), texture.get()));
simpleBlockItem(blk.get(), carpetModel(blk.get(), texture.get()));
}
private String name(Block block) {

7
src/main/java/dev/zontreck/essentials/data/ModDatagen.java
View file

@ -3,7 +3,6 @@ package dev.zontreck.essentials.data;
import dev.zontreck.essentials.AriasEssentials;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.PackOutput;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.data.event.GatherDataEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@ -17,12 +16,10 @@ public class ModDatagen
public static void gatherData(GatherDataEvent event)
{
DataGenerator gen = event.getGenerator();
PackOutput output = gen.getPackOutput();
ExistingFileHelper helper = event.getExistingFileHelper();
gen.addProvider(true, new ModBlockStatesProvider(output, helper));
gen.addProvider(true, new ModItemModelsProvider(output,helper));
gen.addProvider(true, ModLootTablesProvider.create(output));
gen.addProvider(true, new ModBlockStatesProvider(gen, helper));
gen.addProvider(true, new ModItemModelsProvider(gen,helper));
}
}

4
src/main/java/dev/zontreck/essentials/data/ModItemModelsProvider.java
View file

@ -2,7 +2,7 @@ package dev.zontreck.essentials.data;
import dev.zontreck.essentials.AriasEssentials;
import dev.zontreck.essentials.items.ModItems;
import net.minecraft.data.PackOutput;
import net.minecraft.data.DataGenerator;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraftforge.client.model.generators.ItemModelBuilder;
@ -16,7 +16,7 @@ import java.util.Objects;
public class ModItemModelsProvider extends ItemModelProvider
{
public ModItemModelsProvider(PackOutput output, ExistingFileHelper helper)
public ModItemModelsProvider(DataGenerator output, ExistingFileHelper helper)
{
super(output, AriasEssentials.MODID, helper);
}

20
src/main/java/dev/zontreck/essentials/data/ModLootTablesProvider.java
View file

@ -1,20 +0,0 @@
package dev.zontreck.essentials.data;
import dev.zontreck.essentials.data.loot.ModBlockLootTablesProvider;
import net.minecraft.data.PackOutput;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import java.util.List;
import java.util.Set;
public class ModLootTablesProvider
{
public static LootTableProvider create(PackOutput output)
{
return new LootTableProvider(output, Set.of(), List.of(
new LootTableProvider.SubProviderEntry(ModBlockLootTablesProvider::new, LootContextParamSets.BLOCK)
));
}
}

111
src/main/java/dev/zontreck/essentials/data/loot/ModBlockLootTablesProvider.java
View file

@ -1,111 +0,0 @@
package dev.zontreck.essentials.data.loot;
import dev.zontreck.essentials.blocks.ModBlocks;
import net.minecraft.data.loot.BlockLootSubProvider;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.block.*;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.entries.LootItem;
import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
import net.minecraft.world.level.storage.loot.functions.ApplyBonusCount;
import net.minecraft.world.level.storage.loot.functions.SetItemCountFunction;
import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
import net.minecraftforge.registries.RegistryObject;
import java.util.Set;
public class ModBlockLootTablesProvider extends BlockLootSubProvider
{
public ModBlockLootTablesProvider()
{
super(Set.of(), FeatureFlags.REGISTRY.allFlags());
}
@Override
protected void generate() {
/*
Engineer's Decor Blocks
*/
dropSelf(ModBlocks.CLINKER_BRICK_BLOCK.get());
dropSelf(ModBlocks.CLINKER_BRICK_RECESSED.get());
dropSelf(ModBlocks.CLINKER_BRICK_VERTICALLY_SLIT.get());
createSlabItemTable(ModBlocks.CLINKER_BRICK_SLAB);
dropSelf(ModBlocks.CLINKER_BRICK_STAIRS.get());
dropSelf(ModBlocks.CLINKER_BRICK_STAINED_BLOCK.get());
createSlabItemTable(ModBlocks.CLINKER_BRICK_STAINED_SLAB);
dropSelf(ModBlocks.CLINKER_BRICK_STAINED_STAIRS.get());
dropSelf(ModBlocks.CLINKER_BRICK_WALL.get());
dropSelf(ModBlocks.SLAG_BRICK_BLOCK.get());
createSlabItemTable(ModBlocks.SLAG_BRICK_SLAB);
dropSelf(ModBlocks.SLAG_BRICK_WALL.get());
dropSelf(ModBlocks.SLAG_BRICK_STAIRS.get());
dropSelf(ModBlocks.REBAR_CONCRETE_BLOCK.get());
createSlabItemTable(ModBlocks.REBAR_CONCRETE_SLAB);
dropSelf(ModBlocks.REBAR_CONCRETE_STAIRS.get());
dropSelf(ModBlocks.REBAR_CONCRETE_WALL.get());
dropSelf(ModBlocks.REBAR_CONCRETE_TILE_BLOCK.get());
createSlabItemTable(ModBlocks.REBAR_CONCRETE_TILE_SLAB);
dropSelf(ModBlocks.REBAR_CONCRETE_TILE_STAIRS.get());
dropSelf(ModBlocks.PANZER_GLASS_BLOCK.get());
createSlabItemTable(ModBlocks.PANZER_GLASS_SLAB);
dropSelf(ModBlocks.OLD_INDUSTRIAL_WOOD_PLANKS.get());
createSlabItemTable(ModBlocks.OLD_INDUSTRIAL_WOOD_SLAB);
dropSelf(ModBlocks.OLD_INDUSTRIAL_WOOD_STAIRS.get());
createDoorTable(ModBlocks.OLD_INDUSTRIAL_WOOD_DOOR);
dropSelf(ModBlocks.STEEL_TABLE.get());
dropSelf(ModBlocks.STEEL_CATWALK.get());
dropSelf(ModBlocks.STEEL_RAILING.get());
dropSelf(ModBlocks.STEEL_CATWALK_STAIRS.get());
dropSelf(ModBlocks.STEEL_CATWALK_STAIRS_LR.get());
dropSelf(ModBlocks.STEEL_CATWALK_STAIRS_RR.get());
dropSelf(ModBlocks.STEEL_CATWALK_STAIRS_DR.get());
dropSelf(ModBlocks.STEEL_GRATING.get());
dropSelf(ModBlocks.STEEL_GRATING_TOP.get());
dropSelf(ModBlocks.STEEL_CATWALK_TOP.get());
dropSelf(ModBlocks.STEEL_CATWALK_BLOCK.get());
dropSelf(ModBlocks.TFLIPFLOP_BLOCK.get());
}
private void createDoorTable(RegistryObject<Block> blk)
{
var loot = createDoorTable(blk.get());
add(blk.get(), loot);
}
private void createSlabItemTable(RegistryObject<Block> slab)
{
var loot = createSlabItemTable(slab.get());
add(slab.get(), loot);
}
@Override
protected Iterable<Block> getKnownBlocks() {
return ModBlocks.BLOCKS.getEntries().stream().map(RegistryObject::get)::iterator;
}
protected LootTable.Builder createCopperOreDrops(Block block, Item rawOre) {
return createSilkTouchDispatchTable(block, (LootPoolEntryContainer.Builder) this.applyExplosionDecay(block, LootItem.lootTableItem(rawOre).apply(SetItemCountFunction.setCount(UniformGenerator.between(2.0F, 5.0F))).apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))));
}
protected LootTable.Builder createOreDrop(Block block, Item rawOre) {
return createSilkTouchDispatchTable(block, (LootPoolEntryContainer.Builder)this.applyExplosionDecay(block, LootItem.lootTableItem(rawOre).apply(ApplyBonusCount.addOreBonusCount(Enchantments.BLOCK_FORTUNE))));
}
}

1
src/main/java/dev/zontreck/essentials/entities/ModEntities.java
View file

@ -1,7 +1,6 @@
package dev.zontreck.essentials.entities;
import dev.zontreck.essentials.AriasEssentials;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;

4
src/main/java/dev/zontreck/essentials/entities/TimeBoostEntity.java
View file

@ -62,7 +62,7 @@ public class TimeBoostEntity extends Entity
}
@Override
public Packet<ClientGamePacketListener> getAddEntityPacket() {
public Packet<?> getAddEntityPacket() {
return NetworkHooks.getEntitySpawningPacket(this);
}
@ -85,7 +85,7 @@ public class TimeBoostEntity extends Entity
@Override
public void tick() {
super.tick();
Level level = level();
Level level = getLevel();
if(position == null)
{

14
src/main/java/dev/zontreck/essentials/items/CreativeModeTabs.java
View file

@ -1,7 +1,6 @@
package dev.zontreck.essentials.items;
import dev.zontreck.essentials.AriasEssentials;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
@ -19,21 +18,8 @@ import java.util.function.Supplier;
@Mod.EventBusSubscriber(modid = AriasEssentials.MODID, value = Dist.CLIENT)
public class CreativeModeTabs {
public static DeferredRegister<CreativeModeTab> REGISTER = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, AriasEssentials.MODID);
public static void register(IEventBus bus) {
REGISTER.register(bus);
}
public static final List<Supplier<? extends ItemLike>> AE_TAB_ITEMS = new ArrayList<>();
public static RegistryObject<CreativeModeTab> AE_GAME_TAB = REGISTER.register("ariasessentials", ()->CreativeModeTab.builder()
.icon(ModItems.TIME_IN_A_BOTTLE.get()::getDefaultInstance)
.title(Component.translatable("itemGroup.tabs.ariasessentials"))
.displayItems((display, output) -> AE_TAB_ITEMS.forEach(it->output.accept(it.get())))
.build());
public static <T extends Item> RegistryObject<T> addToAETab(RegistryObject<T> item)
{
AE_TAB_ITEMS.add(item);
return item;
}
}

2
src/main/java/dev/zontreck/essentials/items/abstraction/AbstractBottle.java
View file

@ -141,6 +141,6 @@ public abstract class AbstractBottle extends Item {
@Override
public boolean shouldCauseReequipAnimation(ItemStack oldStack, ItemStack newStack, boolean slotChanged) {
return !ItemStack.isSameItem(oldStack, newStack);
return !ItemStack.isSame(oldStack, newStack);
}
}

50
src/main/java/dev/zontreck/essentials/util/SoundUtilities.java
View file

@ -14,34 +14,34 @@ public class SoundUtilities {
// https://minecraft.gamepedia.com/Note_Block
switch (note) {
// Octave 1
case "F#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.5F);
case "G" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.529732F);
case "G#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.561231F);
case "A" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.594604F);
case "A#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.629961F);
case "B" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.667420F);
case "C" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.707107F);
case "C#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.749154F);
case "D" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.793701F);
case "D#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.840896F);
case "E" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.890899F);
case "F" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 0.943874F);
case "F#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.5F);
case "G" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.529732F);
case "G#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.561231F);
case "A" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.594604F);
case "A#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.629961F);
case "B" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.667420F);
case "C" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.707107F);
case "C#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.749154F);
case "D" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.793701F);
case "D#" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.840896F);
case "E" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.890899F);
case "F" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 0.943874F);
// Octave 2
case "F#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1F);
case "G2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.059463F);
case "G#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.122462F);
case "A2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.189207F);
case "A#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.259921F);
case "B2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.334840F);
case "C2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.414214F);
case "C#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.498307F);
case "D2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.587401F);
case "D#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.681793F);
case "E2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.781797F);
case "F2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 1.887749F);
case "F#3" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP.get(), SoundSource.BLOCKS, 0.5F, 2F);
case "F#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1F);
case "G2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.059463F);
case "G#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.122462F);
case "A2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.189207F);
case "A#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.259921F);
case "B2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.334840F);
case "C2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.414214F);
case "C#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.498307F);
case "D2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.587401F);
case "D#2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.681793F);
case "E2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.781797F);
case "F2" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 1.887749F);
case "F#3" -> level.playSound(null, pos, SoundEvents.NOTE_BLOCK_HARP, SoundSource.BLOCKS, 0.5F, 2F);
}
}
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:clinker_brick_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_block"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:clinker_brick_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:clinker_brick_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_stained_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:clinker_brick_stained_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_stained_block"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_stained_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:clinker_brick_stained_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:clinker_brick_stained_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_stained_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_stained_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:clinker_brick_stained_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_stained_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:clinker_brick_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/clinker_brick_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:clinker_brick_wall"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/clinker_brick_wall"
}

30
src/main/resources/data/ariasessentials/loot_tables/blocks/old_industrial_wood_door.json Normal file
View file

@ -0,0 +1,30 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"block": "ariasessentials:old_industrial_wood_door",
"condition": "minecraft:block_state_property",
"properties": {
"half": "lower"
}
}
],
"name": "ariasessentials:old_industrial_wood_door"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/old_industrial_wood_door"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/old_industrial_wood_planks.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:old_industrial_wood_planks"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/old_industrial_wood_planks"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/old_industrial_wood_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:old_industrial_wood_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:old_industrial_wood_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/old_industrial_wood_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/old_industrial_wood_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:old_industrial_wood_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/old_industrial_wood_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/panzerglass_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:panzerglass_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/panzerglass_block"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/panzerglass_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:panzerglass_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:panzerglass_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/panzerglass_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:rebar_concrete"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:rebar_concrete_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:rebar_concrete_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:rebar_concrete_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete_tile.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:rebar_concrete_tile"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete_tile"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete_tile_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:rebar_concrete_tile_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:rebar_concrete_tile_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete_tile_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete_tile_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:rebar_concrete_tile_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete_tile_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/rebar_concrete_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:rebar_concrete_wall"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/rebar_concrete_wall"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/slag_brick_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:slag_brick_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/slag_brick_block"
}

35
src/main/resources/data/ariasessentials/loot_tables/blocks/slag_brick_slab.json Normal file
View file

@ -0,0 +1,35 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"add": false,
"conditions": [
{
"block": "ariasessentials:slag_brick_slab",
"condition": "minecraft:block_state_property",
"properties": {
"type": "double"
}
}
],
"count": 2.0,
"function": "minecraft:set_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "ariasessentials:slag_brick_slab"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/slag_brick_slab"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/slag_brick_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:slag_brick_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/slag_brick_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/slag_brick_wall.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:slag_brick_wall"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/slag_brick_wall"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_block.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk_block"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk_block"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk_stairs"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk_stairs"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs_dr.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk_stairs_dr"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk_stairs_dr"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs_lr.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk_stairs_lr"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk_stairs_lr"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs_rr.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk_stairs_rr"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk_stairs_rr"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_top.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_catwalk_top"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_catwalk_top"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_floor_grating.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_floor_grating"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_floor_grating"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_floor_grating_top.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_floor_grating_top"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_floor_grating_top"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_railing.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_railing"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_railing"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/steel_table.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:steel_table"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/steel_table"
}

21
src/main/resources/data/ariasessentials/loot_tables/blocks/tflipflop.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "ariasessentials:tflipflop"
}
],
"rolls": 1.0
}
],
"random_sequence": "ariasessentials:blocks/tflipflop"
}