From 509895e32cb509d69bd35c826fe64bac92d8456c Mon Sep 17 00:00:00 2001 From: Jenny Date: Fri, 24 Jan 2025 01:13:36 +0100 Subject: [PATCH] changed folder structure --- .../jenny/compressedtnt/blocks/ClusterTNTBlock.java | 2 +- .../jenny/compressedtnt/blocks/blackHoleTNTBlock.java | 2 +- .../jenny/compressedtnt/blocks/claymoreTNTBlock.java | 2 +- .../com/jenny/compressedtnt/blocks/homingTNTBlock.java | 2 +- .../jenny/compressedtnt/blocks/strongerTNTBlock.java | 2 +- .../arrows/baseArrow.java} | 10 +++++----- .../arrows/tntArrow.java} | 8 ++++---- .../compressedtnt/entities/client/BaseTNTRenderer.java | 2 +- .../entities/client/TNTArrowRenderer.java | 8 ++++---- .../entities/client/clusterTNTRenderer.java | 2 +- .../com/jenny/compressedtnt/entities/entities.java | 7 ++++--- .../entities/{ => tnt}/ClusterPrimedTNT.java | 3 ++- .../entities/{ => tnt}/StrongerPrimedTNT.java | 3 ++- .../entities/{ => tnt}/basePrimedTNT.java | 2 +- .../entities/{ => tnt}/blackHolePrimedTNT.java | 3 ++- .../entities/{ => tnt}/claymorePrimedTNT.java | 3 ++- .../entities/{ => tnt}/homingPrimedTNT.java | 3 ++- .../items/{arrows/item => }/ArrowTNT.java | 6 +++--- src/main/java/com/jenny/compressedtnt/items/items.java | 2 -- 19 files changed, 38 insertions(+), 34 deletions(-) rename src/main/java/com/jenny/compressedtnt/{items/arrows/entity/EntityArrowBase.java => entities/arrows/baseArrow.java} (94%) rename src/main/java/com/jenny/compressedtnt/{items/arrows/entity/EntityArrowTNT.java => entities/arrows/tntArrow.java} (79%) rename src/main/java/com/jenny/compressedtnt/entities/{ => tnt}/ClusterPrimedTNT.java (88%) rename src/main/java/com/jenny/compressedtnt/entities/{ => tnt}/StrongerPrimedTNT.java (91%) rename src/main/java/com/jenny/compressedtnt/entities/{ => tnt}/basePrimedTNT.java (99%) rename src/main/java/com/jenny/compressedtnt/entities/{ => tnt}/blackHolePrimedTNT.java (96%) rename src/main/java/com/jenny/compressedtnt/entities/{ => tnt}/claymorePrimedTNT.java (96%) rename src/main/java/com/jenny/compressedtnt/entities/{ => tnt}/homingPrimedTNT.java (97%) rename src/main/java/com/jenny/compressedtnt/items/{arrows/item => }/ArrowTNT.java (77%) diff --git a/src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java b/src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java index 5ea9e78..81a6f7e 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java +++ b/src/main/java/com/jenny/compressedtnt/blocks/ClusterTNTBlock.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.blocks; -import com.jenny.compressedtnt.entities.ClusterPrimedTNT; +import com.jenny.compressedtnt.entities.tnt.ClusterPrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java b/src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java index 4773cf2..b3bc771 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java +++ b/src/main/java/com/jenny/compressedtnt/blocks/blackHoleTNTBlock.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.blocks; -import com.jenny.compressedtnt.entities.blackHolePrimedTNT; +import com.jenny.compressedtnt.entities.tnt.blackHolePrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java b/src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java index 4b67c0c..37c053a 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java +++ b/src/main/java/com/jenny/compressedtnt/blocks/claymoreTNTBlock.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.blocks; -import com.jenny.compressedtnt.entities.claymorePrimedTNT; +import com.jenny.compressedtnt.entities.tnt.claymorePrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java b/src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java index 9bf0f80..f97a173 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java +++ b/src/main/java/com/jenny/compressedtnt/blocks/homingTNTBlock.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.blocks; -import com.jenny.compressedtnt.entities.homingPrimedTNT; +import com.jenny.compressedtnt.entities.tnt.homingPrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java b/src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java index 1b5bc92..b742df4 100644 --- a/src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java +++ b/src/main/java/com/jenny/compressedtnt/blocks/strongerTNTBlock.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.blocks; -import com.jenny.compressedtnt.entities.StrongerPrimedTNT; +import com.jenny.compressedtnt.entities.tnt.StrongerPrimedTNT; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.sounds.SoundEvents; diff --git a/src/main/java/com/jenny/compressedtnt/items/arrows/entity/EntityArrowBase.java b/src/main/java/com/jenny/compressedtnt/entities/arrows/baseArrow.java similarity index 94% rename from src/main/java/com/jenny/compressedtnt/items/arrows/entity/EntityArrowBase.java rename to src/main/java/com/jenny/compressedtnt/entities/arrows/baseArrow.java index ca24b18..acf7601 100644 --- a/src/main/java/com/jenny/compressedtnt/items/arrows/entity/EntityArrowBase.java +++ b/src/main/java/com/jenny/compressedtnt/entities/arrows/baseArrow.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.items.arrows.entity; +package com.jenny.compressedtnt.entities.arrows; import com.google.common.collect.Sets; import net.minecraft.core.particles.ParticleTypes; @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Set; -public class EntityArrowBase extends AbstractArrow { +public class baseArrow extends AbstractArrow { private static final int EXPOSED_POTION_DECAY_TIME = 600; private static final int NO_EFFECT_COLOR = -1; private static final EntityDataAccessor ID_EFFECT_COLOR = SynchedEntityData.defineId(Arrow.class, EntityDataSerializers.INT); @@ -34,15 +34,15 @@ public class EntityArrowBase extends AbstractArrow { private final Set effects = Sets.newHashSet(); private boolean fixedColor; - public EntityArrowBase(EntityType pEntityType, Level pLevel) { + public baseArrow(EntityType pEntityType, Level pLevel) { super(pEntityType, pLevel); } - public EntityArrowBase(Level pLevel, double pX, double pY, double pZ, EntityType pEntityType) { + public baseArrow(Level pLevel, double pX, double pY, double pZ, EntityType pEntityType) { super(pEntityType, pX, pY, pZ, pLevel); } - public EntityArrowBase(Level pLevel, LivingEntity pShooter, EntityType pEntityType) { + public baseArrow(Level pLevel, LivingEntity pShooter, EntityType pEntityType) { super(pEntityType, pShooter, pLevel); } diff --git a/src/main/java/com/jenny/compressedtnt/items/arrows/entity/EntityArrowTNT.java b/src/main/java/com/jenny/compressedtnt/entities/arrows/tntArrow.java similarity index 79% rename from src/main/java/com/jenny/compressedtnt/items/arrows/entity/EntityArrowTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/arrows/tntArrow.java index d2142a8..350dc38 100644 --- a/src/main/java/com/jenny/compressedtnt/items/arrows/entity/EntityArrowTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/arrows/tntArrow.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.items.arrows.entity; +package com.jenny.compressedtnt.entities.arrows; import com.jenny.compressedtnt.items.items; import com.jenny.compressedtnt.entities.entities; @@ -9,12 +9,12 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import org.jetbrains.annotations.NotNull; -public class EntityArrowTNT extends EntityArrowBase { - public EntityArrowTNT(EntityType pEntityType, Level pLevel) { +public class tntArrow extends baseArrow { + public tntArrow(EntityType pEntityType, Level pLevel) { super(pEntityType, pLevel); } - public EntityArrowTNT(Level pLevel, LivingEntity pShooter) { + public tntArrow(Level pLevel, LivingEntity pShooter) { super(pLevel, pShooter, entities.ARROW_TNT.get()); } diff --git a/src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java b/src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java index 6f2ea9f..685115a 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java +++ b/src/main/java/com/jenny/compressedtnt/entities/client/BaseTNTRenderer.java @@ -1,7 +1,7 @@ package com.jenny.compressedtnt.entities.client; import com.jenny.compressedtnt.blocks.blocks; -import com.jenny.compressedtnt.entities.basePrimedTNT; +import com.jenny.compressedtnt.entities.tnt.basePrimedTNT; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java b/src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java index 2311f24..f62ceaa 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java +++ b/src/main/java/com/jenny/compressedtnt/entities/client/TNTArrowRenderer.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.entities.client; -import com.jenny.compressedtnt.items.arrows.entity.EntityArrowTNT; +import com.jenny.compressedtnt.entities.arrows.tntArrow; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.MultiBufferSource; @@ -14,7 +14,7 @@ import net.minecraft.world.level.block.Blocks; import org.jetbrains.annotations.NotNull; -public class TNTArrowRenderer extends EntityRenderer { +public class TNTArrowRenderer extends EntityRenderer { private final BlockRenderDispatcher blockRenderer; private float i = 0; @@ -24,7 +24,7 @@ public class TNTArrowRenderer extends EntityRenderer { this.blockRenderer = pContext.getBlockRenderDispatcher(); } - public void render(@NotNull EntityArrowTNT pEntity, float pEntityYaw, float pPartialTicks, PoseStack pPoseStack, @NotNull MultiBufferSource pBuffer, int pPackedLight) { + public void render(@NotNull tntArrow pEntity, float pEntityYaw, float pPartialTicks, PoseStack pPoseStack, @NotNull MultiBufferSource pBuffer, int pPackedLight) { pPoseStack.pushPose(); pPoseStack.translate(0.0F, 0.5F, 0.0F); pPoseStack.scale(0.5f, 0.5f, 0.5f); @@ -38,7 +38,7 @@ public class TNTArrowRenderer extends EntityRenderer { } @NotNull - public ResourceLocation getTextureLocation(@NotNull EntityArrowTNT pEntity) { + public ResourceLocation getTextureLocation(@NotNull tntArrow pEntity) { return TextureAtlas.LOCATION_BLOCKS; } } diff --git a/src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java b/src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java index 6aa744c..7387c81 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java +++ b/src/main/java/com/jenny/compressedtnt/entities/client/clusterTNTRenderer.java @@ -1,6 +1,6 @@ package com.jenny.compressedtnt.entities.client; -import com.jenny.compressedtnt.entities.ClusterPrimedTNT; +import com.jenny.compressedtnt.entities.tnt.ClusterPrimedTNT; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import net.minecraft.client.renderer.MultiBufferSource; diff --git a/src/main/java/com/jenny/compressedtnt/entities/entities.java b/src/main/java/com/jenny/compressedtnt/entities/entities.java index af73c4f..4b7cabe 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/entities.java +++ b/src/main/java/com/jenny/compressedtnt/entities/entities.java @@ -1,9 +1,10 @@ package com.jenny.compressedtnt.entities; +import com.jenny.compressedtnt.entities.arrows.tntArrow; import com.jenny.compressedtnt.entities.client.BaseTNTRenderer; import com.jenny.compressedtnt.entities.client.TNTArrowRenderer; import com.jenny.compressedtnt.entities.client.clusterTNTRenderer; -import com.jenny.compressedtnt.items.arrows.entity.*; +import com.jenny.compressedtnt.entities.tnt.*; import net.minecraft.client.renderer.entity.EntityRenderers; import net.minecraft.world.entity.EntityType; @@ -39,8 +40,8 @@ public class entities { ENTITY_TYPES.register("tnt_claymore", () -> EntityType.Builder.of(claymorePrimedTNT::new, MobCategory.MISC) .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_claymore")); - public static final RegistryObject> ARROW_TNT = - ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.of(EntityArrowTNT::new, MobCategory.MISC) + public static final RegistryObject> ARROW_TNT = + ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.of(tntArrow::new, MobCategory.MISC) .sized(0.48F, 0.48F).clientTrackingRange(64).build("arrow_tnt")); public static void register(IEventBus eventBus) { diff --git a/src/main/java/com/jenny/compressedtnt/entities/ClusterPrimedTNT.java b/src/main/java/com/jenny/compressedtnt/entities/tnt/ClusterPrimedTNT.java similarity index 88% rename from src/main/java/com/jenny/compressedtnt/entities/ClusterPrimedTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/tnt/ClusterPrimedTNT.java index d0e6a74..dd5bfc7 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/ClusterPrimedTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/tnt/ClusterPrimedTNT.java @@ -1,5 +1,6 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.compressedtnt.entities.tnt; +import com.jenny.compressedtnt.entities.entities; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/jenny/compressedtnt/entities/StrongerPrimedTNT.java b/src/main/java/com/jenny/compressedtnt/entities/tnt/StrongerPrimedTNT.java similarity index 91% rename from src/main/java/com/jenny/compressedtnt/entities/StrongerPrimedTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/tnt/StrongerPrimedTNT.java index 287a96d..18673be 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/StrongerPrimedTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/tnt/StrongerPrimedTNT.java @@ -1,5 +1,6 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.compressedtnt.entities.tnt; +import com.jenny.compressedtnt.entities.entities; import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.level.Level; diff --git a/src/main/java/com/jenny/compressedtnt/entities/basePrimedTNT.java b/src/main/java/com/jenny/compressedtnt/entities/tnt/basePrimedTNT.java similarity index 99% rename from src/main/java/com/jenny/compressedtnt/entities/basePrimedTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/tnt/basePrimedTNT.java index 515b7af..177e332 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/basePrimedTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/tnt/basePrimedTNT.java @@ -1,4 +1,4 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.compressedtnt.entities.tnt; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/jenny/compressedtnt/entities/blackHolePrimedTNT.java b/src/main/java/com/jenny/compressedtnt/entities/tnt/blackHolePrimedTNT.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/entities/blackHolePrimedTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/tnt/blackHolePrimedTNT.java index 346b3bb..9717443 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/blackHolePrimedTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/tnt/blackHolePrimedTNT.java @@ -1,5 +1,6 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.compressedtnt.entities.tnt; +import com.jenny.compressedtnt.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/src/main/java/com/jenny/compressedtnt/entities/claymorePrimedTNT.java b/src/main/java/com/jenny/compressedtnt/entities/tnt/claymorePrimedTNT.java similarity index 96% rename from src/main/java/com/jenny/compressedtnt/entities/claymorePrimedTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/tnt/claymorePrimedTNT.java index 858359c..c69db15 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/claymorePrimedTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/tnt/claymorePrimedTNT.java @@ -1,5 +1,6 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.compressedtnt.entities.tnt; +import com.jenny.compressedtnt.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/src/main/java/com/jenny/compressedtnt/entities/homingPrimedTNT.java b/src/main/java/com/jenny/compressedtnt/entities/tnt/homingPrimedTNT.java similarity index 97% rename from src/main/java/com/jenny/compressedtnt/entities/homingPrimedTNT.java rename to src/main/java/com/jenny/compressedtnt/entities/tnt/homingPrimedTNT.java index 5a9e6f7..4595c1e 100644 --- a/src/main/java/com/jenny/compressedtnt/entities/homingPrimedTNT.java +++ b/src/main/java/com/jenny/compressedtnt/entities/tnt/homingPrimedTNT.java @@ -1,5 +1,6 @@ -package com.jenny.compressedtnt.entities; +package com.jenny.compressedtnt.entities.tnt; +import com.jenny.compressedtnt.entities.entities; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.syncher.EntityDataAccessor; import net.minecraft.network.syncher.EntityDataSerializers; diff --git a/src/main/java/com/jenny/compressedtnt/items/arrows/item/ArrowTNT.java b/src/main/java/com/jenny/compressedtnt/items/ArrowTNT.java similarity index 77% rename from src/main/java/com/jenny/compressedtnt/items/arrows/item/ArrowTNT.java rename to src/main/java/com/jenny/compressedtnt/items/ArrowTNT.java index 05cb069..3a63d9a 100644 --- a/src/main/java/com/jenny/compressedtnt/items/arrows/item/ArrowTNT.java +++ b/src/main/java/com/jenny/compressedtnt/items/ArrowTNT.java @@ -1,6 +1,6 @@ -package com.jenny.compressedtnt.items.arrows.item; +package com.jenny.compressedtnt.items; -import com.jenny.compressedtnt.items.arrows.entity.EntityArrowTNT; +import com.jenny.compressedtnt.entities.arrows.tntArrow; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.projectile.AbstractArrow; import net.minecraft.world.item.ArrowItem; @@ -17,6 +17,6 @@ public class ArrowTNT extends ArrowItem { @Override @NotNull public AbstractArrow createArrow(@NotNull Level pLevel, @NotNull ItemStack pStack, @NotNull LivingEntity pShooter) { - return new EntityArrowTNT(pLevel, pShooter); + return new tntArrow(pLevel, pShooter); } } diff --git a/src/main/java/com/jenny/compressedtnt/items/items.java b/src/main/java/com/jenny/compressedtnt/items/items.java index 078090e..f113b72 100644 --- a/src/main/java/com/jenny/compressedtnt/items/items.java +++ b/src/main/java/com/jenny/compressedtnt/items/items.java @@ -1,7 +1,5 @@ package com.jenny.compressedtnt.items; -import com.jenny.compressedtnt.items.arrows.item.*; - import net.minecraft.world.item.Item; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.registries.DeferredRegister;