From 83ef219c8fbe3d963f840b5b3de0d67042d971cb Mon Sep 17 00:00:00 2001 From: woodiertexas Date: Sat, 14 Oct 2023 00:51:50 -0700 Subject: [PATCH] move fluid stuff to fluid experiments branch pt2 --- .../chocolate_bar/ChocolateBar.java | 12 -- .../chocolate_bar/ChocolateFluid.java | 115 ------------------ .../client/ChocolateBarClient.java | 27 ---- .../chocolate_bar/blockstates/chocolate.json | 7 -- 4 files changed, 161 deletions(-) delete mode 100644 src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateFluid.java delete mode 100644 src/main/java/io/github/woodiertexas/chocolate_bar/client/ChocolateBarClient.java delete mode 100644 src/main/resources/assets/chocolate_bar/blockstates/chocolate.json diff --git a/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateBar.java b/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateBar.java index 8022d20..174d65b 100644 --- a/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateBar.java +++ b/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateBar.java @@ -1,15 +1,9 @@ package io.github.woodiertexas.chocolate_bar; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.minecraft.block.Block; -import net.minecraft.block.Blocks; -import net.minecraft.block.FluidBlock; import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.fluid.FlowableFluid; -import net.minecraft.item.BucketItem; import net.minecraft.item.FoodComponent; -import net.minecraft.item.Item; import net.minecraft.item.ItemGroups; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -20,7 +14,6 @@ import org.apache.logging.log4j.Logger; import org.quiltmc.loader.api.ModContainer; import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; -import org.quiltmc.qsl.block.extensions.api.QuiltBlockSettings; import org.quiltmc.qsl.item.setting.api.QuiltItemSettings; import org.quiltmc.qsl.recipe.api.RecipeManagerHelper; import org.quiltmc.qsl.recipe.api.builder.VanillaRecipeBuilders; @@ -29,11 +22,6 @@ public class ChocolateBar implements ModInitializer { public static final Logger LOGGER = LogManager.getLogger("Chocolate Bar"); public static final String MODID = "chocolate_bar"; - public static Block CHOCOLATE; - public static FlowableFluid STILL_CHOCOLATE; - public static FlowableFluid FLOWING_CHOCOLATE; - public static Item CHOCOLATE_BUCKET; - // Creating items/blocks/etc and defining their properties public static final ChocolateBarItem CHOCOLATE_BAR = new ChocolateBarItem( new QuiltItemSettings().food( diff --git a/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateFluid.java b/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateFluid.java deleted file mode 100644 index 09ab196..0000000 --- a/src/main/java/io/github/woodiertexas/chocolate_bar/ChocolateFluid.java +++ /dev/null @@ -1,115 +0,0 @@ -package io.github.woodiertexas.chocolate_bar; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.fluid.FlowableFluid; -import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.FluidState; -import net.minecraft.item.Item; -import net.minecraft.state.StateManager; -import net.minecraft.state.property.Properties; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.BlockView; -import net.minecraft.world.World; -import net.minecraft.world.WorldAccess; -import net.minecraft.world.WorldView; - -import static io.github.woodiertexas.chocolate_bar.ChocolateBar.CHOCOLATE; - -public abstract class ChocolateFluid extends FlowableFluid { - @Override - public Fluid getFlowing() { - return ChocolateBar.FLOWING_CHOCOLATE; - } - - @Override - public Fluid getStill() { - return ChocolateBar.STILL_CHOCOLATE; - } - - @Override - public Item getBucketItem() { - return ChocolateBar.CHOCOLATE_BUCKET; - } - - @Override - public boolean matchesType(Fluid fluid) { - return fluid == getStill() || fluid == getFlowing(); - } - - @Override - protected boolean isInfinite(World world) { - return false; - } - - @Override - protected void beforeBreakingBlock(WorldAccess world, BlockPos pos, BlockState state) { - final BlockEntity blockEntity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null; - Block.dropStacks(state, world, pos, blockEntity); - } - - @Override - protected int getFlowSpeed(WorldView world) { - return 3; - } - - @Override - protected int getLevelDecreasePerBlock(WorldView world) { - return 2; - } - - @Override - protected boolean canBeReplacedWith(FluidState state, BlockView world, BlockPos pos, Fluid fluid, Direction direction) { - return false; - } - - @Override - public int getTickRate(WorldView world) { - return 5; - } - - @Override - protected float getBlastResistance() { - return 100f; - } - - @Override - public int getLevel(FluidState state) { - return 8; - } - - public BlockState toBlockState(FluidState state) { - return CHOCOLATE.getDefaultState().with(Properties.LEVEL_15, getBlockStateLevel(state)); - } - - public static class Flowing extends ChocolateFluid { - @Override - protected void appendProperties(StateManager.Builder builder) { - super.appendProperties(builder); - builder.add(LEVEL); - } - - @Override - public int getLevel(FluidState fluidState) { - return fluidState.get(LEVEL); - } - - public boolean isSource(FluidState fluidState) { - return false; - } - } - - public static class Still extends ChocolateFluid { - @Override - public int getLevel(FluidState fluidState) { - return 8; - } - - @Override - public boolean isSource(FluidState fluidState) { - return true; - } - } -} diff --git a/src/main/java/io/github/woodiertexas/chocolate_bar/client/ChocolateBarClient.java b/src/main/java/io/github/woodiertexas/chocolate_bar/client/ChocolateBarClient.java deleted file mode 100644 index 9015232..0000000 --- a/src/main/java/io/github/woodiertexas/chocolate_bar/client/ChocolateBarClient.java +++ /dev/null @@ -1,27 +0,0 @@ -package io.github.woodiertexas.chocolate_bar.client; - -import io.github.woodiertexas.chocolate_bar.ChocolateBar; -import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry; -import net.fabricmc.fabric.api.client.render.fluid.v1.SimpleFluidRenderHandler; -import net.minecraft.client.render.RenderLayer; -import net.minecraft.util.Identifier; -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer; -import org.quiltmc.qsl.block.extensions.api.client.BlockRenderLayerMap; - -public class ChocolateBarClient implements ClientModInitializer { - @Override - public void onInitializeClient(ModContainer mod) { - //System.out.println("yeef"); - - /* - FluidRenderHandlerRegistry.INSTANCE.register(ChocolateBar.STILL_CHOCOLATE, ChocolateBar.FLOWING_CHOCOLATE, new SimpleFluidRenderHandler( - new Identifier("minecraft:block/water_still"), - new Identifier("minecraft:block/water_flow"), - 0xff0000 - )); - - BlockRenderLayerMap.put(RenderLayer.getTranslucent(), ChocolateBar.STILL_CHOCOLATE, ChocolateBar.FLOWING_CHOCOLATE); - */ - } -} diff --git a/src/main/resources/assets/chocolate_bar/blockstates/chocolate.json b/src/main/resources/assets/chocolate_bar/blockstates/chocolate.json deleted file mode 100644 index 2207a56..0000000 --- a/src/main/resources/assets/chocolate_bar/blockstates/chocolate.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "chocolate_bar:block/chocolate" - } - } -}