mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-18 19:29:31 +00:00
Fix some dumb bugs and crashes
This commit is contained in:
1 parent
7d318bb3bf
commit
107097af0d
6 files changed
+33
-11
No files matched your search
@@ -221,7 +221,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower {
|
||||
public void onBlockPlacedBy(World world, BlockPos pos, BlockState state, LivingEntity entity, ItemStack stack) {
|
||||
super.onBlockPlacedBy(world, pos, state, entity, stack);
|
||||
if(isPassiveFlower()) {
|
||||
CompoundNBT cmp = stack.getTag();
|
||||
CompoundNBT cmp = stack.getOrCreateTag();
|
||||
passiveDecayTicks = cmp.getInt(TAG_PASSIVE_DECAY_TICKS);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -67,7 +67,10 @@ public class BlockSpecialFlower extends FlowerBlock implements ISpecialFlower, I
|
||||
|
||||
@Override
|
||||
public int getLightValue(@Nonnull BlockState state, IEnviromentBlockReader world, @Nonnull BlockPos pos) {
|
||||
return world.getTileEntity(pos) == null ? 0 : ((TileEntitySpecialFlower) world.getTileEntity(pos)).getLightValue();
|
||||
TileEntity te = world.getTileEntity(pos);
|
||||
if (te instanceof TileEntitySpecialFlower) {
|
||||
return ((TileEntitySpecialFlower) te).getLightValue();
|
||||
} else return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -398,7 +398,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void renderHUD(Minecraft mc) {
|
||||
ItemStack pool = new ItemStack(getBlockState().getBlock());
|
||||
String name = I18n.format(pool.getTranslationKey().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name");
|
||||
String name = pool.getDisplayName().getString();
|
||||
int color = 0x4444FF;
|
||||
HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name);
|
||||
|
||||
|
||||
@@ -213,11 +213,10 @@ public class EntityManaBurst extends ThrowableEntity implements IManaBurst {
|
||||
}
|
||||
*/
|
||||
|
||||
if (!scanBeam && !world.isRemote() && // Botania - collide only on server and non scanbeam
|
||||
raytraceresult.getType() != RayTraceResult.Type.MISS) {
|
||||
if (raytraceresult.getType() != RayTraceResult.Type.MISS) {
|
||||
if (raytraceresult.getType() == RayTraceResult.Type.BLOCK && this.world.getBlockState(((BlockRayTraceResult)raytraceresult).getPos()).getBlock() == Blocks.NETHER_PORTAL) {
|
||||
this.setPortal(((BlockRayTraceResult)raytraceresult).getPos());
|
||||
} else if (!net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)){
|
||||
} else if (!net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, raytraceresult)) {
|
||||
this.onImpact(raytraceresult);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,6 +25,7 @@ public final class ModEntities {
|
||||
public static void registerEntities(RegistryEvent.Register<EntityType<?>> evt) {
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityManaBurst>create(
|
||||
EntityManaBurst::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityManaBurst(w))
|
||||
.size(0, 0)
|
||||
.setUpdateInterval(10)
|
||||
.setTrackingRange(64)
|
||||
@@ -33,6 +34,7 @@ public final class ModEntities {
|
||||
.setRegistryName(LibEntityNames.MANA_BURST));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntitySignalFlare>create(
|
||||
EntitySignalFlare::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntitySignalFlare(w))
|
||||
.size(0, 0)
|
||||
.setUpdateInterval(10)
|
||||
.setTrackingRange(2048)
|
||||
@@ -40,6 +42,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.SIGNAL_FLARE));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityPixie>create(EntityPixie::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityPixie(w))
|
||||
.size(1, 1)
|
||||
.setUpdateInterval(3)
|
||||
.setTrackingRange(16)
|
||||
@@ -47,6 +50,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.PIXIE));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityFlameRing>create(EntityFlameRing::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityFlameRing(w))
|
||||
.size(0, 0)
|
||||
.setTrackingRange(32)
|
||||
.setUpdateInterval(40)
|
||||
@@ -54,12 +58,14 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.FLAME_RING));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityVineBall>create(EntityVineBall::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityVineBall(w))
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(10)
|
||||
.setShouldReceiveVelocityUpdates(true)
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.VINE_BALL));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityDoppleganger>create(EntityDoppleganger::new, EntityClassification.MONSTER)
|
||||
.setCustomClientFactory((p, w) -> new EntityDoppleganger(w))
|
||||
.size(0.6F, 1.8F)
|
||||
.immuneToFire()
|
||||
.setTrackingRange(128)
|
||||
@@ -68,6 +74,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.DOPPLEGANGER));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityMagicLandmine>create(EntityMagicLandmine::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityMagicLandmine(w))
|
||||
.size(0, 0)
|
||||
.setTrackingRange(128)
|
||||
.setUpdateInterval(40)
|
||||
@@ -75,6 +82,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.MAGIC_LANDMINE));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntitySpark>create(EntitySpark::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntitySpark(w))
|
||||
.size(0.1F, 0.5F)
|
||||
.immuneToFire()
|
||||
.setTrackingRange(64)
|
||||
@@ -83,6 +91,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.SPARK));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityThrownItem>create(EntityThrownItem::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityThrownItem(w))
|
||||
.size(0.25F, 0.25F)
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(20)
|
||||
@@ -90,6 +99,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.THROWN_ITEM));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityMagicMissile>create(EntityMagicMissile::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityMagicMissile(w))
|
||||
.size(0, 0)
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(2)
|
||||
@@ -97,12 +107,14 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.MAGIC_MISSILE));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityThornChakram>create(EntityThornChakram::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityThornChakram(EntityThornChakram.TYPE, w))
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(10)
|
||||
.setShouldReceiveVelocityUpdates(true)
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.THORN_CHAKRAM));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityCorporeaSpark>create(EntityCorporeaSpark::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityCorporeaSpark(w))
|
||||
.size(0.1F, 0.5F)
|
||||
.immuneToFire()
|
||||
.setTrackingRange(64)
|
||||
@@ -111,6 +123,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.CORPOREA_SPARK));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityEnderAirBottle>create(EntityEnderAirBottle::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityEnderAirBottle(EntityEnderAirBottle.TYPE, w))
|
||||
.size(0.25F, 0.25F)
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(10)
|
||||
@@ -118,6 +131,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.ENDER_AIR_BOTTLE));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityPoolMinecart>create(EntityPoolMinecart::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityPoolMinecart(EntityPoolMinecart.TYPE, w))
|
||||
.size(0.98F, 0.7F)
|
||||
.setTrackingRange(80)
|
||||
.setUpdateInterval(3)
|
||||
@@ -125,6 +139,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.POOL_MINECART));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityPinkWither>create(EntityPinkWither::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityPinkWither(w))
|
||||
.size(0.9F, 3.5F)
|
||||
.setTrackingRange(80)
|
||||
.setUpdateInterval(3)
|
||||
@@ -132,6 +147,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.PINK_WITHER));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityPlayerMover>create(EntityPlayerMover::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityPlayerMover(EntityPlayerMover.TYPE, w))
|
||||
.size(0, 0)
|
||||
.setTrackingRange(40)
|
||||
.setUpdateInterval(3)
|
||||
@@ -139,12 +155,14 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.PLAYER_MOVER));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityManaStorm>create(EntityManaStorm::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityManaStorm(w))
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(10)
|
||||
.setShouldReceiveVelocityUpdates(false)
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.MANA_STORM));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityBabylonWeapon>create(EntityBabylonWeapon::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityBabylonWeapon(EntityBabylonWeapon.TYPE, w))
|
||||
.size(0, 0)
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(10)
|
||||
@@ -152,6 +170,7 @@ public final class ModEntities {
|
||||
.build("")
|
||||
.setRegistryName(LibEntityNames.BABYLON_WEAPON));
|
||||
evt.getRegistry().register(EntityType.Builder.<EntityFallingStar>create(EntityFallingStar::new, EntityClassification.MISC)
|
||||
.setCustomClientFactory((p, w) -> new EntityFallingStar(EntityFallingStar.TYPE, w))
|
||||
.size(0, 0)
|
||||
.setTrackingRange(64)
|
||||
.setUpdateInterval(10)
|
||||
|
||||
Reference in new issue
Block a user