diff --git a/contributors.properties b/contributors.properties index 36e6a04d4..484396592 100644 --- a/contributors.properties +++ b/contributors.properties @@ -29,9 +29,12 @@ evrlost=10 belathus=1 vicceyr=0 superfortress=3 -nematrec=10 +nematrec=15 pika_craft=3 lanman14444=13 noclassdeffound=9 emba=0 jordsta95=6 +kei_kouma=15 +megatronp=15 +thorantin=6 diff --git a/src/api/java/buildcraft/api/core/BCLog.java b/src/api/java/buildcraft/api/core/BCLog.java index 4e5eada55..7f2896de1 100644 --- a/src/api/java/buildcraft/api/core/BCLog.java +++ b/src/api/java/buildcraft/api/core/BCLog.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -27,7 +27,7 @@ public final class BCLog { public static void initLog() { logger.info("Starting BuildCraft " + getVersion()); - logger.info("Copyright (c) SpaceToad, 2011-2014"); + logger.info("Copyright (c) SpaceToad, 2011-2015"); logger.info("http://www.mod-buildcraft.com"); } diff --git a/src/api/java/buildcraft/api/core/BlockIndex.java b/src/api/java/buildcraft/api/core/BlockIndex.java index 87599bfa4..8c295fa8f 100644 --- a/src/api/java/buildcraft/api/core/BlockIndex.java +++ b/src/api/java/buildcraft/api/core/BlockIndex.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -15,7 +15,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; /** - * This class is a comparable container for block positions. TODO: should this be merged with position? + * This class is a comparable container for integer block positions. */ public class BlockIndex implements Comparable { @@ -99,7 +99,7 @@ public class BlockIndex implements Comparable { return b.x == x && b.y == y && b.z == z; } - return super.equals(obj); + return false; } @Override diff --git a/src/api/java/buildcraft/api/core/BlockMetaPair.java b/src/api/java/buildcraft/api/core/BlockMetaPair.java deleted file mode 100644 index d83c1da8e..000000000 --- a/src/api/java/buildcraft/api/core/BlockMetaPair.java +++ /dev/null @@ -1,53 +0,0 @@ -package buildcraft.api.core; - -import net.minecraft.block.Block; -import net.minecraftforge.oredict.OreDictionary; - -public class BlockMetaPair implements Comparable { - private int id, meta; - - public BlockMetaPair(Block block, int meta) { - this.id = Block.getIdFromBlock(block); - this.meta = meta; - } - - public Block getBlock() { - return Block.getBlockById(id); - } - - public int meta() { - return meta; - } - - @Override - public int hashCode() { - return 17 * meta + id; - } - - @Override - public boolean equals(Object other) { - if (other == null || !(other instanceof BlockMetaPair)) { - return false; - } - - return ((BlockMetaPair) other).id == id && ((BlockMetaPair) other).meta == meta; - } - - @Override - public int compareTo(BlockMetaPair arg) { - if (arg.id != id) { - return (id - arg.id) * 16; - } else { - return meta - arg.meta; - } - } - - @Override - public String toString() { - if (this.getBlock() == null) { - return "invalid"; - } - - return Block.blockRegistry.getNameForObject(this.getBlock()) + ":" + (this.meta == OreDictionary.WILDCARD_VALUE ? "*" : this.meta); - } -} diff --git a/src/api/java/buildcraft/api/core/BuildCraftAPI.java b/src/api/java/buildcraft/api/core/BuildCraftAPI.java index ce99d7ce6..9cb0b07e2 100644 --- a/src/api/java/buildcraft/api/core/BuildCraftAPI.java +++ b/src/api/java/buildcraft/api/core/BuildCraftAPI.java @@ -1,13 +1,14 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; +import java.util.HashMap; import java.util.HashSet; import java.util.Set; @@ -19,16 +20,7 @@ public final class BuildCraftAPI { public static ICoreProxy proxy; public static final Set softBlocks = new HashSet(); - - public static IWorldProperty isSoftProperty; - public static IWorldProperty isWoodProperty; - public static IWorldProperty isLeavesProperty; - public static IWorldProperty[] isOreProperty; - public static IWorldProperty isHarvestableProperty; - public static IWorldProperty isFarmlandProperty; - public static IWorldProperty isDirtProperty; - public static IWorldProperty isShoveled; - public static IWorldProperty isFluidSource; + public static final HashMap worldProperties = new HashMap(); /** * Deactivate constructor @@ -36,7 +28,18 @@ public final class BuildCraftAPI { private BuildCraftAPI() { } + public static IWorldProperty getWorldProperty(String name) { + return worldProperties.get(name); + } + + public static void registerWorldProperty(String name, IWorldProperty property) { + if (worldProperties.containsKey(name)) { + BCLog.logger.warn("The WorldProperty key '" + name + "' is being overidden with " + property.getClass().getSimpleName() + "!"); + } + worldProperties.put(name, property); + } + public static boolean isSoftBlock(World world, int x, int y, int z) { - return isSoftProperty.get(world, x, y, z); + return worldProperties.get("soft").get(world, x, y, z); } } diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java index 1db68c6b0..2147e7261 100644 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ b/src/api/java/buildcraft/api/core/EnumColor.java @@ -1,20 +1,18 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import java.util.Locale; import java.util.Random; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -36,6 +34,7 @@ public enum EnumColor { MAGENTA, ORANGE, WHITE; + public static final EnumColor[] VALUES = values(); public static final String[] DYES = { "dyeBlack", @@ -191,13 +190,8 @@ public enum EnumColor { return b.toString().trim(); } - @SideOnly(Side.CLIENT) - public static void registerIcons(IIconRegister iconRegister) { - brushIcons = new IIcon[16]; - for (EnumColor c : values()) { - brushIcons[c.ordinal()] = iconRegister.registerIcon("buildcraft:triggers/color_" - + c.name().toLowerCase(Locale.ENGLISH)); - } + public static void setIconArray(IIcon[] icons) { + brushIcons = icons; } @SideOnly(Side.CLIENT) diff --git a/src/api/java/buildcraft/api/core/IAreaProvider.java b/src/api/java/buildcraft/api/core/IAreaProvider.java index c0179caa1..4abcf6e95 100644 --- a/src/api/java/buildcraft/api/core/IAreaProvider.java +++ b/src/api/java/buildcraft/api/core/IAreaProvider.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -12,7 +12,6 @@ package buildcraft.api.core; * To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. */ public interface IAreaProvider { - int xMin(); int yMin(); @@ -29,5 +28,4 @@ public interface IAreaProvider { * Remove from the world all objects used to define the area. */ void removeFromWorld(); - } diff --git a/src/api/java/buildcraft/api/core/IBox.java b/src/api/java/buildcraft/api/core/IBox.java index 9b2798787..e1e6f7d80 100644 --- a/src/api/java/buildcraft/api/core/IBox.java +++ b/src/api/java/buildcraft/api/core/IBox.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; diff --git a/src/api/java/buildcraft/api/core/ICoreProxy.java b/src/api/java/buildcraft/api/core/ICoreProxy.java index b5132df97..272faebfd 100755 --- a/src/api/java/buildcraft/api/core/ICoreProxy.java +++ b/src/api/java/buildcraft/api/core/ICoreProxy.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; diff --git a/src/api/java/buildcraft/api/core/IIconProvider.java b/src/api/java/buildcraft/api/core/IIconProvider.java index 2734415d8..fa8657e64 100644 --- a/src/api/java/buildcraft/api/core/IIconProvider.java +++ b/src/api/java/buildcraft/api/core/IIconProvider.java @@ -1,16 +1,15 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/api/java/buildcraft/api/core/IInvSlot.java b/src/api/java/buildcraft/api/core/IInvSlot.java index ec4918ce9..ea7a7fa30 100644 --- a/src/api/java/buildcraft/api/core/IInvSlot.java +++ b/src/api/java/buildcraft/api/core/IInvSlot.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -22,6 +22,8 @@ public interface IInvSlot { boolean canTakeStackFromSlot(ItemStack stack); + boolean isItemValidForSlot(ItemStack stack); + ItemStack decreaseStackInSlot(int amount); ItemStack getStackInSlot(); diff --git a/src/api/java/buildcraft/api/core/INBTStoreable.java b/src/api/java/buildcraft/api/core/INBTStoreable.java new file mode 100644 index 000000000..669eed33c --- /dev/null +++ b/src/api/java/buildcraft/api/core/INBTStoreable.java @@ -0,0 +1,8 @@ +package buildcraft.api.core; + +import net.minecraft.nbt.NBTTagCompound; + +public interface INBTStoreable { + void readFromNBT(NBTTagCompound tag); + void writeToNBT(NBTTagCompound tag); +} diff --git a/src/api/java/buildcraft/api/core/IPathProvider.java b/src/api/java/buildcraft/api/core/IPathProvider.java new file mode 100644 index 000000000..2ff392a92 --- /dev/null +++ b/src/api/java/buildcraft/api/core/IPathProvider.java @@ -0,0 +1,10 @@ +package buildcraft.api.core; + +import java.util.List; + +/** + * To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. + */ +public interface IPathProvider { + List getPath(); +} diff --git a/src/api/java/buildcraft/api/core/ISerializable.java b/src/api/java/buildcraft/api/core/ISerializable.java new file mode 100644 index 000000000..a7d011ebb --- /dev/null +++ b/src/api/java/buildcraft/api/core/ISerializable.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.core; + +import io.netty.buffer.ByteBuf; + +/** + * Implemented by classes representing serializable packet state + */ +public interface ISerializable { + /** + * Serializes the state to the stream + * + * @param data + */ + void writeData(ByteBuf data); + + /** + * Deserializes the state from the stream + * + * @param data + */ + void readData(ByteBuf data); +} diff --git a/src/api/java/buildcraft/api/core/IWorldProperty.java b/src/api/java/buildcraft/api/core/IWorldProperty.java index 4a900c621..a55bef1fc 100755 --- a/src/api/java/buildcraft/api/core/IWorldProperty.java +++ b/src/api/java/buildcraft/api/core/IWorldProperty.java @@ -1,17 +1,16 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; import net.minecraft.world.World; public interface IWorldProperty { - boolean get(World world, int x, int y, int z); void clear(); diff --git a/src/api/java/buildcraft/api/core/IZone.java b/src/api/java/buildcraft/api/core/IZone.java index a34bfd129..55ef4f80e 100755 --- a/src/api/java/buildcraft/api/core/IZone.java +++ b/src/api/java/buildcraft/api/core/IZone.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -14,6 +14,8 @@ public interface IZone { double distanceTo(BlockIndex index); + double distanceToSquared(BlockIndex index); + boolean contains(double x, double y, double z); BlockIndex getRandomBlockIndex(Random rand); diff --git a/src/api/java/buildcraft/api/core/JavaTools.java b/src/api/java/buildcraft/api/core/JavaTools.java index e83a717df..e8dd4d898 100755 --- a/src/api/java/buildcraft/api/core/JavaTools.java +++ b/src/api/java/buildcraft/api/core/JavaTools.java @@ -1,25 +1,20 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; -import java.lang.reflect.Array; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; -public class JavaTools { - public static double bounds(double value, double min, double max) { - return Math.max(min, Math.min(value, max)); +public final class JavaTools { + private JavaTools(){ + } - + public static T[] concat(T[] first, T[] second) { T[] result = Arrays.copyOf(first, first.length + second.length); System.arraycopy(second, 0, result, first.length, second.length); @@ -38,50 +33,6 @@ public class JavaTools { return result; } - public T[] concatenate (T[] a, T[] b) { - int aLen = a.length; - int bLen = b.length; - - @SuppressWarnings("unchecked") - T[] c = (T[]) Array.newInstance(a.getClass().getComponentType(), aLen + bLen); - System.arraycopy(a, 0, c, 0, aLen); - System.arraycopy(b, 0, c, aLen, bLen); - - return c; - } - - public static List getAllFields(Class clas) { - List result = new ArrayList(); - - Class current = clas; - - while (current != null && current != Object.class) { - for (Field f : current.getDeclaredFields()) { - result.add(f); - } - - current = current.getSuperclass(); - } - - return result; - } - - public static List getAllMethods(Class clas) { - List result = new ArrayList(); - - Class current = clas; - - while (current != null && current != Object.class) { - for (Method m : current.getDeclaredMethods()) { - result.add(m); - } - - current = current.getSuperclass(); - } - - return result; - } - public static String surroundWithQuotes(String stringToSurroundWithQuotes) { return String.format("\"%s\"", stringToSurroundWithQuotes); } diff --git a/src/api/java/buildcraft/api/core/NetworkData.java b/src/api/java/buildcraft/api/core/NetworkData.java deleted file mode 100644 index 5198f36d3..000000000 --- a/src/api/java/buildcraft/api/core/NetworkData.java +++ /dev/null @@ -1,19 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.core; - -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -@Retention(RetentionPolicy.RUNTIME) -@Inherited -public @interface NetworkData { - -} diff --git a/src/api/java/buildcraft/api/core/Position.java b/src/api/java/buildcraft/api/core/Position.java index 4d9a7ea90..426e09f40 100644 --- a/src/api/java/buildcraft/api/core/Position.java +++ b/src/api/java/buildcraft/api/core/Position.java @@ -1,24 +1,22 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; +import io.netty.buffer.ByteBuf; + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; - import net.minecraftforge.common.util.ForgeDirection; -public class Position { +public class Position implements ISerializable { - @NetworkData public double x, y, z; - - @NetworkData public ForgeDirection orientation; public Position() { @@ -178,4 +176,25 @@ public class Position { return !(sqrDis > f * f); } + + @Override + public void readData(ByteBuf stream) { + x = stream.readDouble(); + y = stream.readDouble(); + z = stream.readDouble(); + orientation = ForgeDirection.getOrientation(stream.readByte()); + } + + @Override + public void writeData(ByteBuf stream) { + stream.writeDouble(x); + stream.writeDouble(y); + stream.writeDouble(z); + stream.writeByte(orientation.ordinal()); + } + + @Override + public int hashCode() { + return (51 * (int) x) + (13 * (int) y) + (int) z; + } } diff --git a/src/api/java/buildcraft/api/core/SafeTimeTracker.java b/src/api/java/buildcraft/api/core/SafeTimeTracker.java index 9b60b86ec..3e56ee989 100644 --- a/src/api/java/buildcraft/api/core/SafeTimeTracker.java +++ b/src/api/java/buildcraft/api/core/SafeTimeTracker.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -82,4 +82,4 @@ public class SafeTimeTracker { public void markTime(World world) { lastMark = world.getTotalWorldTime(); } -} +} \ No newline at end of file diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java index 092c173f0..776aaafdf 100644 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ b/src/api/java/buildcraft/api/core/StackKey.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.core; @@ -87,7 +87,7 @@ public final class StackKey { } } if (fluidStack != null) { - if (fluidStack.fluidID != k.fluidStack.fluidID || + if (fluidStack.getFluid().getID() != k.fluidStack.getFluid().getID() || fluidStack.amount != k.fluidStack.amount || !objectsEqual(fluidStack.tag, k.fluidStack.tag)) { return false; @@ -106,7 +106,7 @@ public final class StackKey { } result = 31 * result + 7; if (fluidStack != null) { - result = 31 * result + fluidStack.fluidID; + result = 31 * result + fluidStack.getFluid().getID(); result = 31 * result + fluidStack.amount; result = 31 * result + objectHashCode(fluidStack.tag); } diff --git a/src/api/java/buildcraft/api/core/WorldBlockIndex.java b/src/api/java/buildcraft/api/core/WorldBlockIndex.java deleted file mode 100755 index aedbeaf58..000000000 --- a/src/api/java/buildcraft/api/core/WorldBlockIndex.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.core; - -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; - -/** - * This class is a comparable container for block positions. TODO: should this be merged with position? - */ -public class WorldBlockIndex implements Comparable { - - public int x; - public int y; - public int z; - public int dimension; - - public WorldBlockIndex() { - - } - - /** - * Creates an index for a block located on x, y. z - */ - public WorldBlockIndex(World world, int x, int y, int z) { - - dimension = world.provider.dimensionId; - this.x = x; - this.y = y; - this.z = z; - } - - public WorldBlockIndex(NBTTagCompound c) { - dimension = c.getInteger("dimension"); - x = c.getInteger("x"); - y = c.getInteger("y"); - z = c.getInteger("z"); - } - - public WorldBlockIndex(Entity entity) { - dimension = entity.worldObj.provider.dimensionId; - x = (int) Math.floor(entity.posX); - y = (int) Math.floor(entity.posY); - z = (int) Math.floor(entity.posZ); - } - - /** - * Provides a deterministic and complete ordering of block positions. - */ - @Override - public int compareTo(WorldBlockIndex o) { - - if (o.dimension < dimension) { - return 1; - } else if (o.dimension > dimension) { - return -1; - } else if (o.x < x) { - return 1; - } else if (o.x > x) { - return -1; - } else if (o.z < z) { - return 1; - } else if (o.z > z) { - return -1; - } else if (o.y < y) { - return 1; - } else if (o.y > y) { - return -1; - } else { - return 0; - } - } - - public void writeTo(NBTTagCompound c) { - c.setInteger("dimension", dimension); - c.setInteger("x", x); - c.setInteger("y", y); - c.setInteger("z", z); - } - - @Override - public String toString() { - return "{" + dimension + ":" + x + ", " + y + ", " + z + "}"; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof WorldBlockIndex) { - WorldBlockIndex b = (WorldBlockIndex) obj; - - return b.dimension == dimension && b.x == x && b.y == y && b.z == z; - } - - return super.equals(obj); - } - - @Override - public int hashCode() { - return (dimension * 37 + (x * 37 + y)) * 37 + z; - } -} diff --git a/src/api/java/buildcraft/api/core/package-info.java b/src/api/java/buildcraft/api/core/package-info.java index 5bc4a2fa9..0fc4db4cc 100644 --- a/src/api/java/buildcraft/api/core/package-info.java +++ b/src/api/java/buildcraft/api/core/package-info.java @@ -1,11 +1,12 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "1.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") +@API(apiVersion = "1.5", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") package buildcraft.api.core; import cpw.mods.fml.common.API; + diff --git a/src/api/java/buildcraft/api/core/render/ICullable.java b/src/api/java/buildcraft/api/core/render/ICullable.java new file mode 100644 index 000000000..b800c0851 --- /dev/null +++ b/src/api/java/buildcraft/api/core/render/ICullable.java @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.core.render; + +import net.minecraft.world.IBlockAccess; +import net.minecraftforge.common.util.ForgeDirection; + +/* + * This interface designates a block as a state machine responsible for culling + * For implementation details look into FakeBlock implementation + */ +public interface ICullable { + + //Side Rendering States + //They are used to effectively cull obstructed sides while processing facades. + //Make sure your implementation is correct otherwise expect FPS drop + + void setRenderSide(ForgeDirection side, boolean render); + + void setRenderAllSides(); + + boolean shouldSideBeRendered(IBlockAccess blockAccess, int x, int y, int z, int side); + + void setRenderMask(int mask); + +} diff --git a/src/api/java/buildcraft/api/core/render/ITextureStateManager.java b/src/api/java/buildcraft/api/core/render/ITextureStateManager.java new file mode 100644 index 000000000..8161d6b93 --- /dev/null +++ b/src/api/java/buildcraft/api/core/render/ITextureStateManager.java @@ -0,0 +1,7 @@ +package buildcraft.api.core.render; + +import net.minecraft.util.IIcon; + +public interface ITextureStateManager { + void set(IIcon icon); +} diff --git a/src/api/java/buildcraft/api/core/render/ITextureStates.java b/src/api/java/buildcraft/api/core/render/ITextureStates.java new file mode 100644 index 000000000..835caf7fe --- /dev/null +++ b/src/api/java/buildcraft/api/core/render/ITextureStates.java @@ -0,0 +1,22 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.core.render; + +import net.minecraft.block.Block; +import net.minecraft.util.IIcon; + +public interface ITextureStates extends ICullable { + + ITextureStateManager getTextureState(); + + IIcon getIcon(int side, int meta); + + Block getBlock(); + +} diff --git a/src/api/java/buildcraft/api/gates/GateExpansionController.java b/src/api/java/buildcraft/api/gates/GateExpansionController.java index 5a9eca25d..e37ae20a5 100644 --- a/src/api/java/buildcraft/api/gates/GateExpansionController.java +++ b/src/api/java/buildcraft/api/gates/GateExpansionController.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; @@ -42,7 +42,7 @@ public abstract class GateExpansionController { public void startResolution() { } - public boolean resolveAction(IStatement action) { + public boolean resolveAction(IStatement action, int count) { return false; } diff --git a/src/api/java/buildcraft/api/gates/GateExpansions.java b/src/api/java/buildcraft/api/gates/GateExpansions.java index c94b9b729..bc667f58e 100644 --- a/src/api/java/buildcraft/api/gates/GateExpansions.java +++ b/src/api/java/buildcraft/api/gates/GateExpansions.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; @@ -14,10 +14,14 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -public final class GateExpansions { +import com.google.common.collect.HashBiMap; +import net.minecraft.item.ItemStack; + +public final class GateExpansions { private static final Map expansions = new HashMap(); private static final ArrayList expansionIDs = new ArrayList(); + private static final Map recipes = HashBiMap.create(); private GateExpansions() { } @@ -31,6 +35,11 @@ public final class GateExpansions { expansionIDs.add(expansion); } + public static void registerExpansion(IGateExpansion expansion, ItemStack addedRecipe) { + registerExpansion(expansion.getUniqueIdentifier(), expansion); + recipes.put(expansion, addedRecipe); + } + public static IGateExpansion getExpansion(String identifier) { return expansions.get(identifier); } @@ -40,6 +49,10 @@ public final class GateExpansions { set.addAll(expansionIDs); return set; } + + public static Map getRecipesForPostInit() { + return recipes; + } // The code below is used by networking. diff --git a/src/api/java/buildcraft/api/gates/IGate.java b/src/api/java/buildcraft/api/gates/IGate.java index 2018cb441..6127caadb 100644 --- a/src/api/java/buildcraft/api/gates/IGate.java +++ b/src/api/java/buildcraft/api/gates/IGate.java @@ -1,22 +1,32 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; -import net.minecraftforge.common.util.ForgeDirection; +import java.util.List; +import buildcraft.api.statements.IStatement; +import buildcraft.api.statements.IStatementParameter; +import buildcraft.api.statements.StatementSlot; +import buildcraft.api.statements.containers.ISidedStatementContainer; import buildcraft.api.transport.IPipe; -public interface IGate { +public interface IGate extends ISidedStatementContainer { @Deprecated void setPulsing(boolean pulse); - - ForgeDirection getSide(); IPipe getPipe(); + + List getTriggers(); + List getActions(); + + List getActiveActions(); + + List getTriggerParameters(int index); + List getActionParameters(int index); } diff --git a/src/api/java/buildcraft/api/gates/IGateExpansion.java b/src/api/java/buildcraft/api/gates/IGateExpansion.java index 361f0a4dd..ad61fad66 100644 --- a/src/api/java/buildcraft/api/gates/IGateExpansion.java +++ b/src/api/java/buildcraft/api/gates/IGateExpansion.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.gates; diff --git a/src/api/java/buildcraft/api/gates/package-info.java b/src/api/java/buildcraft/api/gates/package-info.java index 067e6edcf..83cb2a2c4 100644 --- a/src/api/java/buildcraft/api/gates/package-info.java +++ b/src/api/java/buildcraft/api/gates/package-info.java @@ -1,12 +1,12 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "3.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|gates") +@API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|gates") package buildcraft.api.gates; import cpw.mods.fml.common.API; diff --git a/src/api/java/buildcraft/api/statements/ActionState.java b/src/api/java/buildcraft/api/statements/ActionState.java index 1a30beb4e..72e4d58ba 100755 --- a/src/api/java/buildcraft/api/statements/ActionState.java +++ b/src/api/java/buildcraft/api/statements/ActionState.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/IActionExternal.java b/src/api/java/buildcraft/api/statements/IActionExternal.java index 6bb0ad1bf..1d6e2eb54 100644 --- a/src/api/java/buildcraft/api/statements/IActionExternal.java +++ b/src/api/java/buildcraft/api/statements/IActionExternal.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; @@ -12,7 +12,5 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; public interface IActionExternal extends IStatement { - void actionActivate(TileEntity target, ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters); - } diff --git a/src/api/java/buildcraft/api/statements/IActionInternal.java b/src/api/java/buildcraft/api/statements/IActionInternal.java index 21f2c7f86..6a019a459 100644 --- a/src/api/java/buildcraft/api/statements/IActionInternal.java +++ b/src/api/java/buildcraft/api/statements/IActionInternal.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/IActionProvider.java b/src/api/java/buildcraft/api/statements/IActionProvider.java index 761156f80..147d4d39d 100644 --- a/src/api/java/buildcraft/api/statements/IActionProvider.java +++ b/src/api/java/buildcraft/api/statements/IActionProvider.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/IActionReceptor.java b/src/api/java/buildcraft/api/statements/IActionReceptor.java index f4ef4968b..db7cea027 100644 --- a/src/api/java/buildcraft/api/statements/IActionReceptor.java +++ b/src/api/java/buildcraft/api/statements/IActionReceptor.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java b/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java index 22d86ebc6..c9c7db8ed 100644 --- a/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java +++ b/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/IStatement.java b/src/api/java/buildcraft/api/statements/IStatement.java index a05824d66..e466efd2b 100644 --- a/src/api/java/buildcraft/api/statements/IStatement.java +++ b/src/api/java/buildcraft/api/statements/IStatement.java @@ -1,24 +1,22 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public interface IStatement { - /** - * Every trigger needs a unique tag, it should be in the format of - * ":". + * Every statement needs a unique tag, it should be in the format of + * "<modid>:<name>. * * @return the unique id */ @@ -31,27 +29,27 @@ public interface IStatement { void registerIcons(IIconRegister iconRegister); /** - * Return the maximum number of parameter this trigger can have, 0 if none. + * Return the maximum number of parameter this statement can have, 0 if none. */ int maxParameters(); /** - * Return the minimum number of parameter this trigger can have, 0 if none. + * Return the minimum number of parameter this statement can have, 0 if none. */ int minParameters(); /** - * Return the trigger description in the UI + * Return the statement description in the UI */ String getDescription(); /** - * Create parameters for the trigger. + * Create parameters for the statement. */ IStatementParameter createParameter(int index); /** - * This returns the trigger after a left rotation. Used in particular in + * This returns the statement after a left rotation. Used in particular in * blueprints orientation. */ IStatement rotateLeft(); diff --git a/src/api/java/buildcraft/api/statements/IStatementContainer.java b/src/api/java/buildcraft/api/statements/IStatementContainer.java index f258b3416..43a4f51ef 100644 --- a/src/api/java/buildcraft/api/statements/IStatementContainer.java +++ b/src/api/java/buildcraft/api/statements/IStatementContainer.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/IStatementParameter.java b/src/api/java/buildcraft/api/statements/IStatementParameter.java index 0bbc3dcb0..9a9e397cd 100755 --- a/src/api/java/buildcraft/api/statements/IStatementParameter.java +++ b/src/api/java/buildcraft/api/statements/IStatementParameter.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; @@ -12,7 +12,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -20,7 +19,7 @@ public interface IStatementParameter { /** * Every parameter needs a unique tag, it should be in the format of - * ":". + * "<modi>:<name>". * * @return the unique id */ diff --git a/src/api/java/buildcraft/api/statements/ITriggerExternal.java b/src/api/java/buildcraft/api/statements/ITriggerExternal.java index 9167761c4..532f67a5f 100644 --- a/src/api/java/buildcraft/api/statements/ITriggerExternal.java +++ b/src/api/java/buildcraft/api/statements/ITriggerExternal.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java b/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java new file mode 100644 index 000000000..7103c06ac --- /dev/null +++ b/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java @@ -0,0 +1,17 @@ +package buildcraft.api.statements; + +import net.minecraftforge.common.util.ForgeDirection; + +/** + * This interface can be used by tiles to override external trigger + * behaviour. + * + * Please use wisely. + */ +public interface ITriggerExternalOverride { + public enum Result { + TRUE, FALSE, IGNORE + } + + Result override(ForgeDirection side, IStatementContainer source, IStatementParameter[] parameters); +} diff --git a/src/api/java/buildcraft/api/statements/ITriggerInternal.java b/src/api/java/buildcraft/api/statements/ITriggerInternal.java index 750331b5a..a4241d3da 100755 --- a/src/api/java/buildcraft/api/statements/ITriggerInternal.java +++ b/src/api/java/buildcraft/api/statements/ITriggerInternal.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/ITriggerProvider.java b/src/api/java/buildcraft/api/statements/ITriggerProvider.java index 92c154218..548f107bf 100644 --- a/src/api/java/buildcraft/api/statements/ITriggerProvider.java +++ b/src/api/java/buildcraft/api/statements/ITriggerProvider.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/StatementManager.java b/src/api/java/buildcraft/api/statements/StatementManager.java index 5718dc3b1..fec7d9510 100644 --- a/src/api/java/buildcraft/api/statements/StatementManager.java +++ b/src/api/java/buildcraft/api/statements/StatementManager.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; @@ -92,6 +92,8 @@ public final class StatementManager { result = ((IOverrideDefaultStatements) entity).overrideActions(); if (result != null) { return result; + } else { + result = new LinkedList(); } } diff --git a/src/api/java/buildcraft/api/statements/StatementMouseClick.java b/src/api/java/buildcraft/api/statements/StatementMouseClick.java index d48ade5cd..54688ebb8 100644 --- a/src/api/java/buildcraft/api/statements/StatementMouseClick.java +++ b/src/api/java/buildcraft/api/statements/StatementMouseClick.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; diff --git a/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java b/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java index 02c796dbe..3bccda5d3 100755 --- a/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java +++ b/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java @@ -1,13 +1,12 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.statements; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -32,6 +31,8 @@ public class StatementParameterItemStack implements IStatementParameter { if (stack != null) { this.stack = stack.copy(); this.stack.stackSize = 1; + } else { + this.stack = null; } } diff --git a/src/api/java/buildcraft/api/statements/StatementSlot.java b/src/api/java/buildcraft/api/statements/StatementSlot.java new file mode 100644 index 000000000..6d8c1c2ce --- /dev/null +++ b/src/api/java/buildcraft/api/statements/StatementSlot.java @@ -0,0 +1,36 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.statements; + +public class StatementSlot { + public IStatement statement; + public IStatementParameter[] parameters; + + @Override + public boolean equals(Object o) { + if (o == null || !(o instanceof StatementSlot)) { + return false; + } + StatementSlot s = (StatementSlot) o; + if (s.statement != statement || parameters.length != s.parameters.length) { + return false; + } + for (int i = 0; i < parameters.length; i++) { + IStatementParameter p1 = parameters[i]; + IStatementParameter p2 = s.parameters[i]; + if (p1 == null && p2 != null) { + return false; + } + if (!(p1.equals(p2))) { + return false; + } + } + return true; + } +} diff --git a/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java b/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java new file mode 100644 index 000000000..0856041cb --- /dev/null +++ b/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java @@ -0,0 +1,19 @@ +package buildcraft.api.statements.containers; + +import net.minecraftforge.common.util.ForgeDirection; + +public interface IRedstoneStatementContainer { + /** + * Get the redstone input from a given side. + * @param side The side - use "UNKNOWN" for maximum input. + * @return The redstone input, from 0 to 15. + */ + int getRedstoneInput(ForgeDirection side); + + /** + * Set the redstone input for a given side. + * @param side The side - use "UNKNOWN" for all sides. + * @return Whether the set was successful. + */ + boolean setRedstoneOutput(ForgeDirection side, int value); +} diff --git a/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java b/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java new file mode 100644 index 000000000..6262bf2f8 --- /dev/null +++ b/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java @@ -0,0 +1,12 @@ +package buildcraft.api.statements.containers; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.statements.IStatementContainer; + +/** + * Created by asie on 3/14/15. + */ +public interface ISidedStatementContainer extends IStatementContainer { + ForgeDirection getSide(); +} diff --git a/src/api/java/buildcraft/api/statements/package-info.java b/src/api/java/buildcraft/api/statements/package-info.java index 94d36f68e..ed7613ea2 100644 --- a/src/api/java/buildcraft/api/statements/package-info.java +++ b/src/api/java/buildcraft/api/statements/package-info.java @@ -1,12 +1,12 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "1.0", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|statements") +@API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|statements") package buildcraft.api.statements; import cpw.mods.fml.common.API; diff --git a/src/api/java/buildcraft/api/transport/IExtractionHandler.java b/src/api/java/buildcraft/api/transport/IExtractionHandler.java deleted file mode 100755 index 4d56659ed..000000000 --- a/src/api/java/buildcraft/api/transport/IExtractionHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.transport; - -import net.minecraft.world.World; - -/** - * Implement and register with the PipeManager if you want to suppress connections from wooden pipes. - */ -public interface IExtractionHandler { - - /** - * Can this pipe extract items from the block located at these coordinates? - * param extractor can be null - */ - boolean canExtractItems(Object extractor, World world, int i, int j, int k); - - /** - * Can this pipe extract liquids from the block located at these coordinates? - * param extractor can be null - */ - boolean canExtractFluids(Object extractor, World world, int i, int j, int k); -} diff --git a/src/api/java/buildcraft/api/transport/IInjectable.java b/src/api/java/buildcraft/api/transport/IInjectable.java new file mode 100644 index 000000000..6a05a688a --- /dev/null +++ b/src/api/java/buildcraft/api/transport/IInjectable.java @@ -0,0 +1,23 @@ +package buildcraft.api.transport; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.core.EnumColor; + +public interface IInjectable { + boolean canInjectItems(ForgeDirection from); + + /** + * Offers an ItemStack for 3addition to the pipe. Will be rejected if the + * pipe doesn't accept items from that side. + * + * @param stack ItemStack offered for addition. Do not manipulate this! + * @param doAdd If false no actual addition should take place. Implementors + * should simulate. + * @param from Orientation the ItemStack is offered from. + * @param color The color of the item to be added to the pipe, or null for no color. + * @return Amount of items used from the passed stack. + */ + int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); +} diff --git a/src/api/java/buildcraft/api/transport/IItemPipe.java b/src/api/java/buildcraft/api/transport/IItemPipe.java new file mode 100644 index 000000000..f5f766775 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/IItemPipe.java @@ -0,0 +1,16 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * BuildCraft is distributed under the terms of the Minecraft Mod Public + * License 1.0, or MMPL. Please check the contents of the license located in + * http://www.mod-buildcraft.com/MMPL-1.0.txt + */ +package buildcraft.api.transport; + +/** + * To be implemented by the real item pipe in Transport mod, but leaves knowledge for classes that do not have direct dependency on transport. + */ +public interface IItemPipe { + +} diff --git a/src/api/java/buildcraft/api/transport/IPipe.java b/src/api/java/buildcraft/api/transport/IPipe.java index e4a82a4c0..94b021d02 100755 --- a/src/api/java/buildcraft/api/transport/IPipe.java +++ b/src/api/java/buildcraft/api/transport/IPipe.java @@ -1,24 +1,18 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.gates.IGate; public interface IPipe { - - int x(); - - int y(); - - int z(); - IPipeTile getTile(); IGate getGate(ForgeDirection side); diff --git a/src/api/java/buildcraft/api/transport/IPipeConnection.java b/src/api/java/buildcraft/api/transport/IPipeConnection.java index 27ca26ff5..4899f24bd 100644 --- a/src/api/java/buildcraft/api/transport/IPipeConnection.java +++ b/src/api/java/buildcraft/api/transport/IPipeConnection.java @@ -1,23 +1,21 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.transport.IPipeTile.PipeType; - public interface IPipeConnection { enum ConnectOverride { CONNECT, DISCONNECT, DEFAULT - }; + } /** * Allows you to override pipe connection logic. @@ -27,5 +25,5 @@ public interface IPipeConnection { * @return CONNECT to force a connection, DISCONNECT to force no connection, * and DEFAULT to let the pipe decide. */ - ConnectOverride overridePipeConnection(PipeType type, ForgeDirection with); + ConnectOverride overridePipeConnection(IPipeTile.PipeType type, ForgeDirection with); } diff --git a/src/api/java/buildcraft/api/transport/IPipePluggable.java b/src/api/java/buildcraft/api/transport/IPipePluggable.java deleted file mode 100755 index b299d07f1..000000000 --- a/src/api/java/buildcraft/api/transport/IPipePluggable.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team - * http://www.mod-buildcraft.com - * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt - */ -package buildcraft.api.transport; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IPipePluggable { - void writeToNBT(NBTTagCompound nbt); - - void readFromNBT(NBTTagCompound nbt); - - ItemStack[] getDropItems(IPipeTile pipe); - - void onAttachedPipe(IPipeTile pipe, ForgeDirection direction); - - void onDetachedPipe(IPipeTile pipe, ForgeDirection direction); - - boolean blocking(IPipeTile pipe, ForgeDirection direction); - - void invalidate(); - - void validate(IPipeTile pipe, ForgeDirection direction); -} diff --git a/src/api/java/buildcraft/api/transport/IPipeTile.java b/src/api/java/buildcraft/api/transport/IPipeTile.java index a37db11ad..1bdd04f09 100644 --- a/src/api/java/buildcraft/api/transport/IPipeTile.java +++ b/src/api/java/buildcraft/api/transport/IPipeTile.java @@ -1,46 +1,36 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + import buildcraft.api.core.EnumColor; +import buildcraft.api.transport.pluggable.PipePluggable; -public interface IPipeTile { - - public enum PipeType { - - ITEM, FLUID, POWER, STRUCTURE; +public interface IPipeTile extends IInjectable { + enum PipeType { + ITEM, FLUID, POWER, STRUCTURE } PipeType getPipeType(); - /** - * Offers an ItemStack for addition to the pipe. Will be rejected if the - * pipe doesn't accept items from that side. - * - * @param stack ItemStack offered for addition. Do not manipulate this! - * @param doAdd If false no actual addition should take place. Implementors - * should simulate. - * @param from Orientation the ItemStack is offered from. - * @param color The color of the item to be added to the pipe, or null for no color. - * @return Amount of items used from the passed stack. - */ - int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); + World getWorld(); - /** - * Same as - * {@link #injectItem(ItemStack, boolean, ForgeDirection, EnumColor)} - * but with no color attribute. - */ - int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from); + int x(); + + int y(); + + int z(); /** * True if the pipe is connected to the block/pipe in the specific direction @@ -50,7 +40,23 @@ public interface IPipeTile { */ boolean isPipeConnected(ForgeDirection with); - TileEntity getAdjacentTile(ForgeDirection dir); + Block getNeighborBlock(ForgeDirection dir); + TileEntity getNeighborTile(ForgeDirection dir); + IPipe getNeighborPipe(ForgeDirection dir); IPipe getPipe(); + int getPipeColor(); + + PipePluggable getPipePluggable(ForgeDirection direction); // Now in IPluggableProvider + boolean hasPipePluggable(ForgeDirection direction); // Now in IPluggableProvider + boolean hasBlockingPluggable(ForgeDirection direction); + + void scheduleNeighborChange(); + void scheduleRenderUpdate(); + + // For compatibility with BC 6.2.x and below + int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from, EnumColor color); + + @Deprecated // Now in IInjectable + int injectItem(ItemStack stack, boolean doAdd, ForgeDirection from); } diff --git a/src/api/java/buildcraft/api/transport/IStripesActivator.java b/src/api/java/buildcraft/api/transport/IStripesActivator.java new file mode 100644 index 000000000..47308ae0a --- /dev/null +++ b/src/api/java/buildcraft/api/transport/IStripesActivator.java @@ -0,0 +1,17 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ +package buildcraft.api.transport; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +public interface IStripesActivator { + void sendItem(ItemStack itemStack, ForgeDirection direction); + void dropItem(ItemStack itemStack, ForgeDirection direction); +} diff --git a/src/api/java/buildcraft/api/transport/IStripesHandler.java b/src/api/java/buildcraft/api/transport/IStripesHandler.java index f8c36e364..a9cc011f6 100644 --- a/src/api/java/buildcraft/api/transport/IStripesHandler.java +++ b/src/api/java/buildcraft/api/transport/IStripesHandler.java @@ -1,3 +1,11 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ package buildcraft.api.transport; import net.minecraft.entity.player.EntityPlayer; @@ -6,7 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; public interface IStripesHandler { - public static enum StripesHandlerType { + enum StripesHandlerType { ITEM_USE, BLOCK_BREAK } @@ -16,5 +24,5 @@ public interface IStripesHandler { boolean shouldHandle(ItemStack stack); boolean handle(World world, int x, int y, int z, ForgeDirection direction, - ItemStack stack, EntityPlayer player, IStripesPipe pipe); + ItemStack stack, EntityPlayer player, IStripesActivator activator); } diff --git a/src/api/java/buildcraft/api/transport/IStripesPipe.java b/src/api/java/buildcraft/api/transport/IStripesPipe.java index e65750973..30a8452d5 100644 --- a/src/api/java/buildcraft/api/transport/IStripesPipe.java +++ b/src/api/java/buildcraft/api/transport/IStripesPipe.java @@ -1,9 +1,12 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ package buildcraft.api.transport; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -public interface IStripesPipe extends IPipe { - void sendItem(ItemStack itemStack, ForgeDirection direction); - void dropItem(ItemStack itemStack, ForgeDirection direction); +public interface IStripesPipe extends IPipe, IStripesActivator { } diff --git a/src/api/java/buildcraft/api/transport/PipeManager.java b/src/api/java/buildcraft/api/transport/PipeManager.java index 6cc0e3429..896f08210 100755 --- a/src/api/java/buildcraft/api/transport/PipeManager.java +++ b/src/api/java/buildcraft/api/transport/PipeManager.java @@ -1,54 +1,78 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; import java.util.List; +import java.util.Map; import net.minecraft.world.World; +import buildcraft.api.transport.pluggable.PipePluggable; + public abstract class PipeManager { public static List stripesHandlers = new ArrayList(); - public static List extractionHandlers = new ArrayList(); + public static ArrayList> pipePluggables = new ArrayList>(); + private static Map> pipePluggableNames = + new HashMap>(); + private static Map, String> pipePluggableByNames = + new HashMap, String>(); + private static Map stripesHandlerPriorities = + new HashMap(); - public static void registerExtractionHandler(IExtractionHandler handler) { - extractionHandlers.add(handler); - } - - public static void registerStripesHandler(IStripesHandler handler) { - stripesHandlers.add(handler); - } - - /** - * param extractor can be null - */ + @Deprecated public static boolean canExtractItems(Object extractor, World world, int i, int j, int k) { - for (IExtractionHandler handler : extractionHandlers) { - if (!handler.canExtractItems(extractor, world, i, j, k)) { - return false; - } - } - return true; } - /** - * param extractor can be null - */ + @Deprecated public static boolean canExtractFluids(Object extractor, World world, int i, int j, int k) { - for (IExtractionHandler handler : extractionHandlers) { - if (!handler.canExtractFluids(extractor, world, i, j, k)) { - return false; - } - } - return true; } + + @Deprecated + public static void registerStripesHandler(IStripesHandler handler) { + registerStripesHandler(handler, 0); + } + + /** + * Register a Stripes Pipe handler. + * @param handler The handler. + * @param priority The priority - 0 is normal, higher numbers have higher priority. + */ + public static void registerStripesHandler(IStripesHandler handler, int priority) { + stripesHandlers.add(handler); + stripesHandlerPriorities.put(handler, priority); + + Collections.sort(stripesHandlers, new Comparator() { + @Override + public int compare(IStripesHandler o1, IStripesHandler o2) { + return stripesHandlerPriorities.get(o2) - stripesHandlerPriorities.get(o1); + } + }); + } + + public static void registerPipePluggable(Class pluggable, String name) { + pipePluggables.add(pluggable); + pipePluggableNames.put(name, pluggable); + pipePluggableByNames.put(pluggable, name); + } + + public static Class getPluggableByName(String pluggableName) { + return pipePluggableNames.get(pluggableName); + } + + public static String getPluggableName(Class aClass) { + return pipePluggableByNames.get(aClass); + } } diff --git a/src/api/java/buildcraft/api/transport/PipeWire.java b/src/api/java/buildcraft/api/transport/PipeWire.java index e7551091a..eb8665e15 100644 --- a/src/api/java/buildcraft/api/transport/PipeWire.java +++ b/src/api/java/buildcraft/api/transport/PipeWire.java @@ -1,10 +1,10 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ package buildcraft.api.transport; diff --git a/src/api/java/buildcraft/api/transport/package-info.java b/src/api/java/buildcraft/api/transport/package-info.java index 414098f2a..b670143c6 100644 --- a/src/api/java/buildcraft/api/transport/package-info.java +++ b/src/api/java/buildcraft/api/transport/package-info.java @@ -1,12 +1,12 @@ /** - * Copyright (c) 2011-2014, SpaceToad and the BuildCraft Team + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team * http://www.mod-buildcraft.com * - * BuildCraft is distributed under the terms of the Minecraft Mod Public - * License 1.0, or MMPL. Please check the contents of the license located in - * http://www.mod-buildcraft.com/MMPL-1.0.txt + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. */ -@API(apiVersion = "2.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") +@API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") package buildcraft.api.transport; import cpw.mods.fml.common.API; diff --git a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java new file mode 100644 index 000000000..6289714ac --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java @@ -0,0 +1,13 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraft.block.Block; + +public interface IFacadePluggable { + Block getCurrentBlock(); + + int getCurrentMetadata(); + + boolean isTransparent(); + + boolean isHollow(); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java new file mode 100644 index 000000000..614c65ff9 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java @@ -0,0 +1,9 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.transport.IPipe; + +public interface IPipePluggableDynamicRenderer { + void renderPluggable(IPipe pipe, ForgeDirection side, PipePluggable pipePluggable, double x, double y, double z); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java new file mode 100644 index 000000000..0ac208905 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java @@ -0,0 +1,10 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.transport.IPipe; + +public interface IPipePluggableItem { + PipePluggable createPipePluggable(IPipe pipe, ForgeDirection side, ItemStack stack); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java new file mode 100644 index 000000000..2cd4bc276 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableRenderer.java @@ -0,0 +1,13 @@ +package buildcraft.api.transport.pluggable; + +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.core.render.ITextureStates; +import buildcraft.api.transport.IPipe; + +public interface IPipePluggableRenderer { + void renderPluggable(RenderBlocks renderblocks, IPipe pipe, ForgeDirection side, + PipePluggable pipePluggable, ITextureStates blockStateMachine, + int renderPass, int x, int y, int z); +} diff --git a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java new file mode 100644 index 000000000..223ce7096 --- /dev/null +++ b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java @@ -0,0 +1,67 @@ +/** + * Copyright (c) 2011-2015, SpaceToad and the BuildCraft Team + * http://www.mod-buildcraft.com + * + * The BuildCraft API is distributed under the terms of the MIT License. + * Please check the contents of the license, which should be located + * as "LICENSE.API" in the BuildCraft source code distribution. + */ +package buildcraft.api.transport.pluggable; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.common.util.ForgeDirection; + +import buildcraft.api.core.INBTStoreable; +import buildcraft.api.core.ISerializable; +import buildcraft.api.transport.IPipeTile; + +/** + * An IPipePluggable MUST have an empty constructor for client-side + * rendering! + */ +public abstract class PipePluggable implements INBTStoreable, ISerializable { + public abstract ItemStack[] getDropItems(IPipeTile pipe); + + public void update(IPipeTile pipe, ForgeDirection direction) { + + } + + public void onAttachedPipe(IPipeTile pipe, ForgeDirection direction) { + validate(pipe, direction); + } + + public void onDetachedPipe(IPipeTile pipe, ForgeDirection direction) { + invalidate(); + } + + public abstract boolean isBlocking(IPipeTile pipe, ForgeDirection direction); + + public void invalidate() { + + } + + public void validate(IPipeTile pipe, ForgeDirection direction) { + + } + + public boolean isSolidOnSide(IPipeTile pipe, ForgeDirection direction) { + return false; + } + + public abstract AxisAlignedBB getBoundingBox(ForgeDirection side); + + @SideOnly(Side.CLIENT) + public abstract IPipePluggableRenderer getRenderer(); + + @SideOnly(Side.CLIENT) + public IPipePluggableDynamicRenderer getDynamicRenderer() { + return null; + } + + public boolean requiresRenderUpdate(PipePluggable old) { + return true; + } +} diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java index 98478d5e5..0544383d5 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -45,6 +45,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona IIcon iconBases, iconFaces; IIcon iconBasesA, iconFacesA; + IIcon iconBasesB, iconFacesB; public BlockForestDrum() { super(Material.wood); @@ -88,18 +89,21 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona iconFaces = IconHelper.forBlock(par1IconRegister, this, 1); iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2); iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3); + iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4); + iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5); } @Override public void getSubBlocks(Item item, CreativeTabs tab, List list) { - for(int i = 0; i < 2; i++) + for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } @Override public IIcon getIcon(int side, int meta) { boolean animal = meta == 1; - return side < 2 ? animal ? iconBasesA : iconBases : animal ? iconFacesA : iconFaces; + boolean tree = meta == 2; + return side < 2 ? animal ? iconBasesA : tree ? iconBasesB : iconBases : animal ? iconFacesA : tree ? iconFacesB : iconFaces; } @Override @@ -109,6 +113,8 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona if(world.getBlockMetadata(x, y, z) == 0) ItemGrassHorn.breakGrass(world, 0, x, y, z); + else if(world.getBlockMetadata(x, y, z) == 2) + ItemGrassHorn.breakGrass(world, 1, x, y, z); else if(!world.isRemote) { int range = 10; List entities = world.getEntitiesWithinAABB(EntityLiving.class, AxisAlignedBB.getBoundingBox(x - range, y - range, z - range, x + range + 1, y + range + 1, z + range + 1)); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 904c16b9d..3621178c3 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -262,6 +262,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeTerraAxe; public static IRecipe recipeHourglass; public static IRecipe recipeGhostRail; + public static IRecipe recipeCanopyDrum; public static void init() { // Lexicon Recipe @@ -1752,6 +1753,14 @@ public final class ModCraftingRecipes { GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.ghostRail), new ItemStack(Blocks.rail), new ItemStack(ModBlocks.platform, 1, 1)); recipeGhostRail = BotaniaAPI.getLatestAddedRecipe(); + // Drum of the Canopy Recipe + addOreDictRecipe(new ItemStack(ModBlocks.forestDrum, 1, 2), + "WLW", "WHW", "WLW", + 'W', LibOreDict.LIVING_WOOD, + 'L', new ItemStack(Items.leather), + 'H', new ItemStack(ModItems.grassHorn, 1, 1)); + recipeCanopyDrum = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index 0c202adde..295e2648d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -160,9 +160,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName()); BlockPistonRelay.mappedPositions.put(bindPos, currentPos); BlockPistonRelay.WorldData.get(par3World).markDirty(); - - if(par3World.isRemote) - par2EntityPlayer.swingItem(); + + par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F); } return false; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 85d021d01..42d4090b2 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -116,7 +116,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC } } } - } else if(originCoords.posY == -1 && heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && player.isSneaking()) { + } else if(originCoords.posY != -1 && heldItemStack != null && event.action == Action.RIGHT_CLICK_BLOCK && lookPos != null && player.isSneaking()) { List cursors = getCursorList(lokiRing); for(ChunkCoordinates cursor : cursors) { int x = lookPos.blockX + cursor.posX; diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index e0765640c..14e514377 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -148,6 +148,7 @@ public final class LexiconData { public static LexiconEntry incense; public static LexiconEntry hourglass; public static LexiconEntry ghostRail; + public static LexiconEntry canopyDrum; public static LexiconEntry manaBlaster; public static LexiconEntry grassSeeds; @@ -595,6 +596,9 @@ public final class LexiconData { ghostRail = new ALexiconEntry(LibLexicon.DEVICE_GHOST_RAIL, categoryDevices); ghostRail.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeGhostRail)); + canopyDrum = new BLexiconEntry(LibLexicon.DEVICE_CANOPY_DRUM, categoryDevices); + canopyDrum.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeCanopyDrum)); + // TOOLS ENTRIES manaBlaster = new BLexiconEntry(LibLexicon.TOOL_MANA_BLASTER, categoryTools); manaBlaster.setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageCraftingRecipe("3", ModCraftingRecipes.recipeManaBlaster)); diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 2d6f7859d..a3161ed4a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -120,6 +120,7 @@ public final class LibLexicon { public static final String DEVICE_INCENSE = "incense"; public static final String DEVICE_HOURGLASS = "hourglass"; public static final String DEVICE_GHOST_RAIL = "ghostRail"; + public static final String DEVICE_CANOPY_DRUM = "canopyDrum"; public static final String TOOL_MANA_BLASTER = "manaBlaster"; public static final String TOOL_GRASS_SEEDS = "grassSeeds"; diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 0f5dd4275..41a1c2234 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -19,7 +19,7 @@ public final class LibMisc { public static final String MOD_NAME = MOD_ID; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[10.12.2.1147,);required-after:Baubles;after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:Forge@[10.13.2.1236,);required-after:Baubles;after:Thaumcraft"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d1e2d39d5..69990c1c8 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -585,6 +585,7 @@ tile.botania:storage3.name=Block of Mana Diamond tile.botania:storage4.name=Block of Dragonstone tile.botania:forestDrum0.name=Drum of the Wild tile.botania:forestDrum1.name=Drum of the Gathering +tile.botania:forestDrum2.name=Drum of the Canopy tile.botania:shinyFlower0.name=Glimmering White Flower tile.botania:shinyFlower1.name=Glimmering Orange Flower tile.botania:shinyFlower2.name=Glimmering Magenta Flower @@ -2088,6 +2089,12 @@ botania.entry.ghostRail=Spectral Rail botania.page.ghostRail0=Using a &1Spectral Platform&0 as a &1Rail&0 component gives some interesting abilities to a &1Minecart&0 that passes through it: when launched off the rail, the cart will float for a bit, it'll also be able to pass through walls.
This effect stops if the cart lands on a rail or collides with any variant of &1Dreamwood&0. botania.page.ghostRail1=Spirit Tracks, you could say +# -- DRUM OF THE CANOPY +botania.entry.canopyDrum=Drum of the Canopy +botania.page.canopyDrum0=The &1Drum of the Canopy&0 is like the &1Drum of the Wild&0 in that it is the percussion counterpart of the &1Horn of the Canopy&0. It serves the exact same purpose as the handheld horn, but is placed in world.
To trigger a beat and break nearby leaves, one would fire a &4Mana Burst&0 at the drum. +botania.page.canopyDrum1=It's to note that the drum does not store mana, hence, in order to trigger it, a &1Redstone Mana Spreader&0 or a &1Mana Blaster&0 is required. +botania.page.canopyDrum2=Pruning with style + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=Mana Blaster diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_FR.lang index f0bc38f19..e18e5a7be 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_FR.lang @@ -4,65 +4,65 @@ itemGroup.Botania=Botania # Something that is not localized, translators, do NOT change this line. botaniamisc.noloc=botaniamisc.noloc -botaniamisc.nextPage=Next Page -botaniamisc.prevPage=Previous Page -botaniamisc.back=Back -botaniamisc.craftingContainer=Returns on Crafting -botaniamisc.shapeless=Shapeless Recipe -botaniamisc.oredict=Ore Dictionary Recipe -botaniamisc.statusUnknown=Unknown Status -botaniamisc.color=%s Tinted -botaniamisc.manaUsage=Mana Usage -botaniamisc.shiftToRead=Shift-right click to read more -botaniamisc.clickToRecipe=Shift click to see recipe -botaniamisc.clickToIndex=Shift click for index -botaniamisc.flareColor=%s Rounds -botaniamisc.outputtingPower=Sparing Mana to Items -botaniamisc.inputtingPower=Accepting Mana from Items -botaniamisc.creative=Creative -botaniamisc.invFull=Your inventory is full. -botaniamisc.compositeLens=Composite with %s -botaniamisc.filter0=Pickup only items in Frames -botaniamisc.filter1=Pickup only items not in Frames -botaniamisc.filter2=Pickup any items -botaniamisc.creativePool0=Creative Mana Pool, has infinite Mana -botaniamisc.creativePool1=Worthy of an Egoist -botaniamisc.savedByLaurel=Your Golden Laurel Crown shatters, as it saves you from death. -botaniamisc.toolRank=%s&7 Rank -botaniamisc.edition=%s Edition +botaniamisc.nextPage=Page suivante +botaniamisc.prevPage=Page précédante +botaniamisc.back=Retour +botaniamisc.craftingContainer=Retour à la fabrication +botaniamisc.shapeless=Recette sans forme +botaniamisc.oredict=Recette du dictionnaire de minerai +botaniamisc.statusUnknown=Statut inconnu +botaniamisc.color=%s teinté +botaniamisc.manaUsage=Utilisation de mana +botaniamisc.shiftToRead=Maj-cliquez droit pour lire plus +botaniamisc.clickToRecipe=Maj-cliquez vour voir la recette +botaniamisc.clickToIndex=Maj-cliquez pour l'index +botaniamisc.flareColor=%s tours +botaniamisc.outputtingPower=Partage le mana aux éléments +botaniamisc.inputtingPower=Accepte du mana des éléments +botaniamisc.creative=Créatif +botaniamisc.invFull=Votre inventaire est plein. +botaniamisc.compositeLens=Composé avec %s +botaniamisc.filter0=Ramassage seulement des éléments en cadres +botaniamisc.filter1=Ramassage seulement des éléments hors cadres +botaniamisc.filter2=Ramassage de tous les éléments +botaniamisc.creativePool0=Bassin de mana créatif, a du mana à l'infini +botaniamisc.creativePool1=Digne d'un égoïste +botaniamisc.savedByLaurel=Votre couronne de laurier d'or vole en éclats, dès qu'elle vous sauve de la mort. +botaniamisc.toolRank=%s&7 rang +botaniamisc.edition=%s édition # ^ Leave this empty for no edition display -botaniamisc.devEdition=Writer's -botaniamisc.lexiconcover0=Your guide to all -botaniamisc.lexiconcover1=Botanical needs -botaniamisc.lexiconcover2=From Bestselling author +botaniamisc.devEdition=L'auteur est +botaniamisc.lexiconcover0=Votre guide pour tout +botaniamisc.lexiconcover1=vos besoins botaniques +botaniamisc.lexiconcover2=De l'auteur à succès botaniamisc.lexiconcover3=Lizbeth "Vazkii" Rika -botaniamisc.lexiconcover4=Edited by BevoLJ -botaniamisc.lexiconcover5=Edited by Saice -botaniamisc.shiftinfo=Hold &bSHIFT&7 for more info -botaniamisc.knowledgeTypesSingular=Contains %s School of Knowledge -botaniamisc.knowledgeTypesPlural=Contains %s Schools of Knowledge -botaniamisc.bookmark=Bookmark #%s -botaniamisc.clickToSee=Click to read -botaniamisc.shiftToRemove=Shift-click to remove -botaniamisc.clickToAdd=Add Bookmark +botaniamisc.lexiconcover4=Edité par BevoLJ +botaniamisc.lexiconcover5=Edité par Saice +botaniamisc.shiftinfo=Appuyez sur &bMaj&7 pour plus d'info +botaniamisc.knowledgeTypesSingular=Contient %s savoir scolaire +botaniamisc.knowledgeTypesPlural=Contient %s savoirs scolaires +botaniamisc.bookmark=Marque-page #%s +botaniamisc.clickToSee=Cliquez pour lire +botaniamisc.shiftToRemove=Maj-cliquez pour retirer +botaniamisc.clickToAdd=Marquez la page botaniamisc.ratio=Zoom: %sx botaniamisc.bottleTooltip=It has an acquired taste botaniamisc.coarseDirt0=Coarse Dirt, grass botaniamisc.coarseDirt1=won't grow on it botaniamisc.spawnerTip=Tip: Use a Spawn Egg to change the mob botaniamisc.shardLevel=Shard Power %s -botaniamisc.lexiconIndex=Lexicon Index +botaniamisc.lexiconIndex=Index du lexique botaniamisc.hasIvy=Has Timeless Ivy botaniamisc.shareMsg=[{"text":"%name%","color":"light_purple"},{"text":" has shared a ","color":"blue"},{"text":"Lexica Botania","color":"green","hoverEvent":{"action":"show_text","value":{"text":"You can make one using a Book and a Sapling!","color":"aqua"}}},{"text":" entry, click to see it: ","color":"blue"},{"text":"[%entryname%]","color":"green","clickEvent":{"action":"run_command","value":"/botania-open %entry%"},"hoverEvent":{"action":"show_text","value":{"text":"Click to read about this","color":"aqua"}}}] botaniamisc.noLexicon=You need a Lexica Botania in-hand to read this. botaniamisc.cantOpen=It doesn't seem like your Lexica Botania has this page. Perhaps it comes from an outside source...? -botaniamisc.clickToShare=Share -botaniamisc.drop=Drop +botaniamisc.clickToShare=Partagez +botaniamisc.drop=Jeter botaniamisc.dropTip0=Tip: You can press %key% in your inv to drop botaniamisc.dropTip1=CTRL-%key% will drop a full stack botaniamisc.wandMode.bind=Bind Mode botaniamisc.wandMode.function=Function Mode -botaniamisc.playVideo=Play Video +botaniamisc.playVideo=Jouer la vidéo botaniamisc.brewOf=Brew of %s botaniamisc.needsCatalysts=No matter how hard you try to push the Ingot into the Beacon, nothing seems to happen, perhaps your configuration of catalyst pylons might be off. botaniamisc.peacefulNoob=You try to offer the Ingot, but the peaceful vibes of your world prevent you from doing so. Perhaps you should do something about that. @@ -175,7 +175,7 @@ botania.sign10=Verseau botania.sign11=Poisson # WINGS -botania.wings0=No Wings +botania.wings0=Pas d'ailes botania.wings1=Wings: Flügel botania.wings2=Wings: One-Winged Angel botania.wings3=Wings: Ice Fairy @@ -187,7 +187,7 @@ botania.wings8=Wings: Mega Ultra Chicken botania.wings9=Wings: The One # ARMOR SETS -botania.armorset.manasteel.name=Mana Affinity +botania.armorset.manasteel.name=Affinité au mana botania.armorset.manasteel.desc=10% less Mana cost on Mana Tools botania.armorset.elementium.name=Great Fairy's Blessing botania.armorset.elementium.desc=Chance for pixies to apply potion effects @@ -241,8 +241,8 @@ botania.roman29=XXIX botania.roman30=XXX # KNOWLEDGE -botania.knowledge.minecraft=Minecraftian Knowledge -botania.knowledge.alfheim=&aElven&7 Knowledge +botania.knowledge.minecraft=Savoir Minecraftien +botania.knowledge.alfheim=Savoir &aElfique&7 # CONFIGURATION blockBreakingParticles.enabled=Block Break Particles @@ -389,7 +389,7 @@ item.dice.poem2=The hidden laws of a probable outcome, item.dice.poem3=The numbers lead a dance. # DEATH MESSAGES -death.attack.botania-relic=%s was punished for using a relic that isn't theirs +death.attack.botania-relic=%s a été puni en utilisant une relique qui n'était pas la sienne # ENTITY NAMES entity.Botania.botania:manaBurst.name=Explosion de mana @@ -408,10 +408,10 @@ entity.Botania.botania:enderAirBottle.name=Bouteille d'air du néant entity.Botania.botania:poolMinecart.name=Wagonnet à bassin de mana # ACHIEVEMENT NAMES + DESC -achievement.botania:flowerPickup=Sky of Beginning -achievement.botania:flowerPickup.desc=Pick up a Fleur mystique Flower from the world +achievement.botania:flowerPickup=Ciel du Commencement +achievement.botania:flowerPickup.desc=Cueuillez une Fleur mystique de ce monde achievement.botania:lexiconUse=A Realistical Logical Ideologist -achievement.botania:lexiconUse.desc=Open a Lexica Botania and have a look through the index +achievement.botania:lexiconUse.desc=Ouvrez un Lexica Botania et jetez un oeil à l'index achievement.botania:daybloomPickup=Daybreak Arrival achievement.botania:daybloomPickup.desc=Make a Daybloom in a Petal Apothecary achievement.botania:manaPoolPickup=Vivid Wave @@ -584,7 +584,8 @@ tile.botania:storage2.name=Bloc d'élémentium tile.botania:storage3.name=Bloc de mana diamant tile.botania:storage4.name=Bloc de dragonite tile.botania:forestDrum0.name=Tambour sauvage -tile.botania:forestDrum1.name=tambour de récolte +tile.botania:forestDrum1.name=Tambour de récolte +tile.botania:forestDrum2.name=Tambour de la canopée tile.botania:shinyFlower0.name=Fleur chatoyante blanche tile.botania:shinyFlower1.name=Fleur chatoyante orange tile.botania:shinyFlower2.name=Fleur chatoyante magenta @@ -922,6 +923,7 @@ tile.botania:corporeaInterceptor.name=Intercepteur de Corporea tile.botania:corporeaCrystalCube.name=Cube de cristal Corporea tile.botania:incensePlate.name=Assiette d'encens tile.botania:hourglass.name=Sablier plannant +tile.botania:ghostRail.name=Rail spectral # FLOWER NAMES tile.botania:flower..name=Fleur Botania @@ -2082,10 +2084,21 @@ botania.page.hourglass3=Note that the sand is added all at once, so the size of botania.page.hourglass4=Right clicking the block with a &1Wand of the Forest&0 locks (and unlocks) it. When locked, sand can't be added or removed, just in case someone right clicks it on accident.
If a &4Mana Burst&0 collides with the block, it'll stop the flow of sand and pause the timer, colliding again continues it. botania.page.hourglass5=The sands of time -# - Fleur mystique INSTRUMENTS +# -- SPECTRAL RAIL +botania.entry.ghostRail=Rail spectral +botania.page.ghostRail0=Utiliser une &1Plateforme spectral&0 comme un composant de &1Rail&0 donne quelques habilités interressantes au &1Chariot&0 qui passerai à travers lui : lorsqu'il est éjecté de ce rail, le chariot flotte un instant, il sera aussi capable de passer à travers les murs.
Cet effet s'arrêtera si le chariot atterri sur un rail ou rentre en collision avec n'importe quelle variété de &1Boisrève&0. +botania.page.ghostRail1=Voie de l'esprit, pourriez-vous dire + +# -- DRUM OF THE CANOPY +botania.entry.canopyDrum=Tambour de la canopée +botania.page.canopyDrum0=Le &1Tambour de la canopée&0 est comme le &1Tambour sauvage&0 en celà qu'il est l'équivalent percution de la &1Corne de la canopée&0. Il sert à la même chose que la corne en main, mais placé dans le monde.
Pour déclencher un rythme et casser les feuilles alentour, quelqu'un doit tirer une *4Explosion de mana*0 sur le tambour. +botania.page.canopyDrum1=Il est a noter que ce tambour ne stocke pas de mana, d'où, pour le déclencher, un &1Diffuseur de mana redstone&0 ou un &1Exploseur de mana&0 est requis. +botania.page.canopyDrum2=Émondage avec style + +# - MYSTICAL INSTRUMENTS # -- MANA BLASTER -botania.entry.manaBlaster=Mana Blaster -botania.page.manaBlaster0=The &1Mana Blaster&0 is like a portable &1Diffuseur de mana&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.
By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at. +botania.entry.manaBlaster=Exploseur de mana +botania.page.manaBlaster0=The &1Exploseur de mana&0 is like a portable &1Diffuseur de mana&0, while shaped like a pistol for easy handling, it's not exactly a firearm, as much as it is just a portable spreader.
By utilizing &4Mana&0 from &4Mana carrying items&0 in the holder's inventory, it can shoot a mana burst when one is looking at. botania.page.manaBlaster1=This burst is a bit different from the one fired from speaders, as it's faster, but carries only three quarters of the mana a spreader burst would. There's also a short cooldown period after firing the blaster until another burst can be shot. botania.page.manaBlaster2=&1Mana Lenses&0 also function with the blaster, to attach one to it, put them side by side on a crafting table, to remove it, simply place the &1Mana Blaster&0 back on the crafting grid. botania.page.manaBlaster3=We need more dakka diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_KR.lang index 6cc05b38c..104bc48ef 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_KR.lang @@ -588,6 +588,7 @@ tile.botania:storage3.name=마나 다이아몬드 블럭 tile.botania:storage4.name=드래곤스톤 블럭 tile.botania:forestDrum0.name=야생의 드럼 tile.botania:forestDrum1.name=수집의 드럼 +tile.botania:forestDrum2.name=캐너피 드럼 tile.botania:shinyFlower0.name=빛나는 하얀색 꽃 tile.botania:shinyFlower1.name=빛나는 주황색 꽃 tile.botania:shinyFlower2.name=빛나는 자홍색 꽃 @@ -2091,6 +2092,12 @@ botania.entry.ghostRail=스펙트럼 레일 botania.page.ghostRail0=Using a &1Spectral Platform&0 as a &1Rail&0 component gives some interesting abilities to a &1Minecart&0 that passes through it: when launched off the rail, the cart will float for a bit, it'll also be able to pass through walls.
This effect stops if the cart lands on a rail or collides with any variant of &1Dreamwood&0. botania.page.ghostRail1=Spirit Tracks, you could say +# -- DRUM OF THE CANOPY +botania.entry.canopyDrum=Drum of the Canopy +botania.page.canopyDrum0=The &1Drum of the Canopy&0 is like the &1Drum of the Wild&0 in that it is the percussion counterpart of the &1Horn of the Canopy&0. It serves the exact same purpose as the handheld horn, but is placed in world.
To trigger a beat and break nearby leaves, one would fire a &4Mana Burst&0 at the drum. +botania.page.canopyDrum1=It's to note that the drum does not store mana, hence, in order to trigger it, a &1Redstone Mana Spreader&0 or a &1Mana Blaster&0 is required. +botania.page.canopyDrum2=Pruning with style + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=마나 블래스터 diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_CN.lang index 99622a64a..d947f34c9 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_CN.lang @@ -585,6 +585,7 @@ tile.botania:storage3.name=魔力钻石块 tile.botania:storage4.name=龙石块 tile.botania:forestDrum0.name=狂野之鼓 tile.botania:forestDrum1.name=收集之鼓 +tile.botania:forestDrum2.name=林冠之鼓 tile.botania:shinyFlower0.name=白色荧光花 tile.botania:shinyFlower1.name=橙色荧光花 tile.botania:shinyFlower2.name=品红色荧光花 @@ -2088,6 +2089,12 @@ botania.entry.ghostRail=幻影轨道 botania.page.ghostRail0=将&1铁轨&0铺在&1幻影平台&0上会给 经过其上的&1矿车&0附加有趣的 能力:当它驶过这段轨道时, 矿车会略微的浮空,此时它也 能穿墙而过.
该效果会在矿车着陆于另一 段铁轨或撞上&1梦之木&0一类的 方块时消失. botania.page.ghostRail1=你可以称它:灵魂轨迹 +# -- DRUM OF THE CANOPY +botania.entry.canopyDrum=林冠之鼓 +botania.page.canopyDrum0=&1林冠之鼓&0就像&1狂野之鼓&0一样, 不过它所用的是&1林冠号角&0.它 的功能和手持的号角相同,不 过它需要放置下来.
若要让它发出振动破坏周围 的树叶,你需要向其发射一道 &4魔力脉冲&0. +botania.page.canopyDrum1=鼓本身不会储存魔力,因此激 活它就需要一个&1红石魔力发&0 &1射器&0或&1魔力发射器&0. +botania.page.canopyDrum2=修出我的范儿 + # - MYSTICAL INSTRUMENTS # -- MANA BLASTER botania.entry.manaBlaster=魔力脉冲枪 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_TW.lang index dcb027053..2b77b3564 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_TW.lang @@ -26,7 +26,7 @@ botaniamisc.filter0=只拾取物品展示框內物品 botaniamisc.filter1=只拾取物品展示框以外物品 botaniamisc.filter2=拾取所有物品 botaniamisc.creativePool0=創造模式瑪那池,有無限瑪那 -botaniamisc.creativePool1=與自我主義相配的 +botaniamisc.creativePool1=創造模式獨享 botaniamisc.savedByLaurel=你的金冠破碎了,但它救了你的命. botaniamisc.toolRank=%s&7 級 botaniamisc.edition=%s 版本 @@ -111,10 +111,10 @@ botaniamisc.active=&a啟動 botaniamisc.inactive=&c關閉 botaniamisc.achievements=植物魔法成就 botaniamisc.dropIkea=&b將它扔出去會分裂開來 -botaniamisc.hourglassLock=This Hourglass is locked. Right click it with a Wand of the Forest to unlock it. -botaniamisc.locked=Locked -botaniamisc.stopped=Stopped -botaniamisc.lockedStopped=Locked, Stopped +botaniamisc.hourglassLock=沙漏已鎖定.用森林法杖右擊可解鎖. +botaniamisc.locked=鎖定 +botaniamisc.stopped=停止 +botaniamisc.lockedStopped=鎖定,停止 # NEI INTEGRATION botania.nei.brewery=植物釀造 @@ -251,14 +251,14 @@ boundBlock.wireframe.enabled=綁定方塊線框 darkQuartz.enabled=啟用煙熏石英 fallenKanade.enabled=啟用天降之奏 manaEnchanter.enabled=啟用瑪那附魔台 -manaFluxfield.enabled=開啟瑪那轉換器 -relics.enabled=啟用遺物 +manaFluxfield.enabled=啟用瑪那轉換器 +relics.enabled=啟用諸神遺物 18stones.enabled=啟用1.8版本的石頭 ringOfOdin.fireResist=啟用奧丁之戒的抗火效果 flower.forceCheck=花的對象檢查 -enderPickpocket.enabled=啟用終界扒手 +enderPickpocket.enabled=啟用終界之手 thermalily.obsidian=熾玫瑰吸收黑曜石上的岩漿 -passiveWither.time=被動枯萎時間 +passiveWither.time=被動產能花凋零時間 flowerParticles.frequency=花粒子頻率 lexicon.enable.rotatingItems=辭典頁面物品旋轉特效 lexicon.enable.justifiedText=辭典文本調整 @@ -328,7 +328,7 @@ botania.versioning.flavour42=如果你打開語言文件後發現這條趣味文 botania.versioning.flavour43=植物魔法更新不可能會有問題的,絕對不可能.它可是葡萄牙產的. botania.versioning.flavour44=看著更新,現在回過頭看著我,現在再回過頭去看著更新.那裡有個下載按鈕,呆瓜. botania.versioning.flavour45=很遺憾,你不會因為更新植物魔法而獲得薯條. -botania.versioning.flavour46=你妄想著植物魔法還是最新版本的,但我又來了! Dio! +botania.versioning.flavour46=你妄想著植物魔法還是最新版本的,但又是我! Dio! botania.versioning.flavour47=江湖傳言如果你能移動一輛卡車,你就能在卡車下找到一個植物魔法的更新. botania.versioning.flavour48=我很好奇BevoLJ什麼時候會更新他的整合包... botania.versioning.flavour49=1個植物魔法的更新在牆上,1個植物魔法的更新在牆上. @@ -410,80 +410,80 @@ entity.Botania.botania:poolMinecart.name=瑪那池礦車 # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=Sky of Beginning achievement.botania:flowerPickup.desc=拾取一朵神秘花 -achievement.botania:lexiconUse=有邏輯的理論家 +achievement.botania:lexiconUse=現實的論理主義者 achievement.botania:lexiconUse.desc=打開一本植物魔法辭典並瀏覽目錄 -achievement.botania:daybloomPickup=黎明到來 +achievement.botania:daybloomPickup=拂曉抵達 achievement.botania:daybloomPickup.desc=在花藥台製作一朵太陽花 -achievement.botania:manaPoolPickup=微波蕩漾 +achievement.botania:manaPoolPickup=Vivid Wave achievement.botania:manaPoolPickup.desc=將稀釋瑪那池升級為普通的瑪那池 -achievement.botania:endoflamePickup=熔化吧 +achievement.botania:endoflamePickup=爐心融解 achievement.botania:endoflamePickup.desc=做出一朵火紅蓮來加速瑪那生產 -achievement.botania:tinyPotatoPet=做個朋友 +achievement.botania:tinyPotatoPet=Just Be Friends achievement.botania:tinyPotatoPet.desc=做出一個小土豆再愛撫它 -achievement.botania:sparkCraft=活的驅動器 +achievement.botania:sparkCraft=Live Drive achievement.botania:sparkCraft.desc=製作火花協助傳輸瑪那 -achievement.botania:baubleWear=藝術精神 +achievement.botania:baubleWear=Inner Arts achievement.botania:baubleWear.desc=做出一件飾品並佩戴 -achievement.botania:manaCookieEat=墮落的異端和巧克力 +achievement.botania:manaCookieEat=腐れ外道とチョコレゐト achievement.botania:manaCookieEat.desc=注魔一塊瑪那曲奇並吃掉 achievement.botania:runePickup=Lilium Doll achievement.botania:runePickup.desc=用符文祭壇製作符文 -achievement.botania:manaBlasterShoot=M'aider Stranded Girl +achievement.botania:manaBlasterShoot=M′AIDER遭難ガール achievement.botania:manaBlasterShoot.desc=合成瑪那脈衝槍再發射脈衝 -achievement.botania:tiaraWings=愛心射手 +achievement.botania:tiaraWings=Heart Shooter achievement.botania:tiaraWings.desc=製作天翼族之冠並用翅膀裝飾它 -achievement.botania:terrasteelPickup=暗中起舞 +achievement.botania:terrasteelPickup=Dancer in the Dark achievement.botania:terrasteelPickup.desc=用泰拉凝聚板製作一塊泰拉錠 -achievement.botania:elfPortalOpen=世界的呼喚 +achievement.botania:elfPortalOpen=World Calling achievement.botania:elfPortalOpen.desc=打開通往精靈王國的傳送門 achievement.botania:gaiaGuardianKill=Dead and Seek achievement.botania:gaiaGuardianKill.desc=在蓋亞儀式中召喚並擊殺一隻蓋亞守護者 -achievement.botania:terrasteelWeaponCraft=遠程攻擊的偏執 +achievement.botania:terrasteelWeaponCraft=Remote Paranoia achievement.botania:terrasteelWeaponCraft.desc=用泰拉錠製作的武器武裝你自己 -achievement.botania:kekimurusPickup=After-School Stride +achievement.botania:kekimurusPickup=放課後ストライド achievement.botania:kekimurusPickup.desc=製作一朵貪食花來提供大量瑪那 -achievement.botania:heiseiDreamPickup=平成之災 +achievement.botania:heiseiDreamPickup=Heisei Cataclysm achievement.botania:heiseiDreamPickup.desc=製作一朵平成之夢讓怪物們窩裡鬥 achievement.botania:dirtRodCraft=Rockbell achievement.botania:dirtRodCraft.desc=製作一根泥棍子...哦不,是大地法杖 achievement.botania:spawnerMoverUse=I can take off my (redacted) achievement.botania:spawnerMoverUse.desc=用一個生命聚合器來轉移刷怪籠 -achievement.botania:enderAirMake=仿製空氣 +achievement.botania:enderAirMake=Imitation Air achievement.botania:enderAirMake.desc=收集一瓶終界之氣 achievement.botania:corporeaCraft=Drop Pop Candy achievement.botania:corporeaCraft.desc=合成一個使用多媒體網絡的方塊 -achievement.botania:signalFlareStun=光的力量 +achievement.botania:signalFlareStun=See the Lights achievement.botania:signalFlareStun.desc=用一發信號彈讓至少100隻怪物眩暈 -achievement.botania:l20ShardUse=飛起來 +achievement.botania:l20ShardUse=Out of Step achievement.botania:l20ShardUse.desc=用能量為XX的拉普達碎片將地面升至天空 -achievement.botania:gaiaGuardianNoArmor=神話結局 +achievement.botania:gaiaGuardianNoArmor=Mythologia's End achievement.botania:gaiaGuardianNoArmor.desc=戰鬥從頭至尾不穿任何護甲擊殺一隻蓋亞守護者 -achievement.botania:rankSSPick=破壞天才 +achievement.botania:rankSSPick=Talent Shredder achievement.botania:rankSSPick.desc=用SS級的泰拉粉碎者挖穿世界 -achievement.botania:superCorporeaRequest=侵略少女 +achievement.botania:superCorporeaRequest=Invader Girl achievement.botania:superCorporeaRequest.desc=成功從多媒體索引處請求單種物品至少50,000個 -achievement.botania:pinkinator=裝飾品 +achievement.botania:pinkinator=Decorator achievement.botania:pinkinator.desc=使用粉色手炮 -achievement.botania:infiniteFruit=無罪之人 -achievement.botania:infiniteFruit.desc=獲得禁忌之果的獎勵 -achievement.botania:excaliber=流動之心 -achievement.botania:excaliber.desc=獲得王者聖劍的獎勵 -achievement.botania:flugelEye=死亡天使 -achievement.botania:flugelEye.desc=獲得天翼族之眼的獎勵 -achievement.botania:thorRing=疊加一層 -achievement.botania:thorRing.desc=獲得托爾之戒的獎勵 -achievement.botania:odinRing=流逝的記憶 -achievement.botania:odinRing.desc=獲得奧丁之戒的獎勵 -achievement.botania:lokiRing=幾何算法 -achievement.botania:lokiRing.desc=獲得洛基之戒的獎勵 -achievement.botania:aesirRing=謹遵神諭 +achievement.botania:infiniteFruit=Innocentia +achievement.botania:infiniteFruit.desc=獲得戰利品:灰色的果實 +achievement.botania:excaliber=Streaming Heart +achievement.botania:excaliber.desc=獲得戰利品:王者聖劍 +achievement.botania:flugelEye=Angel of Death +achievement.botania:flugelEye.desc=獲得戰利品:天翼族之眼 +achievement.botania:thorRing=One Step Layered +achievement.botania:thorRing.desc=獲得戰利品:托爾之戒 +achievement.botania:odinRing=回憶補時 +achievement.botania:odinRing.desc=獲得戰利品:奧丁之戒 +achievement.botania:lokiRing=Arithmetic +achievement.botania:lokiRing.desc=獲得戰利品:洛基之戒 +achievement.botania:aesirRing=神のまにまに achievement.botania:aesirRing.desc=通過合成做出諸神之戒 -achievement.botania:nullFlower=放輕鬆 +achievement.botania:nullFlower=Take it Easy achievement.botania:nullFlower.desc=發現一個bug導致你有了一朵未定義的植物魔法花.別忘了提交! -achievement.botania:desuGun=Two-Faced Lovers +achievement.botania:desuGun=裏表ラバーズ achievement.botania:desuGun.desc=ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN # ^ Don't localize @@ -585,6 +585,7 @@ tile.botania:storage3.name=瑪那鑽石塊 tile.botania:storage4.name=龍石塊 tile.botania:forestDrum0.name=狂野之鼓 tile.botania:forestDrum1.name=收集之鼓 +tile.botania:forestDrum2.name=林冠之鼓 tile.botania:shinyFlower0.name=白色螢光花 tile.botania:shinyFlower1.name=橙色螢光花 tile.botania:shinyFlower2.name=洋紅色螢光花 @@ -921,7 +922,8 @@ tile.botania:blazeBlock.name=烈焰燈 tile.botania:corporeaInterceptor.name=多媒體攔截器 tile.botania:corporeaCrystalCube.name=多媒體水晶魔方 tile.botania:incensePlate.name=香盤 -tile.botania:hourglass.name=Hovering Hourglass +tile.botania:hourglass.name=懸浮沙漏 +tile.botania:ghostRail.name=幻影軌道 # FLOWER NAMES tile.botania:flower..name=植物魔法花 @@ -970,12 +972,12 @@ tile.botania:flower.dreadthorn.reference=C計劃 tile.botania:flower.heiseiDream.name=平成之夢 tile.botania:flower.heiseiDream.reference=平成,平成,崩壞... tile.botania:flower.tigerseye.name=虎之眼 -tile.botania:flower.tigerseye.reference=掌上老虎 -tile.botania:flower.jadedAmaranthus.name=傑迪德莧 +tile.botania:flower.tigerseye.reference=掌中老虎 +tile.botania:flower.jadedAmaranthus.name=翡翠莧 tile.botania:flower.jadedAmaranthus.reference=一對情侶因此而死 tile.botania:flower.orechid.name=凝礦蘭 tile.botania:flower.orechid.reference=你挖了什麼我就種了什麼 -tile.botania:flower.orechidIgnem.name=地獄凝礦蘭 +tile.botania:flower.orechidIgnem.name=炎礦蘭 tile.botania:flower.orechidIgnem.reference=如玫瑰般紅 tile.botania:flower.fallenKanade.name=天降之奏 tile.botania:flower.fallenKanade.reference=我不是天使 @@ -1250,7 +1252,7 @@ item.botania:craftingHalo.name=合成環 item.botania:blackLotus0.name=黑蓮花 item.botania:blackLotus1.name=暗黑蓮花 item.botania:dreamwoodTwig.name=夢之木棍 -item.botania:monocle.name=窺魔單片鏡 +item.botania:monocle.name=窺魔之鏡 item.botania:clip.name=透鏡夾 item.botania:cobbleRod.name=深淵法杖 item.botania:smeltRod.name=熾心法杖 @@ -1267,7 +1269,7 @@ item.botania:craftPattern5.name=合成模板#6: 3x1 item.botania:craftPattern6.name=合成模板#7: 2x3 item.botania:craftPattern7.name=合成模板#8: 3x2 item.botania:craftPattern8.name=合成模板#9: 圈形 -item.botania:gaiaIngot.name=蓋亞錠 +item.botania:gaiaIngot.name=蓋亞魂錠 item.botania:ancientWill0.name=艾琳的意志 item.botania:ancientWill1.name=達洛克的意志 item.botania:ancientWill2.name=古讚的意志 @@ -1343,24 +1345,24 @@ botania.brew.jumpBoost=上湧 botania.brew.regen=再生 botania.brew.regenWeak=恢復 botania.brew.resistance=剛毅 -botania.brew.fireResistance=熔岩外皮 +botania.brew.fireResistance=炎膚 botania.brew.waterBreathing=魚鰓 botania.brew.invisibility=隱身 botania.brew.nightVision=梟眼 botania.brew.absorption=護盾 -botania.brew.soulCross=交叉靈魂 +botania.brew.soulCross=噬魂 botania.brew.featherFeet=羽翼 -botania.brew.emptiness=虛榮之空虛 -botania.brew.bloodthirst=紅色陰影 +botania.brew.emptiness=虛空之影 +botania.brew.bloodthirst=腥紅之影 botania.brew.overload=過載 botania.brew.allure=誘惑 -botania.brew.warpWard=理智思想 +botania.brew.warpWard=理智 # POTION NAMES -botania.potion.soulCross=靈魂十字 -botania.potion.featherFeet=羽毛腿 +botania.potion.soulCross=噬魂 +botania.potion.featherFeet=羽翼 botania.potion.emptiness=空虛 -botania.potion.bloodthirst=血之渴望 +botania.potion.bloodthirst=嗜血 botania.potion.allure=引誘 # GUI TEXT @@ -1387,16 +1389,16 @@ botania.category.misc=雜項 # - BASIC # -- WELCOME TO BOTANIA -botania.entry.welcome=Welcome To Botania -botania.page.welcome0=&oWhat is peace? Is it truly just a lack of combat? Is it years of sitting quietly in a garden, surrounded by flowers? Is it watching over a kingdom that you are able to call your own? Is it the completion of almost every task known to man? Is it the ability to watch numbers of resources steadily rise as you watch your collection grow? -botania.page.welcome1=&oIs peace something that can be obtained easily, without work - or is it something difficult to obtain?
Let's say for a moment - not even a second - that peace is truly just a lack of work; peaceful days surrounded by flowers. -botania.page.welcome2=&oYears spent watching time tick by while you watch your flora perform every single task imaginable, without outside help from polluting machines or computers tangled in cables and pipes.
Now imagine that everything we just talked about was possible. -botania.page.welcome3=&oImagine that through your hard labor - your cultivation of flowers, your manipulation of mana, your knowledge of the mechanisms of the world and redstone - you could obtain that dreamlike state. Imagine that you could have everything you could ever desire automated with flora. Flora, some magic, and your own ingenuity. -botania.page.welcome4=&oWith the help of this book, your dreams will become a reality.
The name of this book is deceptive. Despite being called the Lexica Botania, this tome focuses on far more than just flowers. It focuses on a variety of devices, both magical and bordering on technological. -botania.page.welcome5=&oIt holds the secrets of the elves, who have long ago fled from this world, as well as possible clues to the origins of the very world itself. For anyone with a basic knowledge of redstone and the creativity to put it to use, this book offers answers to nearly every problem known to man, without the need to use foreign schools of magic or machinery. -botania.page.welcome6=&oThis book contains instructions on how to perform nearly every task that one could ever need, with only the use of what's in it, and available in the world of Minecraft, assuming you're up to the task of putting them together in ingenious ways.
Try it out, you'll be amazed at what you can do without outside interference. -botania.page.welcome7=&oThe school of botany does not solely apply to those with a knack for complex thought processes.
Introduction to the art is simple, and the rewards are vast. A wide range of magical accessories and instruments allow for empowering of one who decides to study the various options therein. -botania.page.welcome8=&oDear reader, I welcome you to the realm of Botania.&r
- Written by &nGideon Seymour&r, guest writer. (Adapted for use) +botania.entry.welcome=歡迎來到植物魔法 +botania.page.welcome0=&o什麼是和平?是沒有鬥爭?是 年復一年的待在鮮花環繞的 花園裡?是看管著你所謂的王 國?是完成已知的所有任務? 是看著自己收集的資源越來 越多? +botania.page.welcome1=&o和平是不需勞作就能獲得之 物-又或是難以獲得之物?
讓我們來簡單地說說-只需要 一會兒-和平其實就是無需工 作;可以過著被花朵所包圍的 和平日子. +botania.page.welcome2=&o看著你的植物們如預期般的 完成各自的任務,就這樣感受 著時間的流逝,沒有嘈雜且污 染四布的機器和電腦,也沒有 密佈的線纜和管道.
現在想像一下,我們所討論的 這一切都是可能實現的. +botania.page.welcome3=&o想像下,經過你的一番努力- 對植物的精心培養,對魔力的 使用,對於這個世界和紅石的 知識運用-你就能達到那種夢 寐以求的境界.想像下你所需 求的一切都能通過植物來實 現自動化.植物,加上些魔法, 還有你的智慧. +botania.page.welcome4=&o有了這本書,你就能夢想成真 了.
書名只是表面的.儘管稱它植 物魔法辭典,但它所涉及的可 不僅僅都是花.其中也涵蓋了 各種魔法和近似科技的裝置. +botania.page.welcome5=&o它裡面也蘊藏著精靈的秘密, 而精靈們卻早已帶著世界起 源的線索一同消失在了這個 世界上.對於每一個有著基礎 紅石知識並能將其投入實踐 的人而言,這本書為每一個人 們所知的問題給出了答案,有 了它你就再也不需要學習那 些不明所以的魔法和機械知 識了. +botania.page.welcome6=&o書的內容也包括了你所要進 行的每一項任務的解釋說明, 只需要用上書中的東西,確保 在Minecraft的世界裡可行, 然後動用你的聰明才智,難題 就都不是問題了.
試試看,你會吃驚於自己在沒 有外界干擾的情況下竟然可 以做到這麼多. +botania.page.welcome7=&o植物學的知識不僅適用於那 些需要動腦筋的思考的傢伙.
言雖簡,報頗豐.各式各樣的 魔法飾品和工具想必也能讓 其他人自由選擇他們想要的. +botania.page.welcome8=&o尊敬的讀者,我誠摯地歡迎您 來到植物魔法的世界.&r
- 特約撰稿人 &nGideon Seymour&r作. # -- TUTORIAL OF THE BASICS botania.entry.tutorial=基礎教程 @@ -1415,7 +1417,7 @@ botania.page.lexicon2=&1植物魔法辭典&0標題也可以定 制.將它放入& # -- MYSTICAL FLOWERS botania.entry.flowers=神秘花 -botania.page.flowers0=世界各地,你都能遇到大量的 神秘花.找到它們並不困難因 為它們總是閃爍著亮光.
它們有著共計&416&0種不同的顏 色.
也可以使用&1花肥&0(往下看)種 出這些花. +botania.page.flowers0=世界各地,你都能遇到大量的 神秘花.找到它們並不困難因 為它們總是閃爍著亮光.
它們有著共計&416&0種不同的顏色.
也可以使用&1花肥&0(往下看)種 出這些花. botania.page.flowers1=它們看起來是這樣的... botania.page.flowers2=這些花可以採摘用於獲取&1神&0 &1秘花瓣&0,可以用來製成魔法工 具或是類似的植物.
這些花瓣也能磨成&1花粉&0,使用 &1杵和臼&0,功能和所有的普通染 料相似. botania.page.flowers3=摘取花瓣. @@ -1701,7 +1703,7 @@ botania.page.heiseiDream2=&o平成壞れちゃって,壞れちゃ って.平和 # -- TIGERSEYE botania.entry.tigerseye=虎之眼 -botania.page.tigerseye0=我們都知道&4爬行者&0害怕&4貓&0.
&1虎之眼&0利用非常微弱的,通過 散發出貓的氣味,恐嚇附近的 &4爬行者&0,阻止它們爆炸.也會 讓它們主動逃離&4玩家&0. +botania.page.tigerseye0=我們都知道&4苦力怕&0害怕&4貓&0.
&1虎之眼&0利用非常微弱的,通過 散發出貓的氣味,恐嚇附近的 &4苦力怕&0,阻止它們爆炸.也會 讓它們主動逃離&4玩家&0. botania.page.tigerseye1=&o是時候向敵人反擊了&r. # -- ORECHID @@ -1710,7 +1712,7 @@ botania.page.orechid0=儘管挖礦很好,我們應想些可 再生的方法.&1 botania.page.orechid1=&o這可不是龍的便便(SAO)&r. # -- ORECHID IGNEM -botania.entry.orechidIgnem=地獄凝礦蘭 +botania.entry.orechidIgnem=炎礦蘭 botania.page.orechidIgnem0=&1凝礦蘭&0是朵不錯的花.用&4瑪那&0 來產生原礦,對誰而言都是極 好的.然而它卻不能產生來自 &4地獄&0的礦物.通過改變花瓣的 配方,你解決了這個問題.現 在它就能利用&1地獄岩&0來產生 &4地獄&0礦物.花必須在&4地獄&0才能 工作 botania.page.orechidIgnem1=&o變熱吧&r. @@ -2074,13 +2076,24 @@ botania.page.craftCrate8=&1機巧箱&0也能裝上模板.用於鎖 定配方中 botania.page.craftCrate9=9種不同的模板 # -- HOVERING HOURGLASS -botania.entry.hourglass=Hovering Hourglass -botania.page.hourglass0=The ability to count time is an essential one to anyone who wishes to develop any redstonic contraptions. A single timer, however, can take a up both a lot of space and be slow in general. The &1Hovering Hourglass&0 is a simple, accurate, sand based timer. As the name implies, it's a hourglass that hovers and turns by itself. -botania.page.hourglass1=The hourglass contains an inventory, in which up to a stack of &1Sand&0, &1Red Sand&0 or &1Soul Sand&0 can be added via a right click. Right clicking again removes it. The sand will then fall from one of the chambers into another, and when is done, release a single redstone pulse and turn over, starting the process again. -botania.page.hourglass2=The amount of time for each pulse is dependent on how much and what type of sand is in the chamber. &1Sand&0 will count for one second per block, &1Red Sand&0 ten seconds per and &1Soul Sand&0 one minute per. Sand types can't be mixed. The time for each pulse can be seen by hovering over the block with a &1Wand of the Forest&0. -botania.page.hourglass3=Note that the sand is added all at once, so the size of the stack to be added needs to be set in the inventory.
Sand can't be added to the hourglass after it already has some in, trying to do so will end up removing the sand there instead. The sand in the block can be taken and added by &1Hoppers&0 or other methods. -botania.page.hourglass4=Right clicking the block with a &1Wand of the Forest&0 locks (and unlocks) it. When locked, sand can't be added or removed, just in case someone right clicks it on accident.
If a &4Mana Burst&0 collides with the block, it'll stop the flow of sand and pause the timer, colliding again continues it. -botania.page.hourglass5=The sands of time +botania.entry.hourglass=懸浮沙漏 +botania.page.hourglass0=對於任何一個想要鑽研紅石 電路的人而言,計時器是必經 之路.一個單獨的時鐘電路就 會佔用不少空間,並且運作緩 慢.而&1懸浮沙漏&0就是一個基於 沙子的計時器,簡單而精確. 如名字所示,它能自行懸浮並 倒置. +botania.page.hourglass1=沙漏自身有一個物品欄,可通 過右擊存入最多1組&1沙子&0,&1紅&0 &1沙&0或&1靈魂沙&0.再次右擊就會取 出.放入沙子後,它們就會流 向沙漏的另一端,全部流下時 輸出一個紅石脈衝並顛倒沙 漏,重置整個計時. +botania.page.hourglass2=每道脈衝的間隔時間取決於 使用的沙子數量和種類.普通 的&1沙子&0每個計做1秒,&1紅沙&0每 個計做10秒,&1靈魂沙&0每個計做 1分鐘.各種沙子不能混合使 用.手持&1森林法杖&0指向沙漏方 塊可以查看每次脈衝的間隔 時間. +botania.page.hourglass3=注意沙子是一次性加入的,因 此你必須在自己的物品欄內 設定好所需的數量.
不能向已有沙子的沙漏內添 入新的沙子,否則就會移除之 前加入的沙子.沙漏內的沙子 可以通過&1漏斗&0和其他途逕取 出或添入. +botania.page.hourglass4=用&1森林法杖&0右擊則會將它鎖 定(或解鎖).鎖定時,無法添 加或移除沙子,以免有人不小 心右擊到.
如果一道&4魔力脈衝&0擊中該方 塊,則會讓沙子停止流動,再 次擊中則會繼續流動. +botania.page.hourglass5=時之沙 + +# -- SPECTRAL RAIL +botania.entry.ghostRail=幻影軌道 +botania.page.ghostRail0=將&1鐵軌&0鋪在&1幻影平台&0上會給 經過其上的&1礦車&0附加有趣的 能力:當它駛過這段軌道時, 礦車會略微的浮空,此時它也 能穿牆而過.
該效果會在礦車著陸於另一 段鐵軌或撞上&1夢之木&0一類的 方塊時消失. +botania.page.ghostRail1=你可以稱它:靈魂軌跡 + +# -- DRUM OF THE CANOPY +botania.entry.canopyDrum=林冠之鼓 +botania.page.canopyDrum0=&1林冠之鼓&0就像&1狂野之鼓&0一樣, 不過它所用的是&1林冠號角&0.它 的功能和手持的號角相同,不 過它需要放置下來.
若要讓它發出振動破壞周圍 的樹葉,你需要向其發射一道 &4瑪那脈衝&0. +botania.page.canopyDrum1=鼓本身不會儲存魔力,因此激 活它就需要一個&1紅石瑪那發&0 &1射器&0或&1瑪那發射器&0. +botania.page.canopyDrum2=修出我的范兒 # - MYSTICAL INSTRUMENTS # -- MANA BLASTER @@ -2150,7 +2163,7 @@ botania.page.terraPick1=工具裡儲存的&4瑪那&0量決定了 它的&4階位& botania.page.terraPick2=從&4C&0升至&4B&0,需要一個滿的&1瑪那&0 &1池&0,每級是上一級的十倍消耗 ,最終到達&4SS&0.
工具的階位不會改變它的速 度,但會增強&4激活能力&0.
可以通過右擊開啟工具的能 力. botania.page.terraPick3=當工具激活時,它能破壞區域 內的方塊.階位&4C&0還是一小塊 ,到了&4B&0就成了一個區域, 隨著 階位升高區域也會增大.注意 階位&4D&0的工具不能激活.
激活時會消耗工具儲存的&4魔&0 &4力&0,哪怕不是用於挖掘. botania.page.terraPick4=最後,工具每次破壞方塊時都 會受到磨損,所以最好物品欄 有與階位相應的&4瑪那&0儲存,工 具的功能又像&1魔鋼工具&0,因為 它使用&4瑪那&0抵消磨損,製作原 料是&1泰拉鋼&0.
它也不會像普通掉落物品那 樣消失. -botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW (紀錄的地平線) +botania.page.terraPick5=WE'RE MINING IN THE DATABASE WOW WOW(紀錄的地平線) # -- ROD OF THE SEAS botania.entry.waterRod=海洋法杖 @@ -2319,7 +2332,7 @@ botania.page.enderAir0=&1終界&0的空氣看起來有一些變 異的特性.如 # -- ENDER OVERSEER botania.entry.enderEyeBlock=終界監視者 botania.page.enderEyeBlock0=&4終界使者&0的眼睛被看見時十分 敏感.由此製成的方塊在64格 內被玩家直視時就會發出&4紅&0 &4石信號&0.
當然,頭戴&1南瓜&0時可以避免. -botania.page.enderEyeBlock1=我的品牌 +botania.page.enderEyeBlock1=MY BRAND # -- FORCE RELAY botania.entry.pistonRelay=力量傳遞器 @@ -2457,7 +2470,7 @@ botania.page.cosmeticBaubles12=鄰人部 botania.page.cosmeticBaubles13=喵 botania.page.cosmeticBaubles14=別讓自己太前衛了 botania.page.cosmeticBaubles15=邪惡吧! -botania.page.cosmeticBaubles16=裸哦哦哦哦哦... +botania.page.cosmeticBaubles16=Nudistoooooooooo botania.page.cosmeticBaubles17=誰說我是死魚眼的 botania.page.cosmeticBaubles18=Lurk moar botania.page.cosmeticBaubles19=我需要你的時間 @@ -2579,7 +2592,7 @@ botania.page.judgementCloaks2=神聖的斗篷 botania.page.judgementCloaks3=嘗嘗我的復仇! # -- MANASEER MONOCLE -botania.entry.monocle=窺魔單片鏡 +botania.entry.monocle=窺魔之鏡 botania.page.monocle0=觀察&4瑪那脈衝&0去向一個極其 方便的工具就是&1窺魔單片鏡&0. 它不僅是一個奇特的護目鏡, 還可以讓裝備者看到附近所 有的&4瑪那脈衝&0,即便他們視線 被擋住了.更重要的是,或許 戴著它看向花時能知曉其作 用的範圍. botania.page.monocle1=Why hello there old chap @@ -2641,7 +2654,7 @@ botania.page.gaiaRitual4=你最好記住以下幾點.首先極 力推薦附魔 botania.entry.gaiaRitualHardmode=蓋亞儀式II botania.page.gaiaRitualHardmode0=有人認為,以&1泰拉鋼&0和&1蓋亞之&0 &1魂&0的形式結合兩種已知的最 強大能源,可以製造一種無敵 的材料.看起來這種材料極其 強勁.事實上,當兩種材料相互 抵消結合形成錠的時候,創造 了一種完全無用的合金. botania.page.gaiaRitualHardmode1=這種錠,由於集中了能量和瑪 那,或許能召喚出更加強大的 &1蓋亞守護者&0,擁有更強的韌性, 力量和速度.
因此,它也會比平常的掉落更 多的&1蓋亞之魂&0,還有少量稀世 珍寶,這都讓它成為一個有價 值的敵人. -botania.page.gaiaRitualHardmode2=製作&1蓋亞錠&0. +botania.page.gaiaRitualHardmode2=製作&1蓋亞魂錠&0. # -- THE RELICS OF THE AESIR botania.entry.relics=諸神的遺物 diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum4.png b/src/main/resources/assets/botania/textures/blocks/forestDrum4.png new file mode 100644 index 000000000..8133f3025 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/forestDrum4.png differ diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum5.png b/src/main/resources/assets/botania/textures/blocks/forestDrum5.png new file mode 100644 index 000000000..217f504e3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/blocks/forestDrum5.png differ diff --git a/src/main/resources/assets/botania/textures/items/unused/cosmetic_phi.png b/src/main/resources/assets/botania/textures/items/unused/cosmetic_phi.png new file mode 100644 index 000000000..349da69e3 Binary files /dev/null and b/src/main/resources/assets/botania/textures/items/unused/cosmetic_phi.png differ