From 713f38488fe315329a5b8be30ef14859cdb64965 Mon Sep 17 00:00:00 2001 From: Karl Satchi Navida Date: Thu, 12 Dec 2024 11:56:10 +0800 Subject: [PATCH] Implemented Mapping Migrations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Implemented the mapping migrations for the source files. [CHANGELOG] 🟢 Added Turret Remover repair ingredients tag. 🟢 🟡 Updated Gradle to 8.11. 🟡 Made healables and effect sources protected in Cannon Turret entity class. 🟡 Updated codes of Turret Entity to the newly mapped source files. 🟡 Updated codes of Turret Remover item class to the newly mapped source files. 🟡 Updated codes of Tool Materials enum to the newly mapped source files. 🟡 Temporarily commented out fuel registries. 🟡 Updated codes of Turret Item class to the newly mapped source files. 🔴 Removed remapped files. --- gradle/wrapper/gradle-wrapper.jar | Bin 43453 -> 43583 bytes gradlew | 5 +- gradlew.bat | 2 + .../defensive_measures/DefensiveMeasures.java | 53 - .../advancement/criterion/ModCriterion.java | 14 - .../TurretItemRetrievedCriterion.java | 54 - .../entity/ModEntities.java | 86 -- .../entity/TurretMaterial.java | 6 - .../entity/ai/goal/TargetOtherTeamGoal.java | 34 - .../entity/ai/goal/TargetPlayerGoal.java | 32 - .../entity/turrets/CannonTurretEntity.java | 344 ------ .../entity/turrets/Itemable.java | 154 --- .../entity/turrets/TurretEntity.java | 1100 ----------------- .../item/ModItemGroups.java | 50 - .../defensive_measures/item/ModItems.java | 137 -- .../item/ModToolMaterials.java | 62 - .../item/equipments/TurretRemoverItem.java | 31 - .../item/turrets/TurretItem.java | 152 --- .../item/turrets/cannon/CannonBaseItem.java | 21 - .../item/turrets/cannon/CannonHeadItem.java | 17 - .../item/turrets/cannon/CannonStandItem.java | 21 - .../item/turrets/cannon/CannonTurretItem.java | 18 - .../cannon/UnfinishedCannonHeadItem.java | 14 - .../network/ModPackets.java | 8 - .../particle/ModParticles.java | 26 - .../sound/ModSoundEvents.java | 59 - .../defensive_measures/util/ItemUtil.java | 59 - .../entity/ai/goal/TargetPlayerGoal.java | 4 +- .../entity/turrets/CannonTurretEntity.java | 4 +- .../entity/turrets/TurretEntity.java | 13 +- .../defensive_measures/item/ModItems.java | 3 +- .../item/ModToolMaterials.java | 59 +- .../item/equipments/TurretRemoverItem.java | 4 +- .../item/turrets/TurretItem.java | 20 +- .../item/turrets/cannon/CannonBaseItem.java | 4 +- .../tags/item/turret_remover_repairable.json | 7 + 36 files changed, 67 insertions(+), 2610 deletions(-) delete mode 100644 remappedSrc/com/virus5600/defensive_measures/DefensiveMeasures.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/advancement/criterion/ModCriterion.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/advancement/criterion/TurretItemRetrievedCriterion.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/ModEntities.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/TurretMaterial.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/turrets/Itemable.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/ModItemGroups.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/ModItems.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/ModToolMaterials.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/turrets/TurretItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/network/ModPackets.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/particle/ModParticles.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/sound/ModSoundEvents.java delete mode 100644 remappedSrc/com/virus5600/defensive_measures/util/ItemUtil.java create mode 100644 src/main/resources/data/dm/tags/item/turret_remover_repairable.json diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3d4ba8a0da8d277868979cfbc8ad796..a4b76b9530d66f5e68d973ea569d8e19de379189 100644 GIT binary patch delta 12612 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 HJ4oML2Lo<@i8BwbL^1~GkG`E7C$SEa_ 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 diff --git a/gradlew b/gradlew index b740cf1..f5feea6 100644 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30d..9d21a21 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/remappedSrc/com/virus5600/defensive_measures/DefensiveMeasures.java b/remappedSrc/com/virus5600/defensive_measures/DefensiveMeasures.java deleted file mode 100644 index ccb69de..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/DefensiveMeasures.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.virus5600.defensive_measures; - -import com.virus5600.defensive_measures.advancement.criterion.ModCriterion; -import com.virus5600.defensive_measures.entity.ModEntities; -import com.virus5600.defensive_measures.item.ModItemGroups; -import com.virus5600.defensive_measures.item.ModItems; -import com.virus5600.defensive_measures.particle.ModParticles; -import com.virus5600.defensive_measures.sound.ModSoundEvents; -import net.fabricmc.api.ModInitializer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Main entry point of the mod. - * - * This class holds the Mod ID, name, and Logger instances, along with common initialization processes and - * utility methods that can be used throughout the mod's development. - */ -public class DefensiveMeasures implements ModInitializer { - /** - * Defines the mod's unique identifier. - */ - public static final String MOD_ID = "dm"; - /** - * Defines the mod's name. - */ - public static final String MOD_NAME = "DefensiveMeasures"; - /** - * Defines the mod's logger instance. - */ - public static final Logger LOGGER = LoggerFactory.getLogger(DefensiveMeasures.MOD_NAME); - - /** - * Main entry point of the mod. Initializes all server side logic. - */ - @Override - public void onInitialize() { - LOGGER.info("INITIALIZING MAIN ENTRY POINT FOR {}...", MOD_NAME); - - // Modded Stuff's Registration - ModItemGroups.registerModItemGroups(); - ModItems.registerModItems(); - ModSoundEvents.registerSoundEvents(); - ModCriterion.registerModCriterion(); - ModParticles.registerParticles(); - ModEntities.registerModEntityAttributes(); - - // Networking part - - LOGGER.info("{} MAIN ENTRY POINT INITIALIZED.", MOD_NAME); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/advancement/criterion/ModCriterion.java b/remappedSrc/com/virus5600/defensive_measures/advancement/criterion/ModCriterion.java deleted file mode 100644 index 95d8067..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/advancement/criterion/ModCriterion.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.virus5600.defensive_measures.advancement.criterion; - -import com.virus5600.defensive_measures.DefensiveMeasures; - -import net.minecraft.advancement.criterion.Criteria; - -public class ModCriterion { - - public static final TurretItemRetrievedCriterion TURRET_ITEM_RETRIEVED_CRITERION = Criteria.register("turret_item_retrieved", new TurretItemRetrievedCriterion()); - - public static void registerModCriterion() { - DefensiveMeasures.LOGGER.info("REGISTERING CRITERION FOR {}...", DefensiveMeasures.MOD_NAME); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/advancement/criterion/TurretItemRetrievedCriterion.java b/remappedSrc/com/virus5600/defensive_measures/advancement/criterion/TurretItemRetrievedCriterion.java deleted file mode 100644 index a88345c..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/advancement/criterion/TurretItemRetrievedCriterion.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.virus5600.defensive_measures.advancement.criterion; - -import com.mojang.serialization.Codec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import com.virus5600.defensive_measures.DefensiveMeasures; - -import net.minecraft.advancement.AdvancementCriterion; -import net.minecraft.advancement.criterion.AbstractCriterion; -import net.minecraft.item.ItemStack; -import net.minecraft.predicate.entity.EntityPredicate; -import net.minecraft.predicate.entity.LootContextPredicate; -import net.minecraft.predicate.item.ItemPredicate; -import net.minecraft.server.network.ServerPlayerEntity; - -import java.util.Optional; - -public class TurretItemRetrievedCriterion extends AbstractCriterion { - @Override - public Codec getConditionsCodec() { - return TurretItemRetrievedCriterion.Conditions.CODEC; - } - - public void trigger(ServerPlayerEntity player, ItemStack stack) { - this.trigger(player, conditions -> conditions.matches(stack)); - } - - public static record Conditions(Optional player, Optional item) implements AbstractCriterion.Conditions { - public static final Codec CODEC = RecordCodecBuilder.create( - instance -> instance.group( - EntityPredicate.LOOT_CONTEXT_PREDICATE_CODEC - .optionalFieldOf("player") - .forGetter(TurretItemRetrievedCriterion.Conditions::player), - ItemPredicate.CODEC - .optionalFieldOf("item") - .forGetter(TurretItemRetrievedCriterion.Conditions::item) - ) - .apply(instance, TurretItemRetrievedCriterion.Conditions::new) - ); - - public static AdvancementCriterion create(ItemPredicate.Builder item) { - return ModCriterion.TURRET_ITEM_RETRIEVED_CRITERION - .create( - new TurretItemRetrievedCriterion.Conditions( - Optional.empty(), - Optional.of(item.build()) - ) - ); - } - - public boolean matches(ItemStack stack) { - return this.item.isEmpty() || this.item.get().test(stack); - } - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/ModEntities.java b/remappedSrc/com/virus5600/defensive_measures/entity/ModEntities.java deleted file mode 100644 index 11b9628..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/ModEntities.java +++ /dev/null @@ -1,86 +0,0 @@ -package com.virus5600.defensive_measures.entity; - -import com.virus5600.defensive_measures.DefensiveMeasures; - -import com.virus5600.defensive_measures.entity.turrets.CannonTurretEntity; - -import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.EntityType.Builder; -import net.minecraft.entity.SpawnGroup; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; - -public class ModEntities { - // TURRETS // - // v1.0.0 - public static final EntityType CANNON_TURRET = Registry.register( - Registries.ENTITY_TYPE, - Identifier.of(DefensiveMeasures.MOD_ID, "cannon_turret"), - Builder - .create(CannonTurretEntity::new, SpawnGroup.MISC) - .dimensions(1F, 1F) - .eyeHeight(0.51F) - .build() - ); - -// public static final EntityType BALLISTA = Registry.register( -// Registries.ENTITY_TYPE, -// Identifier.of(DefensiveMeasures.MOD_ID, "ballista"), -// Builder -// .create(BallistaTurretEntity::new, SpawnGroup.MISC) -// .dimensions(1F, 1F) -// .build() -// ); -// -// public static final EntityType MG_TURRET = Registry.register( -// Registries.ENTITY_TYPE, -// Identifier.of(DefensiveMeasures.MOD_ID, "mg_turret"), -// Builder -// .create(MGTurretEntity::new, SpawnGroup.MISC) -// .dimensions(1F, 1F) -// .build() -// ); - - // PROJECTILES // - // v1.0.0 -// public static final EntityType CANNONBALL = Registry.register( -// Registries.ENTITY_TYPE, -// Identifier.of(DefensiveMeasures.MOD_ID, "cannonball"), -// Builder -// .create(CannonballEntity::new, SpawnGroup.MISC) -// .dimensions(EntityDimensions.fixed(0.125f, 0.125f)) -// .build() -// ); - -// public static final EntityType BALLISTA_ARROW = Registry.register( -// Registries.ENTITY_TYPE, -// Identifier.of(DefensiveMeasures.MOD_ID, "ballista_arrow"), -// Builder -// .create(BallistaArrowEntity::new, SpawnGroup.MISC) -// .dimensions(EntityDimensions.fixed(0.125f, 0.125f)) -// .build() -// ); - -// public static final EntityType MG_BULLET = Registry.register( -// Registries.ENTITY_TYPE, -// Identifier.of(DefensiveMeasures.MOD_ID, "mg_bullet"), -// Builder -// .create(MGBulletEntity::new, SpawnGroup.MISC) -// .dimensions(EntityDimensions.fixed(0.125f, 0.125f)) -// .build() -// ); - - // REGISTRY // - public static void registerModEntityAttributes() { - DefensiveMeasures.LOGGER.info("REGISTERING ENTITY ATTRIBUTES FOR {}...", DefensiveMeasures.MOD_NAME); - - // TURRETS // - // v1.0.0 - FabricDefaultAttributeRegistry.register(ModEntities.CANNON_TURRET, CannonTurretEntity.setAttributes()); -// FabricDefaultAttributeRegistry.register(ModEntities.BALLISTA, BallistaTurretEntity.setAttributes()); -// FabricDefaultAttributeRegistry.register(ModEntities.MG_TURRET, MGTurretEntity.setAttributes()); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/TurretMaterial.java b/remappedSrc/com/virus5600/defensive_measures/entity/TurretMaterial.java deleted file mode 100644 index 4e3934c..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/TurretMaterial.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.virus5600.defensive_measures.entity; - -public enum TurretMaterial { - METAL, - WOOD -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java b/remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java deleted file mode 100644 index 38c81cf..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.virus5600.defensive_measures.entity.ai.goal; - -import com.virus5600.defensive_measures.entity.turrets.TurretEntity; - -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.goal.ActiveTargetGoal; -import net.minecraft.entity.mob.Monster; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Direction; - -public class TargetOtherTeamGoal extends ActiveTargetGoal { - public TargetOtherTeamGoal(TurretEntity turret) { - super(turret, LivingEntity.class, 10, true, false, (entity) -> { - return entity instanceof Monster; - }); - } - - public boolean canStart() { - return this.mob.getScoreboardTeam() != null && super.canStart(); - } - - protected Box getSearchBox(double distance) { - Direction dir = Direction.DOWN; - - if (dir.getAxis() == Direction.Axis.X) { - return this.mob.getBoundingBox().expand(4.0, distance, distance); - } - - return dir.getAxis() == Direction.Axis.Z - ? this.mob.getBoundingBox().expand(distance, distance, 4.0) - : this.mob.getBoundingBox().expand(distance, 4.0, distance); - - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java b/remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java deleted file mode 100644 index 84c5310..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.virus5600.defensive_measures.entity.ai.goal; - -import net.minecraft.entity.ai.goal.ActiveTargetGoal; -import net.minecraft.entity.player.PlayerEntity; - -import com.virus5600.defensive_measures.entity.turrets.TurretEntity; -import net.minecraft.util.math.Box; -import net.minecraft.util.math.Direction; - -public class TargetPlayerGoal extends ActiveTargetGoal { - public TargetPlayerGoal(TurretEntity turret) { - super(turret, PlayerEntity.class, true); - } - - @Override - public boolean canStart() { - return this.mob.getScoreboardTeam() != null && super.canStart(); - } - - @Override - protected Box getSearchBox(double distance) { - Direction dir = Direction.DOWN; - - if (dir.getAxis() == Direction.Axis.X) { - return this.mob.getBoundingBox().expand(4.0, distance, distance); - } - - return dir.getAxis() == Direction.Axis.Z - ? this.mob.getBoundingBox().expand(distance, distance, 4.0) - : this.mob.getBoundingBox().expand(distance, 4.0, distance); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java b/remappedSrc/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java deleted file mode 100644 index 39ce443..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java +++ /dev/null @@ -1,344 +0,0 @@ -package com.virus5600.defensive_measures.entity.turrets; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.virus5600.defensive_measures.item.ModItems; -import com.virus5600.defensive_measures.particle.ModParticles; -import com.virus5600.defensive_measures.sound.ModSoundEvents; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.ai.RangedAttackMob; -import net.minecraft.entity.ai.goal.*; -import net.minecraft.entity.attribute.DefaultAttributeContainer; -import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.data.DataTracker.Builder; -import net.minecraft.entity.data.DataTracker; -import net.minecraft.entity.data.TrackedData; -import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.effect.StatusEffects; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.mob.Monster; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.entity.projectile.ProjectileEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.World; - -import org.jetbrains.annotations.Nullable; - -import com.virus5600.defensive_measures.DefensiveMeasures; -import com.virus5600.defensive_measures.entity.TurretMaterial; -import com.virus5600.defensive_measures.entity.ai.goal.TargetOtherTeamGoal; - -import software.bernie.geckolib.animatable.GeoEntity; -import software.bernie.geckolib.animatable.instance.AnimatableInstanceCache; -import software.bernie.geckolib.animation.AnimatableManager.ControllerRegistrar; -import software.bernie.geckolib.animation.AnimationController; -import software.bernie.geckolib.animation.AnimationState; -import software.bernie.geckolib.animation.PlayState; -import software.bernie.geckolib.animation.RawAnimation; -import software.bernie.geckolib.util.GeckoLibUtil; - -public class CannonTurretEntity extends TurretEntity implements GeoEntity, RangedAttackMob, Itemable { - /** - * Defines how many seconds the cannon should wait before shooting again. - * The time is calculated in ticks and by default, it's 5 seconds (20 ticks times 5 seconds). - */ - private static final int totalAttCooldown = 20 * 5; - private static final TrackedData FUSE_LIT; - /** - * Contains all the items that can heal this entity. - */ - protected static final Map healables; - /** - * Contains all the items that can give effect to this entity - */ - protected static final Map> effectSource; - - private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); - private double attCooldown = totalAttCooldown; - private boolean animPlayed = false; - - protected ProjectileAttackGoal attackGoal; - - ////////////////// - // CONSTRUCTORS // - ////////////////// - public CannonTurretEntity(EntityType entityType, World world) { - super(entityType, world, TurretMaterial.METAL, ArrowEntity.class, ModItems.CANNON_TURRET); - this.setShootSound(ModSoundEvents.TURRET_CANNON_SHOOT); - this.setHealSound(ModSoundEvents.TURRET_REPAIR_METAL); - this.addHealables(healables); - this.addEffectSource(effectSource); - } - - ////////////////// - // INITIALIZERS // - ////////////////// - @Override - protected void initGoals() { - this.attackGoal = new ProjectileAttackGoal(this, 0, totalAttCooldown, 16.625F); - // Goals - this.goalSelector.add(1, attackGoal); - this.goalSelector.add(2, new LookAtEntityGoal(this, MobEntity.class, 8.0F, 0.02F, true)); - this.goalSelector.add(8, new LookAroundGoal(this)); - - // Targets - this.targetSelector.add(1, new ActiveTargetGoal(this, MobEntity.class, 10, true, false, (entity) -> { - return entity instanceof Monster; - })); - this.targetSelector.add(3, new TargetOtherTeamGoal(this)); - } - - @Override - protected void initDataTracker(Builder builder) { - super.initDataTracker(builder); - - builder.add(FUSE_LIT, false); - } - - public static DefaultAttributeContainer.Builder setAttributes() { - return TurretEntity.createMobAttributes() - .add(EntityAttributes.GENERIC_FOLLOW_RANGE, 16) - .add(EntityAttributes.GENERIC_MAX_HEALTH, 50) - .add(EntityAttributes.GENERIC_MOVEMENT_SPEED, 0) - .add(EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE, 1.0); - } - - ///////////////////// - // PROCESS METHODS // - ///////////////////// - - @Override - public void shootAt(LivingEntity target, float pullProgress) { - if (target == null) { - if (this.isShooting()) - this.setShooting(false); - return; - } - - this.setShooting(true); - - try { - double vx = (target.getX() - this.getX()) * 1.0625; - double vy = target.getBodyY((double) 2 / 3) - this.getY() + 0.25; - double vz = (target.getZ() - this.getZ()) * 1.0625; - double variance = Math.sqrt(vx * vx + vz * vz); - float divergence = this.getWorld().getDifficulty().getId() * 2; -// ProjectileEntity projectile = (ProjectileEntity) new CannonballEntity(ModEntities.CANNONBALL, this, vx, vy, vz, this.getWorld()); - ProjectileEntity projectile = (ProjectileEntity) new ArrowEntity(EntityType.ARROW, this.getWorld()); - - projectile.setVelocity(vx, vy + variance * 0.1f, vz, 1.5f, divergence); - projectile.setPos(this.getX(), this.getY() + 0.5, this.getZ()); - - this.playSound(this.getShootSound(), 1.0f, 1.0f / (this.getRandom().nextFloat() * 0.4f + 0.8f)); - this.getWorld().spawnEntity(projectile); - this.triggerAnim("Firing Sequence", "Shoot"); - } catch (IllegalArgumentException | SecurityException e) { - e.printStackTrace(System.out); - - DefensiveMeasures.LOGGER.error(""); - DefensiveMeasures.LOGGER.error(" {} ERROR OCCURRED ", DefensiveMeasures.MOD_ID.toUpperCase()); - DefensiveMeasures.LOGGER.error("===== ERROR MSG START ====="); - DefensiveMeasures.LOGGER.error("LOCALIZED ERROR MESSAGE:"); - DefensiveMeasures.LOGGER.error(e.getLocalizedMessage()); - DefensiveMeasures.LOGGER.error(""); - DefensiveMeasures.LOGGER.error("ERROR MESSAGE:"); - DefensiveMeasures.LOGGER.error(e.getMessage()); - DefensiveMeasures.LOGGER.error("===== ERROR MSG END ====="); - DefensiveMeasures.LOGGER.error(""); - } - } - - @Override - public void tick() { - super.tick(); - - this.setYaw(0); - this.setBodyYaw(0); - - if (this.isShooting() && this.hasTarget()) { - if (this.attackGoal != null) { - if (this.attackGoal.shouldContinue()) { - if (--this.attCooldown <= 0) { - this.setShootingFXDone(false); - this.setFuseLit(false); - this.attCooldown = totalAttCooldown; - } - else { - this.setShootingFXDone(true); - this.setFuseLit(true); - this.triggerAnim("Firing Sequence", "Charge"); - } - } - } - } - } - - ////////////////////////////////////// - // QUESTION METHODS (True or False) // - ////////////////////////////////////// - - ///////////////////////// - // GETTERS AND SETTERS // - ///////////////////////// - - @Nullable - @Override - protected SoundEvent getHurtSound(DamageSource source) { - return ModSoundEvents.TURRET_CANNON_HURT; - } - - @Nullable - @Override - protected SoundEvent getDeathSound() { - return ModSoundEvents.TURRET_CANNON_DESTROYED; - } - - protected boolean isFuseLit() { - return this.dataTracker.get(FUSE_LIT); - } - protected void setFuseLit(boolean lit) { - this.dataTracker.set(FUSE_LIT, lit); - } - - @Override - public ItemStack getEntityItem() { - return new ItemStack(ModItems.CANNON_TURRET); - } - - /////////////////////////// - // ANIMATION CONTROLLERS // - /////////////////////////// - - private PlayState deathController(final AnimationState event) { - if (!this.isAlive() && !animPlayed) { - animPlayed = true; - event.setAnimation( - RawAnimation - .begin() - .thenPlayAndHold("animation.cannon_turret.death") - ); - return PlayState.STOP; - } - return PlayState.CONTINUE; - } - - private PlayState idleController(final AnimationState event) { - return event - .setAndContinue( - RawAnimation - .begin() - .thenLoop("animation.cannon_turret.look_at_target") - .thenLoop("animation.cannon_turret.setup") - ); - } - - // TODO: Fix particle spawning - private PlayState firingSequenceController(final AnimationState event) { - Vec3d fusePos = this.getRelativePos(0, 1, 0), - barrelPos = this.getRelativePos(0, 0, 0); - - // Shooting sequence - event.getController() - .setParticleKeyframeHandler((state) -> { - String locator = state.getKeyframeData().getLocator(), - effectName = state.getKeyframeData().getEffect(), - currentState = "fuse"; - - if (this.hasTarget() && this.isShooting()) { - if (this.isFuseLit()) currentState = "fuse"; - else currentState = "shoot"; - } - - System.out.println("Locator: " + locator + " | Effect: " + effectName + " | State: " + currentState); - - if (currentState.equals("fuse")) { - System.out.println("Fuse Position: " + fusePos.toString()); - this.getWorld().addParticle( - ModParticles.CANNON_FUSE, - fusePos.getX(), fusePos.getY(), fusePos.getZ(), - 0,0,0 - ); - } - else { - System.out.println("Barrel Position: " + barrelPos.toString()); - this.getWorld().addParticle( - ModParticles.CANNON_FLASH, - barrelPos.getX(), barrelPos.getY(), barrelPos.getZ(), - 0,0,0 - ); - } - - state.getController() - .setAnimation( - RawAnimation - .begin() - .thenPlay("animation.cannon_turret." + currentState) - ); - }); - - return PlayState.CONTINUE; - } - - /////////////////////////////// - // INTERFACE IMPLEMENTATIONS // - /////////////////////////////// - - // GeoEntity // - @Override - public void registerControllers(final ControllerRegistrar controllers) { - controllers - .add( - new AnimationController<>(this, "Death", this::deathController), - new AnimationController<>(this, "Idle", this::idleController), - new AnimationController<>(this, "Firing Sequence", this::firingSequenceController) - .triggerableAnim("Charge", RawAnimation.begin().thenPlay("animation.cannon_turret.fuse")) - .triggerableAnim("Shoot", RawAnimation.begin().thenPlay("animation.cannon_turret.shoot")) - ); - } - - @Override - public AnimatableInstanceCache getAnimatableInstanceCache() { - return this.geoCache; - } - - /////////////////// - // LOCAL CLASSES // - /////////////////// - - /////////////////////// - // STATIC INITIALIZE // - /////////////////////// - - static { - FUSE_LIT = DataTracker.registerData(CannonTurretEntity.class, TrackedDataHandlerRegistry.BOOLEAN); - - healables = new HashMap() { - { - for (Item item : TurretEntity.PLANKS) - put(item, 1.0f); - put(Items.IRON_NUGGET, 1f); - put(Items.IRON_INGOT, 10f); - put(Items.IRON_BLOCK, 100f); - } - }; - - effectSource = new HashMap>() { - { - put(Items.IRON_BLOCK, new ArrayList() { - { - add(new Object[] {StatusEffects.ABSORPTION, 60, 2}); - } - }); - } - }; - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/turrets/Itemable.java b/remappedSrc/com/virus5600/defensive_measures/entity/turrets/Itemable.java deleted file mode 100644 index dc79877..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/turrets/Itemable.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.virus5600.defensive_measures.entity.turrets; - -import com.virus5600.defensive_measures.advancement.criterion.ModCriterion; -import com.virus5600.defensive_measures.entity.TurretMaterial; -import com.virus5600.defensive_measures.sound.ModSoundEvents; -import net.minecraft.component.DataComponentTypes; -import net.minecraft.component.type.NbtComponent; -import net.minecraft.entity.ItemEntity; -import net.minecraft.entity.LivingEntity; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.MathHelper; -import net.minecraft.world.World; - -import java.util.Optional; -import java.util.Random; - -/** - * An interface that serves as a base for all entities that can be stored as an items. - * - * @author Virus5600 - * @version 1.0.0 - */ -public interface Itemable { - /** - * Determines whether this entity is from an item. - * @return {@link byte} - */ - public byte isFromItem(); - - /** - * Sets the value that identifies whether this entity is from an item. - * @param fromItem {@link byte} A `1` or `0` value. - */ - public void setFromItem(byte fromItem); - - /** - * Copies the data to the given stack. - * @param stack {@link ItemStack} The stack to copy the data to. - */ - public void copyDataToStack(ItemStack stack); - - /** - * Copies the data from the given NBT to this entity. - * @param nbt {@link NbtCompound} The NBT to copy the data from. - */ - public void copyDataFromNbt(NbtCompound nbt); - - /** - * Retrieves the item this turret is from. - * @return {@link ItemStack} - */ - public ItemStack getEntityItem(); - - /** - * Retrieves the sound that plays when the turret is removed. - * @return {@link SoundEvent} - */ - public SoundEvent getEntityRemoveSound(); - - /** - * Copies the data from this entity to the given stack. - * - * @param entity {@link MobEntity} The entity to copy the data from. - * @param stack {@link ItemStack} The stack to copy the data to. - */ - public static void copyDataToStack(MobEntity entity, ItemStack stack) { - // Sets the name - stack.set(DataComponentTypes.CUSTOM_NAME, entity.hasCustomName() ? entity.getCustomName() : stack.getName()); - - NbtCompound nbtCompound = new NbtCompound(); - - // Sets the NBT - nbtCompound.putBoolean("NoAI", entity.isAiDisabled()); - nbtCompound.putBoolean("Silent", entity.isSilent()); - nbtCompound.putBoolean("NoGravity", entity.hasNoGravity()); - nbtCompound.putBoolean("Glowing", entity.isGlowing()); - nbtCompound.putBoolean("Invulnerable", entity.isInvulnerable()); - nbtCompound.putFloat("Health", entity.getHealth()); - nbtCompound.putUuid("UUID", entity.getUuid()); - - stack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(nbtCompound)); - } - - /** - * Copies the data from the given NBT to this entity. - * - * @param entity {@link MobEntity} The entity to copy the data to. - * @param nbt {@link NbtCompound} The NBT to copy the data from. - */ - public static void copyDataFromNbt(MobEntity entity, NbtCompound nbt) { - NbtComponent.of(nbt).applyToEntity(entity); - } - - /** - * Attempts to retrieve the {@link Itemable Itemable Entity} as an item. - * @param player The player that is attempting to retrieve the item. - * @param hand The hand the player is using to retrieve the item. - * @param entity The entity to retrieve the item from. - * @param tool The tool the player is using to retrieve the item. - * @param modItem The item to retrieve. - * @return {@link Optional} The result of the action. - * @param The type of entity. - */ - public static Optional tryItem(PlayerEntity player, Hand hand, T entity, Item tool, Item modItem) { - ItemStack itemStack = player.getStackInHand(hand); - if (itemStack.getItem() == tool && entity.isAlive()) { - World world = entity.getWorld(); - - if (!world.isClient) { - if (((TurretEntity) entity).getTurretMaterial() == TurretMaterial.METAL) { - entity.playSound(ModSoundEvents.TURRET_REMOVED_METAL, 1.0f, new Random().nextFloat(0.75f, 1.25f)); - } - else if (((TurretEntity) entity).getTurretMaterial() == TurretMaterial.WOOD) { - entity.playSound(ModSoundEvents.TURRET_REMOVED_WOOD, 1.0f, new Random().nextFloat(0.75f, 1.25f)); - } - } - - if (player.isCreative() && !player.isSneaking()) { - entity.discard(); - return Optional.of(ActionResult.success(true)); - } - - ItemStack stack = new ItemStack(modItem); - ((Itemable) entity).copyDataToStack(stack); - - float x = (float) entity.getPos().x + 0.5f; - float y = (float) entity.getPos().y + 0.5f; - float z = (float) entity.getPos().z + 0.5f; - double vx = MathHelper.nextDouble(world.random, -0.1, 0.1); - double vy = MathHelper.nextDouble(world.random, 0.0, 0.1); - double vz = MathHelper.nextDouble(world.random, -0.1, 0.1); - - entity.discard(); - ItemEntity itemStackEntity = new ItemEntity(world, x, y, z, stack, vx, vy, vz); - world.spawnEntity(itemStackEntity); - - if (!world.isClient) { - ModCriterion.TURRET_ITEM_RETRIEVED_CRITERION.trigger((ServerPlayerEntity) player, stack); - } - - entity.discard(); - return Optional.of(ActionResult.success(world.isClient)); - } - return Optional.empty(); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java b/remappedSrc/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java deleted file mode 100644 index 8cd46ce..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java +++ /dev/null @@ -1,1100 +0,0 @@ -package com.virus5600.defensive_measures.entity.turrets; - -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.*; -import net.minecraft.entity.ai.RangedAttackMob; -import net.minecraft.entity.ai.control.BodyControl; -import net.minecraft.entity.ai.control.LookControl; -import net.minecraft.entity.damage.DamageSource; -import net.minecraft.entity.data.DataTracker; -import net.minecraft.entity.data.TrackedData; -import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.effect.StatusEffect; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.projectile.ArrowEntity; -import net.minecraft.entity.projectile.ProjectileEntity; -import net.minecraft.item.Equipment; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.registry.entry.RegistryEntry; -import net.minecraft.sound.SoundEvent; -import net.minecraft.sound.SoundEvents; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.math.*; -import net.minecraft.util.math.random.Random; -import net.minecraft.world.LocalDifficulty; -import net.minecraft.world.ServerWorldAccess; -import net.minecraft.world.World; - -import com.virus5600.defensive_measures.DefensiveMeasures; -import com.virus5600.defensive_measures.entity.TurretMaterial; -import com.virus5600.defensive_measures.item.ModItems; -import com.virus5600.defensive_measures.item.turrets.TurretItem; - -import net.minecraft.world.event.GameEvent; -import org.jetbrains.annotations.Nullable; - -import java.lang.reflect.InvocationTargetException; -import java.util.*; - -/** - * The mob base for all the Turrets that will be added into this mod. The - * {@code TurretEntity} extends to the base code of {@code MobEntity}, the same - * superclass used by various mobs that has the same trait as this. The custom - * interface {@code Itemable} and {@code RangedAttackMob} interfaces are also - * implemented to define this entity as something that can do range attacks - * and can be converted to an item.
- *
- * New custom {@code NBT}s are also added such as {@code LEVEL} - * and {@code FROM_ITEM} to identify their level variation and whether - * this entity is spawned from an instance of already spawned turret entity. - * - * @author Virus5600 - * @since 1.0.0 - * - * @see MobEntity - * @see Itemable - * @see RangedAttackMob - * - */ -public class TurretEntity extends MobEntity implements Itemable, RangedAttackMob{ - /** - * Tracks the level (stage) of this turret entity. - */ - private static final TrackedData LEVEL; - /** - * Tracks whether this entity is spawned from an item. - */ - private static final TrackedData FROM_ITEM; - /** - * Tracks whether this entity is shooting. - */ - private static final TrackedData SHOOTING; - /** - * Tracks whether the shooting effect is done. - */ - private static final TrackedData SHOOTING_FX_DONE; - /** - * Tracks whether this turret has a target. - */ - private static final TrackedData HAS_TARGET; - - /** - * Tracks the direction where this turret is attached to. - */ - protected static final TrackedData ATTACHED_FACE; - /** - * Tracks the X position of this turret. - */ - protected static final TrackedData X; - /** - * Tracks the Y position of this turret. - */ - protected static final TrackedData Y; - /** - * Tracks the Z position of this turret. - */ - protected static final TrackedData Z; - /** - * Tracks the yaw of this turret. - */ - protected static final TrackedData YAW; - /** - * Tracks the pitch of this turret. - */ - protected static final TrackedData PITCH; - /** - * Tracks the X position of this turret's target. - */ - protected static final TrackedData TARGET_POS_X; - /** - * Tracks the Y position of this turret's target. - */ - protected static final TrackedData TARGET_POS_Y; - /** - * Tracks the Z position of this turret's target. - */ - protected static final TrackedData TARGET_POS_Z; - - //////////////////////// - // INSTANCE VARIABLES // - //////////////////////// - /** - * Acts as a storage for the turret's world position, allowing the turret to snap in place. - */ - private BlockPos prevAttachedBlock; - /** - * Contains all the items that can heal this entity. - */ - private Map healables; - /** - * Contains all the items that can give effect to this entity, and must be stored in a 2D array. - * An item can have multiple effects and is structured as this:
- * 


-	 * [
-	 * 	[StatusEffect, duration, amplifier]
-	 * 	[StatusEffect, duration, amplifier]
-	 * 	[StatusEffect, duration, amplifier]
-	 * ]
-	 *
- */ - private Map> effectSource; - - /** - * The sound the turret makes when it is being healed. - */ - protected SoundEvent healSound = SoundEvents.ENTITY_IRON_GOLEM_REPAIR; - /** - * The sound the turret makes when it is shooting. - */ - protected SoundEvent shootSound = SoundEvents.ENTITY_ARROW_SHOOT; - /** - * Defines what kind of projectile this turret will shoot. - */ - protected Class projectile; - /** - * Defines the level of this turret. The higher the level, the stronger - * the turret. - */ - protected int level; - /** - * The material of this turret. - */ - protected TurretMaterial material; - /** - * The item counterpart of this item. Refer to {@link ModItems} list - * to see the list of items that can be converted to this entity. - * The items should be a subclass of {@link TurretItem}. - */ - protected Item itemable; - /** - * A randomizer for this turret's instance. - */ - protected final Random random; - - /** - * List of plank items in the game. This allows easy insertion of all the items when needed by iterating through the List. - */ - public static final List PLANKS = Arrays.asList(new Item[] { - Items.ACACIA_PLANKS, - Items.BAMBOO_PLANKS, - Items.BIRCH_PLANKS, - Items.CHERRY_PLANKS, - Items.CRIMSON_PLANKS, - Items.DARK_OAK_PLANKS, - Items.JUNGLE_PLANKS, - Items.MANGROVE_PLANKS, - Items.OAK_PLANKS, - Items.SPRUCE_PLANKS, - Items.WARPED_PLANKS - }); - /** - * List of log items in the game. This allows easy insertion of all the items when needed by iterating through the List. - */ - public static final List LOGS = Arrays.asList(new Item[]{ - Items.ACACIA_LOG, - Items.BAMBOO, - Items.BIRCH_LOG, - Items.CHERRY_LOG, - Items.CRIMSON_STEM, - Items.DARK_OAK_LOG, - Items.JUNGLE_LOG, - Items.MANGROVE_LOG, - Items.OAK_LOG, - Items.SPRUCE_LOG, - Items.WARPED_HYPHAE, - Items.WARPED_STEM, - Items.STRIPPED_ACACIA_LOG, - Items.STRIPPED_BIRCH_LOG, - Items.STRIPPED_CHERRY_LOG, - Items.STRIPPED_CRIMSON_STEM, - Items.STRIPPED_DARK_OAK_LOG, - Items.STRIPPED_JUNGLE_LOG, - Items.STRIPPED_MANGROVE_LOG, - Items.STRIPPED_OAK_LOG, - Items.STRIPPED_SPRUCE_LOG, - Items.STRIPPED_WARPED_HYPHAE, - Items.STRIPPED_WARPED_STEM - }); - - ////////////////// - // CONSTRUCTORS // - ////////////////// - - /** - * Constructs a new {@code TurretEntity} with the given {@code EntityType}, {@code World}, - * {@code TurretMaterial}, {@code Class} of the projectile, and {@code Item}. - * - * @param entityType The type of this entity. - * @param world The world this entity is in. - * @param material The material of this turret. - * @param projectile The class of the projectile this turret will shoot. - * @param itemable The itemable counterpart of this entity. - * - * @see #itemable - */ - public TurretEntity(EntityType entityType, World world, TurretMaterial material, Class projectile, Item itemable) { - this(entityType, world, material, itemable); - this.projectile = projectile; - } - - /** - * Constructs a new {@code TurretEntity} with the given {@code EntityType}, {@code World}, - * {@code TurretMaterial}, and {@code Item}. If the {@code projectile} is not yet defined, the default - * projectile will be used, which is an {@code ArrowEntity}. - * - * @param entityType The type of this entity. - * @param world The world this entity is in. - * @param material The material of this turret. - * @param itemable The itemable counterpart of this entity. - * - * @see #itemable - */ - public TurretEntity(EntityType entityType, World world, TurretMaterial material, Item itemable) { - super(entityType, world); - DefensiveMeasures.LOGGER.debug("Creating a new TurretEntity called {}", entityType.getName()); - - this.material = material; - this.itemable = itemable; - this.random = Random.create(); - this.lookControl = new TurretEntity.TurretLookControl(this); - - if (this.projectile == null) { - this.projectile = ArrowEntity.class; - } - } - - ////////////////// - // INITIALIZERS // - ////////////////// - - @Override - protected void initDataTracker(DataTracker.Builder builder) { - // Entity related tracking - builder.add(LEVEL, this.level) - .add(FROM_ITEM, (byte) 1) - .add(SHOOTING, false) - .add(SHOOTING_FX_DONE, true) - .add(HAS_TARGET, false) - - // Position related tracking - .add(ATTACHED_FACE, Direction.DOWN) - .add(X, 0f) - .add(Y, 0f) - .add(Z, 0f) - .add(YAW, 0f) - .add(PITCH, 0f) - .add(TARGET_POS_X, 0f) - .add(TARGET_POS_Y, 0f) - .add(TARGET_POS_Z, 0f); - super.initDataTracker(builder); - } - - @Override - protected BodyControl createBodyControl() { - return new TurretBodyControl(this); - } - - @Nullable - @Override - public EntityData initialize(ServerWorldAccess world, LocalDifficulty difficulty, SpawnReason spawnReason, @Nullable EntityData entityData) { - this.headYaw = this.prevHeadYaw; - this.prevBodyYaw = 0.0f; - this.resetPosition(); - - if (spawnReason == SpawnReason.SPAWN_EGG) { - return entityData; - } - - return super.initialize(world, difficulty, spawnReason, entityData); - } - - ///////////////////// - // PROCESS METHODS // - ///////////////////// - - /** - * Attempts to attach this entity to a block or fall if there is no block to attach to - * at the current position. If the entity is attached to a block, it will not fall but - * will instead snap to the block's position. However, if the entity is not attached to - * a block, it will look for a block to attach to around it and if there is none, it will - * fall. - */ - protected void tryAttachOrFall() { - Direction dir = this.findAttachableSide(this.getBlockPos()); - if (dir != null) - this.setAttachedFace(dir); - else - this.tryFall(); - } - - /** - * Attempts to let this turret fall regardless of whether it is attached to a block or not. - * - * @return {@code boolean} Returns {@code true} if the turret is falling, otherwise {@code false}. - */ - protected boolean tryFall() { - if (this.isAiDisabled() || !this.isAlive()) - return false; - - BlockPos blockPos = this.getBlockPos().add(new Vec3i(0, -1, 0)); - if (this.isValidFallingPosition(blockPos)) { - this.setVelocity(super.getVelocity().multiply(0.98)); - return true; - } - return false; - } - - /** - * Retrieves the currently attached side of this turret. - * @param pos The current position of this turret. - * @return {@code Direction} The direction where this turret is attached to. - */ - @Nullable - protected Direction findAttachableSide(BlockPos pos) { - for (Direction dir : Direction.values()) { - if (!this.canStay(pos, dir)) - continue; - return dir; - } - return null; - } - - @Override - protected ActionResult interactMob(PlayerEntity player, Hand hand) { - ItemStack item = player.getStackInHand(hand); - Equipment equipment = Equipment.fromStack(item); - boolean isSurvival = !player.isCreative(); - boolean isSuccess = false; - - // Turret Remover Interaction - if (item.getItem() == ModItems.TURRET_REMOVER) { - if (equipment != null && isSurvival) - item.damage(1, player, equipment.getSlotType()); - - isSuccess = true; - } - - // Healables - else if (this.isHealableItem(item.getItem())) { - // Heals the turret - this.heal(this.getHealAmt(item.getItem())); - - // Indicates a repair was done - float pitch = 1F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F; - this.playSound(this.getHealSound(), 1F, pitch); - - isSuccess = true; - } - - // Effect Source - if (this.isEffectSource(item.getItem())) { - for (Object[] args : this.getMobEffect(item.getItem())) { - this.addStatusEffect( - new StatusEffectInstance( - (RegistryEntry) args[0], - (int) ((float) ((Integer) args[1]) * 20), - (Integer) args[2] - ) - ); - } - - if (item.isDamageable()) { - if (equipment != null) - item.damage(1, player, equipment.getSlotType()); - } - else { - item.decrementUnlessCreative(1, player); - } - - isSuccess = true; - } - - if (isSuccess) - return ActionResult.SUCCESS; - - if (item.getItem() == ModItems.TURRET_REMOVER) { - return Itemable.tryItem(player, hand, this, ModItems.TURRET_REMOVER, this.itemable) - .orElse(super.interactMob(player, hand)); - } - return super.interactMob(player, hand); - } - - @Override - public void readCustomDataFromNbt(NbtCompound nbt) { - super.readCustomDataFromNbt(nbt); - this.setLevel(nbt.getInt("Level")); - this.setFromItem(nbt.getByte("FromItem")); - } - - @Override - public boolean startRiding(Entity entity, boolean force) { - if (this.getWorld().isClient()) { - this.prevAttachedBlock = null; - } - - this.setAttachedFace(Direction.DOWN); - return super.startRiding(entity, force); - } - - @Override - public void stopRiding() { - super.stopRiding(); - - if (this.getWorld().isClient) { - this.prevAttachedBlock = this.getBlockPos(); - } - - this.prevBodyYaw = 0.0f; - this.bodyYaw = 0.0f; - } - - @Override - @Nullable - public ItemStack getPickBlockStack() { - TurretItem turretItem = TurretItem.forEntity(this.getType()); - - if (turretItem == null) - return null; - - return new ItemStack(turretItem); - } - - @Override - public void tick() { - super.tick(); - - if (!this.getWorld().isClient()) { - this.setHasTarget(this.getTarget() != null); - } else { - // SNAPPING THE TURRET BACK IN PLACE - if (this.getVelocity().x == 0 && this.getVelocity().z == 0 && !this.hasVehicle()) { - Vec3d newPos = new Vec3d( - (double) MathHelper.floor(this.getX()) + 0.5, - this.getY(), - (double) MathHelper.floor(this.getZ()) + 0.5 - ); - - this.tryAttachOrFall(); - super.setPosition(newPos); - this.getWorld().emitGameEvent(this, GameEvent.TELEPORT, newPos); - - if (this.getVelocity() == Vec3d.ZERO && this.getWorld().isClient() && !this.hasVehicle()) { - this.lastRenderX = this.getX(); - this.lastRenderY = this.getY(); - this.lastRenderZ = this.getZ(); - } - } - } - } - - @Override - public void tickMovement() { - super.tickMovement(); - - if (!(this.getWorld().isClient() - || this.hasVehicle() - || this.canStay(this.getBlockPos(), this.getAttachedFace()))) { - this.tryAttachOrFall(); - } - } - - ////////////////////////////////////// - // QUESTION METHODS (True or False) // - ////////////////////////////////////// - - /** - * Determines whether this turret can stay on the given position or not. - * @param pos The position to check. - * @param dir The direction to check. - * @return {@code boolean} Returns {@code true} if the turret can stay, otherwise {@code false}. - */ - protected boolean canStay(BlockPos pos, Direction dir) { - if (!this.isValidFallingPosition(pos)) - return false; - - dir = dir == null ? Direction.DOWN : dir; - Direction opposite = dir.getOpposite(); - - if (!this.getWorld().isDirectionSolid(pos.offset(dir), this, opposite)) - return false; - - Box box = this.calculateBoundingBox().offset(pos).contract(1.0E-6); - return this.getWorld().isSpaceEmpty(this, box); - } - - /** - * Identifies whether the position is a valid falling position for this turret. - * Blocks that are considered valid falling blocks are air, water, and bubble columns. - * @param pos The position to check. - * @return {@code boolean} Returns {@code true} if the position is valid, otherwise {@code false}. - */ - protected boolean isValidFallingPosition(BlockPos pos) { - BlockState bState = this.getWorld().getBlockState(pos); - - if (bState.isAir() - || (bState.isOf(Blocks.BUBBLE_COLUMN) && pos.equals(this.getBlockPos())) - || (bState.isOf(Blocks.WATER) && pos.equals(this.getBlockPos())) - ) - return true; - - return !(bState.isOf(Blocks.MOVING_PISTON) && pos.equals(this.getBlockPos())); - } - - /** - * Identifies whether the submitted item is part of the healable map. - * @param item The item in question - * @return boolean - */ - public boolean isHealableItem(Item item) { - return this.healables.containsKey(item); - } - - /** - * Identifies whether the submitted item is part of the effect source map. - * @param item The item in question - * - * @return boolean - * - * @see StatusEffect - */ - public boolean isEffectSource(Item item) { - return this.effectSource.containsKey(item); - } - /** - * Identifies whether this item already have the effect in its list or not. This iterates through all the entries - * - * @param item The item in question - * @param effect The effect to check - * @return boolean - */ - public boolean effectSourceHasEffect(Item item, StatusEffect effect) { - List mobEffects = this.getMobEffect(item); - if (mobEffects!= null) - for (Object[] registeredEffect : mobEffects) - if ((StatusEffect) registeredEffect[0] == effect) - return true; - return false; - } - - @Override - public boolean canBeLeashed() { - return false; - } - - @Override - public boolean isCollidable() { - return this.isAlive(); - } - - @Override - public boolean isPushable() { - return false; - } - - ///////////////////////// - // GETTERS AND SETTERS // - ///////////////////////// - - @Override - protected MoveEffect getMoveEffect() { - return MoveEffect.NONE; - } - - protected final Vec3d getHeadRotationVector() { - float f = this.getPitch() * ((float)Math.PI / 180); - float g = -this.getHeadYaw()* ((float)Math.PI / 180); - float h = MathHelper.cos(g); - float i = MathHelper.sin(g); - float j = MathHelper.cos(f); - float k = MathHelper.sin(f); - return new Vec3d(i * j, -k, h * j); - } - - /** - * Sets the direction where this will be attached to. - * @param dir The direction to attach to. - */ - protected void setAttachedFace(Direction dir) { - this.dataTracker.set(ATTACHED_FACE, dir); - } - /** - * Retrieves the direction where this turret is attached to. - * @return {@code Direction} The direction where this turret is attached to. - */ - protected Direction getAttachedFace() { - return this.dataTracker.get(ATTACHED_FACE); - } - - /** - * Identifies the position of a point relative to this turret rotation and position. - * For reference: - *
    - *
  • X-Axis == Pitch: Identifies the elevation rotation (Horizontal line axis)
    • - *
  • Y-Axis == Yaw: Identifies where you are looking (Vertical line axis)
    • - *
  • Z-Axis == Roll: It's the one facing you (The 3D line)
    • - *
- * - * @param xOffset The offset of the point at the local X-Axis of this turret. - * @param yOffset The offset of the point at the local Y-Axis of this turret. - * @param zOffset The offset of the point at the local Z-Axis of this turret. - * - * @return Vec3d the relative position of this point, assuming that the origin is at [0, 0, 0] - */ - public Vec3d getRelativePos(double xOffset, double yOffset, double zOffset) { - return this.getRotationVecClient().add(this.getPos()) - .add(xOffset, yOffset, zOffset); - } - - @Override - public int getMaxLookPitchChange() { - return 30; - } - - @Override - public int getMaxHeadRotation() { - return 360; - } - - @Override - public boolean handleFallDamage(float fallDistance, float damageMultiplier, DamageSource damageSource) { - return false; - } - - @Override - public int getMinAmbientSoundDelay() { - return 120; - } - - public int getLevel() { - return this.dataTracker.get(LEVEL); - } - public void setLevel(int level) { - this.dataTracker.set(LEVEL, level); - } - - public SoundEvent getShootSound() { - return this.shootSound; - } - public void setShootSound(SoundEvent sound) { - this.shootSound = sound; - } - - public SoundEvent getHealSound() { - return this.healSound; - } - public void setHealSound(SoundEvent sound) { - this.healSound = sound; - } - - public TurretMaterial getTurretMaterial() { - return this.material; - } - - /** - * Adds an item to the map of items that can heal this turret. - *

NOTE: If the item is already added, the old heal amount would be updated to the specified value - * - * @param item Item to be added - * @param amount Amount of health that will be healed when used - * @return TurretEntity - * - * @see Item - * @see Items - * @see TurretEntity - */ - public TurretEntity addHealable(Item item, float amount) { - if (this.healables == null) - this.healables = new HashMap<>(); - this.healables.put(item, amount); - return this; - } - /** - * Adds the list of items to the map of items that can heal this turret. - *

NOTE: If the item is already added, the old heal amount would be updated to the specified value - * - * @param group A {@link List list} of items that will be added to the {@code healable} map - * @param amount Amount of health that will be healed when used - * @return TurretEntity - * - * @see Item - * @see Items - * @see TurretEntity - */ - public TurretEntity addHealable(List group, float amount) { - if (this.healables == null) - this.healables = new HashMap<>(); - - for (Item item : group) - this.healables.put(item, amount); - - return this; - } - /** - * Adds all the items to the list of items that can heal this turret. - * @param healables A key-value pair made from a {@code Map}, The map uses the {@code Item} as the key, and the {@code Float} as the amount of health healed - * @return TurretEntity - * - * @see Item - * @see Items - * @see Map - * @see TurretEntity - */ - public TurretEntity addHealables(Map healables) { - if (this.healables == null || this.healables.isEmpty()) - this.healables = healables; - else - this.healables.putAll(healables); - return this; - } - /** - * Retrieves the item and identifies the heal amount of this item, otherwise, return {@code null}. - * @param item The item to get the heal amount from. - * @return float Amount of healing this item will give to the entity; otherwise, {@code 0} - */ - public float getHealAmt(Item item) { - return this.isHealableItem(item) ? this.healables.get(item) : 0; - } - - /** - * Adds an item to the map of items that can give mob effect to this turret. - *

NOTE: If the item is already added, the old values will be updated - * - * @param item Item to be added - * @param effect The mob effect that will be added - * @param duration How long this effect will last (in seconds) - * @param amplifier Level of severity (or just basically level) with 0 being the lowest. - * @return TurretEntity - * - * @see Item - * @see Items - * @see StatusEffect - * @see TurretEntity - */ - public TurretEntity addEffectSource(Item item, StatusEffect effect, float duration, int amplifier) { - if (this.effectSource == null) - this.effectSource = new HashMap<>(); - this.effectSource.put(item, new ArrayList() {{add(new Object[] {effect, duration, amplifier});}}); - - return this; - } - /** - * Adds the list of items to the map of items that can give this turret a mob effect. - *

NOTE: If the item is already added, the old heal amount would be updated to the specified value - * - * @param group A {@link List list} of items that will be added to the {@code healable} map - * @param effect The mob effect that will be added - * @param duration How long this effect will last (in seconds) - * @param amplifier Level of severity (or just basically level) with 0 being the lowest. - * @return TurretEntity - * - * @see Item - * @see Items - * @see StatusEffect - * @see TurretEntity - */ - public TurretEntity addEffectSource(List group, StatusEffect effect, float duration, int amplifier) { - if (this.effectSource == null) - this.effectSource = new HashMap<>(); - - List args = new ArrayList<>() {{add(new Object[] {effect, duration, amplifier});}}; - for (Item item : group) - this.effectSource.put(item, args); - - return this; - } - - /** - * Adds all the items to the list of items that can give this turret a mob effect. - * @param effectSource A key-value pair made from a {@code Map}, The map uses the {@code Item} as the key, and a {@code List} of {@code Object} array for the effect. The array should only have three items in order: {@code StatusEffect}, {@code duration}, and {@code amplifier}. - * @return TurretEntity - * - * @see #effectSource - * @see Item - * @see Items - * @see Map - * @see StatusEffect - * @see TurretEntity - */ - public TurretEntity addEffectSource(Map> effectSource) { - if (this.effectSource == null) - this.effectSource = effectSource; - else - this.effectSource.putAll(effectSource); - return this; - } - - /** - * Updates a single entry in the list of effect the item has. If the effect isn't in the list yet, it will be added with default values of 10 seconds duration and amplifier of 0. - * Many effects can be updated at the same time. - * - * @param item The item in question - * @param args An Object array that consists of {@code StatusEffect,} {@code duration} (in seconds), and {@code amplifier} level - * - * @return TurretEntity - * - * @see #effectSource - * @see Item - * @see Items - * @see StatusEffect - * @see TurretEntity - */ - public TurretEntity updateEffectSource(Item item, Object[]... args) { - List currentArgs = this.getMobEffect(item); - - if (args.length == 0) - return this; - - for (Object[] arg : args) { - if (arg.length == 0) - continue; - - Object[] toPass = new Object[3]; - - if (arg[0] instanceof StatusEffect) { - toPass[0] = arg[0]; - toPass[1] = 10; - toPass[2] = 0; - - if (arg.length == 2) { - if (arg[1] instanceof Float) - toPass[1] = arg[1]; - else if (arg[1] instanceof Integer) - toPass[2] = arg[1]; - } - else if (arg.length == 3) { - toPass[1] = arg[1]; - toPass[2] = arg[2]; - } - - if (currentArgs != null) - currentArgs.add(toPass); - else - currentArgs = Arrays.asList(new Object[][] {toPass}); - } - else { - if (arg.length == 3) - DefensiveMeasures.LOGGER.warn("Effect source at {} was not {} due to given array not matching the correct order of items in the array, having [{}, {}, {}] instead of [StatusEffect, Float, Integer]", this.getName().getString(), this.effectSourceHasEffect(item, (StatusEffect) arg[0]) ? "updated" : "registered", arg[0].getClass().getName(), arg[1].getClass().getName(), arg[2].getClass().getName()); - else if (arg.length == 2) - DefensiveMeasures.LOGGER.warn("Effect source at {} was not {} due to given array not matching the correct order of items in the array, having [{}, {}] instead of [StatusEffect, Float] OR [StatusEffect, Integer]", this.getName().getString(), this.effectSourceHasEffect(item, (StatusEffect) arg[0]) ? "updated" : "registered", arg[0].getClass().getName(), arg[1].getClass().getName()); - else if (arg.length == 1) - DefensiveMeasures.LOGGER.warn("Effect source at {} was not {} due to given array not matching the correct order of items in the array, having [{}] instead of [StatusEffect]", this.getName().getString(), this.effectSourceHasEffect(item, (StatusEffect) arg[0]) ? "updated" : "registered", arg[0].getClass().getName()); - } - - } - - this.effectSource.put(item, currentArgs); - - return this; - } - - /** - * Retrieves the item and identifies the mob effects this should apply to this turret, otherwise, returns an empty {@code List}. - * @param item The item to get the mob effects from. - * - * @return {@code List} A list of information consisting an array of the effect data. The data are set in this order: - *
    - *
  1. {@code StatusEffect}
    2. - *
  2. {@code duration}
    3. - *
  3. {@code amplifier}
    4. - *
- */ - public List getMobEffect(Item item) { - return this.isEffectSource(item) ? this.effectSource.get(item) : List.of(); - } - - public boolean isShooting() { - return this.dataTracker.get(SHOOTING); - } - - public void setShooting(boolean shooting) { - this.dataTracker.set(SHOOTING, shooting); - } - - public boolean getShootingFXDone() { - return this.dataTracker.get(SHOOTING_FX_DONE); - } - - public void setShootingFXDone(boolean status) { - this.dataTracker.set(SHOOTING_FX_DONE, status); - } - - public boolean hasTarget() { - return this.dataTracker.get(HAS_TARGET); - } - - public void setHasTarget(boolean hasTarget) { - this.dataTracker.set(HAS_TARGET, hasTarget); - } - - public void setPos(TrackedData axis, double value) { - this.dataTracker.set(axis, (float) value); - } - - public double getPos(TrackedData axis) { - return this.dataTracker.get(axis); - } - - public void setTrackedYaw(double value) { - this.dataTracker.set(YAW, (float) value); - } - - public double getTrackedYaw() { - return (double) this.dataTracker.get(YAW); - } - - public void setTrackedPitch(double value) { - this.dataTracker.set(PITCH, (float) value); - } - - public double getTrackedPitch() { - return (double) this.dataTracker.get(PITCH); - } - - @Override - public Vec3d getVelocity() { - if (this.getWorld().getBlockState(this.getVelocityAffectingPos()).isOf(Blocks.BUBBLE_COLUMN) - || this.getWorld().getBlockState(this.getVelocityAffectingPos().add(0, 1, 0)).isOf(Blocks.BUBBLE_COLUMN) - || this.getWorld().getBlockState(this.getVelocityAffectingPos()).isOf(Blocks.WATER) - || this.getWorld().getBlockState(this.getVelocityAffectingPos().add(0, 1, 0)).isOf(Blocks.WATER) - || this.getAttachedFace() != Direction.DOWN) - return new Vec3d(0, -Math.abs(super.getVelocity().getY()), 0); - - return super.getVelocity(); - } - - /////////////////////////////// - // INTERFACE IMPLEMENTATIONS // - /////////////////////////////// - - @Override - public byte isFromItem() { - return this.getDataTracker().get(FROM_ITEM); - } - - @Override - public void setFromItem(byte fromItem) { - this.getDataTracker().set(FROM_ITEM, fromItem); - } - - @Override - public void copyDataToStack(ItemStack stack) { - Itemable.copyDataToStack(this, stack); - } - - @Override - public void copyDataFromNbt(NbtCompound nbt) { - Itemable.copyDataFromNbt(this, nbt); - } - - public ItemStack getEntityItem() { - return null; - } - - public SoundEvent getEntityRemoveSound() { - return null; - }; - - @Override - public void shootAt(LivingEntity target, float pullProgress) { - if (!this.isShooting()) - this.setShooting(target != null); - - try { - String targetName = target != null ? target.getName().getString() : "(nothing)"; - System.out.println("Shooting at " + targetName + " with a pull progress of " + pullProgress); - this.setHasTarget(target != null); - - if (target != null) { - ProjectileEntity projectile = (ProjectileEntity) this.projectile - .getConstructor(World.class, LivingEntity.class) - .newInstance(this.getWorld(), this); - - double[] velocity = new double[] { - target.getX() - this.getX(), - target.getBodyY((double) 1 / 2) - projectile.getX(), - target.getZ() - this.getZ(), - }; - double variance = Math.sqrt(velocity[0] * velocity[0] + velocity[2] + velocity[2]); - float divergence = this.getWorld().getDifficulty().getId() * 2; - - projectile.setVelocity(velocity[0], velocity[1] + variance * 0.125F, velocity[2], 2.5F, divergence); - this.getWorld().spawnEntity(projectile); - this.playSound(this.getShootSound(), 1F, 1F / (this.random.nextFloat() * 0.4F + 0.8F)); - } - - } catch (InstantiationException - | IllegalAccessException - | IllegalArgumentException - | InvocationTargetException - | SecurityException - | NoSuchMethodException e) - { - e.printStackTrace(System.out); - - DefensiveMeasures.LOGGER.error(""); - DefensiveMeasures.LOGGER.error("\t {} ERROR OCCURRED\t ", DefensiveMeasures.MOD_ID.toUpperCase()); - DefensiveMeasures.LOGGER.error("===== ERROR MSG START ====="); - DefensiveMeasures.LOGGER.error("LOCALIZED ERROR MESSAGE:"); - DefensiveMeasures.LOGGER.error(e.getLocalizedMessage()); - DefensiveMeasures.LOGGER.error(""); - DefensiveMeasures.LOGGER.error("ERROR MESSAGE:"); - DefensiveMeasures.LOGGER.error(e.getMessage()); - DefensiveMeasures.LOGGER.error("===== ERROR MSG END ====="); - DefensiveMeasures.LOGGER.error(""); - } - } - - /////////////////// - // LOCAL CLASSES // - /////////////////// - - static class TurretBodyControl extends BodyControl { - public TurretBodyControl(MobEntity entity) { - super(entity); - } - - @Override - public void tick() { - } - } - - static class TurretLookControl extends LookControl { - public TurretLookControl(MobEntity entity) { - super(entity); - } - - @Override - protected void clampHeadYaw() { - } - } - - /////////////////////// - // STATIC INITIALIZE // - /////////////////////// - - static { - LEVEL = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.INTEGER); - FROM_ITEM = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.BYTE); - SHOOTING = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.BOOLEAN); - SHOOTING_FX_DONE = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.BOOLEAN); - HAS_TARGET = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.BOOLEAN); - - ATTACHED_FACE = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FACING); - X = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - Y = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - Z = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - YAW = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - PITCH = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - - TARGET_POS_X = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - TARGET_POS_Y = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - TARGET_POS_Z = DataTracker.registerData(TurretEntity.class, TrackedDataHandlerRegistry.FLOAT); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/ModItemGroups.java b/remappedSrc/com/virus5600/defensive_measures/item/ModItemGroups.java deleted file mode 100644 index 1fffa22..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/ModItemGroups.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.virus5600.defensive_measures.item; - -import com.virus5600.defensive_measures.DefensiveMeasures; - -import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; -import net.minecraft.item.ItemGroup; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.registry.RegistryKey; -import net.minecraft.text.Text; -import net.minecraft.util.Identifier; - -public class ModItemGroups { - public static final RegistryKey DMI_KEY = RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(DefensiveMeasures.MOD_ID, "defensive_measures_items")); - public static final ItemGroup DEFENSIVE_MEASURES_ITEMS = FabricItemGroup.builder() - .displayName(Text.translatable("itemGroup.dm.defensive_measures.items")) - .icon(ModItems.CANNON_HEAD::getDefaultStack) - .build(); - - public static final RegistryKey DME_KEY = RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(DefensiveMeasures.MOD_ID, "defensive_measures_equipments")); - public static final ItemGroup DEFENSIVE_MEASURES_EQUIPMENTS = FabricItemGroup.builder() - .displayName(Text.translatable("itemGroup.dm.defensive_measures.equipments")) - .icon(ModItems.TURRET_REMOVER::getDefaultStack) - .build(); - -// public static final RegistryKey DMTR_KEY = RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(DefensiveMeasures.MOD_ID, "defensive_measures_traps")); -// public static final ItemGroup DEFENSIVE_MEASURES_TRAPS = FabricItemGroup.builder() -// .displayName(Text.translatable("itemGroup.dm.defensive_measures.traps")) -// .icon(() -> ModBlocks.ARROWHEAD.asItem().getDefaultStack()) -// .build(); - - public static final RegistryKey DMTT_KEY = RegistryKey.of(Registries.ITEM_GROUP.getKey(), Identifier.of(DefensiveMeasures.MOD_ID, "defensive_measures_turrets")); - public static final ItemGroup DEFENSIVE_MEASURES_TURRETS = FabricItemGroup.builder() - .displayName(Text.translatable("itemGroup.dm.defensive_measures.turrets")) - .icon(ModItems.CANNON_TURRET::getDefaultStack) - .build(); - - //////////////////// - // REGISTER ITEMS // - //////////////////// - - public static void registerModItemGroups() { - DefensiveMeasures.LOGGER.info("REGISTERING ITEM GROUPS FOR {}...", DefensiveMeasures.MOD_NAME); - - Registry.register(Registries.ITEM_GROUP, DMI_KEY, DEFENSIVE_MEASURES_ITEMS); - Registry.register(Registries.ITEM_GROUP, DME_KEY, DEFENSIVE_MEASURES_EQUIPMENTS); -// Registry.register(Registries.ITEM_GROUP, DMTR_KEY, DEFENSIVE_MEASURES_TRAPS); - Registry.register(Registries.ITEM_GROUP, DMTT_KEY, DEFENSIVE_MEASURES_TURRETS); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/ModItems.java b/remappedSrc/com/virus5600/defensive_measures/item/ModItems.java deleted file mode 100644 index 5f0ac32..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/ModItems.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.virus5600.defensive_measures.item; - -import com.virus5600.defensive_measures.DefensiveMeasures; - -import com.virus5600.defensive_measures.entity.ModEntities; -import com.virus5600.defensive_measures.item.equipments.TurretRemoverItem; -import com.virus5600.defensive_measures.item.turrets.cannon.*; - -import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.minecraft.item.Item; -import net.minecraft.item.Item.Settings; -import net.minecraft.item.ToolItem; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; - -import java.util.Arrays; - -public class ModItems { - public final static Item[] DM_ITEMS; - public final static Item[] DM_EQUIPMENTS; - public final static Item[] DM_TRAPS; - public final static Item[] DM_TURRETS; - - ///////////// - // TURRETS // - ///////////// - - // CANNON - public final static Item CANNON_TURRET = registerItem("cannon_turret", new CannonTurretItem(ModEntities.CANNON_TURRET, itemSettings())); - public final static Item CANNON_BASE = registerItem("cannon_base", new CannonBaseItem(itemSettings())); - public final static Item CANNON_HEAD = registerItem("cannon_head", new CannonHeadItem(itemSettings())); - public final static Item CANNON_STAND = registerItem("cannon_stand", new CannonStandItem(itemSettings())); - public final static Item UNFINISHED_CANNON_HEAD = registerItem("unfinished_cannon_head", new UnfinishedCannonHeadItem(itemSettings())); - - // BALLISTA -// public final static Item BALLISTA = new BallistaTurretItem(ModEntities.BALLISTA, SETTING_DMT); -// public final static Item BALLISTA_ARROW = new BallistaArrowItem(SETTING_DMI); -// public final static Item BALLISTA_BASE = new BallistaBaseItem(SETTING_DMI); -// public final static Item BALLISTA_BASE_WITH_STAND = new BallistaBaseWithStandItem(SETTING_DMI); -// public final static Item BALLISTA_BOW = new BallistaBowItem(SETTING_DMI); - - // MACHINE GUN -// public final static Item MG_TURRET = new MachineGunTurretItem(ModEntities.MG_TURRET, SETTING_DMT); -// public final static Item AMMO_CASE = new AmmoCaseItem(SETTING_DMI); -// public final static Item AMMO_ROUNDS = new AmmoRoundsItem(SETTING_DMI); -// public final static Item MACHINE_GUN_BASE = new MachineGunBaseItem(SETTING_DMI); -// public final static Item MACHINE_GUN_HEAD = new MachineGunHeadItem(SETTING_DMI); -// public final static Item MACHINE_GUN_STAND = new MachineGunStandItem(SETTING_DMI); - - //////////////// - // EQUIPMENTS // - //////////////// - - // TURRET REMOVER - public final static ToolItem TURRET_REMOVER = (ToolItem) registerItem("turret_remover", new TurretRemoverItem(ModToolMaterials.TURRET_REMOVER, itemSettings())); - - ////////////////////////////// - // REGISTRY RELATED METHODS // - ////////////////////////////// - - /** - * Creates an instance of {@link Settings} for items. - * @return an instance of {@link Settings} - */ - private static Settings itemSettings() { - return new Settings(); - }; - - /** - * Registers an item to the game. - * @param name the name of the item. - * @param item the item to register. - */ - private static Item registerItem(String name, Item item) { - return Registry.register(Registries.ITEM, Identifier.of(DefensiveMeasures.MOD_ID, name), item); - } - - public static void registerModItems() { - DefensiveMeasures.LOGGER.info("REGISTERING ITEMS TO ITEM GROUPS..."); - - Arrays.stream(DM_ITEMS).iterator().forEachRemaining((item) -> { - ItemGroupEvents.modifyEntriesEvent(ModItemGroups.DMI_KEY).register((content) -> { - content.add(item); - }); - }); - - Arrays.stream(DM_EQUIPMENTS).iterator().forEachRemaining((item) -> { - ItemGroupEvents.modifyEntriesEvent(ModItemGroups.DME_KEY).register((content) -> { - content.add(item); - }); - }); - -// Arrays.stream(DM_TRAPS).iterator().forEachRemaining((item) -> { -// ItemGroupEvents.modifyEntriesEvent(ModItemGroups.DMTR_KEY).register((content) -> { -// content.add(item); -// }); -// }); - - Arrays.stream(DM_TURRETS).iterator().forEachRemaining((item) -> { - ItemGroupEvents.modifyEntriesEvent(ModItemGroups.DMTT_KEY).register((content) -> { - content.add(item); - }); - }); - } - - static { - DM_ITEMS = new Item[]{ - CANNON_BASE, - CANNON_HEAD, - CANNON_STAND, - UNFINISHED_CANNON_HEAD, -// BALLISTA_ARROW, -// BALLISTA_BASE, -// BALLISTA_BASE_WITH_STAND, -// BALLISTA_BOW, -// AMMO_CASE, -// AMMO_ROUNDS, -// MACHINE_GUN_BASE, -// MACHINE_GUN_HEAD, -// MACHINE_GUN_STAND - }; - - DM_EQUIPMENTS = new Item[]{ - TURRET_REMOVER - }; - - DM_TRAPS = new Item[]{ - }; - - DM_TURRETS = new Item[]{ - CANNON_TURRET, -// BALLISTA, -// MG_TURRET - }; - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/ModToolMaterials.java b/remappedSrc/com/virus5600/defensive_measures/item/ModToolMaterials.java deleted file mode 100644 index 955e80d..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/ModToolMaterials.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.virus5600.defensive_measures.item; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.Items; -import net.minecraft.item.ToolMaterial; -import net.minecraft.recipe.Ingredient; -import net.minecraft.registry.tag.TagKey; - -public enum ModToolMaterials implements ToolMaterial { - TURRET_REMOVER(100, 1.0F, 0.0F, null, 15, new Item[] { - Items.GOLD_NUGGET, - Items.IRON_NUGGET, - Items.REDSTONE - }); - - private final int itemDurability; - private final float miningSpeed; - private final float attackDamage; - private final TagKey inverseTags; - private final int enchantability; - private final Item[] repairIngredients; - - private ModToolMaterials(int itemDurability, float miningSpeed, float attackDamage, TagKey inverseTags, int enchantability, Item[] repairIngredients) { - this.itemDurability = itemDurability; - this.miningSpeed = miningSpeed; - this.attackDamage = attackDamage; - this.inverseTags = inverseTags; - this.enchantability = enchantability; - this.repairIngredients = repairIngredients; - } - - @Override - public int getDurability() { - return this.itemDurability; - } - - @Override - public float getMiningSpeedMultiplier() { - return this.miningSpeed; - } - - @Override - public float getAttackDamage() { - return this.attackDamage; - } - - @Override - public TagKey getInverseTag() { - return this.inverseTags; - } - - @Override - public int getEnchantability() { - return this.enchantability; - } - - @Override - public Ingredient getRepairIngredient() { - return Ingredient.ofItems(this.repairIngredients); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java b/remappedSrc/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java deleted file mode 100644 index d8ee7ec..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.virus5600.defensive_measures.item.equipments; - -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ToolItem; -import net.minecraft.item.ToolMaterial; -import net.minecraft.util.Rarity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public class TurretRemoverItem extends ToolItem { - - public TurretRemoverItem(ToolMaterial material, Settings settings) { - super( - material, - // RARITY - settings.rarity(Rarity.COMMON) - ); - } - - @Override - public boolean canMine(BlockState state, World world, BlockPos pos, PlayerEntity miner) { - // CAN'T DESTROY IN CREATIVE - return !miner.isCreative(); - } - - @Override - public int getEnchantability() { - return this.getMaterial().getEnchantability(); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/turrets/TurretItem.java b/remappedSrc/com/virus5600/defensive_measures/item/turrets/TurretItem.java deleted file mode 100644 index e449b4d..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/turrets/TurretItem.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.virus5600.defensive_measures.item.turrets; - -import java.util.Map; -import java.util.Objects; - -import net.minecraft.component.DataComponentTypes; -import net.minecraft.component.type.NbtComponent; -import net.minecraft.text.Text; -import org.jetbrains.annotations.Nullable; - -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; -import com.virus5600.defensive_measures.entity.turrets.TurretEntity; - -import net.minecraft.block.BlockState; -import net.minecraft.block.FluidBlock; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityType; -import net.minecraft.entity.SpawnReason; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUsageContext; -import net.minecraft.item.SpawnEggItem; -import net.minecraft.nbt.NbtCompound; -import net.minecraft.nbt.NbtElement; -import net.minecraft.server.world.ServerWorld; -import net.minecraft.stat.Stats; -import net.minecraft.util.ActionResult; -import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; -import net.minecraft.util.hit.BlockHitResult; -import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Direction; -import net.minecraft.world.RaycastContext; -import net.minecraft.world.World; -import net.minecraft.world.event.GameEvent; - -public class TurretItem extends Item { - private static final Map, TurretItem> TURRETS = Maps.newIdentityHashMap(); - private final EntityType type; - - public TurretItem(EntityType type, net.minecraft.item.Item.Settings settings) { - super(settings); - this.type = type; - } - - public ActionResult useOnBlock(ItemUsageContext context) { - World world = context.getWorld(); - - // If the world is not the Server world - if (!(world instanceof ServerWorld)) { - return ActionResult.SUCCESS; - } else { - ItemStack itemStack = context.getStack(); - BlockPos blockPos = context.getBlockPos(); - Direction direction = context.getSide(); - BlockState blockState = world.getBlockState(blockPos); - BlockPos blockPos2; - - if (blockState.getCollisionShape(world, blockPos).isEmpty()) { - blockPos2 = blockPos; - } else { - blockPos2 = blockPos.offset(direction); - } - - NbtComponent nbtComponent = itemStack.get(DataComponentTypes.CUSTOM_DATA); - NbtCompound nbt = nbtComponent != null ? nbtComponent.copyNbt() : NbtComponent.DEFAULT.copyNbt(); - EntityType entityType2 = this.getEntityType(nbt); - Entity entity = entityType2.spawnFromItemStack( - (ServerWorld) world, - itemStack, - context.getPlayer(), - blockPos2, - SpawnReason.SPAWN_EGG, - true, - !Objects.equals(blockPos, blockPos2) && direction == Direction.UP - ); - - if (entity != null) { - itemStack.decrement(1); - world.emitGameEvent(context.getPlayer(), GameEvent.ENTITY_PLACE, blockPos); - } - - return ActionResult.CONSUME; - } - } - - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - ItemStack itemStack = user.getStackInHand(hand); - BlockHitResult hitResult = SpawnEggItem.raycast(world, user, RaycastContext.FluidHandling.SOURCE_ONLY); - - if (((HitResult) hitResult).getType() != HitResult.Type.BLOCK) { - return TypedActionResult.pass(itemStack); - } - if (!(world instanceof ServerWorld)) { - return TypedActionResult.success(itemStack); - } - - BlockPos blockPos = hitResult.getBlockPos(); - - if (!(world.getBlockState(blockPos).getBlock() instanceof FluidBlock)) { - return TypedActionResult.pass(itemStack); - } - if (!world.canPlayerModifyAt(user, blockPos) || !user.canPlaceOn(blockPos, hitResult.getSide(), itemStack)) { - return TypedActionResult.fail(itemStack); - } - - NbtComponent nbtComponent = itemStack.get(DataComponentTypes.CUSTOM_DATA); - NbtCompound nbt = nbtComponent != null ? nbtComponent.copyNbt() : NbtComponent.DEFAULT.copyNbt(); - EntityType entityType = this.getEntityType(nbt); - Entity entity = entityType.spawnFromItemStack((ServerWorld)world, itemStack, user, blockPos, SpawnReason.SPAWN_EGG, false, false); - if (entity == null) { - return TypedActionResult.pass(itemStack); - } - if (!user.getAbilities().creativeMode) { - itemStack.decrement(1); - } - - user.incrementStat(Stats.USED.getOrCreateStat(this)); - world.emitGameEvent((Entity)user, GameEvent.ENTITY_PLACE, entity.getPos()); - - return TypedActionResult.consume(itemStack); - } - - public boolean isOfSameEntityType(@Nullable NbtCompound nbt, EntityType type) { - return Objects.equals(this.getEntityType(nbt), type); - } - - @Nullable - public static TurretItem forEntity(@Nullable EntityType type) { - return (TurretItem)TURRETS.get(type); - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public static Iterable getAll() { - return Iterables.unmodifiableIterable((Iterable)TURRETS.values()); - } - - public EntityType getEntityType(@Nullable NbtCompound nbt) { - if (nbt != null && nbt.contains("EntityTag", NbtElement.COMPOUND_TYPE)) { - NbtCompound nbtCompound = nbt.getCompound("EntityTag"); - if (nbtCompound.contains("id", NbtElement.STRING_TYPE)) { - return EntityType.get(nbtCompound.getString("id")).orElse(this.type); - } - } - - return this.type; - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java b/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java deleted file mode 100644 index a545f57..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.virus5600.defensive_measures.item.turrets.cannon; - -import net.fabricmc.fabric.api.registry.FuelRegistry; -import net.minecraft.item.Item; -import net.minecraft.util.Rarity; - -/** - * The class for the Cannon Base {@link Item item}. - */ -public class CannonBaseItem extends Item { - public CannonBaseItem(net.minecraft.item.Item.Settings settings) { - super( - settings - .maxCount(16) // MAX STACK SIZE - .rarity(Rarity.COMMON) // RARITY - ); - - // FUEL - FuelRegistry.INSTANCE.add(this, 300); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java b/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java deleted file mode 100644 index 5cb0b00..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.virus5600.defensive_measures.item.turrets.cannon; - -import net.minecraft.item.Item; -import net.minecraft.util.Rarity; - -/** - * The class for the Cannon Head {@link Item item}. - */ -public class CannonHeadItem extends Item { - public CannonHeadItem(net.minecraft.item.Item.Settings settings) { - super( - settings - .maxCount(1) // MAX STACK SIZE - .rarity(Rarity.COMMON) // RARITY - ); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java b/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java deleted file mode 100644 index 9486762..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.virus5600.defensive_measures.item.turrets.cannon; - -import net.fabricmc.fabric.api.registry.FuelRegistry; -import net.minecraft.item.Item; -import net.minecraft.util.Rarity; - -/** - * The class for the Cannon Stand {@link Item item}. - */ -public class CannonStandItem extends Item { - public CannonStandItem(net.minecraft.item.Item.Settings settings) { - super( - settings - .maxCount(16) // MAX STACK SIZE - .rarity(Rarity.COMMON) // RARITY - ); - - // FUEL - FuelRegistry.INSTANCE.add(this, 600); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java b/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java deleted file mode 100644 index 0878d54..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.virus5600.defensive_measures.item.turrets.cannon; - -import com.virus5600.defensive_measures.item.turrets.TurretItem; - -import net.minecraft.entity.EntityType; -import net.minecraft.entity.mob.MobEntity; -import net.minecraft.util.Rarity; - -public class CannonTurretItem extends TurretItem { - public CannonTurretItem(EntityType type, net.minecraft.item.Item.Settings settings) { - super( - type, - settings - .maxCount(16) // MAX STACK SIZE - .rarity(Rarity.RARE) // RARITY - ); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java b/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java deleted file mode 100644 index c6c14b6..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.virus5600.defensive_measures.item.turrets.cannon; - -import net.minecraft.item.Item; -import net.minecraft.util.Rarity; - -public class UnfinishedCannonHeadItem extends Item { - public UnfinishedCannonHeadItem(net.minecraft.item.Item.Settings settings) { - super( - settings - .maxCount(1) // MAX STACK SIZE - .rarity(Rarity.COMMON) // RARITY - ); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/network/ModPackets.java b/remappedSrc/com/virus5600/defensive_measures/network/ModPackets.java deleted file mode 100644 index 3bd8f83..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/network/ModPackets.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.virus5600.defensive_measures.network; - -import com.virus5600.defensive_measures.DefensiveMeasures; -import net.minecraft.util.Identifier; - -public class ModPackets { - public static final Identifier SPAWN_TURRET = Identifier.of(DefensiveMeasures.MOD_ID, "spawn_turret"); -} diff --git a/remappedSrc/com/virus5600/defensive_measures/particle/ModParticles.java b/remappedSrc/com/virus5600/defensive_measures/particle/ModParticles.java deleted file mode 100644 index 7ceffda..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/particle/ModParticles.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.virus5600.defensive_measures.particle; - -import com.virus5600.defensive_measures.DefensiveMeasures; - -import net.fabricmc.fabric.api.particle.v1.FabricParticleTypes; -import net.minecraft.particle.SimpleParticleType; -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.util.Identifier; - -public class ModParticles { - public static final SimpleParticleType CANNON_FUSE = register("cannon_fuse", true); - public static final SimpleParticleType CANNON_FLASH = register("cannon_flash", false); - - private static SimpleParticleType register(String identifier, boolean shouldAlwaysSpawn) { - return Registry.register( - Registries.PARTICLE_TYPE, - Identifier.of(DefensiveMeasures.MOD_ID, identifier), - FabricParticleTypes.simple(shouldAlwaysSpawn) - ); - } - - public static void registerParticles() { - DefensiveMeasures.LOGGER.info("REGISTERING PARTICLES FOR {}...", DefensiveMeasures.MOD_NAME); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/sound/ModSoundEvents.java b/remappedSrc/com/virus5600/defensive_measures/sound/ModSoundEvents.java deleted file mode 100644 index 507e31d..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/sound/ModSoundEvents.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.virus5600.defensive_measures.sound; - -import com.virus5600.defensive_measures.DefensiveMeasures; - -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.sound.SoundEvent; -import net.minecraft.util.Identifier; - -public class ModSoundEvents { - - // V1.0 - public final static SoundEvent TURRET_REMOVED_METAL = ModSoundEvents.registerSoundEvent("turret.remove.metal"); - public final static SoundEvent TURRET_REMOVED_WOOD = ModSoundEvents.registerSoundEvent("turret.remove.wood"); - public final static SoundEvent TURRET_REPAIR_METAL = ModSoundEvents.registerSoundEvent("turret.repair.iron"); - public final static SoundEvent TURRET_REPAIR_WOOD = ModSoundEvents.registerSoundEvent("turret.repair.wood"); - public final static SoundEvent TURRET_REPAIR_BOW = ModSoundEvents.registerSoundEvent("turret.repair.bow"); - - // CANNON - public final static SoundEvent TURRET_CANNON_HURT = ModSoundEvents.registerSoundEvent("turret.cannon.hurt"); - public final static SoundEvent TURRET_CANNON_DESTROYED = ModSoundEvents.registerSoundEvent("turret.cannon.destroyed"); - public final static SoundEvent TURRET_CANNON_SHOOT = ModSoundEvents.registerSoundEvent("turret.cannon.shoot"); - // BALLISTA - public final static SoundEvent TURRET_BALLISTA_HURT = ModSoundEvents.registerSoundEvent("turret.ballista.hurt"); - public final static SoundEvent TURRET_BALLISTA_DESTROYED = ModSoundEvents.registerSoundEvent("turret.ballista.destroyed"); - public final static SoundEvent TURRET_BALLISTA_SHOOT = ModSoundEvents.registerSoundEvent("turret.ballista.shoot"); - // MG TURRET - public final static SoundEvent TURRET_MG_HURT = ModSoundEvents.registerSoundEvent("turret.mg_turret.hurt"); - public final static SoundEvent TURRET_MG_DESTROYED = ModSoundEvents.registerSoundEvent("turret.mg_turret.destroyed"); - public final static SoundEvent TURRET_MG_SHOOT = ModSoundEvents.registerSoundEvent("turret.mg_turret.shoot"); - - // v1.1.0-beta - public static final SoundEvent BULLET_IMPACT_DIRT = ModSoundEvents.registerSoundEvent("generic.impact.bullet.dirt"); - public static final SoundEvent BULLET_IMPACT_FLESH = ModSoundEvents.registerSoundEvent("generic.impact.bullet.flesh"); - public static final SoundEvent BULLET_IMPACT_GLASS = ModSoundEvents.registerSoundEvent("generic.impact.bullet.glass"); - public static final SoundEvent BULLET_IMPACT_METAL = ModSoundEvents.registerSoundEvent("generic.impact.bullet.metal"); - public static final SoundEvent BULLET_IMPACT_STONE = ModSoundEvents.registerSoundEvent("generic.impact.bullet.stone"); - public static final SoundEvent BULLET_IMPACT_WOOD = ModSoundEvents.registerSoundEvent("generic.impact.bullet.wood"); - - // ANTI-AIR TURRET - public static final SoundEvent TURRET_ANTI_AIR_HURT = ModSoundEvents.registerSoundEvent("turret.anti_air_turret.hurt"); - public static final SoundEvent TURRET_ANTI_AIR_DESTROYED = ModSoundEvents.registerSoundEvent("turret.anti_air_turret.destroyed"); - public static final SoundEvent TURRET_ANTI_AIR_BEGIN_SHOOT = ModSoundEvents.registerSoundEvent("turret.anti_air_turret.shoot.begin"); - public static final SoundEvent TURRET_ANTI_AIR_SHOOT = ModSoundEvents.registerSoundEvent("turret.anti_air_turret.shoot"); - public static final SoundEvent TURRET_ANTI_AIR_END_SHOOT = ModSoundEvents.registerSoundEvent("turret.anti_air_turret.shoot.end"); - - private static SoundEvent registerSoundEvent(final String soundID) { - Identifier identifier = Identifier.of(DefensiveMeasures.MOD_ID, soundID); - return Registry.register( - Registries.SOUND_EVENT, - identifier, - SoundEvent.of(identifier) - ); - } - - public static void registerSoundEvents() { - DefensiveMeasures.LOGGER.info("REGISTERING SOUND EVENTS FOR {}...", DefensiveMeasures.MOD_NAME); - } -} diff --git a/remappedSrc/com/virus5600/defensive_measures/util/ItemUtil.java b/remappedSrc/com/virus5600/defensive_measures/util/ItemUtil.java deleted file mode 100644 index 1fcdda4..0000000 --- a/remappedSrc/com/virus5600/defensive_measures/util/ItemUtil.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.virus5600.defensive_measures.util; - -import net.minecraft.item.Item; -import net.minecraft.item.ToolItem; - -/** - * Contains all utility methods that can be used for the {@link net.minecraft.item.Item Item class} such as identifying if it is a {@link net.minecraft.item.ToolItem ToolItem} instance or other. - * This is to supplement some shortcomings of the primary vanilla {@code Item} class and create flexibility towards applying features and modifications. - * @author Virus5600 - * @since 1.0.0 - * @see net.minecraft.item.Item Item - * @see net.minecraft.item.ToolItem ToolItem - * @see net.minecraft.item.SwordItem SwordItem - */ -public class ItemUtil { - /** - * Identifies whether the provided {@code item} is a subclass of the provided {@code class} - * @param type Target subclass - * @param item Item in question - * @return boolean - */ - public static boolean isTypeMatch(Class type, Item item) { - return type.isAssignableFrom(item.getClass()); - } - - /** - * Identifies whether the provided {@code item} is a subclass of {@link ToolItem} - * @param item Item in question - * @return boolean - * @see ToolItem - */ - public static boolean isToolItem(Item item) { - return ToolItem.class.isAssignableFrom(item.getClass()); - } - - /** - * Retrieves the Class instance provided by the {@code type} of this item. - * @param type Target subclass - * @param item Item in question - * @return An instance provided on the parameter {@code type} - */ - public static T getObjectInstance(Class type, Item item) { - if (ItemUtil.isTypeMatch(type, item)) - return type.cast(item); - return null; - } - - /** - * Retrieves the {@link ToolItem} instance of this item. - * @param item Item in question - * @return ToolItem - * @see ToolItem - */ - public static ToolItem getToolItem(Item item) { - if (ItemUtil.isToolItem(item)) - return (ToolItem) item; - return null; - } -} diff --git a/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java b/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java index 84c5310..d4e771b 100644 --- a/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java @@ -2,11 +2,11 @@ import net.minecraft.entity.ai.goal.ActiveTargetGoal; import net.minecraft.entity.player.PlayerEntity; - -import com.virus5600.defensive_measures.entity.turrets.TurretEntity; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; +import com.virus5600.defensive_measures.entity.turrets.TurretEntity; + public class TargetPlayerGoal extends ActiveTargetGoal { public TargetPlayerGoal(TurretEntity turret) { super(turret, PlayerEntity.class, true); diff --git a/src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java b/src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java index 6cff897..39ce443 100644 --- a/src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java @@ -56,11 +56,11 @@ public class CannonTurretEntity extends TurretEntity implements GeoEntity, Range /** * Contains all the items that can heal this entity. */ - private static Map healables; + protected static final Map healables; /** * Contains all the items that can give effect to this entity */ - private static Map> effectSource; + protected static final Map> effectSource; private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); private double attCooldown = totalAttCooldown; diff --git a/src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java b/src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java index 8cd46ce..c3ced71 100644 --- a/src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java @@ -16,7 +16,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ArrowEntity; import net.minecraft.entity.projectile.ProjectileEntity; -import net.minecraft.item.Equipment; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -308,7 +307,7 @@ public EntityData initialize(ServerWorldAccess world, LocalDifficulty difficulty this.prevBodyYaw = 0.0f; this.resetPosition(); - if (spawnReason == SpawnReason.SPAWN_EGG) { + if (spawnReason == SpawnReason.SPAWN_ITEM_USE) { return entityData; } @@ -369,14 +368,13 @@ protected Direction findAttachableSide(BlockPos pos) { @Override protected ActionResult interactMob(PlayerEntity player, Hand hand) { ItemStack item = player.getStackInHand(hand); - Equipment equipment = Equipment.fromStack(item); boolean isSurvival = !player.isCreative(); boolean isSuccess = false; // Turret Remover Interaction - if (item.getItem() == ModItems.TURRET_REMOVER) { - if (equipment != null && isSurvival) - item.damage(1, player, equipment.getSlotType()); + if (item.getItem().getName().equals(ModItems.TURRET_REMOVER)) { + if (isSurvival) + item.damage(1, player); isSuccess = true; } @@ -406,8 +404,7 @@ else if (this.isHealableItem(item.getItem())) { } if (item.isDamageable()) { - if (equipment != null) - item.damage(1, player, equipment.getSlotType()); + item.damage(1, player); } else { item.decrementUnlessCreative(1, player); diff --git a/src/main/java/com/virus5600/defensive_measures/item/ModItems.java b/src/main/java/com/virus5600/defensive_measures/item/ModItems.java index 5f0ac32..7cc2a09 100644 --- a/src/main/java/com/virus5600/defensive_measures/item/ModItems.java +++ b/src/main/java/com/virus5600/defensive_measures/item/ModItems.java @@ -9,7 +9,6 @@ import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; -import net.minecraft.item.ToolItem; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; @@ -53,7 +52,7 @@ public class ModItems { //////////////// // TURRET REMOVER - public final static ToolItem TURRET_REMOVER = (ToolItem) registerItem("turret_remover", new TurretRemoverItem(ModToolMaterials.TURRET_REMOVER, itemSettings())); + public final static Item TURRET_REMOVER = registerItem("turret_remover", new TurretRemoverItem(ModToolMaterials.TURRET_REMOVER.getToolMaterialInstance(), itemSettings())); ////////////////////////////// // REGISTRY RELATED METHODS // diff --git a/src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java b/src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java index 955e80d..512b7e8 100644 --- a/src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java +++ b/src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java @@ -1,62 +1,65 @@ package com.virus5600.defensive_measures.item; import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.Items; import net.minecraft.item.ToolMaterial; -import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; -public enum ModToolMaterials implements ToolMaterial { - TURRET_REMOVER(100, 1.0F, 0.0F, null, 15, new Item[] { - Items.GOLD_NUGGET, - Items.IRON_NUGGET, - Items.REDSTONE - }); + public enum ModToolMaterials { + TURRET_REMOVER(100, 1.0F, 0.0F, null, 15, "turret_remover_repairable");; private final int itemDurability; private final float miningSpeed; - private final float attackDamage; - private final TagKey inverseTags; + private final float attackDamageBonus; + private final TagKey incorrectBlocksForDrops; private final int enchantability; - private final Item[] repairIngredients; + private final String repairIngredientsItemTag; + private final ToolMaterial toolMaterialInstance; - private ModToolMaterials(int itemDurability, float miningSpeed, float attackDamage, TagKey inverseTags, int enchantability, Item[] repairIngredients) { + ModToolMaterials(int itemDurability, float miningSpeed, float attackDamageBonus, TagKey incorrectBlocksForDrops, int enchantability, String repairIngredientsItemTag) { this.itemDurability = itemDurability; this.miningSpeed = miningSpeed; - this.attackDamage = attackDamage; - this.inverseTags = inverseTags; + this.attackDamageBonus = attackDamageBonus; + this.incorrectBlocksForDrops = incorrectBlocksForDrops; this.enchantability = enchantability; - this.repairIngredients = repairIngredients; + this.repairIngredientsItemTag = repairIngredientsItemTag; + + this.toolMaterialInstance = new ToolMaterial( + this.incorrectBlocksForDrops, + this.itemDurability, + this.miningSpeed, + this.attackDamageBonus, + this.enchantability, + TagKey.of(RegistryKeys.ITEM, Identifier.of(repairIngredientsItemTag)) + ); } - @Override public int getDurability() { return this.itemDurability; } - @Override public float getMiningSpeedMultiplier() { return this.miningSpeed; } - @Override - public float getAttackDamage() { - return this.attackDamage; + public float getAttackDamageBonus() { + return this.attackDamageBonus; } - @Override - public TagKey getInverseTag() { - return this.inverseTags; + public TagKey getIncorrectBlocksForDrops() { + return this.incorrectBlocksForDrops; } - @Override public int getEnchantability() { return this.enchantability; } - @Override - public Ingredient getRepairIngredient() { - return Ingredient.ofItems(this.repairIngredients); + public String getRepairIngredientsItemTag() { + return this.repairIngredientsItemTag; + } + + public ToolMaterial getToolMaterialInstance() { + return this.toolMaterialInstance; } } diff --git a/src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java b/src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java index d8ee7ec..9f52ac2 100644 --- a/src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java @@ -2,13 +2,13 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ToolItem; +import net.minecraft.item.Item; import net.minecraft.item.ToolMaterial; import net.minecraft.util.Rarity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class TurretRemoverItem extends ToolItem { +public class TurretRemoverItem extends Item { public TurretRemoverItem(ToolMaterial material, Settings settings) { super( diff --git a/src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java index 3b9e024..e8b40d6 100644 --- a/src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java @@ -5,7 +5,6 @@ import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.NbtComponent; -import net.minecraft.text.Text; import org.jetbrains.annotations.Nullable; import com.google.common.collect.Iterables; @@ -29,7 +28,6 @@ import net.minecraft.stat.Stats; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; @@ -74,7 +72,7 @@ public ActionResult useOnBlock(ItemUsageContext context) { itemStack, context.getPlayer(), blockPos2, - SpawnReason.SPAWN_EGG, + SpawnReason.SPAWN_ITEM_USE, true, !Objects.equals(blockPos, blockPos2) && direction == Direction.UP ); @@ -88,32 +86,32 @@ public ActionResult useOnBlock(ItemUsageContext context) { } } - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { + public ActionResult use(World world, PlayerEntity user, Hand hand) { ItemStack itemStack = user.getStackInHand(hand); BlockHitResult hitResult = SpawnEggItem.raycast(world, user, RaycastContext.FluidHandling.SOURCE_ONLY); if (((HitResult) hitResult).getType() != HitResult.Type.BLOCK) { - return TypedActionResult.pass(itemStack); + return ActionResult.PASS; } if (!(world instanceof ServerWorld)) { - return TypedActionResult.success(itemStack); + return ActionResult.SUCCESS; } BlockPos blockPos = hitResult.getBlockPos(); if (!(world.getBlockState(blockPos).getBlock() instanceof FluidBlock)) { - return TypedActionResult.pass(itemStack); + return ActionResult.PASS; } if (!world.canPlayerModifyAt(user, blockPos) || !user.canPlaceOn(blockPos, hitResult.getSide(), itemStack)) { - return TypedActionResult.fail(itemStack); + return ActionResult.FAIL; } NbtComponent nbtComponent = itemStack.get(DataComponentTypes.CUSTOM_DATA); NbtCompound nbt = nbtComponent != null ? nbtComponent.copyNbt() : NbtComponent.DEFAULT.copyNbt(); EntityType entityType = this.getEntityType(nbt); - Entity entity = entityType.spawnFromItemStack((ServerWorld)world, itemStack, user, blockPos, SpawnReason.SPAWN_EGG, false, false); + Entity entity = entityType.spawnFromItemStack((ServerWorld)world, itemStack, user, blockPos, SpawnReason.SPAWN_ITEM_USE, false, false); if (entity == null) { - return TypedActionResult.pass(itemStack); + return ActionResult.PASS; } if (!user.getAbilities().creativeMode) { itemStack.decrement(1); @@ -122,7 +120,7 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han user.incrementStat(Stats.USED.getOrCreateStat(this)); world.emitGameEvent((Entity)user, GameEvent.ENTITY_PLACE, entity.getPos()); - return TypedActionResult.consume(itemStack); + return ActionResult.CONSUME; } public boolean isOfSameEntityType(@Nullable NbtCompound nbt, EntityType type) { diff --git a/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java index d2ffc9c..a4a7d0e 100644 --- a/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java @@ -1,6 +1,6 @@ package com.virus5600.defensive_measures.item.turrets.cannon; -import net.fabricmc.fabric.api.registry.FuelRegistry; +import net.minecraft.item.FuelRegistry; import net.minecraft.item.Item; import net.minecraft.util.Rarity; @@ -16,6 +16,6 @@ public CannonBaseItem(Settings settings) { ); // FUEL - FuelRegistry.INSTANCE.add(this, 300); +// FuelRegistry.createDefault(Registry. 300); } } diff --git a/src/main/resources/data/dm/tags/item/turret_remover_repairable.json b/src/main/resources/data/dm/tags/item/turret_remover_repairable.json new file mode 100644 index 0000000..481a0a4 --- /dev/null +++ b/src/main/resources/data/dm/tags/item/turret_remover_repairable.json @@ -0,0 +1,7 @@ +{ + "values": [ + "minecraft:gold_nugget", + "minecraft:iron_nugget", + "minecraft:redstone" + ] +}