From b7fa6abf2beb1bb6141472bd1fb278ffea3bdc4e Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 23 Jan 2017 16:52:05 -0600 Subject: [PATCH 1/6] Fix my 'GG looks like you' feature not working on dedi servers --- .../render/entity/RenderDoppleganger.java | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java index fde3f4a57..0f5947e59 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java @@ -15,6 +15,7 @@ import java.util.UUID; import javax.annotation.Nonnull; +import net.minecraft.client.entity.AbstractClientPlayer; import org.lwjgl.opengl.ARBShaderObjects; import com.mojang.authlib.minecraft.MinecraftProfileTexture; @@ -24,7 +25,6 @@ import net.minecraft.client.model.ModelPlayer; import net.minecraft.client.renderer.entity.RenderBiped; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.resources.DefaultPlayerSkin; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import vazkii.botania.api.internal.ShaderCallback; import vazkii.botania.client.core.helper.ShaderHelper; @@ -80,26 +80,13 @@ public class RenderDoppleganger extends RenderBiped { @Nonnull @Override - protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger par1Entity) { + protected ResourceLocation getEntityTexture(@Nonnull EntityDoppleganger entity) { Minecraft mc = Minecraft.getMinecraft(); - if(!(mc.getRenderViewEntity() instanceof EntityPlayer)) + if(!(mc.getRenderViewEntity() instanceof AbstractClientPlayer)) return DefaultPlayerSkin.getDefaultSkinLegacy(); - EntityPlayer view = (EntityPlayer) mc.getRenderViewEntity(); - - // Adapated from TileEntitySkullRenderer.renderTileEntityAt - Map map = mc.getSkinManager().loadSkinFromCache(view.getGameProfile()); - - if (map.containsKey(MinecraftProfileTexture.Type.SKIN)) - { - return mc.getSkinManager().loadSkin(map.get(MinecraftProfileTexture.Type.SKIN), MinecraftProfileTexture.Type.SKIN); - } - else - { - UUID uuid = EntityPlayer.getUUID(view.getGameProfile()); - return DefaultPlayerSkin.getDefaultSkin(uuid); - } + return ((AbstractClientPlayer) mc.getRenderViewEntity()).getLocationSkin(); } } From ec930b324994fb805dbbb8a8c50a738472b4415b Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 28 Jan 2017 12:35:21 -0600 Subject: [PATCH 2/6] Fix banner lexicon pages not showing bc they thought they still needed Et Futurum --- .../vazkii/botania/common/lexicon/LexiconData.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 8eb3581b7..7824eacf6 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -1412,6 +1412,10 @@ public final class LexiconData { preventingDecay = new DogLexiconEntry(LibLexicon.MISC_PRENTING_DECAY, categoryMisc); preventingDecay.setLexiconPages(new PageText("0")).setIcon(new ItemStack(ModItems.monocle)); + banners = new BasicLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc); + banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)) + .setIcon(new ItemStack(ModItems.lexicon)); + if (Botania.bcTriggersLoaded) { bcIntegration = new CompatLexiconEntry(LibLexicon.MISC_BC_INTEGRATION, categoryMisc, "BuildCraft"); bcIntegration.setLexiconPages(new PageText("0")).setIcon(new ItemStack(Items.REDSTONE)); @@ -1441,11 +1445,5 @@ public final class LexiconData { new PageBrew(ModBrewRecipes.warpWardBrew, "6a", "6b")) .setIcon(new ItemStack(ModItems.manaInkwell)); } - - if (Botania.etFuturumLoaded) { - banners = new CompatLexiconEntry(LibLexicon.MISC_BANNERS, BotaniaAPI.categoryMisc, "EtFuturum"); - banners.setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BANNERS)) - .setIcon(new ItemStack(ModItems.lexicon)); - } } } From 02b4a25e70bcb47005723a41ef0eb1e0784308a7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 Jan 2017 21:32:25 -0600 Subject: [PATCH 3/6] Dear past self: don't try clever tricks that don't actually work and probably run slower. Closes #2111 --- .../common/core/helper/MathHelper.java | 37 ----------------- .../equipment/bauble/ItemFlightTiara.java | 2 +- .../item/equipment/bauble/ItemItemFinder.java | 41 +++++++------------ .../common/network/PacketBotaniaEffect.java | 4 -- 4 files changed, 15 insertions(+), 69 deletions(-) diff --git a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java index ddd6a6970..31115a457 100644 --- a/src/main/java/vazkii/botania/common/core/helper/MathHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/MathHelper.java @@ -14,43 +14,6 @@ import net.minecraft.entity.Entity; import vazkii.botania.api.internal.VanillaPacketDispatcher; public final class MathHelper { - - public static int[] doubleArrayToIntArray(double[] doubles) { - int[] ret = new int[doubles.length * 2]; - for (int i = 0; i < doubles.length; i++) { - long l = Double.doubleToLongBits(doubles[i]); - ret[i] = (int) (l >>> 32); - ret[i + 1] = (int) l; - } - return ret; - } - - public static int[] longArrayToIntArray(long[] longs) { - int[] ret = new int[longs.length * 2]; - for (int i = 0; i < longs.length; i++) { - ret[i] = (int) (longs[i] >>> 32); - ret[i + 1] = (int) longs[i]; - } - return ret; - } - - public static long[] intArrayToLongArray(int[] ints) { - long[] ret = new long[ints.length / 2]; - for (int i = 0; i < ints.length; i += 2) { - ret[i / 2] = (long) ints[i] << 32 | ints[i + 1]; - } - return ret; - } - - public static double[] intArrayToDoubleArray(int[] ints) { - double[] ret = new double[ints.length / 2]; - for (int i = 0; i < ints.length; i += 2) { - long l = (long) ints[i] << 32 | ints[i + 1]; - ret[i / 2] = Double.longBitsToDouble(l); - } - return ret; - } - public static float pointDistanceSpace(double x1, double y1, double z1, double x2, double y2, double z2) { return (float) Math.sqrt((x1 - x2) * (x1 - x2) + (y1 - y2) * (y1 - y2) + (z1 - z2) * (z1 - z2)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 1feedab6f..43c101001 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -156,7 +156,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub player.setSprinting(false); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2); if(player instanceof EntityPlayerMP) - BotaniaAPI.internalHandler.sendBaubleUpdatePacket((EntityPlayerMP) player, 0); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket((EntityPlayerMP) player, 4); } } else if(!flying) { boolean doGlide = player.isSneaking() && !player.onGround && player.fallDistance >= 2F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 452d3a1fe..8cd11088e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -17,7 +17,6 @@ import java.util.List; import baubles.api.BaubleType; import baubles.api.BaublesApi; import gnu.trove.list.array.TIntArrayList; -import gnu.trove.list.array.TLongArrayList; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; @@ -31,11 +30,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.nbt.NBTTagLong; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.village.MerchantRecipe; +import net.minecraftforge.common.util.Constants; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.CapabilityItemHandler; @@ -47,12 +49,10 @@ import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.core.helper.MathHelper; import vazkii.botania.common.lib.LibItemNames; public class ItemItemFinder extends ItemBauble implements IBaubleRender { - private static final String TAG_POSITIONS_OLD = "highlightPositions"; private static final String TAG_ENTITY_POSITIONS = "highlightPositionsEnt"; private static final String TAG_BLOCK_POSITIONS = "highlightPositionsBlock1"; @@ -76,10 +76,11 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(!Botania.proxy.isTheClientPlayer(player)) return; - long[] blocks = getBlockPositions(stack); + NBTTagList blocks = ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false); Botania.proxy.setWispFXDepthTest(false); - for(long l : blocks) { - BlockPos pos = BlockPos.fromLong(l); + + for(int i = 0; i < blocks.tagCount(); i++) { + BlockPos pos = BlockPos.fromLong(((NBTTagLong) blocks.get(i)).getLong()); float m = 0.02F; Botania.proxy.wispFX(pos.getX() + (float) Math.random(), pos.getY() + (float) Math.random(), pos.getZ() + (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5), m * (float) (Math.random() - 0.5)); } @@ -97,29 +98,26 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } protected void tickServer(ItemStack stack, EntityPlayer player) { - ItemNBTHelper.removeEntry(stack, TAG_POSITIONS_OLD); - TIntArrayList entPosBuilder = new TIntArrayList(); - TLongArrayList blockPosBuilder = new TLongArrayList(); + NBTTagList blockPosBuilder = new NBTTagList(); scanForStack(player.getHeldItemMainhand(), player, entPosBuilder, blockPosBuilder); scanForStack(player.getHeldItemOffhand(), player, entPosBuilder, blockPosBuilder); int[] currentEnts = entPosBuilder.toArray(); - long[] currentBlocks = blockPosBuilder.toArray(); boolean entsEqual = Arrays.equals(currentEnts, ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS)); - boolean blocksEqual = Arrays.equals(currentBlocks, getBlockPositions(stack)); + boolean blocksEqual = blockPosBuilder.equals(ItemNBTHelper.getList(stack, TAG_BLOCK_POSITIONS, Constants.NBT.TAG_LONG, false)); if(!entsEqual) ItemNBTHelper.setIntArray(stack, TAG_ENTITY_POSITIONS, currentEnts); if(!blocksEqual) - setBlockPositions(stack, currentBlocks); + ItemNBTHelper.setList(stack, TAG_BLOCK_POSITIONS, blockPosBuilder); if(!entsEqual || !blocksEqual) - BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, 0); + BotaniaAPI.internalHandler.sendBaubleUpdatePacket(player, 4); } - private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, TLongArrayList blockPosBuilder) { + private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, NBTTagList blockPosBuilder) { if(pstack != null || player.isSneaking()) { int range = 24; @@ -172,7 +170,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { for(EnumFacing e : EnumFacing.VALUES) { if(tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e) && scanInventory(tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e), pstack)) { - blockPosBuilder.add(pos_.toLong()); + blockPosBuilder.appendTag(new NBTTagLong(pos_.toLong())); foundCap = true; break; } @@ -180,7 +178,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(!foundCap && tile instanceof IInventory) { IInventory inv = (IInventory) tile; if(scanInventory(new InvWrapper(inv), pstack)) - blockPosBuilder.add(pos_.toLong()); + blockPosBuilder.appendTag(new NBTTagLong(pos_.toLong())); } } } @@ -205,17 +203,6 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { return false; } - private long[] getBlockPositions(ItemStack stack) { - int[] ints = ItemNBTHelper.getIntArray(stack, TAG_BLOCK_POSITIONS); - return MathHelper.intArrayToLongArray(ints); - } - - private void setBlockPositions(ItemStack stack, long[] vals) { - stack.getTagCompound().removeTag(TAG_BLOCK_POSITIONS); - int[] write = MathHelper.longArrayToIntArray(vals); - ItemNBTHelper.setIntArray(stack, TAG_BLOCK_POSITIONS, write); - } - @Override public BaubleType getBaubleType(ItemStack arg0) { return BaubleType.HEAD; diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 891803f2e..580ceb1cb 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -40,10 +40,6 @@ public class PacketBotaniaEffect implements IMessage { this.args = args; } - public PacketBotaniaEffect(EffectType type, double x, double y, double z, double... args) { - this(type, x, y, z, MathHelper.doubleArrayToIntArray(args)); - } - @Override public void fromBytes(ByteBuf buf) { type = EffectType.values()[buf.readShort()]; From 6d97e48de545c954e9c8355b2134d20535548872 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 30 Jan 2017 21:58:35 -0600 Subject: [PATCH 4/6] Fix soulscribe not dealing extra damage due to a 1.9 porting error. Closes #2148 --- .../botania/common/item/equipment/tool/ItemEnderDagger.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index c98976255..f4d329c24 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -40,8 +40,7 @@ public class ItemEnderDagger extends ItemManasteelSword { public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) { if(!target.worldObj.isRemote && target instanceof EntityEnderman - && attacker instanceof EntityPlayer - && ((EntityPlayer) attacker).getCooledAttackStrength(0) == 1) { + && attacker instanceof EntityPlayer) { target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 20); } From 687772bb9a0bdc5849d95960f676909dcec3c1f2 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Mon, 6 Feb 2017 16:44:06 +0000 Subject: [PATCH 5/6] Update contributors.properties --- contributors.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/contributors.properties b/contributors.properties index c713adcc2..b56f6913d 100644 --- a/contributors.properties +++ b/contributors.properties @@ -71,3 +71,4 @@ spectacular101=0 tamaized=6 lerazzer=10 akirakujo=5 +gamerofyoyos=12 From f9974d77a0f53758f8b0a5a9bde5309009a83bef Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 7 Feb 2017 19:50:24 -0600 Subject: [PATCH 6/6] Remove lexicon references to thatch and reed blocks, closes #2157 --- src/main/resources/assets/botania/lang/en_US.lang | 2 +- src/main/resources/assets/botania/lang/es_ES.lang | 2 +- src/main/resources/assets/botania/lang/ja_JP.lang | 2 +- src/main/resources/assets/botania/lang/nl_NL.lang | 2 +- src/main/resources/assets/botania/lang/ru_RU.lang | 2 +- src/main/resources/assets/botania/lang/zh_CN.lang | 2 +- src/main/resources/assets/botania/lang/zh_TW.lang | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 95c2ba2a9..fc9920098 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -3714,7 +3714,7 @@ botania.page.decorativeBlocks13=Blaze Quartz botania.page.decorativeBlocks14=Lavender Quartz botania.page.decorativeBlocks15=Redquartz botania.page.decorativeBlocks23=Sunny Quartz -botania.page.decorativeBlocks16=A few blocks can be organized in methods different than normal to create new building blocks, such as &1Reed Blocks&0, &1Thatch&0, &1Roof Tiles&0 and a few new &1Bricks&0.
All these also can be crafted into both stairs and slabs. +botania.page.decorativeBlocks16=A few blocks can be organized in methods different than normal to create new building blocks, such as &1Roof Tiles&0 and a few new &1Bricks&0.
All these also can be crafted into both stairs and slabs. botania.page.decorativeBlocks17=Crafting &1Reed Blocks&0 botania.page.decorativeBlocks18=Crafting &1Thatch&0 botania.page.decorativeBlocks19=Crafting &1Roof Tiles&0 diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_ES.lang index a327a1ba5..e3991ee05 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_ES.lang @@ -2819,7 +2819,7 @@ botania.page.decorativeBlocks13=Cuarzo de blaze botania.page.decorativeBlocks14=Cuarzo lavanda botania.page.decorativeBlocks15=Cuarzo rojo botania.page.decorativeBlocks23=Cuarzo solar -botania.page.decorativeBlocks16=Algunos bloques se pueden organizar en formas diferentes a la normal para crear nuevos bloques de construcción, tales como &1boques de caña&0, &1paja entrelazada&0, &1tejas&0 algunos &1ladrillos&0 nuevos.
Todos estos pueden se transformados tanto en escaleras como en losas. +botania.page.decorativeBlocks16=Algunos bloques se pueden organizar en formas diferentes a la normal para crear nuevos bloques de construcción, tales como &1tejas&0 algunos &1ladrillos&0 nuevos.
Todos estos pueden se transformados tanto en escaleras como en losas. botania.page.decorativeBlocks17=Creando &1bloque de caña&0 botania.page.decorativeBlocks18=Creando &1bloque de paja&0 botania.page.decorativeBlocks19=Creando &1tejas&0 diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_JP.lang index 41130c8fd..afe831641 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_JP.lang @@ -1878,7 +1878,7 @@ botania.page.decorativeBlocks13=ブレイズクォーツ botania.page.decorativeBlocks14=ラベンダークォーツ botania.page.decorativeBlocks15=レッドクォーツ botania.page.decorativeBlocks23=サニークォーツ -botania.page.decorativeBlocks16=いくつかのブロックは、新 しい建材ブロックを作るた めに、通常と異なる方法で 編成できる。例えば、&1サト ウキビブロック&0、&1わらぶき ブロック&0、&1屋根瓦&0、そして いくつかの新しい&1レンガ&0。
これらは全て、階段とハー フブロックに加工すること もできる。 +botania.page.decorativeBlocks16=いくつかのブロックは、新 しい建材ブロックを作るた めに、通常と異なる方法で 編成できる。例えば、&1屋根瓦&0、そして いくつかの新しい&1レンガ&0。
これらは全て、階段とハー フブロックに加工すること もできる。 botania.page.decorativeBlocks17=&1サトウキビブロック&0の作り 方 botania.page.decorativeBlocks18=&1わらぶきブロック&0の作り方 botania.page.decorativeBlocks19=&1屋根瓦&0の作り方 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_NL.lang index 0b01c62b6..4b526c527 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_NL.lang @@ -3476,7 +3476,7 @@ botania.page.decorativeBlocks13=Schijnend Kwarts botania.page.decorativeBlocks14=Lavendel Kwarts botania.page.decorativeBlocks15=Rood Kwarts botania.page.decorativeBlocks23=Zonnig Kwarts -botania.page.decorativeBlocks16=Enkele blokken kunnen op afwijkende manieren worden georganiseerd om nieuwe bouwblokken te verkrijgen, zoals &1Rietblokken&0, &1Rietbedekking&0, &1Dakpannen&0 en enkele nieuwe &1Bakstenen&0.
Al deze kunnen ook worden vervaardigd tot Trappen en Platen. +botania.page.decorativeBlocks16=Enkele blokken kunnen op afwijkende manieren worden georganiseerd om nieuwe bouwblokken te verkrijgen, zoals &1Dakpannen&0 en enkele nieuwe &1Bakstenen&0.
Al deze kunnen ook worden vervaardigd tot Trappen en Platen. botania.page.decorativeBlocks17=Het vervaardigen van &1Rietblokken&0 botania.page.decorativeBlocks18=Het vervaardigen van &1Rietbedekking&0 botania.page.decorativeBlocks19=Het vervaardigen van &1Dakpannen&0 diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_RU.lang index 3233b26df..d4e3ef3dd 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_RU.lang @@ -1619,7 +1619,7 @@ botania.page.decorativeBlocks12=Манакварц botania.page.decorativeBlocks13=Пламенный кварц botania.page.decorativeBlocks14=Лавандовый кварц botania.page.decorativeBlocks15=Красный кварц -botania.page.decorativeBlocks16=Некоторые блоки могут быть созданы по особым рецептам, для создания новых строительных блоков. Это &1Тростниковый блок&0, &1Солома&0, &1Черепица&0 и несколько новых видов &1кирпича&0.
Все они могут быть преобразованы в ступени или плиты. +botania.page.decorativeBlocks16=Некоторые блоки могут быть созданы по особым рецептам, для создания новых строительных блоков. Это &1Черепица&0 и несколько новых видов &1кирпича&0.
Все они могут быть преобразованы в ступени или плиты. botania.page.decorativeBlocks17=Изготовление &1Тростникового блока&0 botania.page.decorativeBlocks18=Изготовление &1Соломы&0 botania.page.decorativeBlocks19=Изготовление &1Черепицы&0 diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index 54b43b65a..ac76edbe0 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -3672,7 +3672,7 @@ botania.page.decorativeBlocks13=烈焰石英 botania.page.decorativeBlocks14=熏香石英 botania.page.decorativeBlocks15=红色石英 botania.page.decorativeBlocks23=金黄石英 -botania.page.decorativeBlocks16=少数方块能用不同于平常的 方法制作成新的建筑方块,例 如&1甘蔗块&0,&1茅草块&0,&1瓦块&0和一 些新的&1砖块&0.
它们都能做成台阶和楼梯. +botania.page.decorativeBlocks16=少数方块能用不同于平常的 方法制作成新的建筑方块,例 如&1瓦块&0和一 些新的&1砖块&0.
它们都能做成台阶和楼梯. botania.page.decorativeBlocks17=合成&1甘蔗块&0 botania.page.decorativeBlocks18=合成&1茅草块&0 botania.page.decorativeBlocks19=合成&1瓦块&0 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index 259960665..c6b684065 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -3608,7 +3608,7 @@ botania.page.decorativeBlocks13=烈焰石英 botania.page.decorativeBlocks14=熏香石英 botania.page.decorativeBlocks15=紅色石英 botania.page.decorativeBlocks23=金黃石英 -botania.page.decorativeBlocks16=少數方塊能用不同於平常的 方法製作成新的建築方塊,例 如&1甘蔗塊&0,&1茅草塊&0,&1瓦塊&0和一 些新的&1磚塊&0.
它們都能做成半磚和階梯. +botania.page.decorativeBlocks16=少數方塊能用不同於平常的 方法製作成新的建築方塊,例 如&1瓦塊&0和一 些新的&1磚塊&0.
它們都能做成半磚和階梯. botania.page.decorativeBlocks17=合成&1甘蔗塊&0 botania.page.decorativeBlocks18=合成&1茅草塊&0 botania.page.decorativeBlocks19=合成&1瓦塊&0