From 0a81d239bef5679ae8e1e18a0fbbb6491e1cf60c Mon Sep 17 00:00:00 2001 From: Karl Satchi Navida Date: Fri, 12 Jul 2024 16:50:20 +0800 Subject: [PATCH] Update 20240712 - Refactor and Clean Up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Refactored some packages from having plural names into singular. Furthermore, unused directories and files are removed. [CHANGELOG] 🟡 Renamed `com.virus5600.defensive_measures.entities` package into `.entity`. 🟡 Renamed `com.virus5600.defensive_measures.items` package into `.item`. 🟡 Updated some values in Gradle properties. 🔴 Removed mixins in fabric mod JSON file. 🔴 Removed the entire `src.client` package. 🔴 Removed unused Loom configurations in Gradle build. --- build.gradle | 17 +--- gradle.properties | 4 +- .../DefensiveMeasuresClient.java | 22 ----- src/client/resources/dm.client.mixins.json | 10 -- .../defensive_measures/DefensiveMeasures.java | 6 +- .../entities/TurretMaterial.java | 6 -- .../{entities => entity}/ModEntities.java | 4 +- .../entity/TurretMaterial.java | 6 ++ .../ai/goal/TargetOtherTeamGoal.java | 4 +- .../ai/goal/TargetPlayerGoal.java | 4 +- .../turrets/CannonTurretEntity.java | 98 ++++++++++++++++++- .../turrets/Itemable.java | 3 +- .../turrets/TurretEntity.java | 8 +- .../{items => item}/ModItemGroups.java | 2 +- .../{items => item}/ModItems.java | 8 +- .../{items => item}/ModToolMaterials.java | 2 +- .../equipments/TurretRemoverItem.java | 2 +- .../{items => item}/turrets/TurretItem.java | 6 +- .../turrets/cannon/CannonBaseItem.java | 2 +- .../turrets/cannon/CannonHeadItem.java | 2 +- .../turrets/cannon/CannonStandItem.java | 2 +- .../turrets/cannon/CannonTurretItem.java | 4 +- .../cannon/UnfinishedCannonHeadItem.java | 2 +- src/main/resources/fabric.mod.json | 12 +-- 24 files changed, 133 insertions(+), 103 deletions(-) delete mode 100644 src/client/java/com/virus5600/defensive_measures/DefensiveMeasuresClient.java delete mode 100644 src/client/resources/dm.client.mixins.json delete mode 100644 src/main/java/com/virus5600/defensive_measures/entities/TurretMaterial.java rename src/main/java/com/virus5600/defensive_measures/{entities => entity}/ModEntities.java (95%) create mode 100644 src/main/java/com/virus5600/defensive_measures/entity/TurretMaterial.java rename src/main/java/com/virus5600/defensive_measures/{entities => entity}/ai/goal/TargetOtherTeamGoal.java (87%) rename src/main/java/com/virus5600/defensive_measures/{entities => entity}/ai/goal/TargetPlayerGoal.java (86%) rename src/main/java/com/virus5600/defensive_measures/{entities => entity}/turrets/CannonTurretEntity.java (69%) rename src/main/java/com/virus5600/defensive_measures/{entities => entity}/turrets/Itemable.java (96%) rename src/main/java/com/virus5600/defensive_measures/{entities => entity}/turrets/TurretEntity.java (99%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/ModItemGroups.java (98%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/ModItems.java (94%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/ModToolMaterials.java (96%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/equipments/TurretRemoverItem.java (92%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/turrets/TurretItem.java (97%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/turrets/cannon/CannonBaseItem.java (85%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/turrets/cannon/CannonHeadItem.java (80%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/turrets/cannon/CannonStandItem.java (85%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/turrets/cannon/CannonTurretItem.java (74%) rename src/main/java/com/virus5600/defensive_measures/{items => item}/turrets/cannon/UnfinishedCannonHeadItem.java (81%) diff --git a/build.gradle b/build.gradle index 18b59af..59db348 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" // GeckoLib modImplementation "software.bernie.geckolib:geckolib-fabric-${minecraft_version}:${geckolib_version}" - + } processResources { @@ -94,18 +94,3 @@ publishing { // retrieving dependencies. } } - -// loom configurations -loom { - runs { - client { - client() - vmArg "-Dgeckolib.disable_examples=true" - } - - server { - server() - vmArg "-Dgeckolib.disable_examples=true" - } - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a3a3814..b4c51fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx2G +org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true # Fabric Properties @@ -15,4 +15,4 @@ archives_base_name = defensive-measures # Dependencies fabric_version=0.100.6+1.21 -geckolib_version=4.5.5 \ No newline at end of file +geckolib_version=4.5.5 diff --git a/src/client/java/com/virus5600/defensive_measures/DefensiveMeasuresClient.java b/src/client/java/com/virus5600/defensive_measures/DefensiveMeasuresClient.java deleted file mode 100644 index 05dd2b5..0000000 --- a/src/client/java/com/virus5600/defensive_measures/DefensiveMeasuresClient.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.virus5600.defensive_measures; - -import net.fabricmc.api.ClientModInitializer; - -/** - * The second main entry point of the mod. - * - * This class holds the client-specific initialization processes - * along with the needed C2S packet registrations. - */ -public class DefensiveMeasuresClient implements ClientModInitializer { - - /** - * Client side initialization. - */ - @Override - public void onInitializeClient() { - // Renderers - - // Networking - } -} diff --git a/src/client/resources/dm.client.mixins.json b/src/client/resources/dm.client.mixins.json deleted file mode 100644 index d19b010..0000000 --- a/src/client/resources/dm.client.mixins.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "required": true, - "package": "com.virus5600.defensive_measures.mixin.client", - "compatibilityLevel": "JAVA_21", - "client": [ - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/src/main/java/com/virus5600/defensive_measures/DefensiveMeasures.java b/src/main/java/com/virus5600/defensive_measures/DefensiveMeasures.java index 63fba69..4e7ee91 100644 --- a/src/main/java/com/virus5600/defensive_measures/DefensiveMeasures.java +++ b/src/main/java/com/virus5600/defensive_measures/DefensiveMeasures.java @@ -1,8 +1,8 @@ package com.virus5600.defensive_measures; -import com.virus5600.defensive_measures.entities.ModEntities; -import com.virus5600.defensive_measures.items.ModItemGroups; -import com.virus5600.defensive_measures.items.ModItems; +import com.virus5600.defensive_measures.entity.ModEntities; +import com.virus5600.defensive_measures.item.ModItemGroups; +import com.virus5600.defensive_measures.item.ModItems; import net.fabricmc.api.ModInitializer; import org.slf4j.Logger; diff --git a/src/main/java/com/virus5600/defensive_measures/entities/TurretMaterial.java b/src/main/java/com/virus5600/defensive_measures/entities/TurretMaterial.java deleted file mode 100644 index 4f0bf88..0000000 --- a/src/main/java/com/virus5600/defensive_measures/entities/TurretMaterial.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.virus5600.defensive_measures.entities; - -public enum TurretMaterial { - METAL, - WOOD -} diff --git a/src/main/java/com/virus5600/defensive_measures/entities/ModEntities.java b/src/main/java/com/virus5600/defensive_measures/entity/ModEntities.java similarity index 95% rename from src/main/java/com/virus5600/defensive_measures/entities/ModEntities.java rename to src/main/java/com/virus5600/defensive_measures/entity/ModEntities.java index 1b78760..18e3ae1 100644 --- a/src/main/java/com/virus5600/defensive_measures/entities/ModEntities.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/ModEntities.java @@ -1,8 +1,8 @@ -package com.virus5600.defensive_measures.entities; +package com.virus5600.defensive_measures.entity; import com.virus5600.defensive_measures.DefensiveMeasures; -import com.virus5600.defensive_measures.entities.turrets.CannonTurretEntity; +import com.virus5600.defensive_measures.entity.turrets.CannonTurretEntity; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; diff --git a/src/main/java/com/virus5600/defensive_measures/entity/TurretMaterial.java b/src/main/java/com/virus5600/defensive_measures/entity/TurretMaterial.java new file mode 100644 index 0000000..4e3934c --- /dev/null +++ b/src/main/java/com/virus5600/defensive_measures/entity/TurretMaterial.java @@ -0,0 +1,6 @@ +package com.virus5600.defensive_measures.entity; + +public enum TurretMaterial { + METAL, + WOOD +} diff --git a/src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetOtherTeamGoal.java b/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java similarity index 87% rename from src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetOtherTeamGoal.java rename to src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java index cf4b7c8..38c81cf 100644 --- a/src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetOtherTeamGoal.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetOtherTeamGoal.java @@ -1,6 +1,6 @@ -package com.virus5600.defensive_measures.entities.ai.goal; +package com.virus5600.defensive_measures.entity.ai.goal; -import com.virus5600.defensive_measures.entities.turrets.TurretEntity; +import com.virus5600.defensive_measures.entity.turrets.TurretEntity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.goal.ActiveTargetGoal; diff --git a/src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetPlayerGoal.java b/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java similarity index 86% rename from src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetPlayerGoal.java rename to src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java index 5e42b2b..84c5310 100644 --- a/src/main/java/com/virus5600/defensive_measures/entities/ai/goal/TargetPlayerGoal.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/ai/goal/TargetPlayerGoal.java @@ -1,9 +1,9 @@ -package com.virus5600.defensive_measures.entities.ai.goal; +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.entities.turrets.TurretEntity; +import com.virus5600.defensive_measures.entity.turrets.TurretEntity; import net.minecraft.util.math.Box; import net.minecraft.util.math.Direction; diff --git a/src/main/java/com/virus5600/defensive_measures/entities/turrets/CannonTurretEntity.java b/src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java similarity index 69% rename from src/main/java/com/virus5600/defensive_measures/entities/turrets/CannonTurretEntity.java rename to src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java index 3ce5b4a..f0fef09 100644 --- a/src/main/java/com/virus5600/defensive_measures/entities/turrets/CannonTurretEntity.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/turrets/CannonTurretEntity.java @@ -1,11 +1,11 @@ -package com.virus5600.defensive_measures.entities.turrets; +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.DefensiveMeasures; +import net.fabricmc.fabric.api.networking.v1.PlayerLookup; import net.minecraft.entity.EntityType; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.ai.RangedAttackMob; @@ -30,14 +30,25 @@ import net.minecraft.item.Items; import net.minecraft.sound.SoundEvent; import net.minecraft.sound.SoundEvents; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; -import com.virus5600.defensive_measures.entities.ai.goal.TargetOtherTeamGoal; -import com.virus5600.defensive_measures.entities.TurretMaterial; +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.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 RangedAttackMob, Itemable { +public class CannonTurretEntity extends TurretEntity implements GeoEntity, RangedAttackMob, Itemable { private static final int totalAttCooldown = 20 * 5; private static final TrackedData FUSE_LIT; /** @@ -48,12 +59,15 @@ public class CannonTurretEntity extends TurretEntity implements RangedAttackMob, * Contains all the items that can give effect to this entity */ private static Map> effectSource; + + private final AnimatableInstanceCache geoCache = GeckoLibUtil.createInstanceCache(this); /** * Defines the current target of this Cannon. */ @Nullable private LivingEntity currentTarget = null; private double attCooldown = totalAttCooldown; + private boolean animPlayed = false; ////////////////// // CONSTRUCTORS // @@ -174,10 +188,84 @@ public ItemStack getEntityItem() { return new ItemStack(Items.IRON_BLOCK); } + /////////////////////////// + // ANIMATION CONTROLLERS // + /////////////////////////// + + private PlayState deathController(final AnimationState event) { + if (!this.isAlive() && !animPlayed) { + animPlayed = true; + event.setAnimation( + RawAnimation + .begin() + .thenLoop("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.setup") + ); + } + + private PlayState lookAtTargetController(final AnimationState event) { + return event + .setAndContinue( + RawAnimation + .begin() + .thenLoop("animation.cannon_turret.look_at_target") + ); + } + + private PlayState firingSequenceController(final AnimationState event) { + Vec3d fusePos = this.getRelativePos(0, 0, 0), + barrelPos = this.getRelativePos(0, 0, 0); + + if (this.hasTarget() && this.isShooting()) { + event.getController() + .setParticleKeyframeHandler((state) -> { + String fuse = state.getKeyframeData().getLocator(), + effectName = state.getKeyframeData().getEffect(); + }) + .setAnimation( + RawAnimation + .begin() + .thenPlay("animation.cannon_turret.shoot") + ); + + if (!this.getShootingFXDone()) { + int count = MathHelper.nextInt(this.random, 10, 25); + double vx = (this.getPos(TARGET_POS_X) - this.getPos(X))/10; + double vy = (this.getPos(TARGET_POS_Y) - this.getPos(Y)); + double vz = (this.getPos(TARGET_POS_Z) - this.getPos(Z))/10; + double variance = Math.sqrt(vx * vx + vz * vz) * 0.5; + } + } + + return PlayState.CONTINUE; + } + /////////////////////////////// // INTERFACE IMPLEMENTATIONS // /////////////////////////////// + // GeoEntity // + @Override + public void registerControllers(ControllerRegistrar controllers) { + + } + + @Override + public AnimatableInstanceCache getAnimatableInstanceCache() { + return this.geoCache; + } + /////////////////// // LOCAL CLASSES // /////////////////// diff --git a/src/main/java/com/virus5600/defensive_measures/entities/turrets/Itemable.java b/src/main/java/com/virus5600/defensive_measures/entity/turrets/Itemable.java similarity index 96% rename from src/main/java/com/virus5600/defensive_measures/entities/turrets/Itemable.java rename to src/main/java/com/virus5600/defensive_measures/entity/turrets/Itemable.java index 13b067b..9e1bd11 100644 --- a/src/main/java/com/virus5600/defensive_measures/entities/turrets/Itemable.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/turrets/Itemable.java @@ -1,6 +1,5 @@ -package com.virus5600.defensive_measures.entities.turrets; +package com.virus5600.defensive_measures.entity.turrets; -import net.minecraft.component.ComponentType; import net.minecraft.component.DataComponentTypes; import net.minecraft.component.type.NbtComponent; import net.minecraft.entity.mob.MobEntity; diff --git a/src/main/java/com/virus5600/defensive_measures/entities/turrets/TurretEntity.java b/src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java similarity index 99% rename from src/main/java/com/virus5600/defensive_measures/entities/turrets/TurretEntity.java rename to src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java index 9a4f9bf..ccf6434 100644 --- a/src/main/java/com/virus5600/defensive_measures/entities/turrets/TurretEntity.java +++ b/src/main/java/com/virus5600/defensive_measures/entity/turrets/TurretEntity.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.entities.turrets; +package com.virus5600.defensive_measures.entity.turrets; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; @@ -33,9 +33,9 @@ import net.minecraft.world.World; import com.virus5600.defensive_measures.DefensiveMeasures; -import com.virus5600.defensive_measures.entities.TurretMaterial; -import com.virus5600.defensive_measures.items.ModItems; -import com.virus5600.defensive_measures.items.turrets.TurretItem; +import com.virus5600.defensive_measures.entity.TurretMaterial; +import com.virus5600.defensive_measures.item.ModItems; +import com.virus5600.defensive_measures.item.turrets.TurretItem; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/virus5600/defensive_measures/items/ModItemGroups.java b/src/main/java/com/virus5600/defensive_measures/item/ModItemGroups.java similarity index 98% rename from src/main/java/com/virus5600/defensive_measures/items/ModItemGroups.java rename to src/main/java/com/virus5600/defensive_measures/item/ModItemGroups.java index c6bcc89..369c826 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/ModItemGroups.java +++ b/src/main/java/com/virus5600/defensive_measures/item/ModItemGroups.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items; +package com.virus5600.defensive_measures.item; import com.virus5600.defensive_measures.DefensiveMeasures; diff --git a/src/main/java/com/virus5600/defensive_measures/items/ModItems.java b/src/main/java/com/virus5600/defensive_measures/item/ModItems.java similarity index 94% rename from src/main/java/com/virus5600/defensive_measures/items/ModItems.java rename to src/main/java/com/virus5600/defensive_measures/item/ModItems.java index 68d0d63..378ce76 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/ModItems.java +++ b/src/main/java/com/virus5600/defensive_measures/item/ModItems.java @@ -1,10 +1,10 @@ -package com.virus5600.defensive_measures.items; +package com.virus5600.defensive_measures.item; import com.virus5600.defensive_measures.DefensiveMeasures; -import com.virus5600.defensive_measures.entities.ModEntities; -import com.virus5600.defensive_measures.items.equipments.TurretRemoverItem; -import com.virus5600.defensive_measures.items.turrets.cannon.*; +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; diff --git a/src/main/java/com/virus5600/defensive_measures/items/ModToolMaterials.java b/src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java similarity index 96% rename from src/main/java/com/virus5600/defensive_measures/items/ModToolMaterials.java rename to src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java index ecba09a..955e80d 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/ModToolMaterials.java +++ b/src/main/java/com/virus5600/defensive_measures/item/ModToolMaterials.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items; +package com.virus5600.defensive_measures.item; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/src/main/java/com/virus5600/defensive_measures/items/equipments/TurretRemoverItem.java b/src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java similarity index 92% rename from src/main/java/com/virus5600/defensive_measures/items/equipments/TurretRemoverItem.java rename to src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java index 44ed5c0..d8ee7ec 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/equipments/TurretRemoverItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/equipments/TurretRemoverItem.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items.equipments; +package com.virus5600.defensive_measures.item.equipments; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/com/virus5600/defensive_measures/items/turrets/TurretItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java similarity index 97% rename from src/main/java/com/virus5600/defensive_measures/items/turrets/TurretItem.java rename to src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java index b236532..720fd06 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/turrets/TurretItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/TurretItem.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items.turrets; +package com.virus5600.defensive_measures.item.turrets; import java.util.Map; import java.util.Objects; @@ -9,7 +9,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Maps; -import com.virus5600.defensive_measures.entities.turrets.TurretEntity; +import com.virus5600.defensive_measures.entity.turrets.TurretEntity; import net.minecraft.block.BlockState; import net.minecraft.block.FluidBlock; @@ -97,7 +97,7 @@ public TypedActionResult use(World world, PlayerEntity user, Hand han if (!(world instanceof ServerWorld)) { return TypedActionResult.success(itemStack); } - + BlockPos blockPos = hitResult.getBlockPos(); if (!(world.getBlockState(blockPos).getBlock() instanceof FluidBlock)) { diff --git a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonBaseItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java similarity index 85% rename from src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonBaseItem.java rename to src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java index a74085b..3d80595 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonBaseItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonBaseItem.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items.turrets.cannon; +package com.virus5600.defensive_measures.item.turrets.cannon; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.item.Item; diff --git a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonHeadItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java similarity index 80% rename from src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonHeadItem.java rename to src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java index b83341e..9ed75e5 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonHeadItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonHeadItem.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items.turrets.cannon; +package com.virus5600.defensive_measures.item.turrets.cannon; import net.minecraft.item.Item; import net.minecraft.util.Rarity; diff --git a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonStandItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java similarity index 85% rename from src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonStandItem.java rename to src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java index 3f0b268..944c0f6 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonStandItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonStandItem.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items.turrets.cannon; +package com.virus5600.defensive_measures.item.turrets.cannon; import net.fabricmc.fabric.api.registry.FuelRegistry; import net.minecraft.item.Item; diff --git a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonTurretItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java similarity index 74% rename from src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonTurretItem.java rename to src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java index f39fdfd..0d585bf 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/CannonTurretItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/CannonTurretItem.java @@ -1,6 +1,6 @@ -package com.virus5600.defensive_measures.items.turrets.cannon; +package com.virus5600.defensive_measures.item.turrets.cannon; -import com.virus5600.defensive_measures.items.turrets.TurretItem; +import com.virus5600.defensive_measures.item.turrets.TurretItem; import net.minecraft.entity.EntityType; import net.minecraft.entity.mob.MobEntity; diff --git a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/UnfinishedCannonHeadItem.java b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java similarity index 81% rename from src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/UnfinishedCannonHeadItem.java rename to src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java index 27ef162..b62cbc9 100644 --- a/src/main/java/com/virus5600/defensive_measures/items/turrets/cannon/UnfinishedCannonHeadItem.java +++ b/src/main/java/com/virus5600/defensive_measures/item/turrets/cannon/UnfinishedCannonHeadItem.java @@ -1,4 +1,4 @@ -package com.virus5600.defensive_measures.items.turrets.cannon; +package com.virus5600.defensive_measures.item.turrets.cannon; import net.minecraft.item.Item; import net.minecraft.util.Rarity; diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 270fa3d..d8d32b5 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,18 +20,8 @@ "entrypoints": { "main": [ "com.virus5600.defensive_measures.DefensiveMeasures" - ], - "client": [ - "com.virus5600.defensive_measures.DefensiveMeasuresClient" ] }, - "mixins": [ - "dm.mixins.json", - { - "config": "dm.client.mixins.json", - "environment": "client" - } - ], "depends": { "fabricloader": ">=0.15.11", "minecraft": "~1.21", @@ -42,4 +32,4 @@ "suggests": { "another-mod": "*" } -} \ No newline at end of file +}