-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
VisualOverhaul 3.0.0 - Puddles & Colors
Switched to MidnightConfig (No need to seperately download AutoConfig & ClothConfig anymore) Adds puddles which spawn during rain and can be used to fill a water bottle. (Game rule: "puddleSpawnRate") Also, snow layers can now pile up during snow storms. (Game rule: "snowStackChance") Items which are colored in their block form also show the color corresponding to the biome as an item. (Toggleable via config)
- Loading branch information
Showing
22 changed files
with
661 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 25 additions & 1 deletion
26
src/main/java/eu/midnightdust/visualoverhaul/VisualOverhaul.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,33 @@ | ||
| package eu.midnightdust.visualoverhaul; | ||
|
|
||
| import eu.midnightdust.visualoverhaul.block.PuddleBlock; | ||
| import net.fabricmc.api.ModInitializer; | ||
| import net.fabricmc.fabric.api.gamerule.v1.GameRuleFactory; | ||
| import net.fabricmc.fabric.api.gamerule.v1.GameRuleRegistry; | ||
| import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; | ||
| import net.minecraft.block.Block; | ||
| import net.minecraft.block.Material; | ||
| import net.minecraft.fluid.Fluids; | ||
| import net.minecraft.item.BlockItem; | ||
| import net.minecraft.item.Item; | ||
| import net.minecraft.util.Identifier; | ||
| import net.minecraft.util.registry.Registry; | ||
| import net.minecraft.world.GameRules; | ||
|
|
||
| public class VisualOverhaul implements ModInitializer { | ||
| public static final String MOD_ID = "visualoverhaul"; | ||
| public static final Block Puddle = new PuddleBlock(Fluids.WATER, FabricBlockSettings.of(Material.WATER)); | ||
| public static GameRules.Key<GameRules.IntRule> PUDDLE_SPAWN_RATE; | ||
| public static GameRules.Key<GameRules.IntRule> SNOW_STACK_CHANCE; | ||
|
|
||
| public class VisualOverhaul { | ||
| public static final Identifier UPDATE_POTION_BOTTLES = new Identifier("visualoverhaul", "brewingstand"); | ||
| public static final Identifier UPDATE_RECORD = new Identifier("visualoverhaul", "record"); | ||
| public static final Identifier UPDATE_FURNACE_ITEMS = new Identifier("visualoverhaul", "furnace"); | ||
|
|
||
| public void onInitialize() { | ||
| PUDDLE_SPAWN_RATE = GameRuleRegistry.register("puddleSpawnRate", GameRules.Category.SPAWNING, GameRuleFactory.createIntRule(1)); | ||
| SNOW_STACK_CHANCE = GameRuleRegistry.register("snowStackChance", GameRules.Category.SPAWNING, GameRuleFactory.createIntRule(1)); | ||
| Registry.register(Registry.BLOCK, new Identifier(MOD_ID,"puddle"), Puddle); | ||
| Registry.register(Registry.ITEM, new Identifier(MOD_ID,"puddle"), new BlockItem(Puddle, new Item.Settings())); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
src/main/java/eu/midnightdust/visualoverhaul/block/PuddleBlock.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package eu.midnightdust.visualoverhaul.block; | ||
|
|
||
| import net.fabricmc.api.EnvType; | ||
| import net.fabricmc.api.Environment; | ||
| import net.minecraft.block.*; | ||
| import net.minecraft.entity.ai.pathing.NavigationType; | ||
| import net.minecraft.entity.player.PlayerEntity; | ||
| import net.minecraft.fluid.*; | ||
| import net.minecraft.item.*; | ||
| import net.minecraft.loot.context.LootContext; | ||
| import net.minecraft.potion.PotionUtil; | ||
| import net.minecraft.potion.Potions; | ||
| import net.minecraft.server.network.ServerPlayerEntity; | ||
| import net.minecraft.server.world.ServerWorld; | ||
| import net.minecraft.sound.BlockSoundGroup; | ||
| import net.minecraft.sound.SoundCategory; | ||
| import net.minecraft.sound.SoundEvents; | ||
| import net.minecraft.stat.Stats; | ||
| import net.minecraft.util.ActionResult; | ||
| import net.minecraft.util.Hand; | ||
| import net.minecraft.util.hit.BlockHitResult; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.Direction; | ||
| import net.minecraft.util.shape.VoxelShape; | ||
| import net.minecraft.util.shape.VoxelShapes; | ||
| import net.minecraft.world.BlockView; | ||
| import net.minecraft.world.World; | ||
| import net.minecraft.world.WorldAccess; | ||
| import net.minecraft.world.WorldView; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Random; | ||
|
|
||
| public class PuddleBlock extends Block { | ||
|
|
||
| protected final FlowableFluid fluid; | ||
| public static final VoxelShape COLLISION_SHAPE; | ||
|
|
||
| public PuddleBlock(FlowableFluid fluid, AbstractBlock.Settings settings) { | ||
| super(settings); | ||
| this.fluid = fluid; | ||
| } | ||
| @Override | ||
| public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { | ||
| ItemStack itemStack = player.getStackInHand(hand); | ||
| if (itemStack.isEmpty()) { | ||
| return ActionResult.PASS; | ||
| } else { | ||
| Item item = itemStack.getItem(); | ||
| ItemStack waterBottleStack; | ||
| if (item == Items.GLASS_BOTTLE) { | ||
| if (!world.isClient) { | ||
| if (!player.abilities.creativeMode) { | ||
| waterBottleStack = PotionUtil.setPotion(new ItemStack(Items.POTION), Potions.WATER); | ||
| player.incrementStat(Stats.USE_CAULDRON); | ||
| itemStack.decrement(1); | ||
| if (itemStack.isEmpty()) { | ||
| player.setStackInHand(hand, waterBottleStack); | ||
| } else if (!player.inventory.insertStack(waterBottleStack)) { | ||
| player.dropItem(waterBottleStack, false); | ||
| } else if (player instanceof ServerPlayerEntity) { | ||
| ((ServerPlayerEntity)player).refreshScreenHandler(player.playerScreenHandler); | ||
| } | ||
| } | ||
|
|
||
| world.playSound(null, pos, SoundEvents.ITEM_BOTTLE_FILL, SoundCategory.BLOCKS, 1.0F, 1.0F); | ||
| world.setBlockState(pos, Blocks.AIR.getDefaultState()); | ||
| } | ||
| return ActionResult.success(world.isClient); | ||
| } | ||
| else return ActionResult.FAIL; | ||
| } | ||
|
|
||
| } | ||
| @Override | ||
| public boolean hasRandomTicks(BlockState state) { | ||
| return true; | ||
| } | ||
| @Override | ||
| public void randomTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { | ||
| if (!world.isRaining() && random.nextInt(2000) == 0) { | ||
| world.setBlockState(pos, Blocks.AIR.getDefaultState()); | ||
| } | ||
|
|
||
| this.scheduledTick(state, world, pos, random); | ||
| } | ||
|
|
||
| @Override | ||
| public VoxelShape getCollisionShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { | ||
| return context.isAbove(COLLISION_SHAPE, pos, true) ? COLLISION_SHAPE : VoxelShapes.empty(); | ||
| } | ||
| @Override | ||
| public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { | ||
| return COLLISION_SHAPE; | ||
| } | ||
| @Override | ||
| public VoxelShape getCullingShape(BlockState state, BlockView world, BlockPos pos) { | ||
| return VoxelShapes.empty(); | ||
| } | ||
|
|
||
| public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { | ||
| return true; | ||
| } | ||
|
|
||
| public FluidState getFluidState(BlockState state) { | ||
| return fluid.getFlowing(1,false); | ||
| } | ||
|
|
||
| @Environment(EnvType.CLIENT) | ||
| public boolean isSideInvisible(BlockState state, BlockState stateFrom, Direction direction) { | ||
| return stateFrom.getFluidState().getFluid().matchesType(this.fluid); | ||
| } | ||
|
|
||
| public BlockRenderType getRenderType(BlockState state) { | ||
| return BlockRenderType.INVISIBLE; | ||
| } | ||
|
|
||
| public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder builder) { | ||
| return Collections.emptyList(); | ||
| } | ||
|
|
||
| public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { | ||
| return world.getBlockState(pos.down()).isSideSolidFullSquare(world,pos,Direction.UP); | ||
| } | ||
| public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState newState, WorldAccess world, BlockPos pos, BlockPos posFrom) { | ||
| return !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : super.getStateForNeighborUpdate(state, direction, newState, world, pos, posFrom); | ||
| } | ||
|
|
||
| static { | ||
| COLLISION_SHAPE = net.minecraft.block.Block.createCuboidShape(0.0D, 0.0D, 0.0D, 16.0D, 0.5D, 16.0D); | ||
| } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.