diff --git a/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png b/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png new file mode 100644 index 0000000..9e5cb8a Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png b/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png new file mode 100644 index 0000000..cf7593e Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png b/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png new file mode 100644 index 0000000..20c9592 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png b/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png new file mode 100644 index 0000000..2fc2d7b Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png b/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png new file mode 100644 index 0000000..b752439 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png b/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png new file mode 100644 index 0000000..499d3b1 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png b/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png new file mode 100644 index 0000000..a2b8148 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png b/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png new file mode 100644 index 0000000..60de882 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png b/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png new file mode 100644 index 0000000..8bbc3dd Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png b/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png new file mode 100644 index 0000000..314f16e Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png b/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png new file mode 100644 index 0000000..e14d4a1 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png differ diff --git a/src/main/java/com/lumiscosity/rounded/blocks/TroughBlock.java b/src/main/java/com/lumiscosity/rounded/blocks/TroughBlock.java index d151ec6..c686a0b 100644 --- a/src/main/java/com/lumiscosity/rounded/blocks/TroughBlock.java +++ b/src/main/java/com/lumiscosity/rounded/blocks/TroughBlock.java @@ -1,6 +1,5 @@ package com.lumiscosity.rounded.blocks; -import com.lumiscosity.rounded.misc.RegisterSounds; import com.mojang.serialization.MapCodec; import net.minecraft.block.*; import net.minecraft.entity.Entity; @@ -16,7 +15,6 @@ import net.minecraft.registry.tag.TagKey; import net.minecraft.server.world.ServerWorld; import net.minecraft.sound.SoundCategory; -import net.minecraft.sound.SoundEvents; import net.minecraft.stat.Stats; import net.minecraft.state.StateManager; import net.minecraft.state.property.IntProperty; @@ -32,7 +30,6 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; -import net.minecraft.world.WorldEvents; import net.minecraft.world.event.GameEvent; import org.jetbrains.annotations.Nullable; @@ -75,8 +72,6 @@ public static void playEffects(WorldAccess world, BlockPos pos) { BlockState blockState = world.getBlockState(pos); world.playSound(null, pos, TROUGH_FILL, SoundCategory.BLOCKS); double d = blockState.getOutlineShape(world, pos).getEndingCoord(Direction.Axis.Y, 0.5, 0.5) + 0.03125; - double e = 0.13125F; - double f = 0.7375F; Random random = world.getRandom(); for (int i = 0; i < 10; i++) { @@ -112,7 +107,7 @@ protected VoxelShape getCollisionShape(BlockState state, BlockView world, BlockP @Override protected void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) { - if ((Integer)state.get(LEVEL) == 7) { + if (state.get(LEVEL) == 7) { world.scheduleBlockTick(pos, state.getBlock(), 20); } } @@ -200,7 +195,7 @@ protected boolean canPathfindThrough(BlockState state, NavigationType type) { @Override public SidedInventory getInventory(BlockState state, WorldAccess world, BlockPos pos) { int i = state.get(LEVEL); - return (SidedInventory)(i < 7 ? new TroughBlock.TroughInventory(state, world, pos) : new TroughBlock.DummyInventory()); + return i < 7 ? new TroughInventory(state, world, pos) : new DummyInventory(); } static class TroughInventory extends SimpleInventory implements SidedInventory { @@ -228,7 +223,7 @@ public int[] getAvailableSlots(Direction side) { @Override public boolean canInsert(int slot, ItemStack stack, @Nullable Direction dir) { - return !this.dirty && dir == Direction.UP && ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.containsKey(stack.getItem()); + return !this.dirty && dir == Direction.UP && stack.isIn(TagKey.of(RegistryKeys.ITEM, Identifier.of(MOD_ID, "trough_feed"))); } @Override @@ -242,7 +237,6 @@ public void markDirty() { if (!itemStack.isEmpty()) { this.dirty = true; BlockState blockState = TroughBlock.addToTrough(null, this.state, this.world, this.pos, itemStack); - this.world.syncWorldEvent(WorldEvents.COMPOSTER_USED, this.pos, blockState != this.state ? 1 : 0); this.removeStack(0); } } diff --git a/src/main/resources/data/rounded/recipe/trough.json b/src/main/resources/data/rounded/recipe/trough.json index 0b6fe7e..2c6f793 100644 --- a/src/main/resources/data/rounded/recipe/trough.json +++ b/src/main/resources/data/rounded/recipe/trough.json @@ -13,7 +13,7 @@ } }, "pattern": [ - "X X",, + "X X", "# #", "OOO" ],