changed folder structure
This commit is contained in:
		
							parent
							
								
									bd8024e2a6
								
							
						
					
					
						commit
						509895e32c
					
				| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.blocks; | 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.BlockPos; | ||||||
| import net.minecraft.core.Direction; | import net.minecraft.core.Direction; | ||||||
| import net.minecraft.sounds.SoundEvents; | import net.minecraft.sounds.SoundEvents; | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.blocks; | 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.BlockPos; | ||||||
| import net.minecraft.core.Direction; | import net.minecraft.core.Direction; | ||||||
| import net.minecraft.sounds.SoundEvents; | import net.minecraft.sounds.SoundEvents; | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.blocks; | 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.BlockPos; | ||||||
| import net.minecraft.core.Direction; | import net.minecraft.core.Direction; | ||||||
| import net.minecraft.sounds.SoundEvents; | import net.minecraft.sounds.SoundEvents; | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.blocks; | 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.BlockPos; | ||||||
| import net.minecraft.core.Direction; | import net.minecraft.core.Direction; | ||||||
| import net.minecraft.sounds.SoundEvents; | import net.minecraft.sounds.SoundEvents; | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.blocks; | 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.BlockPos; | ||||||
| import net.minecraft.core.Direction; | import net.minecraft.core.Direction; | ||||||
| import net.minecraft.sounds.SoundEvents; | import net.minecraft.sounds.SoundEvents; | ||||||
|  | |||||||
| @ -1,4 +1,4 @@ | |||||||
| package com.jenny.compressedtnt.items.arrows.entity; | package com.jenny.compressedtnt.entities.arrows; | ||||||
| 
 | 
 | ||||||
| import com.google.common.collect.Sets; | import com.google.common.collect.Sets; | ||||||
| import net.minecraft.core.particles.ParticleTypes; | import net.minecraft.core.particles.ParticleTypes; | ||||||
| @ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; | |||||||
| import java.util.Collection; | import java.util.Collection; | ||||||
| import java.util.Set; | 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 EXPOSED_POTION_DECAY_TIME = 600; | ||||||
|     private static final int NO_EFFECT_COLOR = -1; |     private static final int NO_EFFECT_COLOR = -1; | ||||||
|     private static final EntityDataAccessor<Integer> ID_EFFECT_COLOR = SynchedEntityData.defineId(Arrow.class, EntityDataSerializers.INT); |     private static final EntityDataAccessor<Integer> ID_EFFECT_COLOR = SynchedEntityData.defineId(Arrow.class, EntityDataSerializers.INT); | ||||||
| @ -34,15 +34,15 @@ public class EntityArrowBase extends AbstractArrow { | |||||||
|     private final Set<MobEffectInstance> effects = Sets.newHashSet(); |     private final Set<MobEffectInstance> effects = Sets.newHashSet(); | ||||||
|     private boolean fixedColor; |     private boolean fixedColor; | ||||||
| 
 | 
 | ||||||
|     public EntityArrowBase(EntityType<? extends EntityArrowBase> pEntityType, Level pLevel) { |     public baseArrow(EntityType<? extends baseArrow> pEntityType, Level pLevel) { | ||||||
|         super(pEntityType, pLevel); |         super(pEntityType, pLevel); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public EntityArrowBase(Level pLevel, double pX, double pY, double pZ, EntityType<? extends EntityArrowBase> pEntityType) { |     public baseArrow(Level pLevel, double pX, double pY, double pZ, EntityType<? extends baseArrow> pEntityType) { | ||||||
|         super(pEntityType, pX, pY, pZ, pLevel); |         super(pEntityType, pX, pY, pZ, pLevel); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public EntityArrowBase(Level pLevel, LivingEntity pShooter, EntityType<? extends EntityArrowBase> pEntityType) { |     public baseArrow(Level pLevel, LivingEntity pShooter, EntityType<? extends baseArrow> pEntityType) { | ||||||
|         super(pEntityType, pShooter, pLevel); |         super(pEntityType, pShooter, pLevel); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| @ -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.items.items; | ||||||
| import com.jenny.compressedtnt.entities.entities; | import com.jenny.compressedtnt.entities.entities; | ||||||
| @ -9,12 +9,12 @@ import net.minecraft.world.item.ItemStack; | |||||||
| import net.minecraft.world.level.Level; | import net.minecraft.world.level.Level; | ||||||
| import org.jetbrains.annotations.NotNull; | import org.jetbrains.annotations.NotNull; | ||||||
| 
 | 
 | ||||||
| public class EntityArrowTNT extends EntityArrowBase { | public class tntArrow extends baseArrow { | ||||||
|     public EntityArrowTNT(EntityType<EntityArrowTNT> pEntityType, Level pLevel) { |     public tntArrow(EntityType<tntArrow> pEntityType, Level pLevel) { | ||||||
|         super(pEntityType, pLevel); |         super(pEntityType, pLevel); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     public EntityArrowTNT(Level pLevel, LivingEntity pShooter) { |     public tntArrow(Level pLevel, LivingEntity pShooter) { | ||||||
|         super(pLevel, pShooter, entities.ARROW_TNT.get()); |         super(pLevel, pShooter, entities.ARROW_TNT.get()); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| @ -1,7 +1,7 @@ | |||||||
| package com.jenny.compressedtnt.entities.client; | package com.jenny.compressedtnt.entities.client; | ||||||
| 
 | 
 | ||||||
| import com.jenny.compressedtnt.blocks.blocks; | 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.blaze3d.vertex.PoseStack; | ||||||
| import com.mojang.math.Axis; | import com.mojang.math.Axis; | ||||||
| import net.minecraft.client.renderer.MultiBufferSource; | import net.minecraft.client.renderer.MultiBufferSource; | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.entities.client; | 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.blaze3d.vertex.PoseStack; | ||||||
| import com.mojang.math.Axis; | import com.mojang.math.Axis; | ||||||
| import net.minecraft.client.renderer.MultiBufferSource; | import net.minecraft.client.renderer.MultiBufferSource; | ||||||
| @ -14,7 +14,7 @@ import net.minecraft.world.level.block.Blocks; | |||||||
| 
 | 
 | ||||||
| import org.jetbrains.annotations.NotNull; | import org.jetbrains.annotations.NotNull; | ||||||
| 
 | 
 | ||||||
| public class TNTArrowRenderer extends EntityRenderer<EntityArrowTNT> { | public class TNTArrowRenderer extends EntityRenderer<tntArrow> { | ||||||
|     private final BlockRenderDispatcher blockRenderer; |     private final BlockRenderDispatcher blockRenderer; | ||||||
|     private float i = 0; |     private float i = 0; | ||||||
| 
 | 
 | ||||||
| @ -24,7 +24,7 @@ public class TNTArrowRenderer extends EntityRenderer<EntityArrowTNT> { | |||||||
|         this.blockRenderer = pContext.getBlockRenderDispatcher(); |         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.pushPose(); | ||||||
|         pPoseStack.translate(0.0F, 0.5F, 0.0F); |         pPoseStack.translate(0.0F, 0.5F, 0.0F); | ||||||
|         pPoseStack.scale(0.5f, 0.5f, 0.5f); |         pPoseStack.scale(0.5f, 0.5f, 0.5f); | ||||||
| @ -38,7 +38,7 @@ public class TNTArrowRenderer extends EntityRenderer<EntityArrowTNT> { | |||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     @NotNull |     @NotNull | ||||||
|     public ResourceLocation getTextureLocation(@NotNull EntityArrowTNT pEntity) { |     public ResourceLocation getTextureLocation(@NotNull tntArrow pEntity) { | ||||||
|         return TextureAtlas.LOCATION_BLOCKS; |         return TextureAtlas.LOCATION_BLOCKS; | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,6 +1,6 @@ | |||||||
| package com.jenny.compressedtnt.entities.client; | 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.blaze3d.vertex.PoseStack; | ||||||
| import com.mojang.math.Axis; | import com.mojang.math.Axis; | ||||||
| import net.minecraft.client.renderer.MultiBufferSource; | import net.minecraft.client.renderer.MultiBufferSource; | ||||||
|  | |||||||
| @ -1,9 +1,10 @@ | |||||||
| package com.jenny.compressedtnt.entities; | 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.BaseTNTRenderer; | ||||||
| import com.jenny.compressedtnt.entities.client.TNTArrowRenderer; | import com.jenny.compressedtnt.entities.client.TNTArrowRenderer; | ||||||
| import com.jenny.compressedtnt.entities.client.clusterTNTRenderer; | 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.client.renderer.entity.EntityRenderers; | ||||||
| import net.minecraft.world.entity.EntityType; | import net.minecraft.world.entity.EntityType; | ||||||
| @ -39,8 +40,8 @@ public class entities { | |||||||
|             ENTITY_TYPES.register("tnt_claymore", () -> EntityType.Builder.<claymorePrimedTNT>of(claymorePrimedTNT::new, MobCategory.MISC) |             ENTITY_TYPES.register("tnt_claymore", () -> EntityType.Builder.<claymorePrimedTNT>of(claymorePrimedTNT::new, MobCategory.MISC) | ||||||
|                     .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_claymore")); |                     .sized(0.98F, 0.7F).fireImmune().clientTrackingRange(8).build("tnt_claymore")); | ||||||
| 
 | 
 | ||||||
|     public static final RegistryObject<EntityType<EntityArrowTNT>> ARROW_TNT = |     public static final RegistryObject<EntityType<tntArrow>> ARROW_TNT = | ||||||
|             ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.<EntityArrowTNT>of(EntityArrowTNT::new, MobCategory.MISC) |             ENTITY_TYPES.register("arrow_tnt", () -> EntityType.Builder.<tntArrow>of(tntArrow::new, MobCategory.MISC) | ||||||
|                     .sized(0.48F, 0.48F).clientTrackingRange(64).build("arrow_tnt")); |                     .sized(0.48F, 0.48F).clientTrackingRange(64).build("arrow_tnt")); | ||||||
| 
 | 
 | ||||||
|     public static void register(IEventBus eventBus) { |     public static void register(IEventBus eventBus) { | ||||||
|  | |||||||
| @ -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.EntityType; | ||||||
| import net.minecraft.world.entity.LivingEntity; | import net.minecraft.world.entity.LivingEntity; | ||||||
| import net.minecraft.world.level.Level; | import net.minecraft.world.level.Level; | ||||||
| @ -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.EntityType; | ||||||
| import net.minecraft.world.entity.LivingEntity; | import net.minecraft.world.entity.LivingEntity; | ||||||
| import net.minecraft.world.level.Level; | import net.minecraft.world.level.Level; | ||||||
| @ -1,4 +1,4 @@ | |||||||
| package com.jenny.compressedtnt.entities; | package com.jenny.compressedtnt.entities.tnt; | ||||||
| 
 | 
 | ||||||
| import net.minecraft.core.particles.ParticleTypes; | import net.minecraft.core.particles.ParticleTypes; | ||||||
| import net.minecraft.nbt.CompoundTag; | import net.minecraft.nbt.CompoundTag; | ||||||
| @ -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.nbt.CompoundTag; | ||||||
| import net.minecraft.network.syncher.EntityDataAccessor; | import net.minecraft.network.syncher.EntityDataAccessor; | ||||||
| import net.minecraft.network.syncher.EntityDataSerializers; | import net.minecraft.network.syncher.EntityDataSerializers; | ||||||
| @ -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.nbt.CompoundTag; | ||||||
| import net.minecraft.network.syncher.EntityDataAccessor; | import net.minecraft.network.syncher.EntityDataAccessor; | ||||||
| import net.minecraft.network.syncher.EntityDataSerializers; | import net.minecraft.network.syncher.EntityDataSerializers; | ||||||
| @ -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.nbt.CompoundTag; | ||||||
| import net.minecraft.network.syncher.EntityDataAccessor; | import net.minecraft.network.syncher.EntityDataAccessor; | ||||||
| import net.minecraft.network.syncher.EntityDataSerializers; | import net.minecraft.network.syncher.EntityDataSerializers; | ||||||
| @ -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.LivingEntity; | ||||||
| import net.minecraft.world.entity.projectile.AbstractArrow; | import net.minecraft.world.entity.projectile.AbstractArrow; | ||||||
| import net.minecraft.world.item.ArrowItem; | import net.minecraft.world.item.ArrowItem; | ||||||
| @ -17,6 +17,6 @@ public class ArrowTNT extends ArrowItem { | |||||||
|     @Override |     @Override | ||||||
|     @NotNull |     @NotNull | ||||||
|     public AbstractArrow createArrow(@NotNull Level pLevel, @NotNull ItemStack pStack, @NotNull LivingEntity pShooter) { |     public AbstractArrow createArrow(@NotNull Level pLevel, @NotNull ItemStack pStack, @NotNull LivingEntity pShooter) { | ||||||
|         return new EntityArrowTNT(pLevel, pShooter); |         return new tntArrow(pLevel, pShooter); | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @ -1,7 +1,5 @@ | |||||||
| package com.jenny.compressedtnt.items; | package com.jenny.compressedtnt.items; | ||||||
| 
 | 
 | ||||||
| import com.jenny.compressedtnt.items.arrows.item.*; |  | ||||||
| 
 |  | ||||||
| import net.minecraft.world.item.Item; | import net.minecraft.world.item.Item; | ||||||
| import net.minecraftforge.eventbus.api.IEventBus; | import net.minecraftforge.eventbus.api.IEventBus; | ||||||
| import net.minecraftforge.registries.DeferredRegister; | import net.minecraftforge.registries.DeferredRegister; | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user