diff --git a/src/main/java/anightdazingzoroark/prift/client/RiftSounds.java b/src/main/java/anightdazingzoroark/prift/client/RiftSounds.java index 6f4b6dd2..99b9bfe7 100644 --- a/src/main/java/anightdazingzoroark/prift/client/RiftSounds.java +++ b/src/main/java/anightdazingzoroark/prift/client/RiftSounds.java @@ -136,6 +136,12 @@ public class RiftSounds { @GameRegistry.ObjectHolder("prift.megaloceros.death") public static final SoundEvent MEGALOCEROS_DEATH = createSoundEvent("prift.megaloceros.death"); + @GameRegistry.ObjectHolder("prift.semi_manual_machine.reset") + public static final SoundEvent SEMI_MANUAL_MACHINE_RESET = createSoundEvent("prift.semi_manual_machine.reset"); + + @GameRegistry.ObjectHolder("prift.semi_manual_machine.jammed") + public static final SoundEvent SEMI_MANUAL_MACHINE_JAMMED = createSoundEvent("prift.semi_manual_machine.jammed"); + private static SoundEvent createSoundEvent(String soundName) { ResourceLocation soundID = new ResourceLocation(RiftInitialize.MODID, soundName); return new SoundEvent(soundID).setRegistryName(soundID); diff --git a/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualBase.java b/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualBase.java index 0f82f630..b75d5361 100644 --- a/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualBase.java +++ b/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualBase.java @@ -3,7 +3,6 @@ import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockSemiManualBase; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; import net.minecraft.inventory.ItemStackHelper; import net.minecraft.item.ItemStack; diff --git a/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualTopBase.java b/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualTopBase.java index a1cbb4b8..18d1a40b 100644 --- a/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualTopBase.java +++ b/src/main/java/anightdazingzoroark/prift/compat/mysticalmechanics/tileentities/TileEntitySemiManualTopBase.java @@ -4,12 +4,14 @@ import anightdazingzoroark.prift.compat.mysticalmechanics.ConsumerMechCapability; import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockSemiManualBase; import anightdazingzoroark.prift.compat.mysticalmechanics.recipes.RiftMMRecipes; -import anightdazingzoroark.prift.compat.mysticalmechanics.recipes.SemiManualExtractorRecipe; import anightdazingzoroark.prift.compat.mysticalmechanics.recipes.SemiManualRecipeBase; import mysticalmechanics.api.IMechCapability; import mysticalmechanics.api.MysticalMechanicsAPI; import mysticalmechanics.util.Misc; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.SoundEvents; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; import net.minecraft.network.play.server.SPacketUpdateTileEntity; @@ -17,11 +19,14 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.ITickable; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import javax.annotation.Nullable; +import java.util.List; import java.util.Random; public class TileEntitySemiManualTopBase extends TileEntity implements ITickable { @@ -42,7 +47,12 @@ public void onPowerChange() { @Override public void update() { if (this.world.isRemote) { - //add smoke particles when it needs to reset + //get nearby players that will hear the sounds + AxisAlignedBB hearRange = new AxisAlignedBB(this.getPos().getX() - 8, this.getPos().getY() - 8, this.getPos().getZ() - 8, this.getPos().getX() + 8, this.getPos().getY() + 8, this.getPos().getZ() + 8); + List playerList = this.world.getEntitiesWithinAABB(EntityPlayer.class, hearRange, null); + if (this.getPower() > 0 && this.world.rand.nextInt(40) < 2) for (EntityPlayer player : playerList) this.world.playSound(player, this.pos, SoundEvents.ENTITY_MINECART_RIDING, SoundCategory.BLOCKS, 0.75F, this.world.rand.nextFloat() * 0.4F + 0.8F); + + //add smoke particles and make jamming sounds when it needs to reset Random rand = new Random(); double motionX = rand.nextGaussian() * 0.07D; double motionY = rand.nextGaussian() * 0.07D; @@ -135,6 +145,10 @@ public void setMustBeReset(boolean value) { } } + public TileEntitySemiManualBase getBottomTEntity() { + return (TileEntitySemiManualBase)this.world.getTileEntity(this.pos.down()); + } + @Override public boolean shouldRefresh(World world, BlockPos pos, IBlockState oldState, IBlockState newSate) { return oldState.getBlock() != newSate.getBlock(); diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftBlowIntoTurbine.java b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftBlowIntoTurbine.java index 6a8ae165..8b177cbb 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftBlowIntoTurbine.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftBlowIntoTurbine.java @@ -1,17 +1,13 @@ package anightdazingzoroark.prift.server.entity.ai; -import anightdazingzoroark.prift.RiftInitialize; import anightdazingzoroark.prift.RiftUtil; -import anightdazingzoroark.prift.client.RiftSounds; import anightdazingzoroark.prift.compat.mysticalmechanics.tileentities.TileEntityBlowPoweredTurbine; import anightdazingzoroark.prift.config.GeneralConfig; import anightdazingzoroark.prift.server.entity.creature.RiftCreature; import anightdazingzoroark.prift.server.entity.interfaces.IWorkstationUser; -import com.codetaylor.mc.pyrotech.modules.tech.machine.tile.spi.TileCombustionWorkerStoneBase; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.Loader; public class RiftBlowIntoTurbine extends EntityAIBase { private final RiftCreature creature; @@ -80,7 +76,7 @@ public void updateTask() { } if (this.animTime == this.animLength) { this.user.setUsingWorkAnim(false); - this.creature.setEnergy(this.creature.getEnergy() - 3); + this.creature.energyActionMod++; this.creature.setXP(this.creature.getXP() + 5); } if (this.animTime > 120) { diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftControlledPackBuff.java b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftControlledPackBuff.java index 01fd92e3..c078922e 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftControlledPackBuff.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftControlledPackBuff.java @@ -1,6 +1,5 @@ package anightdazingzoroark.prift.server.entity.ai; -import anightdazingzoroark.prift.client.RiftSounds; import anightdazingzoroark.prift.server.entity.creature.RiftCreature; import anightdazingzoroark.prift.server.entity.interfaces.IPackHunter; import com.google.common.base.Predicate; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftPackBuff.java b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftPackBuff.java index 1bb6074b..792dd9e0 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftPackBuff.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftPackBuff.java @@ -1,6 +1,5 @@ package anightdazingzoroark.prift.server.entity.ai; -import anightdazingzoroark.prift.client.RiftSounds; import anightdazingzoroark.prift.server.entity.creature.RiftCreature; import anightdazingzoroark.prift.server.entity.interfaces.IPackHunter; import com.google.common.base.Predicate; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftParasaurStokeCombustor.java b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftParasaurStokeCombustor.java index 2ee97d14..e1d7f2cd 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftParasaurStokeCombustor.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftParasaurStokeCombustor.java @@ -1,22 +1,14 @@ package anightdazingzoroark.prift.server.entity.ai; -import anightdazingzoroark.prift.RiftInitialize; import anightdazingzoroark.prift.RiftUtil; import anightdazingzoroark.prift.client.RiftSounds; import anightdazingzoroark.prift.config.GeneralConfig; import anightdazingzoroark.prift.server.entity.creature.Parasaurolophus; -import com.codetaylor.mc.pyrotech.IAirflowConsumerCapability; -import com.codetaylor.mc.pyrotech.modules.core.ModuleCore; import com.codetaylor.mc.pyrotech.modules.tech.bloomery.tile.TileBloomery; import com.codetaylor.mc.pyrotech.modules.tech.machine.tile.spi.TileCombustionWorkerStoneBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.fml.common.Loader; - -import java.util.List; public class RiftParasaurStokeCombustor extends EntityAIBase { private Parasaurolophus parasaur; @@ -77,7 +69,10 @@ public void updateTask() { this.parasaur.setBlowing(true); this.parasaur.playSound(RiftSounds.PARASAUROLOPHUS_BLOW, 2, 1); } - if (this.animTime == this.animBlowTime) stoked.consumeAirflow(8f, false); + if (this.animTime == this.animBlowTime) { + stoked.consumeAirflow(8f, false); + this.parasaur.setXP(this.parasaur.getXP() + 5); + } } } if (tileEntity instanceof TileBloomery) { @@ -87,13 +82,15 @@ public void updateTask() { this.parasaur.setBlowing(true); this.parasaur.playSound(RiftSounds.PARASAUROLOPHUS_BLOW, 2, 1); } - if (this.animTime == this.animBlowTime) stoked.consumeAirflow(8f, false); + if (this.animTime == this.animBlowTime) { + stoked.consumeAirflow(8f, false); + this.parasaur.setXP(this.parasaur.getXP() + 5); + } } } if (this.animTime == this.animLength) { this.parasaur.setBlowing(false); - this.parasaur.setEnergy(this.parasaur.getEnergy() - 3); - this.parasaur.setXP(this.parasaur.getXP() + 5); + this.parasaur.energyActionMod++; } if (this.animTime > 120) { this.animTime = -1; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftSaurophaganaxUseLightBlast.java b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftSaurophaganaxUseLightBlast.java index 57c4e6da..d137d053 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftSaurophaganaxUseLightBlast.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftSaurophaganaxUseLightBlast.java @@ -2,16 +2,7 @@ import anightdazingzoroark.prift.client.RiftSounds; import anightdazingzoroark.prift.server.entity.creature.Saurophaganax; -import com.google.common.base.Predicate; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.DamageSource; -import net.minecraft.util.math.AxisAlignedBB; - -import javax.annotation.Nullable; -import java.util.List; public class RiftSaurophaganaxUseLightBlast extends EntityAIBase { protected final Saurophaganax saurophaganax; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftUseSemiManualMachine.java b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftUseSemiManualMachine.java index 33b45e40..45e721dc 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftUseSemiManualMachine.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/ai/RiftUseSemiManualMachine.java @@ -68,15 +68,15 @@ public void updateTask() { if (this.creature.getEnergy() > 6) { if (this.animTime == 0 && semiManualBase.getTopTEntity().getMustBeReset() && !semiManualBase.canDoResetAnim()) { this.user.setUsingWorkAnim(true); - this.creature.playSound(this.user.useAnimSound(), 2, 1); } if (this.animTime == this.animStompTime && semiManualBase.getTopTEntity().getMustBeReset() && !semiManualBase.canDoResetAnim()) { semiManualBase.setPlayResetAnim(true); semiManualBase.getTopTEntity().setMustBeReset(false); + this.creature.playSound(this.user.useAnimSound(), 2, 1); } if (this.animTime == this.animLength) { this.user.setUsingWorkAnim(false); - this.creature.setEnergy(this.creature.getEnergy() - 3); + this.creature.energyActionMod++; this.creature.setXP(this.creature.getXP() + 5); this.animTime = -1; } diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Anomalocaris.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Anomalocaris.java index 5210f855..8466272a 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Anomalocaris.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Anomalocaris.java @@ -36,7 +36,6 @@ import software.bernie.geckolib3.core.manager.AnimationData; import javax.annotation.Nullable; -import java.util.Arrays; import java.util.List; import java.util.UUID; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Apatosaurus.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Apatosaurus.java index 5d3d0a7f..daec35cb 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Apatosaurus.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Apatosaurus.java @@ -4,9 +4,7 @@ import anightdazingzoroark.prift.RiftUtil; import anightdazingzoroark.prift.SSRCompatUtils; import anightdazingzoroark.prift.client.RiftSounds; -import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockBlowPoweredTurbine; import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockSemiManualBase; -import anightdazingzoroark.prift.compat.mysticalmechanics.tileentities.TileEntityBlowPoweredTurbine; import anightdazingzoroark.prift.compat.mysticalmechanics.tileentities.TileEntitySemiManualBase; import anightdazingzoroark.prift.config.ApatosaurusConfig; import anightdazingzoroark.prift.config.GeneralConfig; @@ -23,7 +21,6 @@ import anightdazingzoroark.prift.server.items.RiftLargeWeaponItem; import anightdazingzoroark.prift.server.message.*; import com.google.common.base.Predicate; -import com.teamderpy.shouldersurfing.client.ShoulderInstance; import net.minecraft.block.Block; import net.minecraft.block.BlockHorizontal; import net.minecraft.block.state.IBlockState; @@ -48,7 +45,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import software.bernie.geckolib3.core.IAnimatable; @@ -60,7 +56,6 @@ import javax.annotation.Nullable; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.UUID; @@ -432,7 +427,7 @@ public void setUsingWorkAnim(boolean value) { } public SoundEvent useAnimSound() { - return null; + return RiftSounds.SEMI_MANUAL_MACHINE_RESET; } public boolean isTameableByFeeding() { diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Dodo.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Dodo.java index c127dc6e..7a123814 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Dodo.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Dodo.java @@ -3,8 +3,6 @@ import anightdazingzoroark.prift.RiftInitialize; import anightdazingzoroark.prift.RiftUtil; import anightdazingzoroark.prift.client.RiftSounds; -import anightdazingzoroark.prift.config.CoelacanthConfig; -import anightdazingzoroark.prift.config.DimetrodonConfig; import anightdazingzoroark.prift.config.DodoConfig; import anightdazingzoroark.prift.server.entity.RiftCreatureType; import anightdazingzoroark.prift.server.entity.ai.*; @@ -13,7 +11,6 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundEvent; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Parasaurolophus.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Parasaurolophus.java index 205515fd..78b8238e 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Parasaurolophus.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Parasaurolophus.java @@ -39,7 +39,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import software.bernie.geckolib3.core.IAnimatable; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Sarcosuchus.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Sarcosuchus.java index a1d321d5..fe33b508 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Sarcosuchus.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Sarcosuchus.java @@ -16,7 +16,6 @@ import net.ilexiconn.llibrary.server.entity.EntityPropertiesHandler; import net.minecraft.client.renderer.culling.ICamera; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.passive.EntityTameable; @@ -41,7 +40,6 @@ import software.bernie.geckolib3.core.manager.AnimationData; import javax.annotation.Nullable; -import java.util.Arrays; import java.util.List; import java.util.UUID; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Stegosaurus.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Stegosaurus.java index a95bc366..bab74e53 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Stegosaurus.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Stegosaurus.java @@ -4,18 +4,14 @@ import anightdazingzoroark.prift.RiftUtil; import anightdazingzoroark.prift.client.RiftSounds; import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockLeadPoweredCrank; -import anightdazingzoroark.prift.config.DimetrodonConfig; import anightdazingzoroark.prift.config.GeneralConfig; -import anightdazingzoroark.prift.config.MegapiranhaConfig; import anightdazingzoroark.prift.config.StegosaurusConfig; import anightdazingzoroark.prift.server.entity.RiftCreatureType; import anightdazingzoroark.prift.server.entity.RiftEntityProperties; import anightdazingzoroark.prift.server.entity.ai.*; import anightdazingzoroark.prift.server.entity.interfaces.ILeadWorkstationUser; -import anightdazingzoroark.prift.server.entity.interfaces.IWorkstationUser; import anightdazingzoroark.prift.server.entity.projectile.ThrownStegoPlate; import anightdazingzoroark.prift.server.enums.TameStatusType; -import com.codetaylor.mc.pyrotech.modules.tech.machine.block.spi.BlockCombustionWorkerStoneBase; import net.ilexiconn.llibrary.server.entity.EntityPropertiesHandler; import net.minecraft.block.Block; import net.minecraft.client.renderer.culling.ICamera; @@ -23,7 +19,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IRangedAttackMob; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.SoundEvents; @@ -40,7 +35,6 @@ import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import software.bernie.geckolib3.core.IAnimatable; diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Triceratops.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Triceratops.java index 6361d71e..79ad5962 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Triceratops.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Triceratops.java @@ -6,9 +6,7 @@ import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockLeadPoweredCrank; import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockSemiManualBase; import anightdazingzoroark.prift.compat.mysticalmechanics.blocks.BlockSemiManualBaseTop; -import anightdazingzoroark.prift.config.DimetrodonConfig; import anightdazingzoroark.prift.config.GeneralConfig; -import anightdazingzoroark.prift.config.MegapiranhaConfig; import anightdazingzoroark.prift.config.TriceratopsConfig; import anightdazingzoroark.prift.server.entity.RiftCreatureType; import anightdazingzoroark.prift.server.entity.ai.*; @@ -35,7 +33,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraft.world.storage.loot.LootTableList; -import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import software.bernie.geckolib3.core.IAnimatable; @@ -247,7 +244,7 @@ public void setUsingWorkAnim(boolean value) { @Override public SoundEvent useAnimSound() { - return null; + return RiftSounds.SEMI_MANUAL_MACHINE_RESET; } @Override diff --git a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Tyrannosaurus.java b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Tyrannosaurus.java index 28d1b884..e2720aa9 100644 --- a/src/main/java/anightdazingzoroark/prift/server/entity/creature/Tyrannosaurus.java +++ b/src/main/java/anightdazingzoroark/prift/server/entity/creature/Tyrannosaurus.java @@ -462,11 +462,12 @@ public void setUsingWorkAnim(boolean value) { } public SoundEvent useAnimSound() { - return RiftSounds.TYRANNOSAURUS_ROAR; + if (this.world.getTileEntity(this.getWorkstationPos()) instanceof TileEntityBlowPoweredTurbine) return RiftSounds.TYRANNOSAURUS_ROAR; + else if (this.world.getTileEntity(this.getWorkstationPos()) instanceof TileEntitySemiManualBase) return RiftSounds.SEMI_MANUAL_MACHINE_RESET; + return null; } public void setRoaring(boolean value) { - System.out.println("is roaring: "+value); this.dataManager.set(ROARING, value); this.setActing(value); } @@ -476,7 +477,6 @@ public boolean isRoaring() { } public void setStomping(boolean value) { - System.out.println("is stomping: "+value); this.dataManager.set(STOMPING, value); this.setActing(value); } diff --git a/src/main/resources/assets/prift/models/item/cannon.json b/src/main/resources/assets/prift/models/item/cannon.json index 98e5f13e..3613ab0c 100644 --- a/src/main/resources/assets/prift/models/item/cannon.json +++ b/src/main/resources/assets/prift/models/item/cannon.json @@ -1,6 +1,130 @@ { - "parent": "item/generated", - "textures": { - "layer0": "prift:items/cannon" - } + "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [128, 128], + "textures": { + "0": "prift:entities/cannon" + }, + "elements": [ + { + "name": "bone", + "from": [4, 7, -6], + "to": [12, 15, 19], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 10.875, 15.5]}, + "faces": { + "north": {"uv": [3.125, 3.125, 4.125, 4.125], "texture": "#0"}, + "east": {"uv": [0, 3.125, 3.125, 4.125], "texture": "#0"}, + "south": {"uv": [7.25, 3.125, 8.25, 4.125], "texture": "#0"}, + "west": {"uv": [4.125, 3.125, 7.25, 4.125], "texture": "#0"}, + "up": {"uv": [4.125, 3.125, 3.125, 0], "texture": "#0"}, + "down": {"uv": [5.125, 0, 4.125, 3.125], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [3, 5, 12], + "to": [13, 13, 20], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6.125, 1, 7.375, 2], "texture": "#0"}, + "east": {"uv": [5.125, 1, 6.125, 2], "texture": "#0"}, + "south": {"uv": [8.375, 1, 9.625, 2], "texture": "#0"}, + "west": {"uv": [7.375, 1, 8.375, 2], "texture": "#0"}, + "up": {"uv": [7.375, 1, 6.125, 0], "texture": "#0"}, + "down": {"uv": [8.625, 0, 7.375, 1], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [3, 5, -1], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0.25, 0.25, 1.5, 1.25], "texture": "#0"}, + "east": {"uv": [0, 0.25, 0.25, 1.25], "texture": "#0"}, + "south": {"uv": [1.75, 0.25, 3, 1.25], "texture": "#0"}, + "west": {"uv": [1.5, 0.25, 1.75, 1.25], "texture": "#0"}, + "up": {"uv": [1.5, 0.25, 0.25, 0], "texture": "#0"}, + "down": {"uv": [2.75, 0, 1.5, 0.25], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [2, 3, -2], + "to": [14, 5, 21], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2.875, 7, 4.375, 7.25], "texture": "#0"}, + "east": {"uv": [0, 7, 2.875, 7.25], "texture": "#0"}, + "south": {"uv": [7.25, 7, 8.75, 7.25], "texture": "#0"}, + "west": {"uv": [4.375, 7, 7.25, 7.25], "texture": "#0"}, + "up": {"uv": [4.375, 7, 2.875, 4.125], "texture": "#0"}, + "down": {"uv": [5.875, 4.125, 4.375, 7], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [0, 0, 0], + "to": [2, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6.5, 4.75, 6.75, 5.375], "texture": "#0"}, + "east": {"uv": [5.875, 4.75, 6.5, 5.375], "texture": "#0"}, + "south": {"uv": [7.375, 4.75, 7.625, 5.375], "texture": "#0"}, + "west": {"uv": [6.75, 4.75, 7.375, 5.375], "texture": "#0"}, + "up": {"uv": [6.75, 4.75, 6.5, 4.125], "texture": "#0"}, + "down": {"uv": [7, 4.125, 6.75, 4.75], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [0, 0, 14], + "to": [2, 5, 19], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6.5, 4.75, 6.75, 5.375], "texture": "#0"}, + "east": {"uv": [5.875, 4.75, 6.5, 5.375], "texture": "#0"}, + "south": {"uv": [7.375, 4.75, 7.625, 5.375], "texture": "#0"}, + "west": {"uv": [6.75, 4.75, 7.375, 5.375], "texture": "#0"}, + "up": {"uv": [6.75, 4.75, 6.5, 4.125], "texture": "#0"}, + "down": {"uv": [7, 4.125, 6.75, 4.75], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [14, 0, 0], + "to": [16, 5, 5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6.75, 4.75, 6.5, 5.375], "texture": "#0"}, + "east": {"uv": [7.375, 4.75, 6.75, 5.375], "texture": "#0"}, + "south": {"uv": [7.625, 4.75, 7.375, 5.375], "texture": "#0"}, + "west": {"uv": [6.5, 4.75, 5.875, 5.375], "texture": "#0"}, + "up": {"uv": [6.5, 4.75, 6.75, 4.125], "texture": "#0"}, + "down": {"uv": [6.75, 4.125, 7, 4.75], "texture": "#0"} + } + }, + { + "name": "bone", + "from": [14, 0, 14], + "to": [16, 5, 19], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [6.75, 4.75, 6.5, 5.375], "texture": "#0"}, + "east": {"uv": [7.375, 4.75, 6.75, 5.375], "texture": "#0"}, + "south": {"uv": [7.625, 4.75, 7.375, 5.375], "texture": "#0"}, + "west": {"uv": [6.5, 4.75, 5.875, 5.375], "texture": "#0"}, + "up": {"uv": [6.5, 4.75, 6.75, 4.125], "texture": "#0"}, + "down": {"uv": [6.75, 4.125, 7, 4.75], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "bone", + "origin": [8, 0, 8], + "color": 0, + "children": [0, 1, 2, 3, 4, 5, 6, 7] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/prift/models/item/catapult.json b/src/main/resources/assets/prift/models/item/catapult.json index c5a4b00b..00db58b0 100644 --- a/src/main/resources/assets/prift/models/item/catapult.json +++ b/src/main/resources/assets/prift/models/item/catapult.json @@ -1,6 +1,363 @@ { - "parent": "item/generated", - "textures": { - "layer0": "prift:items/catapult" - } + "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [128, 128], + "textures": { + "0": "prift:entities/catapult" + }, + "elements": [ + { + "name": "body", + "from": [2, 3, -11], + "to": [14, 5, 14], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [3.125, 7.125, 4.625, 7.375], "texture": "#0"}, + "east": {"uv": [0, 7.125, 3.125, 7.375], "texture": "#0"}, + "south": {"uv": [7.75, 7.125, 9.25, 7.375], "texture": "#0"}, + "west": {"uv": [4.625, 7.125, 7.75, 7.375], "texture": "#0"}, + "up": {"uv": [4.625, 7.125, 3.125, 4], "texture": "#0"}, + "down": {"uv": [6.125, 4, 4.625, 7.125], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, -9], + "to": [2, 5, -4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.625, 8.375, 0.875, 9], "texture": "#0"}, + "east": {"uv": [0, 8.375, 0.625, 9], "texture": "#0"}, + "south": {"uv": [1.5, 8.375, 1.75, 9], "texture": "#0"}, + "west": {"uv": [0.875, 8.375, 1.5, 9], "texture": "#0"}, + "up": {"uv": [0.875, 8.375, 0.625, 7.75], "texture": "#0"}, + "down": {"uv": [1.125, 7.75, 0.875, 8.375], "texture": "#0"} + } + }, + { + "name": "body", + "from": [0, 0, 7], + "to": [2, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.625, 8.375, 0.875, 9], "texture": "#0"}, + "east": {"uv": [0, 8.375, 0.625, 9], "texture": "#0"}, + "south": {"uv": [1.5, 8.375, 1.75, 9], "texture": "#0"}, + "west": {"uv": [0.875, 8.375, 1.5, 9], "texture": "#0"}, + "up": {"uv": [0.875, 8.375, 0.625, 7.75], "texture": "#0"}, + "down": {"uv": [1.125, 7.75, 0.875, 8.375], "texture": "#0"} + } + }, + { + "name": "body", + "from": [14, 0, 7], + "to": [16, 5, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.625, 8.375, 0.875, 9], "texture": "#0"}, + "east": {"uv": [0, 8.375, 0.625, 9], "texture": "#0"}, + "south": {"uv": [1.5, 8.375, 1.75, 9], "texture": "#0"}, + "west": {"uv": [0.875, 8.375, 1.5, 9], "texture": "#0"}, + "up": {"uv": [0.875, 8.375, 0.625, 7.75], "texture": "#0"}, + "down": {"uv": [1.125, 7.75, 0.875, 8.375], "texture": "#0"} + } + }, + { + "name": "body", + "from": [14, 0, -9], + "to": [16, 5, -4], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.625, 8.375, 0.875, 9], "texture": "#0"}, + "east": {"uv": [0, 8.375, 0.625, 9], "texture": "#0"}, + "south": {"uv": [1.5, 8.375, 1.75, 9], "texture": "#0"}, + "west": {"uv": [0.875, 8.375, 1.5, 9], "texture": "#0"}, + "up": {"uv": [0.875, 8.375, 0.625, 7.75], "texture": "#0"}, + "down": {"uv": [1.125, 7.75, 0.875, 8.375], "texture": "#0"} + } + }, + { + "name": "catapult", + "from": [11, 5, 11.475], + "to": [13, 13, 13.475], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [2.5, 0.25, 2.75, 1.25], "texture": "#0"}, + "east": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#0"}, + "south": {"uv": [3, 0.25, 3.25, 1.25], "texture": "#0"}, + "west": {"uv": [2.75, 0.25, 3, 1.25], "texture": "#0"}, + "up": {"uv": [2.75, 0.25, 2.5, 0], "texture": "#0"}, + "down": {"uv": [3, 0, 2.75, 0.25], "texture": "#0"} + } + }, + { + "name": "catapult", + "from": [3, 5, 11.475], + "to": [5, 13, 13.475], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [2.5, 0.25, 2.75, 1.25], "texture": "#0"}, + "east": {"uv": [2.25, 0.25, 2.5, 1.25], "texture": "#0"}, + "south": {"uv": [3, 0.25, 3.25, 1.25], "texture": "#0"}, + "west": {"uv": [2.75, 0.25, 3, 1.25], "texture": "#0"}, + "up": {"uv": [2.75, 0.25, 2.5, 0], "texture": "#0"}, + "down": {"uv": [3, 0, 2.75, 0.25], "texture": "#0"} + } + }, + { + "name": "catapult", + "from": [2.475, 7.5, -8.025], + "to": [2.475, 10.5, 13.975], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [2.75, 7.375, 2.75, 7.75], "texture": "#0"}, + "east": {"uv": [0, 7.375, 2.75, 7.75], "texture": "#0"}, + "south": {"uv": [5.5, 7.375, 5.5, 7.75], "texture": "#0"}, + "west": {"uv": [2.75, 7.375, 5.5, 7.75], "texture": "#0"}, + "up": {"uv": [2.75, 7.375, 2.75, 4.625], "texture": "#0"}, + "down": {"uv": [2.75, 4.625, 2.75, 7.375], "texture": "#0"} + } + }, + { + "name": "catapult", + "from": [1.225, 8.5, -7.025], + "to": [3.225, 9.5, -6.025], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.125, 0.125, 0.375, 0.25], "texture": "#0"}, + "east": {"uv": [0, 0.125, 0.125, 0.25], "texture": "#0"}, + "south": {"uv": [0.5, 0.125, 0.75, 0.25], "texture": "#0"}, + "west": {"uv": [0.375, 0.125, 0.5, 0.25], "texture": "#0"}, + "up": {"uv": [0.375, 0.125, 0.125, 0], "texture": "#0"}, + "down": {"uv": [0.625, 0, 0.375, 0.125], "texture": "#0"} + } + }, + { + "name": "catapult", + "from": [0.425, 8.45, -7.075], + "to": [1.525, 9.55, -5.975], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.125, 0.625, 0.25, 0.75], "texture": "#0"}, + "east": {"uv": [0, 0.625, 0.125, 0.75], "texture": "#0"}, + "south": {"uv": [0.375, 0.625, 0.5, 0.75], "texture": "#0"}, + "west": {"uv": [0.25, 0.625, 0.375, 0.75], "texture": "#0"}, + "up": {"uv": [0.25, 0.625, 0.125, 0.5], "texture": "#0"}, + "down": {"uv": [0.375, 0.5, 0.25, 0.625], "texture": "#0"} + } + }, + { + "name": "catapult", + "from": [3, 5, -10.525], + "to": [13, 13, -2.525], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [6.25, 2.625, 7.5, 3.625], "texture": "#0"}, + "east": {"uv": [5.25, 2.625, 6.25, 3.625], "texture": "#0"}, + "south": {"uv": [8.5, 2.625, 9.75, 3.625], "texture": "#0"}, + "west": {"uv": [7.5, 2.625, 8.5, 3.625], "texture": "#0"}, + "up": {"uv": [7.5, 2.625, 6.25, 1.625], "texture": "#0"}, + "down": {"uv": [8.75, 1.625, 7.5, 2.625], "texture": "#0"} + } + }, + { + "name": "rightCatapultGearOne", + "from": [1.225, 8.5, 11.975], + "to": [3.225, 9.5, 12.975], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.125, 0.375, 0.375, 0.5], "texture": "#0"}, + "east": {"uv": [0, 0.375, 0.125, 0.5], "texture": "#0"}, + "south": {"uv": [0.5, 0.375, 0.75, 0.5], "texture": "#0"}, + "west": {"uv": [0.375, 0.375, 0.5, 0.5], "texture": "#0"}, + "up": {"uv": [0.375, 0.375, 0.125, 0.25], "texture": "#0"}, + "down": {"uv": [0.625, 0.25, 0.375, 0.375], "texture": "#0"} + } + }, + { + "name": "rightCatapultGearOne", + "from": [1.475, 5.75, 9.225], + "to": [1.975, 12.25, 15.725], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [2, 1.75, 2.125, 2.625], "texture": "#0"}, + "east": {"uv": [1.125, 1.75, 2, 2.625], "texture": "#0"}, + "south": {"uv": [3, 1.75, 3.125, 2.625], "texture": "#0"}, + "west": {"uv": [2.125, 1.75, 3, 2.625], "texture": "#0"}, + "up": {"uv": [2.125, 1.75, 2, 0.875], "texture": "#0"}, + "down": {"uv": [2.25, 0.875, 2.125, 1.75], "texture": "#0"} + } + }, + { + "name": "rightCatapultGearOne", + "from": [0.175, 8.45, 11.925], + "to": [1.275, 15.55, 13.025], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [1.375, 2.75, 1.5, 3.625], "texture": "#0"}, + "east": {"uv": [1.25, 2.75, 1.375, 3.625], "texture": "#0"}, + "south": {"uv": [1.625, 2.75, 1.75, 3.625], "texture": "#0"}, + "west": {"uv": [1.5, 2.75, 1.625, 3.625], "texture": "#0"}, + "up": {"uv": [1.5, 2.75, 1.375, 2.625], "texture": "#0"}, + "down": {"uv": [1.625, 2.625, 1.5, 2.75], "texture": "#0"} + } + }, + { + "name": "rightCatapultGearOne", + "from": [-1.625, 14.65, 12.125], + "to": [1.075, 15.35, 12.825], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [1.25, 0.125, 1.625, 0.25], "texture": "#0"}, + "east": {"uv": [1.125, 0.125, 1.25, 0.25], "texture": "#0"}, + "south": {"uv": [1.75, 0.125, 2.125, 0.25], "texture": "#0"}, + "west": {"uv": [1.625, 0.125, 1.75, 0.25], "texture": "#0"}, + "up": {"uv": [1.625, 0.125, 1.25, 0], "texture": "#0"}, + "down": {"uv": [2, 0, 1.625, 0.125], "texture": "#0"} + } + }, + { + "name": "rightCatapultGearTwo", + "from": [1.475, 5.75, -9.775], + "to": [1.975, 12.25, -3.275], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [0.875, 0.875, 1, 1.75], "texture": "#0"}, + "east": {"uv": [0, 0.875, 0.875, 1.75], "texture": "#0"}, + "south": {"uv": [1.875, 0.875, 2, 1.75], "texture": "#0"}, + "west": {"uv": [1, 0.875, 1.875, 1.75], "texture": "#0"}, + "up": {"uv": [1, 0.875, 0.875, 0], "texture": "#0"}, + "down": {"uv": [1.125, 0, 1, 0.875], "texture": "#0"} + } + }, + { + "name": "catapultHand", + "from": [3, 7.06347, 21.1663], + "to": [13, 10.06347, 31.1663], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 2]}, + "faces": { + "north": {"uv": [6.5, 1.25, 7.75, 1.625], "texture": "#0"}, + "east": {"uv": [5.25, 1.25, 6.5, 1.625], "texture": "#0"}, + "south": {"uv": [9, 1.25, 10.25, 1.625], "texture": "#0"}, + "west": {"uv": [7.75, 1.25, 9, 1.625], "texture": "#0"}, + "up": {"uv": [7.75, 1.25, 6.5, 0], "texture": "#0"}, + "down": {"uv": [9, 0, 7.75, 1.25], "texture": "#0"} + } + }, + { + "name": "catapultHand", + "from": [3, 10.06347, 21.1663], + "to": [13, 11.06347, 22.1663], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, -0.00004]}, + "faces": { + "north": {"uv": [0.125, 5.5, 1.375, 5.625], "texture": "#0"}, + "east": {"uv": [0, 5.5, 0.125, 5.625], "texture": "#0"}, + "south": {"uv": [1.5, 5.5, 2.75, 5.625], "texture": "#0"}, + "west": {"uv": [1.375, 5.5, 1.5, 5.625], "texture": "#0"}, + "up": {"uv": [1.375, 5.5, 0.125, 5.375], "texture": "#0"}, + "down": {"uv": [2.625, 5.375, 1.375, 5.5], "texture": "#0"} + } + }, + { + "name": "catapultHand", + "from": [3, 10.06347, 30.1663], + "to": [13, 11.06347, 31.1663], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 7.1663]}, + "faces": { + "north": {"uv": [0.125, 5.25, 1.375, 5.375], "texture": "#0"}, + "east": {"uv": [0, 5.25, 0.125, 5.375], "texture": "#0"}, + "south": {"uv": [1.5, 5.25, 2.75, 5.375], "texture": "#0"}, + "west": {"uv": [1.375, 5.25, 1.5, 5.375], "texture": "#0"}, + "up": {"uv": [1.375, 5.25, 0.125, 5.125], "texture": "#0"}, + "down": {"uv": [2.625, 5.125, 1.375, 5.25], "texture": "#0"} + } + }, + { + "name": "catapultHand", + "from": [12, 10.06347, 22.1663], + "to": [13, 11.06347, 30.1663], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6.1663]}, + "faces": { + "north": {"uv": [1, 5, 1.125, 5.125], "texture": "#0"}, + "east": {"uv": [0, 5, 1, 5.125], "texture": "#0"}, + "south": {"uv": [2.125, 5, 2.25, 5.125], "texture": "#0"}, + "west": {"uv": [1.125, 5, 2.125, 5.125], "texture": "#0"}, + "up": {"uv": [1.125, 5, 1, 4], "texture": "#0"}, + "down": {"uv": [1.25, 4, 1.125, 5], "texture": "#0"} + } + }, + { + "name": "catapultHand", + "from": [3, 10.06347, 22.1663], + "to": [4, 11.06347, 30.1663], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 6.1663]}, + "faces": { + "north": {"uv": [1, 3.625, 1.125, 3.75], "texture": "#0"}, + "east": {"uv": [0, 3.625, 1, 3.75], "texture": "#0"}, + "south": {"uv": [2.125, 3.625, 2.25, 3.75], "texture": "#0"}, + "west": {"uv": [1.125, 3.625, 2.125, 3.75], "texture": "#0"}, + "up": {"uv": [1.125, 3.625, 1, 2.625], "texture": "#0"}, + "down": {"uv": [1.25, 2.625, 1.125, 3.625], "texture": "#0"} + } + }, + { + "name": "catapultHand", + "from": [5, 8.06347, -8.83366], + "to": [11, 10.06347, 21.16634], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 0]}, + "faces": { + "north": {"uv": [3.75, 3.75, 4.5, 4], "texture": "#0"}, + "east": {"uv": [0, 3.75, 3.75, 4], "texture": "#0"}, + "south": {"uv": [8.25, 3.75, 9, 4], "texture": "#0"}, + "west": {"uv": [4.5, 3.75, 8.25, 4], "texture": "#0"}, + "up": {"uv": [4.5, 3.75, 3.75, 0], "texture": "#0"}, + "down": {"uv": [5.25, 0, 4.5, 3.75], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "body", + "origin": [8, 0, 8], + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + { + "name": "catapult", + "origin": [6.975, -18, 9.1], + "color": 1, + "children": [ + 5, + 6, + 7, + 8, + 9, + 10, + { + "name": "rightCatapultGearOne", + "origin": [2.725, 9, 20.475], + "color": 2, + "children": [11, 12, 13, 14] + }, + { + "name": "rightCatapultGearTwo", + "origin": [1.725, 9, 1.475], + "color": 3, + "children": [15] + }, + { + "name": "catapultHand", + "origin": [8.975, 8, 1.475], + "color": 4, + "children": [16, 17, 18, 19, 20, 21] + } + ] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/prift/models/item/mortar.json b/src/main/resources/assets/prift/models/item/mortar.json index 4fefda61..38ed3f48 100644 --- a/src/main/resources/assets/prift/models/item/mortar.json +++ b/src/main/resources/assets/prift/models/item/mortar.json @@ -1,6 +1,129 @@ { - "parent": "item/generated", - "textures": { - "layer0": "prift:items/mortar" - } + "credit": "Made with Blockbench", + "parent": "block/block", + "texture_size": [128, 128], + "textures": { + "0": "prift:entities/mortar" + }, + "elements": [ + { + "name": "mortar", + "from": [4, 2, 4], + "to": [12, 26, 12], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 1, 8]}, + "faces": { + "north": {"uv": [3, 2.25, 4, 5.25], "texture": "#0"}, + "east": {"uv": [2, 2.25, 3, 5.25], "texture": "#0"}, + "south": {"uv": [5, 2.25, 6, 5.25], "texture": "#0"}, + "west": {"uv": [4, 2.25, 5, 5.25], "texture": "#0"}, + "up": {"uv": [4, 2.25, 3, 1.25], "texture": "#0"}, + "down": {"uv": [5, 1.25, 4, 2.25], "texture": "#0"} + } + }, + { + "name": "mortar", + "from": [0, 0, 0], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2, 11.5, 4, 11.625], "texture": "#0"}, + "east": {"uv": [0, 11.5, 2, 11.625], "texture": "#0"}, + "south": {"uv": [6, 11.5, 8, 11.625], "texture": "#0"}, + "west": {"uv": [4, 11.5, 6, 11.625], "texture": "#0"}, + "up": {"uv": [4, 11.5, 2, 9.5], "texture": "#0"}, + "down": {"uv": [6, 9.5, 4, 11.5], "texture": "#0"} + } + }, + { + "name": "mortar", + "from": [2, 1, 2], + "to": [14, 4, 12], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [2.5, 9.125, 4, 9.5], "texture": "#0"}, + "east": {"uv": [1.25, 9.125, 2.5, 9.5], "texture": "#0"}, + "south": {"uv": [5.25, 9.125, 6.75, 9.5], "texture": "#0"}, + "west": {"uv": [4, 9.125, 5.25, 9.5], "texture": "#0"}, + "up": {"uv": [4, 9.125, 2.5, 7.875], "texture": "#0"}, + "down": {"uv": [5.5, 7.875, 4, 9.125], "texture": "#0"} + } + }, + { + "name": "mortar", + "from": [2, 15, -4], + "to": [14, 17, -2], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 9]}, + "faces": { + "north": {"uv": [2.5, 5.5, 4, 5.75], "texture": "#0"}, + "east": {"uv": [2.25, 5.5, 2.5, 5.75], "texture": "#0"}, + "south": {"uv": [4.25, 5.5, 5.75, 5.75], "texture": "#0"}, + "west": {"uv": [4, 5.5, 4.25, 5.75], "texture": "#0"}, + "up": {"uv": [4, 5.5, 2.5, 5.25], "texture": "#0"}, + "down": {"uv": [5.5, 5.25, 4, 5.5], "texture": "#0"} + } + }, + { + "name": "mortar", + "from": [12.5, 0, -3.5], + "to": [13.5, 16, -2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 9]}, + "faces": { + "north": {"uv": [2.625, 5.875, 2.75, 7.875], "texture": "#0"}, + "east": {"uv": [2.5, 5.875, 2.625, 7.875], "texture": "#0"}, + "south": {"uv": [2.875, 5.875, 3, 7.875], "texture": "#0"}, + "west": {"uv": [2.75, 5.875, 2.875, 7.875], "texture": "#0"}, + "up": {"uv": [2.75, 5.875, 2.625, 5.75], "texture": "#0"}, + "down": {"uv": [2.875, 5.75, 2.75, 5.875], "texture": "#0"} + } + }, + { + "name": "mortar", + "from": [2.5, 0, -3.5], + "to": [3.5, 16, -2.5], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 9]}, + "faces": { + "north": {"uv": [5.25, 5.875, 5.125, 7.875], "texture": "#0"}, + "east": {"uv": [5.375, 5.875, 5.25, 7.875], "texture": "#0"}, + "south": {"uv": [5.5, 5.875, 5.375, 7.875], "texture": "#0"}, + "west": {"uv": [5.125, 5.875, 5, 7.875], "texture": "#0"}, + "up": {"uv": [5.125, 5.875, 5.25, 5.75], "texture": "#0"}, + "down": {"uv": [5.25, 5.75, 5.375, 5.875], "texture": "#0"} + } + }, + { + "name": "ammoHole", + "from": [6.5, 8, 3.25], + "to": [9.5, 15, 6.25], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 0, 5]}, + "faces": { + "north": {"uv": [3.625, 0.375, 4, 1.25], "texture": "#0"}, + "east": {"uv": [3.25, 0.375, 3.625, 1.25], "texture": "#0"}, + "south": {"uv": [4.375, 0.375, 4.75, 1.25], "texture": "#0"}, + "west": {"uv": [4, 0.375, 4.375, 1.25], "texture": "#0"}, + "up": {"uv": [4, 0.375, 3.625, 0], "texture": "#0"}, + "down": {"uv": [4.375, 0, 4, 0.375], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "mortar", + "origin": [8, 0, 8], + "color": 0, + "children": [ + 0, + 1, + 2, + 3, + 4, + 5, + { + "name": "ammoHole", + "origin": [8, 8, 7.75], + "color": 1, + "children": [6] + } + ] + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/prift/sounds.json b/src/main/resources/assets/prift/sounds.json index 34f6d8ed..b5791667 100644 --- a/src/main/resources/assets/prift/sounds.json +++ b/src/main/resources/assets/prift/sounds.json @@ -315,5 +315,20 @@ "prift:entities/megaloceros/megaloceros_death" ], "subtitle": "sounds.subtitle.megaloceros_death" + }, + + "prift.semi_manual_machine.reset": { + "category": "block", + "sounds": [ + "prift:blocks/semi_manual_machine_reset" + ], + "subtitle": "sounds.subtitle.semi_manual_machine_reset" + }, + "prift.semi_manual_machine.jammed": { + "category": "block", + "sounds": [ + "prift:blocks/semi_manual_machine_jammed" + ], + "subtitle": "sounds.subtitle.semi_manual_machine_jammed" } } \ No newline at end of file diff --git a/src/main/resources/assets/prift/sounds/blocks/semi_manual_machine_jammed.ogg b/src/main/resources/assets/prift/sounds/blocks/semi_manual_machine_jammed.ogg new file mode 100644 index 00000000..b5e2b8e3 Binary files /dev/null and b/src/main/resources/assets/prift/sounds/blocks/semi_manual_machine_jammed.ogg differ diff --git a/src/main/resources/assets/prift/sounds/blocks/semi_manual_machine_reset.ogg b/src/main/resources/assets/prift/sounds/blocks/semi_manual_machine_reset.ogg new file mode 100644 index 00000000..b3b75db5 Binary files /dev/null and b/src/main/resources/assets/prift/sounds/blocks/semi_manual_machine_reset.ogg differ diff --git a/src/main/resources/assets/prift/textures/entities/catapult.png b/src/main/resources/assets/prift/textures/entities/catapult.png index 79f92835..d5518c76 100644 Binary files a/src/main/resources/assets/prift/textures/entities/catapult.png and b/src/main/resources/assets/prift/textures/entities/catapult.png differ