Various Fixes (#1024)

* Fix loot tables

* Tweak texture

* Fix missing particles

* Fix bug with removing eyes

* Remove shift requirement

* Fixes Loot Tables (#1021)

* Fix missing loot tables

* Add tag

* Rename to PC Screen & Computer

* New block layout template world

* Add infected spark instead of lava particle

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 <T extends BlockEntity> BlockEntityTicker<T> 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));
+                }
+            }
+        }
+    }
 }

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);

src/main/java/pokecube/legends/blocks/plants/HangingTendrilsPlantBlock.java

@@ -46,7 +46,7 @@ public void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState
    @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);

src/main/java/pokecube/legends/init/ClientSetupHandler.java

@@ -4,6 +4,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.FlameParticle;
+import net.minecraft.client.particle.LavaParticle;
 import net.minecraft.client.particle.SmokeParticle;
 import net.minecraft.client.particle.SoulParticle;
 import net.minecraft.client.particle.SuspendedTownParticle;
@@ -197,6 +198,7 @@ public static void registerParticleFactories(final ParticleFactoryRegisterEvent
                 FlameParticle.Provider::new);
         Minecraft.getInstance().particleEngine.register(ParticleInit.INFECTED_SMOKE.get(), SmokeParticle.Provider::new);
         Minecraft.getInstance().particleEngine.register(ParticleInit.INFECTED_SOUL.get(), SoulParticle.Provider::new);
+        Minecraft.getInstance().particleEngine.register(ParticleInit.INFECTED_SPARK.get(), LavaParticle.Provider::new);
         Minecraft.getInstance().particleEngine.register(ParticleInit.MUSHROOM.get(),
                 SuspendedTownParticle.Provider::new);
     }

src/main/java/pokecube/legends/init/ParticleInit.java

@@ -12,6 +12,7 @@ public class ParticleInit
     public static final RegistryObject<SimpleParticleType> INFECTED_FIRE_FLAME;
     public static final RegistryObject<SimpleParticleType> INFECTED_SMOKE;
     public static final RegistryObject<SimpleParticleType> INFECTED_SOUL;
+    public static final RegistryObject<SimpleParticleType> INFECTED_SPARK;
     public static final RegistryObject<SimpleParticleType> 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));
     }
 }

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",

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": [
 		{

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": [
 		{

src/main/resources/assets/pokecube_legends/particles/infected_spark.json

@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "pokecube_legends:infected_spark"
+  ]
+}

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": [

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": [