diff --git a/src/main/java/pokecube/legends/blocks/normalblocks/InfectedCampfireBlock.java b/src/main/java/pokecube/legends/blocks/normalblocks/InfectedCampfireBlock.java index 62387277f0..1f0f2e4364 100644 --- a/src/main/java/pokecube/legends/blocks/normalblocks/InfectedCampfireBlock.java +++ b/src/main/java/pokecube/legends/blocks/normalblocks/InfectedCampfireBlock.java @@ -1,6 +1,11 @@ package pokecube.legends.blocks.normalblocks; +import java.util.Random; + import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.effect.MobEffectInstance; import net.minecraft.world.effect.MobEffects; @@ -15,17 +20,20 @@ import net.minecraft.world.level.block.entity.CampfireBlockEntity; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.BlockState; +import pokecube.legends.init.ParticleInit; import pokecube.legends.init.TileEntityInit; import pokecube.legends.tileentity.InfectedCampfireBlockEntity; public class InfectedCampfireBlock extends CampfireBlock { private final int fireDamage; + private final boolean spawnParticles; - public InfectedCampfireBlock(boolean smoke, int damage, BlockBehaviour.Properties properties) + public InfectedCampfireBlock(boolean particles, int damage, BlockBehaviour.Properties properties) { - super(smoke, damage, properties); + super(particles, damage, properties); this.fireDamage = damage; + this.spawnParticles = particles; } @Override @@ -60,4 +68,26 @@ public BlockEntityTicker getTicker(Level world, Block createTickerHelper(type, TileEntityInit.CAMPFIRE_ENTITY.get(), CampfireBlockEntity::cooldownTick); } } + + @Override + public void animateTick(BlockState state, Level world, BlockPos pos, Random random) + { + if (state.getValue(LIT)) + { + if (random.nextInt(10) == 0) + { + world.playLocalSound((double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, (double)pos.getZ() + 0.5D, + SoundEvents.CAMPFIRE_CRACKLE, SoundSource.BLOCKS, 0.5F + random.nextFloat(), random.nextFloat() * 0.7F + 0.6F, false); + } + + if (this.spawnParticles && random.nextInt(5) == 0) + { + for(int i = 0; i < random.nextInt(1) + 1; ++i) + { + world.addParticle(ParticleInit.INFECTED_SPARK.get(), (double)pos.getX() + 0.5D, (double)pos.getY() + 0.5D, + (double)pos.getZ() + 0.5D, (double)(random.nextFloat() / 2.0F), 5.0E-5D, (double)(random.nextFloat() / 2.0F)); + } + } + } + } } \ No newline at end of file diff --git a/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsBlock.java b/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsBlock.java index 447e199a99..183f2e07ad 100644 --- a/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsBlock.java +++ b/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsBlock.java @@ -58,7 +58,7 @@ public BlockState getGrowIntoState(BlockState state, Random random) @Override public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - if (state.getValue(EYES) == false && player.isShiftKeyDown()) + if (state.getValue(EYES) == true) { float f = Mth.randomBetween(world.random, 0.8F, 1.2F); world.playSound((Player)null, pos, SoundEvents.CAVE_VINES_PICK_BERRIES, SoundSource.BLOCKS, 1.0F, f); diff --git a/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsPlantBlock.java b/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsPlantBlock.java index 0065116c5f..ae73d432dc 100644 --- a/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsPlantBlock.java +++ b/src/main/java/pokecube/legends/blocks/plants/HangingTendrilsPlantBlock.java @@ -46,7 +46,7 @@ public void createBlockStateDefinition(StateDefinition.Builder INFECTED_FIRE_FLAME; public static final RegistryObject INFECTED_SMOKE; public static final RegistryObject INFECTED_SOUL; + public static final RegistryObject INFECTED_SPARK; public static final RegistryObject MUSHROOM; static @@ -22,6 +23,8 @@ public class ParticleInit INFECTED_SOUL = PokecubeLegends.PARTICLES.register("infected_soul", () -> new SimpleParticleType(false)); + INFECTED_SPARK = PokecubeLegends.PARTICLES.register("infected_spark", () -> new SimpleParticleType(false)); + MUSHROOM = PokecubeLegends.PARTICLES.register("mushroom", () -> new SimpleParticleType(false)); } } diff --git a/src/main/resources/assets/pokecube/lang/en_us.json b/src/main/resources/assets/pokecube/lang/en_us.json index 7887cc765e..1046b5a5d7 100644 --- a/src/main/resources/assets/pokecube/lang/en_us.json +++ b/src/main/resources/assets/pokecube/lang/en_us.json @@ -330,8 +330,8 @@ "block.trade_machine.trade": "Trade", "block.tm_machine.apply": "Apply", - "block.pokecube.pc_base": "PC Base", - "block.pokecube.pc_top": "PC Top", + "block.pokecube.pc_base": "PC Computer", + "block.pokecube.pc_top": "PC Screen", "block.pc.autoon": "Auto On", "block.pc.autooff": "Auto Off", "block.pc.rename": "Rename", @@ -345,8 +345,8 @@ "block.pc.option.release": "Release", "block.pc.option.confirm": "Confirm", - "msg.pokecube.pc_top.fail": "§cPC Base required below", - "msg.pokecube.pc_base.fail": "§cPC Top required above", + "msg.pokecube.pc_top.fail": "§cPC Computer required below", + "msg.pokecube.pc_base.fail": "§cPC Screen required above", "block.pokecube.deepslate_fossil_ore": "Deepslate Fossil Ore", "block.pokecube.fossil_ore": "Fossil Ore", diff --git a/src/main/resources/assets/pokecube_legends/models/block/mirage_slab.json b/src/main/resources/assets/pokecube_legends/models/block/mirage_slab.json index 572e8ba764..2046553be7 100644 --- a/src/main/resources/assets/pokecube_legends/models/block/mirage_slab.json +++ b/src/main/resources/assets/pokecube_legends/models/block/mirage_slab.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/slab", "textures": { - "bottom": "pokecube_legends:block/mirage_planks" + "bottom": "pokecube_legends:block/mirage_planks", + "particle": "pokecube_legends:block/mirage_planks" }, "elements": [ { diff --git a/src/main/resources/assets/pokecube_legends/models/block/mirage_slab_top.json b/src/main/resources/assets/pokecube_legends/models/block/mirage_slab_top.json index eec9318c25..01ae75460f 100644 --- a/src/main/resources/assets/pokecube_legends/models/block/mirage_slab_top.json +++ b/src/main/resources/assets/pokecube_legends/models/block/mirage_slab_top.json @@ -2,7 +2,8 @@ "credit": "Made with Blockbench", "parent": "minecraft:block/slab_top", "textures": { - "bottom": "pokecube_legends:block/mirage_planks" + "bottom": "pokecube_legends:block/mirage_planks", + "particle": "pokecube_legends:block/mirage_planks" }, "elements": [ { diff --git a/src/main/resources/assets/pokecube_legends/particles/infected_spark.json b/src/main/resources/assets/pokecube_legends/particles/infected_spark.json new file mode 100644 index 0000000000..a612e94a6d --- /dev/null +++ b/src/main/resources/assets/pokecube_legends/particles/infected_spark.json @@ -0,0 +1,5 @@ +{ + "textures": [ + "pokecube_legends:infected_spark" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone.png b/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone.png index 3369927c58..7163ac86cc 100644 Binary files a/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone.png and b/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone.png differ diff --git a/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone_side.png b/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone_side.png index 20c6b220e9..049130153a 100644 Binary files a/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone_side.png and b/src/main/resources/assets/pokecube_legends/textures/block/cracked_distortic_stone_side.png differ diff --git a/src/main/resources/assets/pokecube_legends/textures/particle/infected_spark.png b/src/main/resources/assets/pokecube_legends/textures/particle/infected_spark.png new file mode 100644 index 0000000000..e1eafd07de Binary files /dev/null and b/src/main/resources/assets/pokecube_legends/textures/particle/infected_spark.png differ diff --git a/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_button.json b/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_button.json index 558f45c6cb..8bd7dee741 100644 --- a/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_button.json +++ b/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_button.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "pokecube_legends:temporal_button" + "name": "pokecube_legends:ultra_stone_button" } ], "conditions": [ diff --git a/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_pressure_plate.json b/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_pressure_plate.json index c4dda13e78..3eb7e3f079 100644 --- a/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_pressure_plate.json +++ b/src/main/resources/data/pokecube_legends/loot_tables/blocks/ultra_stone_pressure_plate.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "pokecube_legends:temporal_pressure_plate" + "name": "pokecube_legends:ultra_stone_pressure_plate" } ], "conditions": [ diff --git a/template_worlds/block_layout/icon.png b/template_worlds/block_layout/icon.png new file mode 100644 index 0000000000..bceffbc8b8 Binary files /dev/null and b/template_worlds/block_layout/icon.png differ diff --git a/template_worlds/block_layout/level.dat b/template_worlds/block_layout/level.dat new file mode 100644 index 0000000000..e6c1bfc177 Binary files /dev/null and b/template_worlds/block_layout/level.dat differ diff --git a/template_worlds/block_layout/region/r.-1.-1.mca b/template_worlds/block_layout/region/r.-1.-1.mca new file mode 100644 index 0000000000..28b7daad39 Binary files /dev/null and b/template_worlds/block_layout/region/r.-1.-1.mca differ diff --git a/template_worlds/block_layout/region/r.-1.0.mca b/template_worlds/block_layout/region/r.-1.0.mca new file mode 100644 index 0000000000..0919573985 Binary files /dev/null and b/template_worlds/block_layout/region/r.-1.0.mca differ diff --git a/template_worlds/block_layout/region/r.0.-1.mca b/template_worlds/block_layout/region/r.0.-1.mca new file mode 100644 index 0000000000..f1b5d15c97 Binary files /dev/null and b/template_worlds/block_layout/region/r.0.-1.mca differ diff --git a/template_worlds/block_layout/region/r.0.0.mca b/template_worlds/block_layout/region/r.0.0.mca new file mode 100644 index 0000000000..49f78dcd2d Binary files /dev/null and b/template_worlds/block_layout/region/r.0.0.mca differ diff --git a/template_worlds/block_layout/region/r.3363.38159.mca b/template_worlds/block_layout/region/r.3363.38159.mca new file mode 100644 index 0000000000..13021e88e2 Binary files /dev/null and b/template_worlds/block_layout/region/r.3363.38159.mca differ diff --git a/template_worlds/block_layout/region/r.3363.38160.mca b/template_worlds/block_layout/region/r.3363.38160.mca new file mode 100644 index 0000000000..119529cbef Binary files /dev/null and b/template_worlds/block_layout/region/r.3363.38160.mca differ