Merge pull request #4 from jamesgreen26/1.20

Big Update!!

Author: JSJBDEV

build.gradle

@@ -40,7 +40,7 @@ dependencies {
 
 	// Fabric API. This is technically optional, but you probably want it anyway.
 	modImplementation "maven.modrinth:valkyrien-skies:1.20.1-fabric-2.3.0-beta.5"
-	modImplementation "maven.modrinth:eureka:1.20.1-fabric-1.3.0-beta.4"
+	modImplementation "maven.modrinth:eureka:1.20.1-fabric-1.5.1-beta.3"
 
 
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

gradle.properties

@@ -10,7 +10,7 @@ loader_version=0.15.10
 fabric_kotlin_version=1.10.19+kotlin.1.9.23
 
 # Mod Properties
-mod_version=0.1.1
+mod_version=1.0.0
 maven_group=ace.actually.pirates
 archives_base_name=ValkyrienPirates
 

src/main/java/ace/actually/pirates/ClientPirates.java

@@ -1,9 +1,11 @@
 package ace.actually.pirates;
 
+import ace.actually.pirates.blocks.CannonPrimingBlockEntityRenderer;
 import ace.actually.pirates.entities.ShotEntityRenderer;
 import ace.actually.pirates.entities.pirate.PirateEntityRenderer;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
+import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.util.Identifier;
 
@@ -17,7 +19,7 @@ public void onInitializeClient() {
         EntityRendererRegistry.register(Pirates.PIRATE_ENTITY_TYPE, PirateEntityRenderer::new);
         EntityRendererRegistry.register(Pirates.SHOT_ENTITY_TYPE, (context) -> new ShotEntityRenderer(context, 1,false));
 
-
+        BlockEntityRendererFactories.register(Pirates.CANNON_PRIMING_BLOCK_ENTITY, CannonPrimingBlockEntityRenderer::new);
 
 
     }

src/main/java/ace/actually/pirates/Pirates.java

@@ -1,38 +1,30 @@
 package ace.actually.pirates;
 
-import ace.actually.pirates.blocks.CannonPrimingBlock;
-import ace.actually.pirates.blocks.CannonPrimingBlockEntity;
-import ace.actually.pirates.blocks.MotionInvokingBlock;
-import ace.actually.pirates.blocks.MotionInvokingBlockEntity;
+import ace.actually.pirates.blocks.*;
 import ace.actually.pirates.entities.ShotEntity;
 import ace.actually.pirates.entities.pirate.PirateEntity;
 import ace.actually.pirates.items.RaycastingItem;
 import ace.actually.pirates.items.TestingStickItem;
+import ace.actually.pirates.sound.ModSounds;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
 import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
 import net.minecraft.block.AbstractBlock;
-import net.minecraft.block.DispenserBlock;
-import net.minecraft.block.dispenser.DispenserBehavior;
-import net.minecraft.block.dispenser.ProjectileDispenserBehavior;
+import net.minecraft.block.Blocks;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnGroup;
-import net.minecraft.entity.projectile.ProjectileEntity;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.Util;
-import net.minecraft.util.math.BlockPointer;
-import net.minecraft.util.math.Position;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,29 +47,36 @@ public void onInitialize() {
 		registerBlocks();
 		registerItems();
 		//block entities do it themselves
-		registerDispenserThings();
+		//registerDispenserThings();
 		PatternProcessor.setupBasicPatterns();
 		//ConfigUtils.checkConfigs();
+		ModSounds.registerSounds();
 		LOGGER.info("Let there be motion!");
 
+
 		//BiomeModifications.addSpawn(BiomeSelectors.categories(Biome.Category.OCEAN), SpawnGroup.WATER_CREATURE, Pirates.SHIP, 3, 1, 1);
 
 
 	}
 
+
 	private void registerEntityThings()
 	{
 
 		FabricDefaultAttributeRegistry.register(PIRATE_ENTITY_TYPE, PirateEntity.attributes());
 	}
 
 
-	public static final MotionInvokingBlock MOTION_INVOKING_BLOCK = new MotionInvokingBlock(AbstractBlock.Settings.create());
-	public static final CannonPrimingBlock CANNON_PRIMING_BLOCK = new CannonPrimingBlock(AbstractBlock.Settings.create());
+	public static final MotionInvokingBlock MOTION_INVOKING_BLOCK = new MotionInvokingBlock(AbstractBlock.Settings.copy(Blocks.BIRCH_WOOD).noBlockBreakParticles().hardness(7));
+	public static final CannonPrimingBlock CANNON_PRIMING_BLOCK = new CannonPrimingBlock(AbstractBlock.Settings.copy(Blocks.DISPENSER).hardness(5));
+	public static final DispenserCannonBlock DISPENSER_CANNON_BLOCK = new DispenserCannonBlock(AbstractBlock.Settings.copy(Blocks.DISPENSER).hardness(5));
+	public static final CrewSpawnerBlock CREW_SPAWNER_BLOCK = new CrewSpawnerBlock(AbstractBlock.Settings.copy(Blocks.BIRCH_WOOD).noBlockBreakParticles().noCollision());
 	private void registerBlocks()
 	{
 		Registry.register(Registries.BLOCK,new Identifier("pirates","cannon_priming_block"),CANNON_PRIMING_BLOCK);
 		Registry.register(Registries.BLOCK,new Identifier("pirates","motion_invoking_block"),MOTION_INVOKING_BLOCK);
+		Registry.register(Registries.BLOCK,new Identifier("pirates","dispenser_cannon_block"),DISPENSER_CANNON_BLOCK);
+		Registry.register(Registries.BLOCK,new Identifier("pirates","crew_spawner_block"),CREW_SPAWNER_BLOCK);
 
 	}
 
@@ -92,34 +91,12 @@ private void registerItems()
 		Registry.register(Registries.ITEM,new Identifier("pirates","cannonball"),CANNONBALL);
 
 		Registry.register(Registries.ITEM,new Identifier("pirates","cannon_priming_block"),new BlockItem(CANNON_PRIMING_BLOCK,new Item.Settings()));
-	}
-
+//		Registry.register(Registries.ITEM,new Identifier("pirates","motion_invoking_block"),new BlockItem(MOTION_INVOKING_BLOCK,new Item.Settings()));
+//		Registry.register(Registries.ITEM,new Identifier("pirates","crew_spawner_block"),new BlockItem(CREW_SPAWNER_BLOCK,new Item.Settings()));
 
-	private void registerDispenserThings()
-	{
-		DispenserBlock.registerBehavior(Pirates.CANNONBALL, new DispenserBehavior() {
-			public ItemStack dispense(BlockPointer blockPointer, ItemStack itemStack) {
-				return (new ProjectileDispenserBehavior() {
-					protected ProjectileEntity createProjectile(World world, Position position, ItemStack stack) {
-						ShotEntity qentity = Util.make(new ShotEntity(Pirates.SHOT_ENTITY_TYPE,world,null,Pirates.CANNONBALL,2,""), (entity) -> {
-							entity.setItem(stack);
-						});
-						qentity.setPosition(new Vec3d(position.getX(),position.getY(),position.getZ()));
-						return qentity;
-					}
-
-					protected float getVariation() {
-						return super.getVariation() * 0.5F;
-					}
-
-					protected float getForce() {
-						return super.getForce() * 1.25F;
-					}
-				}).dispense(blockPointer, itemStack);
-			}
-		});
 	}
 
+
 	//block entities
 	public static final BlockEntityType<MotionInvokingBlockEntity> MOTION_INVOKING_BLOCK_ENTITY = Registry.register(
 			Registries.BLOCK_ENTITY_TYPE,
@@ -131,12 +108,17 @@ protected float getForce() {
 			new Identifier("pirates", "cannon_priming_block_entity"),
 			FabricBlockEntityTypeBuilder.create(CannonPrimingBlockEntity::new, CANNON_PRIMING_BLOCK).build()
 	);
+	public static final BlockEntityType<CrewSpawnerBlockEntity> CREW_SPAWNER_BLOCK_ENTITY = Registry.register(
+			Registries.BLOCK_ENTITY_TYPE,
+			new Identifier("pirates", "crew_spawner_block_entity"),
+			FabricBlockEntityTypeBuilder.create(CrewSpawnerBlockEntity::new, CREW_SPAWNER_BLOCK).build()
+	);
 
 
 	//entities
 	public static final EntityType<ShotEntity> SHOT_ENTITY_TYPE =registerEntity("shot",SpawnGroup.MISC,EntityDimensions.changing(0.5f,0.5f),((type, world) -> new ShotEntity(world)));
 
-	public static final EntityType<PirateEntity> PIRATE_ENTITY_TYPE =registerEntity("pirate",SpawnGroup.MISC,EntityDimensions.changing(0.6f,1.7f),((type, world) -> new PirateEntity(world)));
+	public static final EntityType<PirateEntity> PIRATE_ENTITY_TYPE =registerEntity("pirate",SpawnGroup.MISC,EntityDimensions.changing(0.6f,1.9f),((type, world) -> new PirateEntity(world)));
 
 
 	public static <T extends Entity> EntityType<T> registerEntity(String name, SpawnGroup category, EntityDimensions size, EntityType.EntityFactory<T> factory) {

src/main/java/ace/actually/pirates/blocks/CannonPrimingBlock.java

@@ -5,38 +5,26 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
-import net.minecraft.block.entity.DispenserBlockEntity;
-import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.StateManager;
-import net.minecraft.text.Text;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.Hand;
-import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
 import net.minecraft.util.math.*;
-import net.minecraft.util.shape.VoxelShape;
-import net.minecraft.world.BlockStateRaycastContext;
-import net.minecraft.world.BlockView;
-import net.minecraft.world.RaycastContext;
-import net.minecraft.world.World;
+import net.minecraft.world.*;
 import org.jetbrains.annotations.Nullable;
-import org.joml.Vector3d;
-import org.valkyrienskies.core.api.ships.LoadedServerShip;
-import org.valkyrienskies.core.api.world.ServerShipWorld;
 import org.valkyrienskies.mod.common.VSGameUtilsKt;
-import org.valkyrienskies.mod.common.ValkyrienSkiesMod;
-import org.valkyrienskies.mod.common.util.DimensionIdProvider;
-import org.valkyrienskies.mod.common.world.RaycastUtilsKt;
 
 public class CannonPrimingBlock extends BlockWithEntity {
     public CannonPrimingBlock(Settings settings) {
         super(settings);
     }
+    public static final BooleanProperty DISARMED = Properties.DISARMED;
 
-    @Override
-    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
-        return Block.createCuboidShape(0,0,0,2,2,2);
-    }
 
     @Override
     public BlockRenderType getRenderType(BlockState state) {
@@ -45,40 +33,37 @@ public BlockRenderType getRenderType(BlockState state) {
 
     @Override
     protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
-        builder.add(RedstoneLampBlock.LIT);
+        builder.add(RedstoneLampBlock.LIT).add(Properties.FACING).add(DISARMED);
     }
 
     @Nullable
     @Override
     public BlockState getPlacementState(ItemPlacementContext ctx) {
-        return getDefaultState().with(RedstoneLampBlock.LIT,false);
-    }
+        BlockPos pos = ctx.getBlockPos();
+        World world = ctx.getWorld();
+        Direction facing;
 
-    /**
-     *
-     * @param origin a point to "look" from
-     * @param target a point to "look" at
-     * @return the vector that can be used to travel between these points
-     */
-    public Vec3d pointLine(Vec3d origin, Vec3d target)
-    {
-        double d = target.x - origin.x;
-        double e = target.y - origin.y;
-        double f = target.z - origin.z;
-        double g = Math.sqrt(d * d + f * f);
-        float pitch = (MathHelper.wrapDegrees((float)(-(MathHelper.atan2(e, g) * 57.2957763671875))));
-        float yaw = MathHelper.wrapDegrees((float)(MathHelper.atan2(f, d) * 57.2957763671875) - 90.0F);
-        return getRotationVector(pitch,yaw);
-    }
+        if (world.getBlockState(pos.north()).isOf(Blocks.DISPENSER)) {
+            facing = Direction.NORTH;
+        } else if (world.getBlockState(pos.east()).isOf(Blocks.DISPENSER)) {
+            facing = Direction.EAST;
+        }  else if (world.getBlockState(pos.south()).isOf(Blocks.DISPENSER)) {
+            facing = Direction.SOUTH;
+        }  else if (world.getBlockState(pos.west()).isOf(Blocks.DISPENSER)) {
+            facing = Direction.WEST;
+        }  else if (world.getBlockState(pos.up()).isOf(Blocks.DISPENSER)) {
+            facing = Direction.UP;
+        }  else if (world.getBlockState(pos.down()).isOf(Blocks.DISPENSER)) {
+            facing = Direction.DOWN;
+        } else {
+            facing = ctx.getPlayerLookDirection();
 
-    protected final Vec3d getRotationVector(float pitch, float yaw) {
-        float f = pitch * 0.017453292F;
-        float g = -yaw * 0.017453292F;
-        float h = MathHelper.cos(g);
-        float i = MathHelper.sin(g);
-        float j = MathHelper.cos(f);
-        float k = MathHelper.sin(f);
-        return new Vec3d((double)(i * j), (double)(-k), (double)(h * j));
+        }
+
+        if (world.getBlockState(pos.add(facing.getVector())).isOf(Blocks.DISPENSER) && world.getBlockState(pos.add(facing.getVector())).get(Properties.FACING) == facing) {
+            world.setBlockState(pos.add(facing.getVector()), Pirates.DISPENSER_CANNON_BLOCK.getDefaultState().with(Properties.FACING, facing), 3);
+        }
+        return getDefaultState().with(RedstoneLampBlock.LIT,false).with(Properties.FACING, facing).with(DISARMED, true);
     }
 
     @Nullable
@@ -91,20 +76,48 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
     @Nullable
     @Override
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
-        return checkType(type, Pirates.CANNON_PRIMING_BLOCK_ENTITY, CannonPrimingBlockEntity::tick);
+        return checkType(type, Pirates.CANNON_PRIMING_BLOCK_ENTITY, (world1, pos, state1, be) -> be.tick(world1, pos, state1, be));
     }
 
+//    @Override
+//    public boolean emitsRedstonePower(BlockState state) {
+//        return state.get(RedstoneLampBlock.LIT);
+//    }
+//
+//    @Override
+//    public int getWeakRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) {
+//       if(state.get(RedstoneLampBlock.LIT))
+//       {
+//           return 15;
+//       }
+//       return 0;
+//    }
+
     @Override
-    public boolean emitsRedstonePower(BlockState state) {
-        return state.get(RedstoneLampBlock.LIT);
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) {
+
+        if (world.getBlockState(pos.add(state.get(Properties.FACING).getVector())).isOf(Blocks.DISPENSER) && world.getBlockState(pos.add(state.get(Properties.FACING).getVector())).get(Properties.FACING) == state.get(Properties.FACING)) {
+            world.setBlockState(pos.add(state.get(Properties.FACING).getVector()), Pirates.DISPENSER_CANNON_BLOCK.getDefaultState().with(Properties.FACING, state.get(Properties.FACING)), 3);
+        }
+
+        if (world.isReceivingRedstonePower(pos) && !world.isClient()) {((CannonPrimingBlockEntity)world.getBlockEntity(pos)).fire((World) world, pos, state, 19);}
+        return super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos);
     }
 
-    @Override
-    public int getWeakRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) {
-       if(state.get(RedstoneLampBlock.LIT))
-       {
-           return 15;
-       }
-       return 0;
+    public BlockState rotate(BlockState state, BlockRotation rotation) {
+        return (BlockState)state.with(Properties.FACING, rotation.rotate((Direction)state.get(Properties.FACING)));
+    }
+
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.rotate(mirror.getRotation((Direction)state.get(Properties.FACING)));
+    }
+
+    public static void disarm(World world, BlockPos pos) {
+        if (world.isClient()) return;
+        BlockState blockState = world.getBlockState(pos);
+        if (!blockState.get(DISARMED)) {
+            world.setBlockState(pos, blockState.with(DISARMED, true));
+            world.playSound(null, pos, SoundEvents.BLOCK_REDSTONE_TORCH_BURNOUT, SoundCategory.BLOCKS, 0.5f, 1.5f);
+        }
     }
 }