diff --git a/contributors.properties b/contributors.properties index aeba778eb..79c5c3899 100644 --- a/contributors.properties +++ b/contributors.properties @@ -301,3 +301,13 @@ isquido=1 rex22=9 izzybizzy45=9 dirkinzs=10 +seth_goldfox=1 +klouver0x=15 +cyranonetherrack=0 +kcdgbc=11 +aowolfie=3 +cutiewithluney=6 +jalewis1990=manastar +flarefolf=10 +24minecraftsam=9 +lewdc1na=15 diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java index 912960879..5d4513c01 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityFunctionalFlower.java @@ -46,7 +46,6 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { int sizeLastCheck = -1; TileEntity linkedPool = null; - public int knownMana = -1; BlockPos cachedPoolCoordinates = null; @@ -152,7 +151,6 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { return false; } - knownMana = mana; SoundEvent evt = ForgeRegistries.SOUND_EVENTS.getValue(DING_SOUND_EVENT); if (evt != null) { player.playSound(evt, 0.1F, 1F); @@ -244,7 +242,7 @@ public class TileEntityFunctionalFlower extends TileEntitySpecialFlower { public void renderHUD(Minecraft mc) { String name = I18n.format(getBlockState().getBlock().getTranslationKey()); int color = getColor(); - BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); + BotaniaAPI.internalHandler.drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } } diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java index b29d5761d..62e6b268a 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntityGeneratingFlower.java @@ -48,7 +48,6 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { int sizeLastCheck = -1; protected TileEntity linkedCollector = null; - public int knownMana = -1; public int passiveDecayTicks; BlockPos cachedCollectorCoordinates = null; @@ -206,7 +205,6 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { sync(); } - knownMana = getMana(); SoundEvent evt = ForgeRegistries.SOUND_EVENTS.getValue(DING_SOUND_EVENT); if (evt != null) { player.playSound(evt, 0.1F, 1F); @@ -297,7 +295,7 @@ public class TileEntityGeneratingFlower extends TileEntitySpecialFlower { public void renderHUD(Minecraft mc) { String name = I18n.format(getBlockState().getBlock().getTranslationKey()); int color = getColor(); - BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); + BotaniaAPI.internalHandler.drawComplexManaHUD(color, getMana(), getMaxMana(), name, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding()); } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java index ede7eb1f6..0f214ac6f 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ContributorFancinessHandler.java @@ -42,6 +42,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; import java.nio.charset.StandardCharsets; +import java.util.Collections; import java.util.HashMap; import java.util.Locale; import java.util.Map; @@ -49,7 +50,7 @@ import java.util.Properties; public final class ContributorFancinessHandler extends LayerRenderer> { - public static final Map flowerMap = new HashMap<>(); + private static volatile Map flowerMap = Collections.emptyMap(); private static boolean startedLoading = false; private static final ImmutableMap LEGACY_FLOWER_NAMES = ImmutableMap.builder() @@ -82,8 +83,11 @@ public final class ContributorFancinessHandler extends LayerRenderer m = new HashMap<>(); for (String key : props.stringPropertyNames()) { String value = props.getProperty(key); @@ -105,7 +113,7 @@ public final class ContributorFancinessHandler extends LayerRenderer= 16) { throw new NumberFormatException(); } - flowerMap.put(key, new ItemStack(ModBlocks.getFlower(DyeColor.byId(i)))); + m.put(key, new ItemStack(ModBlocks.getFlower(DyeColor.byId(i)))); } catch (NumberFormatException e) { String rawName = value.toLowerCase(Locale.ROOT); String flowerName = LEGACY_FLOWER_NAMES.getOrDefault(rawName, rawName); @@ -113,9 +121,10 @@ public final class ContributorFancinessHandler extends LayerRenderer flower.getRegistryName().getPath().equals(flowerName)) .findFirst().orElse(Items.POPPY); - flowerMap.put(key, new ItemStack(item)); + m.put(key, new ItemStack(item)); } } + flowerMap = m; } private static void renderGoldfish(MatrixStack ms, IRenderTypeBuffer buffers, int light, PlayerEntity player) { diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index c97fd1b15..5ff50d155 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -363,14 +363,7 @@ public final class HUDHandler { x = mc.getWindow().getScaledWidth() / 2 - 51; y += 10; - renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana); - - if (mana < 0) { - String text = I18n.format("botaniamisc.statusUnknown"); - x = mc.getWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(text) / 2; - y -= 1; - mc.fontRenderer.drawString(text, x, y, color); - } + renderManaBar(x, y, color, 1F, mana, maxMana); RenderSystem.disableBlend(); } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 82898a79b..8405f6fee 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -24,7 +24,7 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { - if (event.getItemStack().hasTag() && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) { + if (ItemKeepIvy.hasIvy(event.getItemStack())) { event.getToolTip().add(new TranslationTextComponent("botaniamisc.hasKeepIvy")); } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java index 84145c07e..ad60541b1 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java @@ -366,8 +366,8 @@ public class RenderTileTinyPotato extends TileEntityRenderer { ms.translate(1.5, -4, -2.5); renderBlock(ms, buffers, light, overlay, Blocks.CAKE); - } else if (ContributorFancinessHandler.flowerMap.containsKey(name)) { - ItemStack icon = ContributorFancinessHandler.flowerMap.getOrDefault(name, ItemStack.EMPTY); + } else { + ItemStack icon = ContributorFancinessHandler.getFlower(name); if (!icon.isEmpty()) { ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180)); ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180)); diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index ef53241bb..04049447d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -116,7 +116,9 @@ public class BlockGhostRail extends AbstractRailBlock { AbstractMinecartEntity c = iter.next(); BlockPos entPos = new BlockPos(c); - if (!c.isAlive() || !c.isAddedToWorld() || !c.world.isBlockLoaded(entPos)) { + if (!c.isAlive() || !c.isAddedToWorld() || !c.world.isBlockLoaded(entPos) + || c.getPersistentData().getInt(TAG_FLOAT_TICKS) <= 0) { + c.noClip = false; iter.remove(); continue; } 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 e24cb1dc2..454cadb7b 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 @@ -75,7 +75,6 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt private static final int MAX_MANA_DILLUTED = 10000; private static final String TAG_MANA = "mana"; - private static final String TAG_KNOWN_MANA = "knownMana"; private static final String TAG_OUTPUTTING = "outputting"; private static final String TAG_COLOR = "color"; private static final String TAG_MANA_CAP = "manaCap"; @@ -91,7 +90,6 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt public DyeColor color = DyeColor.WHITE; private int mana; - private int knownMana = -1; public int manaCap = -1; private int soundTicks = 0; @@ -386,31 +384,14 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt inputKey = cmp.getString(TAG_OUTPUT_KEY); } - if (cmp.contains(TAG_KNOWN_MANA)) { - knownMana = cmp.getInt(TAG_KNOWN_MANA); - } } public void onWanded(PlayerEntity player, ItemStack wand) { if (player == null || player.isSneaking()) { outputting = !outputting; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } - if (!world.isRemote) { - CompoundNBT nbttagcompound = new CompoundNBT(); - writePacketNBT(nbttagcompound); - nbttagcompound.putInt(TAG_KNOWN_MANA, getCurrentMana()); - if (player instanceof ServerPlayerEntity) { - ((ServerPlayerEntity) player).connection.sendPacket(new SUpdateTileEntityPacket(pos, -999, nbttagcompound)); - } - } - - if (player == null) { - world.playSound(null, getPos(), ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F); - } else { - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.ding, SoundCategory.PLAYERS, 0.11F, 1F); - } + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } @OnlyIn(Dist.CLIENT) @@ -418,7 +399,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt ItemStack pool = new ItemStack(getBlockState().getBlock()); String name = pool.getDisplayName().getString(); int color = 0x4444FF; - HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name); + HUDHandler.drawSimpleManaHUD(color, getCurrentMana(), manaCap, name); int x = Minecraft.getInstance().getWindow().getScaledWidth() / 2 - 11; int y = Minecraft.getInstance().getWindow().getScaledHeight() / 2 + 30; diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index e86482200..73ae09717 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -81,7 +81,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, private static final String TAG_UUID_MOST = "uuidMost"; private static final String TAG_UUID_LEAST = "uuidLeast"; private static final String TAG_MANA = "mana"; - private static final String TAG_KNOWN_MANA = "knownMana"; private static final String TAG_REQUEST_UPDATE = "requestUpdate"; private static final String TAG_ROTATION_X = "rotationX"; private static final String TAG_ROTATION_Y = "rotationY"; @@ -125,7 +124,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, UUID identity; private int mana; - private int knownMana = -1; public float rotationX, rotationY; @Nullable public DyeColor paddingColor = null; @@ -353,9 +351,6 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, mmForcedGravity = cmp.getFloat(TAG_FORCED_GRAVITY); mmForcedVelocityMultiplier = cmp.getFloat(TAG_FORCED_VELOCITY_MULTIPLIER); - if (cmp.contains(TAG_KNOWN_MANA)) { - knownMana = cmp.getInt(TAG_KNOWN_MANA); - } if (cmp.contains(TAG_PADDING_COLOR)) { paddingColor = cmp.getInt(TAG_PADDING_COLOR) == -1 ? null : DyeColor.byId(cmp.getInt(TAG_PADDING_COLOR)); } @@ -405,15 +400,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } if (!player.isSneaking()) { - if (!world.isRemote) { - CompoundNBT nbttagcompound = new CompoundNBT(); - writePacketNBT(nbttagcompound); - nbttagcompound.putInt(TAG_KNOWN_MANA, mana); - if (player instanceof ServerPlayerEntity) { - ((ServerPlayerEntity) player).connection.sendPacket(new SUpdateTileEntityPacket(pos, -999, nbttagcompound)); - } - } - world.playSound(null, player.getX(), player.getY(), player.getZ(), ModSounds.ding, SoundCategory.PLAYERS, 0.1F, 1); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } else { RayTraceResult pos = Item.rayTrace(world, player, RayTraceContext.FluidMode.ANY); if (pos instanceof BlockRayTraceResult && !world.isRemote) { @@ -572,7 +559,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public void renderHUD(Minecraft mc) { String name = new ItemStack(getBlockState().getBlock()).getDisplayName().getString(); int color = getVariant().hudColor; - HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name); + HUDHandler.drawSimpleManaHUD(color, getCurrentMana(), getMaxMana(), name); ItemStack lens = itemHandler.getStackInSlot(0); if (!lens.isEmpty()) { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index 50532f57d..1df9b1eac 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -13,6 +13,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraft.item.crafting.SpecialRecipe; import net.minecraft.item.crafting.SpecialRecipeSerializer; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; @@ -66,8 +67,8 @@ public class ManaGunClipRecipe extends SpecialRecipe { } ItemStack lens = ItemManaGun.getLens(gun); - ItemManaGun.setLens(gun, ItemStack.EMPTY); ItemStack gunCopy = gun.copy(); + ItemManaGun.setLens(gunCopy, ItemStack.EMPTY); ItemManaGun.setClip(gunCopy, true); ItemManaGun.setLensAtPos(gunCopy, lens, 0); return gunCopy; @@ -78,6 +79,12 @@ public class ManaGunClipRecipe extends SpecialRecipe { return width * height >= 2; } + @Nonnull + @Override + public NonNullList getRemainingItems(CraftingInventory inv) { + return NonNullList.withSize(inv.getSizeInventory(), ItemStack.EMPTY); + } + @Nonnull @Override public IRecipeSerializer getSerializer() { diff --git a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java index 7fa521c06..bb8edf63b 100644 --- a/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java +++ b/src/main/java/vazkii/botania/common/integration/curios/CurioIntegration.java @@ -29,11 +29,13 @@ import org.apache.commons.lang3.tuple.ImmutableTriple; import top.theillusivec4.curios.api.CuriosAPI; import top.theillusivec4.curios.api.capability.CuriosCapability; import top.theillusivec4.curios.api.capability.ICurio; +import top.theillusivec4.curios.api.event.LivingCurioDropRulesEvent; import top.theillusivec4.curios.api.imc.CurioIMCMessage; import vazkii.botania.common.capability.SimpleCapProvider; import vazkii.botania.common.core.handler.EquipmentHandler; import vazkii.botania.common.core.handler.ModSounds; +import vazkii.botania.common.item.ItemKeepIvy; import vazkii.botania.common.item.equipment.bauble.ItemBauble; import java.util.function.Predicate; @@ -51,6 +53,17 @@ public class CurioIntegration extends EquipmentHandler { InterModComms.sendTo("curios", CuriosAPI.IMC.REGISTER_TYPE, () -> new CurioIMCMessage("necklace")); } + @SubscribeEvent + public static void keepCurioDrops(LivingCurioDropRulesEvent event) { + event.addOverride(stack -> { + if (ItemKeepIvy.hasIvy(stack)) { + stack.removeChildTag(ItemKeepIvy.TAG_KEEP); + return true; + } + return false; + }, ICurio.DropRule.ALWAYS_KEEP); + } + @Override protected LazyOptional getAllWornItems(LivingEntity living) { return CuriosAPI.getCuriosHandler(living).map(h -> { diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 3167bf410..e18d846dc 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @@ -38,7 +37,12 @@ public class ItemKeepIvy extends Item { super(props); } - @SubscribeEvent(priority = EventPriority.LOWEST) + public static boolean hasIvy(ItemStack stack) { + return !stack.isEmpty() && stack.hasTag() && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false); + } + + // Curios are handled in CurioIntegration#keepCurioDrops + @SubscribeEvent public static void onPlayerDrops(LivingDropsEvent event) { if (!(event.getEntityLiving() instanceof PlayerEntity)) { return; @@ -89,8 +93,10 @@ public class ItemKeepIvy extends Item { ItemStack stack = ItemStack.read(cmp2); if (!stack.isEmpty()) { ItemStack copy = stack.copy(); - ItemNBTHelper.setBoolean(copy, TAG_KEEP, false); - event.getPlayer().inventory.addItemStackToInventory(copy); + stack.removeChildTag(TAG_KEEP); + if (!event.getPlayer().inventory.addItemStackToInventory(copy)) { + event.getPlayer().entityDropItem(copy); + } } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index 43299efdb..5cbbf457b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -57,7 +57,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc @Override public void onArmorTick(ItemStack stack, World world, PlayerEntity player) { super.onArmorTick(stack, world, player); - if (hasArmorSet(player)) { + if (!world.isRemote && hasArmorSet(player)) { int food = player.getFoodStats().getFoodLevel(); if (food > 0 && food < 18 && player.shouldHeal() && player.ticksExisted % 80 == 0) { player.heal(1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java index d63b20104..2b86cd51d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemAuraRing.java @@ -23,7 +23,7 @@ public class ItemAuraRing extends ItemBauble implements IManaGivingItem { @Override public void onWornTick(ItemStack stack, LivingEntity player) { - if (player instanceof PlayerEntity && player.ticksExisted % 10 == 0) { + if (!player.world.isRemote && player instanceof PlayerEntity && player.ticksExisted % 10 == 0) { ManaItemHandler.dispatchManaExact(stack, (PlayerEntity) player, 1, true); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java index a8e0044a9..b22cc645d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGreaterAuraRing.java @@ -23,7 +23,7 @@ public class ItemGreaterAuraRing extends ItemBauble implements IManaGivingItem { @Override public void onWornTick(ItemStack stack, LivingEntity player) { - if (player instanceof PlayerEntity && player.ticksExisted % 2 == 0) { + if (!player.world.isRemote && player instanceof PlayerEntity && player.ticksExisted % 2 == 0) { ManaItemHandler.dispatchManaExact(stack, (PlayerEntity) player, 1, true); } } diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 3276010a8..84a671358 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -31,4 +31,4 @@ Botania is a mod that adds nature magic to Minecraft''' mandatory=true versionRange="[FORGE-1.15.2-2.0,)" ordering="AFTER" - side="BOTH" \ No newline at end of file + side="BOTH" diff --git a/src/main/resources/assets/botania/lang/de_de.json b/src/main/resources/assets/botania/lang/de_de.json index c3985e8ce..ea1beb3d7 100644 --- a/src/main/resources/assets/botania/lang/de_de.json +++ b/src/main/resources/assets/botania/lang/de_de.json @@ -8,7 +8,6 @@ "itemGroup.botania": "Botania", - "botaniamisc.statusUnknown": "Unbekannter Status", "botaniamisc.color": "%s gefärbt", "botaniamisc.manaUsage": "Manaverbrauch", "botaniamisc.flareColor": "Ladungen %s", @@ -1461,4 +1460,4 @@ "botania.entry.dispenserTweaks": "Dispenser-Änderungen", "botania.entry.shinyFlowers": "Schimmernde Blumen" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/lang/en_us.json b/src/main/resources/assets/botania/lang/en_us.json index db5efd7b8..a2a9f2054 100644 --- a/src/main/resources/assets/botania/lang/en_us.json +++ b/src/main/resources/assets/botania/lang/en_us.json @@ -14,7 +14,6 @@ "generator.botania-skyblock": "Garden of Glass", "generator.botania-skyblock.info": "Not recommended for Botania newcomers", - "botaniamisc.statusUnknown": "Unknown Status", "botaniamisc.color": "%s Tinted", "botaniamisc.manaUsage": "Mana Usage", "botaniamisc.flareColor": "%s Rounds", @@ -1807,7 +1806,7 @@ "botania.tagline.spreader": "Your essential Mana transporter", "botania.page.spreader0": "The $(item)Mana Spreader$(0) is the single most important tool a botanist needs to manipulate $(thing)Mana$(0).$(p)This block shoots $(thing)Mana$(0) from point A to point B. It faces a cardinal direction when placed, but sneak-right clicking it with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) on a face points it elsewhere. It can be aimed at other blocks with a wand in $(thing)Bind Mode$(0).", "botania.page.spreader1": "The $(item)Mana Spreader$(0), as seen with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) held", - "botania.page.spreader2": "The $(item)Mana Spreader$(0) has a small internal buffer of $(thing)Mana$(0), which will get filled by $(thing)Generating Flora$(0) bound to it. (Flowers, when placed, auto-bind to the nearest spreader.) This buffer can be viewed by right-clicking the $(item)Spreader$(0) with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) in hand.$(p)Note that the block needs to be right-clicked with a wand repeatedly to get a real-time view of its contents.", + "botania.page.spreader2": "The $(item)Mana Spreader$(0) has a small internal buffer of $(thing)Mana$(0), which will get filled by $(thing)Generating Flora$(0) bound to it. (Flowers, when placed, auto-bind to the nearest spreader.) This buffer can be viewed by hovering over the $(item)Spreader$(0) with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) in hand.", "botania.page.spreader3": "Holding a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) makes nearby spreaders display aiming beams. Hovering over a spreader highlights its target. The sparkles show where $(thing)Mana Loss$(0) begins to occur.$(p)As long as the target of the spreader can accept $(thing)Mana$(0) (that is, can contain $(thing)Mana$(0) and isn't full), the spreader will repeatedly fire $(thing)Mana Bursts$(0), which travel to their destination and transfer their $(thing)Mana$(0) to it.", "botania.page.spreader4": "The spreader will only fire another burst when the last one hits its target.$(p)Furthermore, a $(thing)Mana Burst$(0) will start suffering $(thing)Mana Loss$(0) after a small amount of time: this can be seen in the burst's appearance, as it thins at that point.", "botania.page.spreader11": "Applying a $(thing)Redstone Signal$(0) to a spreader will pause its firing of bursts. If finer control is required, a $(l:mana/redstone_spreader)$(item)Pulse Mana Spreader$(0)$(/l) is recommended, as it fires upon a redstone signal in lieu of a target.", @@ -1986,7 +1985,7 @@ "botania.entry.fIntro": "An Introduction to Function", "botania.tagline.fIntro": "Flowers that use mana for beneficial powers", "botania.page.fIntro0": "There are myriad uses for the $(thing)Mana$(0) a botanist generates, notably as the fuel for an assortment of $(thing)Functional Flora$(0).$(p)These flowers will drain $(thing)Mana$(0) from a nearby $(l:mana/pool)$(item)Mana Pool$(0)$(/l) into themselves to perform their respective functions.$(p)Note that flowers can't receive power directly through $(l:mana/spreader)$(item)Mana Spreaders$(0)$(/l).", - "botania.page.fIntro1": "All $(thing)Functional Flora$(0), just like $(thing)Generating Flora$(0), contain a small buffer of $(thing)Mana$(0).$(p)Standard rules for $(thing)Mana$(0)-reading apply (right-clicking with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) will update your view of its buffer).", + "botania.page.fIntro1": "All $(thing)Functional Flora$(0), just like $(thing)Generating Flora$(0), contain a small buffer of $(thing)Mana$(0).", "botania.page.fIntro2": "Flowers bind to only one $(l:mana/pool)$(item)Mana Pool$(0)$(/l) at a time. When placed, they'll bind to the nearest pool (or the closest placed afterward, if none were in range), and should be re-bound with a wand in $(thing)Bind Mode$(0).", "botania.page.fIntro3": "Additionally, some functional flowers use a $(item)Redstone Root$(0) in their creation. These flowers' effects can be toggled with redstone signals.", "botania.page.fIntro4": "$(item)Redstone Root$(0) for Redstone Control", @@ -2142,7 +2141,7 @@ "botania.entry.gIntro": "An Introduction to Generation", "botania.tagline.gIntro": "Flowers that consume resources to make mana", "botania.page.gIntro0": "Generating $(thing)Mana$(0) should be at the top of any botanist's priority list. Luckily, there's a wide selection of $(thing)Generating Flora$(0) willing to do the job.$(p)These flowers, as the name would imply, generate $(thing)Mana$(0), usually consuming resources to do so.", - "botania.page.gIntro1": "All $(thing)Generating Flora$(0), like their $(thing)Functional$(0) brethren, can hold a small internal buffer of $(thing)Mana$(0).$(p)Standard rules for $(thing)Mana$(0) reading apply (right-clicking with a $(l:basics/wand)$(item)Wand of the Forest$(0)$(/l) will update your view of its buffer).$(p)$(thing)Generating Flora$(0) will automatically output to the closest nearby $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l).", + "botania.page.gIntro1": "All $(thing)Generating Flora$(0), like their $(thing)Functional$(0) brethren, can hold a small internal buffer of $(thing)Mana$(0).$(p)$(thing)Generating Flora$(0) will automatically output to the closest nearby $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l).", "botania.page.gIntro2": "These flowers bind to one $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l) at a time for $(thing)Mana$(0) output. They'll bind to the nearest spreader present at the time of their placement (or the nearest placed afterward, if none were in range), and must be re-bound to another spreader with a wand in $(thing)Bind Mode$(0), if so desired.", "botania.page.gIntro3": "Choosing your first $(thing)Generating Flower$(0) is a pretty simple task; the simplest two choices for any fledgling botanist are the $(l:generating_flowers/endoflame)$(item)Endoflame$(0)$(/l) and the $(l:generating_flowers/hydroangeas)$(item)Hydroangeas$(0)$(/l).$(p)The former uses $(item)Coal$(0) or other fuel sources to generate $(thing)Mana$(0). The latter uses $(item)Water$(0) sources for the same task, but decays after about three days.", diff --git a/src/main/resources/assets/botania/lang/es_ar.json b/src/main/resources/assets/botania/lang/es_ar.json index 081cabb23..d240ad7fc 100644 --- a/src/main/resources/assets/botania/lang/es_ar.json +++ b/src/main/resources/assets/botania/lang/es_ar.json @@ -7,7 +7,6 @@ "_comment5": "Once again, don't copy from English, and THANK YOU for your hard work!", "itemGroup.botania": "Botania", - "botaniamisc.statusUnknown": "Estado Desconocido", "botaniamisc.color": "%s Teñido", "botaniamisc.manaUsage": "Uso de Maná", "botaniamisc.flareColor": "%s Rounds", @@ -166,4 +165,4 @@ "block.botania.manasteel_block": "Bloque de Acero de Maná", "block.botania.terrasteel_block": "Bloque de Acero de la Tierra", "block.botania.elementium_block": "Bloque de Elementium" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/lang/es_es.json b/src/main/resources/assets/botania/lang/es_es.json index 5f46944b1..a0442c54b 100644 --- a/src/main/resources/assets/botania/lang/es_es.json +++ b/src/main/resources/assets/botania/lang/es_es.json @@ -11,7 +11,6 @@ "generator.botania-skyblock": "Jardín de cristal", "generator.botania-skyblock.info": "No recomendado para neófitos en Botania", - "botaniamisc.statusUnknown": "Estado desconocido", "botaniamisc.color": "Teñido a %s", "botaniamisc.manaUsage": "Uso de maná", "botaniamisc.flareColor": "%s rondas", diff --git a/src/main/resources/assets/botania/lang/fr_fr.json b/src/main/resources/assets/botania/lang/fr_fr.json index b493fe318..5bb111bee 100644 --- a/src/main/resources/assets/botania/lang/fr_fr.json +++ b/src/main/resources/assets/botania/lang/fr_fr.json @@ -10,7 +10,6 @@ "generator.botania-skyblock": "Jardin de verre", "generator.botania-skyblock.info": "Non recommandé pour les débutants de botania", - "botaniamisc.statusUnknown": "Statut inconnu", "botaniamisc.color": "%s teinté", "botaniamisc.manaUsage": "Utilisation de mana", "botaniamisc.flareColor": "%s tours", @@ -1166,4 +1165,4 @@ "botania.entry.fireRod": "Bâton des enfers", "botania.entry.skyDirtRod": "Bâton des hautes-terres" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/lang/ja_jp.json b/src/main/resources/assets/botania/lang/ja_jp.json index d6d18d948..f235948aa 100644 --- a/src/main/resources/assets/botania/lang/ja_jp.json +++ b/src/main/resources/assets/botania/lang/ja_jp.json @@ -10,7 +10,6 @@ "generator.botania-skyblock": "ガーデンオブグラス", "generator.botania-skyblock.info": "初心者には非推奨", - "botaniamisc.statusUnknown": "不明な状態", "botaniamisc.color": "%s に染められている", "botaniamisc.manaUsage": "マナ使用量", "botaniamisc.outputtingPower": "アイテムへマナを送る", diff --git a/src/main/resources/assets/botania/lang/ko_kr.json b/src/main/resources/assets/botania/lang/ko_kr.json index 2fe857918..df2b77790 100644 --- a/src/main/resources/assets/botania/lang/ko_kr.json +++ b/src/main/resources/assets/botania/lang/ko_kr.json @@ -11,7 +11,6 @@ "generator.botania-skyblock": "잔디의 정원", "generator.botania-skyblock.info": "보타니아를 처음하는 분에게는 권장하지 않습니다.", - "botaniamisc.statusUnknown": "알 수 없는 상태", "botaniamisc.color": "%s 색", "botaniamisc.manaUsage": "마나 사용량", "botaniamisc.flareColor": "%s 색", @@ -1513,4 +1512,4 @@ "botania.page.runeAltar17": "$(item)격노의 룬$(0) 제작하기", "botania.page.runeAltar18": "$(item)질투의 룬$(0) 제작하기", "botania.page.runeAltar19": "$(item)교만의 룬$(0) 제작하기" -} \ No newline at end of file +} diff --git a/src/main/resources/assets/botania/lang/nl_nl.json b/src/main/resources/assets/botania/lang/nl_nl.json index b7dfa8c95..428d58113 100644 --- a/src/main/resources/assets/botania/lang/nl_nl.json +++ b/src/main/resources/assets/botania/lang/nl_nl.json @@ -11,7 +11,6 @@ "generator.botania-skyblock.info": "Niet aanbevolen voor Botania beginners", "botaniamisc.craftingContainer": "Opbrengst van de productie", - "botaniamisc.statusUnknown": "Onbekende Status", "botaniamisc.color": "%s Gekleurd", "botaniamisc.manaUsage": "Mana Verbruik", "botaniamisc.flareColor": "%s Ladingen", diff --git a/src/main/resources/assets/botania/lang/pt_br.json b/src/main/resources/assets/botania/lang/pt_br.json index 728f657f5..7ebaba0c6 100644 --- a/src/main/resources/assets/botania/lang/pt_br.json +++ b/src/main/resources/assets/botania/lang/pt_br.json @@ -10,7 +10,6 @@ "generator.botania-skyblock": "Jardim de Vidro", "generator.botania-skyblock.info": "Não recomendado para iniciantes", "botaniamisc.craftingContainer": "Cria", - "botaniamisc.statusUnknown": "Status desconhecido", "botaniamisc.color": "Cor: %s", "botaniamisc.manaUsage": "Uso de Mana", "botaniamisc.flareColor": "Projéteis: %s", diff --git a/src/main/resources/assets/botania/lang/ru_ru.json b/src/main/resources/assets/botania/lang/ru_ru.json index b1ede342b..c0fbb7108 100644 --- a/src/main/resources/assets/botania/lang/ru_ru.json +++ b/src/main/resources/assets/botania/lang/ru_ru.json @@ -13,7 +13,6 @@ "generator.botania-skyblock.info": "Не рекомендуется для новичков", "botaniamisc.craftingContainer": "Вернуться к созданию", - "botaniamisc.statusUnknown": "Неизвестный статус", "botaniamisc.color": "Окрашено в %s", "botaniamisc.manaUsage": "Потребление маны", "botaniamisc.flareColor": "%s салют", diff --git a/src/main/resources/assets/botania/lang/zh_cn.json b/src/main/resources/assets/botania/lang/zh_cn.json index 423bfbbc9..1a01d42e0 100644 --- a/src/main/resources/assets/botania/lang/zh_cn.json +++ b/src/main/resources/assets/botania/lang/zh_cn.json @@ -14,7 +14,6 @@ "botaniamisc.craftingContainer": "合成返还", - "botaniamisc.statusUnknown": "未知状态", "botaniamisc.color": "%s 染色", "botaniamisc.manaUsage": "魔力消耗", "botaniamisc.flareColor": "%s 弹药", diff --git a/src/main/resources/assets/botania/lang/zh_tw.json b/src/main/resources/assets/botania/lang/zh_tw.json index 672ee9aef..176d158d2 100644 --- a/src/main/resources/assets/botania/lang/zh_tw.json +++ b/src/main/resources/assets/botania/lang/zh_tw.json @@ -11,7 +11,6 @@ "generator.botania-skyblock.info": "不建議植物魔法新手使用", "botaniamisc.craftingContainer": "合成返還", - "botaniamisc.statusUnknown": "未知狀態", "botaniamisc.color": "%s 染色", "botaniamisc.manaUsage": "瑪那消耗", "botaniamisc.flareColor": "%s 彈藥",