diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index b1e2999c3..1c7a51629 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -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); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index f7aee8e1f..47f1e9afa 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index 653dd463d..1c754af6f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -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); diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index 6ad4d84a5..88b7889c6 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -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); } } diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index d830e6052..423c9802d 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -25,6 +25,7 @@ public final class ModEntities { public static void registerEntities(RegistryEvent.Register> evt) { evt.getRegistry().register(EntityType.Builder.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.create(EntityFallingStar::new, EntityClassification.MISC) + .setCustomClientFactory((p, w) -> new EntityFallingStar(EntityFallingStar.TYPE, w)) .size(0, 0) .setTrackingRange(64) .setUpdateInterval(10) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 243a72f62..162a05264 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" #mandatory -loaderVersion="[27,)" +loaderVersion="[28,)" issueTrackerURL="https://github.com/Vazkii/Botania/issues" #optional displayURL="https://botaniamod.net" #optional logoFile="logo.png" #optional @@ -15,13 +15,14 @@ Botania is a mod that adds nature magic to Minecraft ''' [[dependencies.botania]] - modId="forge" #mandatory - mandatory=false #mandatory - versionRange="[28.0.45,)" #mandatory + modId="forge" + mandatory=true + versionRange="[28.1.0,)" ordering="NONE" side="BOTH" [[dependencies.botania]] modId="curios" mandatory=false - ordering="AFTER" \ No newline at end of file + ordering="AFTER" + side="BOTH" \ No newline at end of file