diff --git a/GardenOfGlass.jar b/GardenOfGlass.jar index a6c9ea5b4..98970982c 100644 Binary files a/GardenOfGlass.jar and b/GardenOfGlass.jar differ diff --git a/build.gradle b/build.gradle index dbc7f4a84..75a45df18 100644 --- a/build.gradle +++ b/build.gradle @@ -68,7 +68,7 @@ dependencies { compile files( 'Baubles-deobf.jar' ) - deobfCompile "mezz.jei:jei_1.10.2:3.7.8.234" + deobfCompile "mezz.jei:jei_1.11.2:4.2.0.210" //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" diff --git a/build.properties b/build.properties index 44b747b13..604dedbd6 100644 --- a/build.properties +++ b/build.properties @@ -1,11 +1,11 @@ # -#Fri Mar 10 17:53:56 GMT 2017 +#Sat Jan 21 17:42:42 GMT 2017 mod_name=Botania -cf_meta_version=1.10.2 -forge_version=12.18.1.2076 +cf_meta_version=1.11.2 +forge_version=13.20.0.2206 dir_repo=./ -mc_mappings=snapshot_20160518 +mc_mappings=snapshot_20161227 version=r1.9 dir_output=../Build Output/Botania/ -mc_version=1.10.2 -build_number=342 +mc_version=1.11.2 +build_number=340 diff --git a/src/api/java/buildcraft/api/core/BCLog.java b/src/api/java/buildcraft/api/core/BCLog.java deleted file mode 100644 index 1ba70725c..000000000 --- a/src/api/java/buildcraft/api/core/BCLog.java +++ /dev/null @@ -1,42 +0,0 @@ -/** 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.core; - -import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public final class BCLog { - public static final Logger logger = LogManager.getLogger("BuildCraft"); - - /** Deactivate constructor */ - private BCLog() {} - - @Deprecated - public static void logErrorAPI(String mod, Throwable error, Class classFile) { - logErrorAPI(error, classFile); - } - - public static void logErrorAPI(Throwable error, Class classFile) { - StringBuilder msg = new StringBuilder("API error! Please update your mods. Error: "); - msg.append(error); - StackTraceElement[] stackTrace = error.getStackTrace(); - if (stackTrace.length > 0) { - msg.append(", ").append(stackTrace[0]); - } - - logger.log(Level.ERROR, msg.toString()); - - if (classFile != null) { - msg.append("API error: ").append(classFile.getSimpleName()).append(" is loaded from ").append(classFile.getProtectionDomain().getCodeSource().getLocation()); - logger.log(Level.ERROR, msg.toString()); - } - } - - @Deprecated - public static String getVersion() { - return BuildCraftAPI.getVersion(); - } -} diff --git a/src/api/java/buildcraft/api/core/BuildCraftAPI.java b/src/api/java/buildcraft/api/core/BuildCraftAPI.java deleted file mode 100644 index cc883d610..000000000 --- a/src/api/java/buildcraft/api/core/BuildCraftAPI.java +++ /dev/null @@ -1,52 +0,0 @@ -/** 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.core; - -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Set; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import net.minecraft.block.Block; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public final class BuildCraftAPI { - - public static ICoreProxy proxy; - - public static final Set softBlocks = Sets.newHashSet(); - public static final HashMap worldProperties = Maps.newHashMap(); - - /** Deactivate constructor */ - private BuildCraftAPI() {} - - public static String getVersion() { - try { - Class clazz = Class.forName("buildcraft.core.Version"); - Method method = clazz.getDeclaredMethod("getVersion"); - return String.valueOf(method.invoke(null)); - } catch (Exception e) { - return "UNKNOWN VERSION"; - } - } - - 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, BlockPos pos) { - return worldProperties.get("soft").get(world, pos); - } -} diff --git a/src/api/java/buildcraft/api/core/ConfigAccessor.java b/src/api/java/buildcraft/api/core/ConfigAccessor.java deleted file mode 100644 index a66346ac5..000000000 --- a/src/api/java/buildcraft/api/core/ConfigAccessor.java +++ /dev/null @@ -1,48 +0,0 @@ -package buildcraft.api.core; - -import java.util.Map; - -import com.google.common.collect.Maps; - -import net.minecraftforge.common.config.Property; - -/** Use this to access the various config options. It is recommended that you use this as opposed to the variables in - * the mod, as users may only install the modules that they want, and not the one you may have refereed to. */ -@Deprecated -public final class ConfigAccessor { - public enum EMod { - CORE, - BUILDERS, - ENERGY, - FACTORY, - ROBITICS, - SILICON, - TRANSPORT - } - - private static Map mods = Maps.newHashMap(); - - private ConfigAccessor() {} - - public static Property getOption(EMod mod, String name) { - if (mods.containsKey(mod)) { - return mods.get(mod).getOption(name); - } else { - return null; - } - } - - public static boolean getBoolean(EMod mod, String name, boolean defaultBoolean) { - Property prop = getOption(mod, name); - if (prop == null) { - return defaultBoolean; - } else { - return prop.getBoolean(defaultBoolean); - } - } - - /** WARNING: INTERNAL USE ONLY! */ - public static void addMod(EMod mod, IBuildCraftMod actual) { - mods.put(mod, actual); - } -} diff --git a/src/api/java/buildcraft/api/core/EnumColor.java b/src/api/java/buildcraft/api/core/EnumColor.java deleted file mode 100644 index 14449b303..000000000 --- a/src/api/java/buildcraft/api/core/EnumColor.java +++ /dev/null @@ -1,150 +0,0 @@ -/** 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.core; - -import java.util.Locale; -import java.util.Random; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.ResourceLocation; - -import net.minecraft.util.text.translation.I18n; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import javax.annotation.Nonnull; - -/** Use minecraft's EnumDyeColor in as many places as possible. */ -@Deprecated -public enum EnumColor implements IStringSerializable { - - BLACK, - RED, - GREEN, - BROWN, - BLUE, - PURPLE, - CYAN, - LIGHT_GRAY, - GRAY, - PINK, - LIME, - YELLOW, - LIGHT_BLUE, - MAGENTA, - ORANGE, - WHITE; - - public static final EnumColor[] VALUES = values(); - public static final String[] DYES = { "dyeBlack", "dyeRed", "dyeGreen", "dyeBrown", "dyeBlue", "dyePurple", "dyeCyan", "dyeLightGray", "dyeGray", - "dyePink", "dyeLime", "dyeYellow", "dyeLightBlue", "dyeMagenta", "dyeOrange", "dyeWhite" }; - public static final String[] NAMES = { "Black", "Red", "Green", "Brown", "Blue", "Purple", "Cyan", "LightGray", "Gray", "Pink", "Lime", "Yellow", - "LightBlue", "Magenta", "Orange", "White" }; - public static final int[] DARK_HEX = { 0x2D2D2D, 0xA33835, 0x394C1E, 0x5C3A24, 0x3441A2, 0x843FBF, 0x36809E, 0x888888, 0x444444, 0xE585A0, - 0x3FAA36, 0xCFC231, 0x7F9AD1, 0xFF64FF, 0xFF6A00, 0xFFFFFF }; - public static final int[] LIGHT_HEX = { 0x181414, 0xBE2B27, 0x007F0E, 0x89502D, 0x253193, 0x7e34bf, 0x299799, 0xa0a7a7, 0x7A7A7A, 0xD97199, - 0x39D52E, 0xFFD91C, 0x66AAFF, 0xD943C6, 0xEA7835, 0xe4e4e4 }; - - @SideOnly(Side.CLIENT) - private static ResourceLocation iconSheet; - - @SideOnly(Side.CLIENT) - private static TextureAtlasSprite[] brushSprites; - - public int getDarkHex() { - return DARK_HEX[ordinal()]; - } - - public int getLightHex() { - return LIGHT_HEX[ordinal()]; - } - - public static EnumColor fromId(int id) { - if (id < 0 || id >= VALUES.length) { - return WHITE; - } - return VALUES[id]; - } - - public static EnumColor fromDye(String dyeTag) { - for (int id = 0; id < DYES.length; id++) { - if (DYES[id].equals(dyeTag)) { - return VALUES[id]; - } - } - return null; - } - - public static EnumColor fromName(String name) { - for (int id = 0; id < NAMES.length; id++) { - if (NAMES[id].equals(name)) { - return VALUES[id]; - } - } - return null; - } - - public static EnumColor getRand() { - return VALUES[new Random().nextInt(VALUES.length)]; - } - - public EnumColor getNext() { - EnumColor next = VALUES[(ordinal() + 1) % VALUES.length]; - return next; - } - - public EnumColor getPrevious() { - EnumColor previous = VALUES[(ordinal() + VALUES.length - 1) % VALUES.length]; - return previous; - } - - public EnumColor inverse() { - return EnumColor.VALUES[15 - ordinal()]; - } - - public String getTag() { - return "color." + name().replace("_", ".").toLowerCase(Locale.ENGLISH); - } - - public String getBasicTag() { - return name().replace("_", ".").toLowerCase(Locale.ENGLISH); - } - - @Nonnull - @Override - public String getName() { - return NAMES[ordinal()]; - } - - public String getLocalizedName() { - return I18n.translateToLocal(getTag()); - } - - public String getDye() { - return DYES[ordinal()]; - } - - @Override - public String toString() { - String s = name().replace("_", " "); - String[] words = s.split(" "); - StringBuilder b = new StringBuilder(); - for (String word : words) { - b.append(word.charAt(0)).append(word.substring(1).toLowerCase(Locale.ENGLISH)).append(" "); - } - return b.toString().trim(); - } - - @SideOnly(Side.CLIENT) - public static void registerSprites(TextureAtlasSprite[] sprites) { - brushSprites = sprites; - } - - @SideOnly(Side.CLIENT) - public TextureAtlasSprite getSprite() { - return brushSprites[ordinal()]; - } -} diff --git a/src/api/java/buildcraft/api/core/EnumPipePart.java b/src/api/java/buildcraft/api/core/EnumPipePart.java deleted file mode 100644 index f515ff92b..000000000 --- a/src/api/java/buildcraft/api/core/EnumPipePart.java +++ /dev/null @@ -1,118 +0,0 @@ -package buildcraft.api.core; - -import java.util.Locale; -import java.util.Map; - -import com.google.common.collect.Maps; - -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTPrimitive; -import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IStringSerializable; - -import io.netty.buffer.ByteBuf; - -public enum EnumPipePart implements IStringSerializable,INetworkLoadable_BC8 { - DOWN(EnumFacing.DOWN), - UP(EnumFacing.UP), - NORTH(EnumFacing.NORTH), - SOUTH(EnumFacing.SOUTH), - WEST(EnumFacing.WEST), - EAST(EnumFacing.EAST), - /** CENTER, UNKNOWN and ALL are all valid uses of this constant. */ - CENTER(null); - - private static final Map facingMap = Maps.newEnumMap(EnumFacing.class); - private static final Map nameMap = Maps.newHashMap(); - private static final int MAX_VALUES = values().length; - - public final EnumFacing face; - - static { - for (EnumPipePart part : values()) { - nameMap.put(part.name(), part); - if (part.face != null) facingMap.put(part.face, part); - } - } - - public static EnumPipePart fromFacing(EnumFacing face) { - if (face == null) return EnumPipePart.CENTER; - return facingMap.get(face); - } - - public static EnumPipePart[] validFaces() { - return new EnumPipePart[] { DOWN, UP, NORTH, SOUTH, WEST, EAST }; - } - - public static EnumPipePart fromMeta(int meta) { - if (meta < 0 || meta >= MAX_VALUES) return EnumPipePart.CENTER; - return values()[meta]; - } - - private EnumPipePart(EnumFacing face) { - this.face = face; - } - - public int getIndex() { - if (face == null) return 6; - return face.getIndex(); - } - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - - public EnumPipePart next() { - switch (this) { - case DOWN: - return EAST; - case EAST: - return NORTH; - case NORTH: - return SOUTH; - case SOUTH: - return UP; - case UP: - return WEST; - case WEST: - return DOWN; - default: - return DOWN; - } - } - - public EnumPipePart opposite() { - if (this == CENTER) return CENTER; - return fromFacing(face.getOpposite()); - } - - public static EnumPipePart readFromNBT(NBTBase base) { - if (base == null) return CENTER; - if (base instanceof NBTTagString) { - NBTTagString nbtString = (NBTTagString) base; - String string = nbtString.getString(); - return nameMap.containsKey(string) ? nameMap.get(string) : CENTER; - } else { - byte ord = ((NBTPrimitive) base).getByte(); - if (ord < 0 || ord > 6) return CENTER; - return values()[ord]; - } - } - - public NBTBase writeToNBT() { - return new NBTTagString(name()); - } - - @Override - public EnumPipePart readFromByteBuf(ByteBuf buf) { - byte ord = buf.readByte(); - return fromMeta(ord); - } - - @Override - public void writeToByteBuf(ByteBuf buf) { - buf.writeByte(ordinal()); - } -} diff --git a/src/api/java/buildcraft/api/core/IAreaProvider.java b/src/api/java/buildcraft/api/core/IAreaProvider.java deleted file mode 100644 index 02bcf0ca9..000000000 --- a/src/api/java/buildcraft/api/core/IAreaProvider.java +++ /dev/null @@ -1,17 +0,0 @@ -/** 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.core; - -import net.minecraft.util.math.BlockPos; - -/** To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. */ -public interface IAreaProvider { - BlockPos min(); - - BlockPos max(); - - /** 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 deleted file mode 100644 index fd9add8e7..000000000 --- a/src/api/java/buildcraft/api/core/IBox.java +++ /dev/null @@ -1,20 +0,0 @@ -/** 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.core; - - -import net.minecraft.util.math.BlockPos; - -public interface IBox extends IZone { - IBox expand(int amount); - - IBox contract(int amount); - - BlockPos min(); - - BlockPos max(); - - void createLaserData(); -} diff --git a/src/api/java/buildcraft/api/core/IBuildCraftMod.java b/src/api/java/buildcraft/api/core/IBuildCraftMod.java deleted file mode 100644 index c287088b1..000000000 --- a/src/api/java/buildcraft/api/core/IBuildCraftMod.java +++ /dev/null @@ -1,7 +0,0 @@ -package buildcraft.api.core; - -import net.minecraftforge.common.config.Property; - -public interface IBuildCraftMod { - Property getOption(String name); -} diff --git a/src/api/java/buildcraft/api/core/ICoreProxy.java b/src/api/java/buildcraft/api/core/ICoreProxy.java deleted file mode 100755 index fc10bc092..000000000 --- a/src/api/java/buildcraft/api/core/ICoreProxy.java +++ /dev/null @@ -1,14 +0,0 @@ -/** 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.core; - -import java.lang.ref.WeakReference; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.WorldServer; - -public interface ICoreProxy { - WeakReference getBuildCraftPlayer(WorldServer world); -} diff --git a/src/api/java/buildcraft/api/core/IIconProvider.java b/src/api/java/buildcraft/api/core/IIconProvider.java deleted file mode 100644 index 418c08a00..000000000 --- a/src/api/java/buildcraft/api/core/IIconProvider.java +++ /dev/null @@ -1,13 +0,0 @@ -package buildcraft.api.core; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IIconProvider { - public TextureAtlasSprite getIcon(int iconIndex); - - @SideOnly(Side.CLIENT) - public void registerIcons(TextureMap iconRegister); -} diff --git a/src/api/java/buildcraft/api/core/IInvSlot.java b/src/api/java/buildcraft/api/core/IInvSlot.java deleted file mode 100644 index a047a2f87..000000000 --- a/src/api/java/buildcraft/api/core/IInvSlot.java +++ /dev/null @@ -1,26 +0,0 @@ -/** 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.core; - -import net.minecraft.item.ItemStack; - -public interface IInvSlot { - /** Returns the slot number of the underlying Inventory. - * - * @return the slot number */ - int getIndex(); - - boolean canPutStackInSlot(ItemStack stack); - - boolean canTakeStackFromSlot(ItemStack stack); - - boolean isItemValidForSlot(ItemStack stack); - - ItemStack decreaseStackInSlot(int amount); - - ItemStack getStackInSlot(); - - void setStackInSlot(ItemStack stack); -} diff --git a/src/api/java/buildcraft/api/core/INBTLoadable_BC8.java b/src/api/java/buildcraft/api/core/INBTLoadable_BC8.java deleted file mode 100644 index 8005bcf53..000000000 --- a/src/api/java/buildcraft/api/core/INBTLoadable_BC8.java +++ /dev/null @@ -1,14 +0,0 @@ -package buildcraft.api.core; - -import net.minecraft.nbt.NBTBase; - -/** @param The type that will be loaded from and saved too. This essentially allows Immutable objects to be safely - * loaded without helper methods everywhere. However you are allowed to return this if you are a mutable - * object */ -public interface INBTLoadable_BC8 { - /** @return An object that has the properties loaded. WARNIG! This might be the same object as the one this method - * was called on! (You should always replace the object you have stored with whatever this returns) */ - T readFromNBT(NBTBase nbt); - - NBTBase writeToNBT(); -} diff --git a/src/api/java/buildcraft/api/core/INBTStoreable.java b/src/api/java/buildcraft/api/core/INBTStoreable.java deleted file mode 100644 index c34c134ac..000000000 --- a/src/api/java/buildcraft/api/core/INBTStoreable.java +++ /dev/null @@ -1,12 +0,0 @@ -package buildcraft.api.core; - -import net.minecraft.nbt.NBTTagCompound; - -/** Use {@link INBTLoadable_BC8} instead of this, as this gives you more control over what NBT goes where, and what - * objects are allowed to do. */ -@Deprecated -public interface INBTStoreable { - void readFromNBT(NBTTagCompound tag); - - void writeToNBT(NBTTagCompound tag); -} diff --git a/src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java b/src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java deleted file mode 100644 index de0f99e95..000000000 --- a/src/api/java/buildcraft/api/core/INetworkLoadable_BC8.java +++ /dev/null @@ -1,9 +0,0 @@ -package buildcraft.api.core; - -import io.netty.buffer.ByteBuf; - -public interface INetworkLoadable_BC8 { - T readFromByteBuf(ByteBuf buf); - - void writeToByteBuf(ByteBuf buf); -} diff --git a/src/api/java/buildcraft/api/core/IPathProvider.java b/src/api/java/buildcraft/api/core/IPathProvider.java deleted file mode 100644 index 3903c6e81..000000000 --- a/src/api/java/buildcraft/api/core/IPathProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -package buildcraft.api.core; - -import java.util.List; - -import net.minecraft.util.math.BlockPos; - -/** To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. */ -public interface IPathProvider { - List getPath(); - - /** - * Remove from the world all objects used to define the path. - */ - void removeFromWorld(); -} diff --git a/src/api/java/buildcraft/api/core/ISerializable.java b/src/api/java/buildcraft/api/core/ISerializable.java deleted file mode 100644 index 77d56d541..000000000 --- a/src/api/java/buildcraft/api/core/ISerializable.java +++ /dev/null @@ -1,21 +0,0 @@ -/** 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; - -/** Use {@link INetworkLoadable_BC8} instead, as that gives you more control over how you use objects */ -@Deprecated -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 deleted file mode 100755 index 415dc12d1..000000000 --- a/src/api/java/buildcraft/api/core/IWorldProperty.java +++ /dev/null @@ -1,14 +0,0 @@ -/** 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.core; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; - -public interface IWorldProperty { - boolean get(World world, BlockPos pos); - - void clear(); -} diff --git a/src/api/java/buildcraft/api/core/IZone.java b/src/api/java/buildcraft/api/core/IZone.java deleted file mode 100755 index 21a5df210..000000000 --- a/src/api/java/buildcraft/api/core/IZone.java +++ /dev/null @@ -1,26 +0,0 @@ -/** 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.core; - -import java.util.Random; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; - -public interface IZone { - /** Returns the smallest possible distance that the index would have to be changed by in order for - * {@link #contains(Vec3d)} to return true. If the position is already inside then this will return 0 */ - double distanceTo(BlockPos index); - - /** Returns {@link #distanceTo(BlockPos)} but squared. Usually this will be quicker to calculate. */ - double distanceToSquared(BlockPos index); - - /** Returns true if the point is enclosed by this zone, such that none of the coordinates lie outside the range - * specified by this zone. */ - boolean contains(Vec3d point); - - /** Gets a random position that {@link #contains(Vec3d)} will return true. */ - BlockPos getRandomBlockPos(Random rand); -} diff --git a/src/api/java/buildcraft/api/core/JavaTools.java b/src/api/java/buildcraft/api/core/JavaTools.java deleted file mode 100755 index 7b7eb513c..000000000 --- a/src/api/java/buildcraft/api/core/JavaTools.java +++ /dev/null @@ -1,39 +0,0 @@ -/** 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.core; - -import java.util.Arrays; - -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); - return result; - } - - public static int[] concat(int[] first, int[] second) { - int[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } - - public static float[] concat(float[] first, float[] second) { - float[] result = Arrays.copyOf(first, first.length + second.length); - System.arraycopy(second, 0, result, first.length, second.length); - return result; - } - - public static String surroundWithQuotes(String stringToSurroundWithQuotes) { - return String.format("\"%s\"", stringToSurroundWithQuotes); - } - - public static String stripSurroundingQuotes(String stringToStripQuotes) { - return stringToStripQuotes.replaceAll("^\"|\"$", ""); - } -} diff --git a/src/api/java/buildcraft/api/core/SafeTimeTracker.java b/src/api/java/buildcraft/api/core/SafeTimeTracker.java deleted file mode 100644 index 9390d87e7..000000000 --- a/src/api/java/buildcraft/api/core/SafeTimeTracker.java +++ /dev/null @@ -1,68 +0,0 @@ -/** 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.core; - -import net.minecraft.world.World; - -public class SafeTimeTracker { - - private long lastMark = Long.MIN_VALUE; - private long duration = -1; - private long randomRange = 0; - private long lastRandomDelay = 0; - private long internalDelay = 1; - - /** Only use this if the delay time changes (say, if you use this to determine when a refining should be complete */ - public SafeTimeTracker() { - - } - - public SafeTimeTracker(long delay) { - internalDelay = delay; - } - - /** In many situations, it is a bad idea to have all objects of the same kind to be waiting for the exact same - * amount of time, as that can lead to some situation where they're all synchronized and got to work all at the same - * time. When created with a random range, the mark that is set when reaching the expect delay will be added with a - * random number between [0, range[, meaning that the event will take between 0 and range more tick to run. */ - public SafeTimeTracker(long delay, long random) { - internalDelay = delay; - randomRange = random; - } - - public boolean markTimeIfDelay(World world) { - return markTimeIfDelay(world, internalDelay); - } - - /** Return true if a given delay has passed since last time marked was called successfully. */ - public boolean markTimeIfDelay(World world, long delay) { - if (world == null) { - return false; - } - - long currentTime = world.getTotalWorldTime(); - - if (currentTime < lastMark) { - lastMark = currentTime; - return false; - } else if (lastMark + delay + lastRandomDelay <= currentTime) { - duration = currentTime - lastMark; - lastMark = currentTime; - lastRandomDelay = (int) (Math.random() * randomRange); - - return true; - } else { - return false; - } - } - - public long durationOfLastDelay() { - return duration > 0 ? duration : 0; - } - - public void markTime(World world) { - lastMark = world.getTotalWorldTime(); - } -} diff --git a/src/api/java/buildcraft/api/core/StackKey.java b/src/api/java/buildcraft/api/core/StackKey.java deleted file mode 100644 index 97ee4b8b4..000000000 --- a/src/api/java/buildcraft/api/core/StackKey.java +++ /dev/null @@ -1,126 +0,0 @@ -/** 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.core; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -/** This class is used whenever stacks needs to be stored as keys. */ -public final class StackKey { - public final ItemStack stack; - public final FluidStack fluidStack; - - public StackKey(FluidStack fluidStack) { - this(null, fluidStack); - } - - public StackKey(ItemStack stack) { - this(stack, null); - } - - public StackKey(ItemStack stack, FluidStack fluidStack) { - this.stack = stack; - this.fluidStack = fluidStack; - } - - public static StackKey stack(Item item, int amount, int damage) { - return new StackKey(new ItemStack(item, amount, damage)); - } - - public static StackKey stack(Block block, int amount, int damage) { - return new StackKey(new ItemStack(block, amount, damage)); - } - - public static StackKey stack(Item item) { - return new StackKey(new ItemStack(item, 1, 0)); - } - - public static StackKey stack(Block block) { - return new StackKey(new ItemStack(block, 1, 0)); - } - - public static StackKey stack(ItemStack itemStack) { - return new StackKey(itemStack); - } - - public static StackKey fluid(Fluid fluid, int amount) { - return new StackKey(new FluidStack(fluid, amount)); - } - - public static StackKey fluid(Fluid fluid) { - return new StackKey(new FluidStack(fluid, FluidContainerRegistry.BUCKET_VOLUME)); - } - - public static StackKey fluid(FluidStack fluidStack) { - return new StackKey(fluidStack); - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || o.getClass() != StackKey.class) { - return false; - } - StackKey k = (StackKey) o; - if ((stack == null ^ k.stack == null) || (fluidStack == null ^ k.fluidStack == null)) { - return false; - } - if (stack != null) { - if (stack.getItem() != k.stack.getItem() || stack.getHasSubtypes() && stack.getItemDamage() != k.stack.getItemDamage() || !objectsEqual( - stack.getTagCompound(), k.stack.getTagCompound())) { - return false; - } - } - if (fluidStack != null) { - if (fluidStack.getFluid() != k.fluidStack.getFluid() || fluidStack.amount != k.fluidStack.amount || !objectsEqual( - fluidStack.tag, k.fluidStack.tag)) { - return false; - } - } - return true; - } - - @Override - public int hashCode() { - int result = 7; - if (stack != null) { - result = 31 * result + stack.getItem().hashCode(); - result = 31 * result + stack.getItemDamage(); - result = 31 * result + objectHashCode(stack.getTagCompound()); - } - result = 31 * result + 7; - if (fluidStack != null) { - result = 31 * result + FluidRegistry.getFluidID(fluidStack.getFluid()); - result = 31 * result + fluidStack.amount; - result = 31 * result + objectHashCode(fluidStack.tag); - } - return result; - } - - private boolean objectsEqual(Object o1, Object o2) { - if (o1 == null && o2 == null) { - return true; - } else if (o1 == null || o2 == null) { - return false; - } else { - return o1.equals(o2); - } - } - - private int objectHashCode(Object o) { - return o != null ? o.hashCode() : 0; - } - - public StackKey copy() { - return new StackKey(stack != null ? stack.copy() : null, fluidStack != null ? fluidStack.copy() : null); - } -} diff --git a/src/api/java/buildcraft/api/core/package-info.java b/src/api/java/buildcraft/api/core/package-info.java deleted file mode 100644 index 12cc9ea13..000000000 --- a/src/api/java/buildcraft/api/core/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** 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. - */ -@API(apiVersion = "2.0", owner = "BuildCraft|Core", provides = "BuildCraftAPI|core") -package buildcraft.api.core; - -import net.minecraftforge.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 deleted file mode 100644 index 2399a6927..000000000 --- a/src/api/java/buildcraft/api/core/render/ICullable.java +++ /dev/null @@ -1,27 +0,0 @@ -/** 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.util.EnumFacing; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -/* 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(EnumFacing side, boolean render); - - void setRenderAllSides(); - - boolean shouldSideBeRendered(IBlockAccess blockAccess, BlockPos pos, 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 deleted file mode 100644 index e401b3e2e..000000000 --- a/src/api/java/buildcraft/api/core/render/ITextureStateManager.java +++ /dev/null @@ -1,7 +0,0 @@ -package buildcraft.api.core.render; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; - -public interface ITextureStateManager { - void set(TextureAtlasSprite icon); -} diff --git a/src/api/java/buildcraft/api/core/render/ITextureStates.java b/src/api/java/buildcraft/api/core/render/ITextureStates.java deleted file mode 100644 index 593534f6c..000000000 --- a/src/api/java/buildcraft/api/core/render/ITextureStates.java +++ /dev/null @@ -1,18 +0,0 @@ -/** 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.client.renderer.texture.TextureAtlasSprite; - -public interface ITextureStates extends ICullable { - - ITextureStateManager getTextureState(); - - TextureAtlasSprite 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 deleted file mode 100644 index 749de86f7..000000000 --- a/src/api/java/buildcraft/api/gates/GateExpansionController.java +++ /dev/null @@ -1,54 +0,0 @@ -/** 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.gates; - -import java.util.List; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - -import buildcraft.api.statements.IActionInternal; -import buildcraft.api.statements.IStatement; -import buildcraft.api.statements.IStatementParameter; -import buildcraft.api.statements.ITriggerInternal; - -public abstract class GateExpansionController { - - public final IGateExpansion type; - public final TileEntity pipeTile; - - public GateExpansionController(IGateExpansion type, TileEntity pipeTile) { - this.pipeTile = pipeTile; - this.type = type; - } - - public IGateExpansion getType() { - return type; - } - - public boolean isActive() { - return false; - } - - public void tick(IGate gate) {} - - public void startResolution() {} - - public boolean resolveAction(IStatement action, int count) { - return false; - } - - public boolean isTriggerActive(IStatement trigger, IStatementParameter[] parameters) { - return false; - } - - public void addTriggers(List list) {} - - public void addActions(List list) {} - - public void writeToNBT(NBTTagCompound nbt) {} - - public void readFromNBT(NBTTagCompound nbt) {} -} diff --git a/src/api/java/buildcraft/api/gates/GateExpansions.java b/src/api/java/buildcraft/api/gates/GateExpansions.java deleted file mode 100644 index b1e600371..000000000 --- a/src/api/java/buildcraft/api/gates/GateExpansions.java +++ /dev/null @@ -1,61 +0,0 @@ -/** 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.gates; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -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() {} - - public static void registerExpansion(IGateExpansion expansion) { - registerExpansion(expansion.getUniqueIdentifier(), expansion); - } - - public static void registerExpansion(String identifier, IGateExpansion expansion) { - expansions.put(identifier, expansion); - 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); - } - - public static Set getExpansions() { - Set set = new HashSet(); - set.addAll(expansionIDs); - return set; - } - - public static Map getRecipesForPostInit() { - return recipes; - } - - // The code below is used by networking. - - public static IGateExpansion getExpansionByID(int id) { - return expansionIDs.get(id); - } - - public static int getExpansionID(IGateExpansion expansion) { - return expansionIDs.indexOf(expansion); - } -} diff --git a/src/api/java/buildcraft/api/gates/IGate.java b/src/api/java/buildcraft/api/gates/IGate.java deleted file mode 100644 index df2364937..000000000 --- a/src/api/java/buildcraft/api/gates/IGate.java +++ /dev/null @@ -1,30 +0,0 @@ -/** 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.gates; - -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 extends ISidedStatementContainer { - @Deprecated - void setPulsing(boolean pulse); - - 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 deleted file mode 100644 index f197c0ca7..000000000 --- a/src/api/java/buildcraft/api/gates/IGateExpansion.java +++ /dev/null @@ -1,34 +0,0 @@ -/** 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.gates; - -import java.util.List; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.VertexFormat; -import net.minecraft.tileentity.TileEntity; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IGateExpansion { - - String getUniqueIdentifier(); - - String getDisplayName(); - - GateExpansionController makeController(TileEntity pipeTile); - - @SideOnly(Side.CLIENT) - void textureStitch(TextureMap map); - - @SideOnly(Side.CLIENT) - IGateStaticRenderState getRenderState(); - - public interface IGateStaticRenderState { - List bake(VertexFormat format); - } -} diff --git a/src/api/java/buildcraft/api/gates/package-info.java b/src/api/java/buildcraft/api/gates/package-info.java deleted file mode 100644 index b86ad48bd..000000000 --- a/src/api/java/buildcraft/api/gates/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** 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. */ -@API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|gates") -package buildcraft.api.gates; - -import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/statements/ActionState.java b/src/api/java/buildcraft/api/statements/ActionState.java deleted file mode 100755 index 15f547c07..000000000 --- a/src/api/java/buildcraft/api/statements/ActionState.java +++ /dev/null @@ -1,9 +0,0 @@ -/** 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.statements; - -public class ActionState { - -} diff --git a/src/api/java/buildcraft/api/statements/IActionExternal.java b/src/api/java/buildcraft/api/statements/IActionExternal.java deleted file mode 100644 index 21ffc92c4..000000000 --- a/src/api/java/buildcraft/api/statements/IActionExternal.java +++ /dev/null @@ -1,12 +0,0 @@ -/** 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.statements; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -public interface IActionExternal extends IStatement { - void actionActivate(TileEntity target, EnumFacing 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 deleted file mode 100644 index c3c77a4b1..000000000 --- a/src/api/java/buildcraft/api/statements/IActionInternal.java +++ /dev/null @@ -1,11 +0,0 @@ -/** 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.statements; - -public interface IActionInternal extends IStatement { - - void actionActivate(IStatementContainer source, IStatementParameter[] parameters); - -} diff --git a/src/api/java/buildcraft/api/statements/IActionProvider.java b/src/api/java/buildcraft/api/statements/IActionProvider.java deleted file mode 100644 index 63625b05a..000000000 --- a/src/api/java/buildcraft/api/statements/IActionProvider.java +++ /dev/null @@ -1,19 +0,0 @@ -/** 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.statements; - -import java.util.Collection; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -public interface IActionProvider { - - /** Returns the list of actions that are available from the statement container holding the gate. */ - Collection getInternalActions(IStatementContainer container); - - /** Returns the list of actions available to a gate next to the given block. */ - Collection getExternalActions(EnumFacing side, TileEntity tile); -} diff --git a/src/api/java/buildcraft/api/statements/IActionReceptor.java b/src/api/java/buildcraft/api/statements/IActionReceptor.java deleted file mode 100644 index 34155b86a..000000000 --- a/src/api/java/buildcraft/api/statements/IActionReceptor.java +++ /dev/null @@ -1,9 +0,0 @@ -/** 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.statements; - -public interface IActionReceptor { - void actionActivated(IStatement statement, IStatementParameter[] parameters); -} diff --git a/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java b/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java deleted file mode 100644 index cb2dc78e1..000000000 --- a/src/api/java/buildcraft/api/statements/IOverrideDefaultStatements.java +++ /dev/null @@ -1,13 +0,0 @@ -/** 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.statements; - -import java.util.List; - -public interface IOverrideDefaultStatements { - List overrideTriggers(); - - List overrideActions(); -} diff --git a/src/api/java/buildcraft/api/statements/IStatement.java b/src/api/java/buildcraft/api/statements/IStatement.java deleted file mode 100644 index dc0254332..000000000 --- a/src/api/java/buildcraft/api/statements/IStatement.java +++ /dev/null @@ -1,36 +0,0 @@ -/** 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.statements; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IStatement { - /** Every statement needs a unique tag, it should be in the format of "<modid>:<name>. - * - * @return the unique id */ - String getUniqueTag(); - - /** Return the maximum number of parameter this statement can have, 0 if none. */ - int maxParameters(); - - /** Return the minimum number of parameter this statement can have, 0 if none. */ - int minParameters(); - - /** Return the statement description in the UI */ - String getDescription(); - - /** Create parameters for the statement. */ - IStatementParameter createParameter(int index); - - /** This returns the statement after a left rotation. Used in particular in blueprints orientation. */ - IStatement rotateLeft(); - - /** This should return the icon for this statement, suitable for rending directly into a GUI. This should refer to a - * texture on the map block texture map. */ - @SideOnly(Side.CLIENT) - TextureAtlasSprite getGuiSprite(); -} diff --git a/src/api/java/buildcraft/api/statements/IStatementContainer.java b/src/api/java/buildcraft/api/statements/IStatementContainer.java deleted file mode 100644 index f4a73465f..000000000 --- a/src/api/java/buildcraft/api/statements/IStatementContainer.java +++ /dev/null @@ -1,12 +0,0 @@ -/** 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.statements; - -import net.minecraft.tileentity.TileEntity; - -/** This is implemented by objects containing Statements, such as Gates and TileEntities. */ -public interface IStatementContainer { - TileEntity getTile(); -} diff --git a/src/api/java/buildcraft/api/statements/IStatementParameter.java b/src/api/java/buildcraft/api/statements/IStatementParameter.java deleted file mode 100755 index 7ef29c793..000000000 --- a/src/api/java/buildcraft/api/statements/IStatementParameter.java +++ /dev/null @@ -1,36 +0,0 @@ -/** 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.statements; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface IStatementParameter { - - /** Every parameter needs a unique tag, it should be in the format of "<modid>:<name>". - * - * @return the unique id */ - String getUniqueTag(); - - @SideOnly(Side.CLIENT) - TextureAtlasSprite getIcon(); - - ItemStack getItemStack(); - - /** Return the parameter description in the UI */ - String getDescription(); - - void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse); - - void readFromNBT(NBTTagCompound compound); - - void writeToNBT(NBTTagCompound compound); - - /** This returns the parameter after a left rotation. Used in particular in blueprints orientation. */ - IStatementParameter rotateLeft(); -} diff --git a/src/api/java/buildcraft/api/statements/ITriggerExternal.java b/src/api/java/buildcraft/api/statements/ITriggerExternal.java deleted file mode 100644 index 3db589cbc..000000000 --- a/src/api/java/buildcraft/api/statements/ITriggerExternal.java +++ /dev/null @@ -1,14 +0,0 @@ -/** 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.statements; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -public interface ITriggerExternal extends IStatement { - - boolean isTriggerActive(TileEntity target, EnumFacing side, IStatementContainer source, IStatementParameter[] parameters); - -} diff --git a/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java b/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java deleted file mode 100644 index b8628deec..000000000 --- a/src/api/java/buildcraft/api/statements/ITriggerExternalOverride.java +++ /dev/null @@ -1,16 +0,0 @@ -package buildcraft.api.statements; - -import net.minecraft.util.EnumFacing; - -/** 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(EnumFacing 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 deleted file mode 100755 index 610a5728b..000000000 --- a/src/api/java/buildcraft/api/statements/ITriggerInternal.java +++ /dev/null @@ -1,11 +0,0 @@ -/** 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.statements; - -public interface ITriggerInternal extends IStatement { - - boolean isTriggerActive(IStatementContainer source, IStatementParameter[] parameters); - -} diff --git a/src/api/java/buildcraft/api/statements/ITriggerProvider.java b/src/api/java/buildcraft/api/statements/ITriggerProvider.java deleted file mode 100644 index d6ffbd42f..000000000 --- a/src/api/java/buildcraft/api/statements/ITriggerProvider.java +++ /dev/null @@ -1,20 +0,0 @@ -/** 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.statements; - -import java.util.Collection; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -public interface ITriggerProvider { - - /** Returns the list of triggers that are available from the object holding the gate. */ - Collection getInternalTriggers(IStatementContainer container); - - /** Returns the list of triggers available to a gate next to the given block. */ - Collection getExternalTriggers(EnumFacing side, TileEntity tile); - -} diff --git a/src/api/java/buildcraft/api/statements/StatementManager.java b/src/api/java/buildcraft/api/statements/StatementManager.java deleted file mode 100644 index 419ee1d07..000000000 --- a/src/api/java/buildcraft/api/statements/StatementManager.java +++ /dev/null @@ -1,177 +0,0 @@ -/** 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.statements; - -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; - -import buildcraft.api.core.BCLog; - -public final class StatementManager { - - public static Map statements = new HashMap(); - public static Map> parameters = new HashMap>(); - private static List triggerProviders = new LinkedList(); - private static List actionProviders = new LinkedList(); - - /** Deactivate constructor */ - private StatementManager() {} - - public static void registerTriggerProvider(ITriggerProvider provider) { - if (provider != null && !triggerProviders.contains(provider)) { - triggerProviders.add(provider); - } - } - - public static void registerActionProvider(IActionProvider provider) { - if (provider != null && !actionProviders.contains(provider)) { - actionProviders.add(provider); - } - } - - public static void registerStatement(IStatement statement) { - statements.put(statement.getUniqueTag(), statement); - } - - public static void registerParameterClass(Class param) { - parameters.put(createParameter(param).getUniqueTag(), param); - } - - @Deprecated - public static void registerParameterClass(String name, Class param) { - parameters.put(name, param); - } - - public static List getExternalTriggers(EnumFacing side, TileEntity entity) { - List result; - - if (entity instanceof IOverrideDefaultStatements) { - result = ((IOverrideDefaultStatements) entity).overrideTriggers(); - if (result != null) { - return result; - } - } - - result = new LinkedList(); - - for (ITriggerProvider provider : triggerProviders) { - Collection toAdd = provider.getExternalTriggers(side, entity); - - if (toAdd != null) { - for (ITriggerExternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } - - return result; - } - - public static List getExternalActions(EnumFacing side, TileEntity entity) { - List result = new LinkedList(); - - if (entity instanceof IOverrideDefaultStatements) { - result = ((IOverrideDefaultStatements) entity).overrideActions(); - if (result != null) { - return result; - } - } - - result = new LinkedList(); - - for (IActionProvider provider : actionProviders) { - Collection toAdd = provider.getExternalActions(side, entity); - - if (toAdd != null) { - for (IActionExternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } - - return result; - } - - public static List getInternalTriggers(IStatementContainer container) { - List result = new LinkedList(); - - for (ITriggerProvider provider : triggerProviders) { - Collection toAdd = provider.getInternalTriggers(container); - - if (toAdd != null) { - for (ITriggerInternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } - - return result; - } - - public static List getInternalActions(IStatementContainer container) { - List result = new LinkedList(); - - for (IActionProvider provider : actionProviders) { - Collection toAdd = provider.getInternalActions(container); - - if (toAdd != null) { - for (IActionInternal t : toAdd) { - if (!result.contains(t)) { - result.add(t); - } - } - } - } - - return result; - } - - public static IStatementParameter createParameter(String kind) { - return createParameter(parameters.get(kind)); - } - - private static IStatementParameter createParameter(Class param) { - try { - return param.newInstance(); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (Error error) { - BCLog.logErrorAPI(error, IStatementParameter.class); - throw error; - } - - return null; - } - - // /** - // * Generally, this function should be called by every mod implementing - // * the Statements API ***as a container*** (that is, adding its own gates) - // * on the client side from a given Item of choice. - // */ - // @SideOnly(Side.CLIENT) - // public static void registerIcons(TextureAtlasSpriteRegister register) { - // for (IStatement statement : statements.values()) { - // statement.registerIcons(register); - // } - // - // for (Class parameter : parameters.values()) { - // createParameter(parameter).registerIcons(register); - // } - // } -} diff --git a/src/api/java/buildcraft/api/statements/StatementMouseClick.java b/src/api/java/buildcraft/api/statements/StatementMouseClick.java deleted file mode 100644 index c39ed336f..000000000 --- a/src/api/java/buildcraft/api/statements/StatementMouseClick.java +++ /dev/null @@ -1,23 +0,0 @@ -/** 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.statements; - -public final class StatementMouseClick { - private int button; - private boolean shift; - - public StatementMouseClick(int button, boolean shift) { - this.button = button; - this.shift = shift; - } - - public boolean isShift() { - return shift; - } - - public int getButton() { - return button; - } -} diff --git a/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java b/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java deleted file mode 100755 index def3c36ac..000000000 --- a/src/api/java/buildcraft/api/statements/StatementParameterItemStack.java +++ /dev/null @@ -1,83 +0,0 @@ -/** 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.statements; - -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public class StatementParameterItemStack implements IStatementParameter { - - protected ItemStack stack; - - @Override - public TextureAtlasSprite getIcon() { - return null; - } - - @Override - public ItemStack getItemStack() { - return stack; - } - - @Override - public void onClick(IStatementContainer source, IStatement stmt, ItemStack stack, StatementMouseClick mouse) { - if (stack != null) { - this.stack = stack.copy(); - this.stack.stackSize = 1; - } else { - this.stack = null; - } - } - - @Override - public void writeToNBT(NBTTagCompound compound) { - if (stack != null) { - NBTTagCompound tagCompound = new NBTTagCompound(); - stack.writeToNBT(tagCompound); - compound.setTag("stack", tagCompound); - } - } - - @Override - public void readFromNBT(NBTTagCompound compound) { - stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("stack")); - } - - @Override - public boolean equals(Object object) { - if (object instanceof StatementParameterItemStack) { - StatementParameterItemStack param = (StatementParameterItemStack) object; - - return ItemStack.areItemStacksEqual(stack, param.stack) && ItemStack.areItemStackTagsEqual(stack, param.stack); - } else { - return false; - } - } - - @Override - public String getDescription() { - if (stack != null) { - return stack.getDisplayName(); - } else { - return ""; - } - } - - @Override - public String getUniqueTag() { - return "buildcraft:stack"; - } - - // @Override - // public void registerIcons(TextureAtlasSpriteRegister iconRegister) { - // - // } - - @Override - public IStatementParameter rotateLeft() { - return this; - } -} diff --git a/src/api/java/buildcraft/api/statements/StatementSlot.java b/src/api/java/buildcraft/api/statements/StatementSlot.java deleted file mode 100755 index 11d5441fe..000000000 --- a/src/api/java/buildcraft/api/statements/StatementSlot.java +++ /dev/null @@ -1,32 +0,0 @@ -/** 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 deleted file mode 100644 index 5b34bfd94..000000000 --- a/src/api/java/buildcraft/api/statements/containers/IRedstoneStatementContainer.java +++ /dev/null @@ -1,17 +0,0 @@ -package buildcraft.api.statements.containers; - -import net.minecraft.util.EnumFacing; - -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(EnumFacing 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(EnumFacing 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 deleted file mode 100644 index b65ace45a..000000000 --- a/src/api/java/buildcraft/api/statements/containers/ISidedStatementContainer.java +++ /dev/null @@ -1,10 +0,0 @@ -package buildcraft.api.statements.containers; - -import net.minecraft.util.EnumFacing; - -import buildcraft.api.statements.IStatementContainer; - -/** Created by asie on 3/14/15. */ -public interface ISidedStatementContainer extends IStatementContainer { - EnumFacing getSide(); -} diff --git a/src/api/java/buildcraft/api/statements/package-info.java b/src/api/java/buildcraft/api/statements/package-info.java deleted file mode 100644 index 7dd2c74e6..000000000 --- a/src/api/java/buildcraft/api/statements/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** 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. */ -@API(apiVersion = "1.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|statements") -package buildcraft.api.statements; - -import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java b/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java deleted file mode 100644 index 37c44f6b9..000000000 --- a/src/api/java/buildcraft/api/transport/ICustomPipeConnection.java +++ /dev/null @@ -1,12 +0,0 @@ -package buildcraft.api.transport; - -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -public interface ICustomPipeConnection { - /** @return How long the connecting pipe should extend for. Values less than -4/16 indicate that the pipe will not - * connect at all, and will render as it it was not connected. */ - public float getExtension(World world, BlockPos pos, EnumFacing face, IBlockState state); -} diff --git a/src/api/java/buildcraft/api/transport/IInjectable.java b/src/api/java/buildcraft/api/transport/IInjectable.java deleted file mode 100644 index 0de9e2005..000000000 --- a/src/api/java/buildcraft/api/transport/IInjectable.java +++ /dev/null @@ -1,18 +0,0 @@ -package buildcraft.api.transport; - -import net.minecraft.item.EnumDyeColor; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; - -public interface IInjectable { - boolean canInjectItems(EnumFacing 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, EnumFacing from, EnumDyeColor color); -} diff --git a/src/api/java/buildcraft/api/transport/IItemPipe.java b/src/api/java/buildcraft/api/transport/IItemPipe.java deleted file mode 100644 index c943a81a6..000000000 --- a/src/api/java/buildcraft/api/transport/IItemPipe.java +++ /dev/null @@ -1,11 +0,0 @@ -/** 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 deleted file mode 100755 index 96a7a764c..000000000 --- a/src/api/java/buildcraft/api/transport/IPipe.java +++ /dev/null @@ -1,21 +0,0 @@ -/** 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.util.EnumFacing; - -import buildcraft.api.gates.IGate; - -public interface IPipe { - IPipeTile getTile(); - - IGate getGate(EnumFacing side); - - boolean hasGate(EnumFacing side); - - boolean isWired(PipeWire wire); - - boolean isWireActive(PipeWire wire); -} diff --git a/src/api/java/buildcraft/api/transport/IPipeConnection.java b/src/api/java/buildcraft/api/transport/IPipeConnection.java deleted file mode 100644 index 0b25ec818..000000000 --- a/src/api/java/buildcraft/api/transport/IPipeConnection.java +++ /dev/null @@ -1,24 +0,0 @@ -/** 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.util.EnumFacing; - -public interface IPipeConnection { - - enum ConnectOverride { - - CONNECT, - DISCONNECT, - DEFAULT - } - - /** Allows you to override pipe connection logic. - * - * @param type - * @param with - * @return CONNECT to force a connection, DISCONNECT to force no connection, and DEFAULT to let the pipe decide. */ - ConnectOverride overridePipeConnection(IPipeTile.PipeType type, EnumFacing with); -} diff --git a/src/api/java/buildcraft/api/transport/IPipeTile.java b/src/api/java/buildcraft/api/transport/IPipeTile.java deleted file mode 100644 index 5ed528422..000000000 --- a/src/api/java/buildcraft/api/transport/IPipeTile.java +++ /dev/null @@ -1,51 +0,0 @@ -/** 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.block.Block; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -import buildcraft.api.transport.pluggable.PipePluggable; - -public interface IPipeTile extends IInjectable { - enum PipeType { - ITEM, - FLUID, - POWER, - STRUCTURE - } - - PipeType getPipeType(); - - World getWorldBC(); - - /** True if the pipe is connected to the block/pipe in the specific direction - * - * @param with - * @return true if connect */ - boolean isPipeConnected(EnumFacing with); - - Block getNeighborBlock(EnumFacing dir); - - TileEntity getNeighborTile(EnumFacing dir); - - IPipe getNeighborPipe(EnumFacing dir); - - IPipe getPipe(); - - int getPipeColor(); - - PipePluggable getPipePluggable(EnumFacing direction); // Now in IPluggableProvider - - boolean hasPipePluggable(EnumFacing direction); // Now in IPluggableProvider - - boolean hasBlockingPluggable(EnumFacing direction); - - void scheduleNeighborChange(); - - void scheduleRenderUpdate(); -} diff --git a/src/api/java/buildcraft/api/transport/IStripesActivator.java b/src/api/java/buildcraft/api/transport/IStripesActivator.java deleted file mode 100644 index 540346d7b..000000000 --- a/src/api/java/buildcraft/api/transport/IStripesActivator.java +++ /dev/null @@ -1,14 +0,0 @@ -/** 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.minecraft.util.EnumFacing; - -public interface IStripesActivator { - void sendItem(ItemStack itemStack, EnumFacing direction); - - void dropItem(ItemStack itemStack, EnumFacing direction); -} diff --git a/src/api/java/buildcraft/api/transport/IStripesHandler.java b/src/api/java/buildcraft/api/transport/IStripesHandler.java deleted file mode 100644 index d96b78e44..000000000 --- a/src/api/java/buildcraft/api/transport/IStripesHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -/** 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; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -public interface IStripesHandler { - enum StripesHandlerType { - ITEM_USE, - BLOCK_BREAK - } - - StripesHandlerType getType(); - - boolean shouldHandle(ItemStack stack); - - boolean handle(World world, BlockPos pos, EnumFacing direction, 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 deleted file mode 100644 index 569c53954..000000000 --- a/src/api/java/buildcraft/api/transport/IStripesPipe.java +++ /dev/null @@ -1,9 +0,0 @@ -/** 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 cofh.api.energy.IEnergyHandler; - -public interface IStripesPipe extends IPipe, IStripesActivator, IEnergyHandler {} diff --git a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java b/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java deleted file mode 100644 index 28f497243..000000000 --- a/src/api/java/buildcraft/api/transport/PipeConnectionAPI.java +++ /dev/null @@ -1,48 +0,0 @@ -package buildcraft.api.transport; - -import java.util.Map; - -import com.google.common.collect.Maps; - -import net.minecraft.block.Block; -import net.minecraft.block.state.IBlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.EnumFacing; -import net.minecraft.world.World; - -/** Use this class to register blocks with custom block sizes so that pipes can connect to them properly. Note that you - * do not need to register a custom pipe connection if your block implements ICustomPipeConnection. The registered - * version does not override your own implementation. */ -public final class PipeConnectionAPI { - private static final Map connections = Maps.newHashMap(); - private static final ICustomPipeConnection NOTHING = new ICustomPipeConnection() { - @Override - public float getExtension(World world, BlockPos pos, EnumFacing face, IBlockState state) { - return 0; - } - }; - - /** Register a block with a custom connection. Useful if you don't own the block class or are adding it for some-one - * - * @param block The block instance - * @param connection The connection instance */ - public static void registerConnection(Block block, ICustomPipeConnection connection) { - connections.put(block, connection); - } - - public static void registerConnectionAsNothing(Block block) { - connections.put(block, NOTHING); - } - - /** Gets the current custom connection that the block uses. Will be null if nothing has been set. */ - public static ICustomPipeConnection getCustomConnection(Block block) { - if (block instanceof ICustomPipeConnection) { - return (ICustomPipeConnection) block; - } - ICustomPipeConnection connection = connections.get(block); - if (connection != null) { - return connection; - } - return null; - } -} diff --git a/src/api/java/buildcraft/api/transport/PipeManager.java b/src/api/java/buildcraft/api/transport/PipeManager.java deleted file mode 100755 index 81030e638..000000000 --- a/src/api/java/buildcraft/api/transport/PipeManager.java +++ /dev/null @@ -1,71 +0,0 @@ -/** 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 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.util.math.BlockPos; -import net.minecraft.world.World; - -import buildcraft.api.transport.pluggable.PipePluggable; - -public abstract class PipeManager { - - public static List stripesHandlers = 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(); - - @Deprecated - public static boolean canExtractItems(Object extractor, World world, BlockPos pos) { - return true; - } - - @Deprecated - public static boolean canExtractFluids(Object extractor, World world, BlockPos pos) { - 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 deleted file mode 100644 index 5864db9c3..000000000 --- a/src/api/java/buildcraft/api/transport/PipeWire.java +++ /dev/null @@ -1,73 +0,0 @@ -/** 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 java.util.Locale; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public enum PipeWire { - - RED, - BLUE, - GREEN, - YELLOW; - public static Item item; - public static final PipeWire[] VALUES = values(); - - public PipeWire reverse() { - switch (this) { - case RED: - return YELLOW; - case BLUE: - return GREEN; - case GREEN: - return BLUE; - default: - return RED; - } - } - - public String getTag() { - return name().toLowerCase(Locale.ENGLISH) + "PipeWire"; - } - - public String getColor() { - String name = this.toString().toLowerCase(Locale.ENGLISH); - char first = Character.toUpperCase(name.charAt(0)); - return first + name.substring(1); - } - - public ItemStack getStack() { - return getStack(1); - } - - public ItemStack getStack(int qty) { - if (item == null) { - return null; - } else { - return new ItemStack(item, qty, ordinal()); - } - } - - public boolean isPipeWire(ItemStack stack) { - if (stack == null) { - return false; - } else if (stack.getItem() != item) { - return false; - } else { - return stack.getItemDamage() == ordinal(); - } - } - - public static PipeWire fromOrdinal(int ordinal) { - if (ordinal < 0 || ordinal >= VALUES.length) { - return RED; - } else { - return VALUES[ordinal]; - } - } -} diff --git a/src/api/java/buildcraft/api/transport/package-info.java b/src/api/java/buildcraft/api/transport/package-info.java deleted file mode 100644 index 7ab0064d3..000000000 --- a/src/api/java/buildcraft/api/transport/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/** 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. */ -@API(apiVersion = "4.1", owner = "BuildCraftAPI|core", provides = "BuildCraftAPI|transport") -package buildcraft.api.transport; - -import net.minecraftforge.fml.common.API; diff --git a/src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java b/src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java deleted file mode 100644 index 4bede4d03..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IConnectionMatrix.java +++ /dev/null @@ -1,7 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import net.minecraft.util.EnumFacing; - -public interface IConnectionMatrix { - boolean isConnected(EnumFacing face); -} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java deleted file mode 100644 index a3ad9f329..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IFacadePluggable.java +++ /dev/null @@ -1,11 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import net.minecraft.block.state.IBlockState; - -public interface IFacadePluggable { - IBlockState getCurrentState(); - - 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 deleted file mode 100644 index 2601a356d..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableDynamicRenderer.java +++ /dev/null @@ -1,9 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import net.minecraft.util.EnumFacing; - -import buildcraft.api.transport.IPipe; - -public interface IPipePluggableDynamicRenderer { - void renderDynamicPluggable(IPipe pipe, EnumFacing 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 deleted file mode 100644 index b9295e5f0..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; - -import buildcraft.api.transport.IPipe; - -public interface IPipePluggableItem { - PipePluggable createPipePluggable(IPipe pipe, EnumFacing side, ItemStack stack); -} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java deleted file mode 100644 index 7b657dfd0..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableState.java +++ /dev/null @@ -1,9 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import net.minecraft.util.EnumFacing; - -public interface IPipePluggableState { - IConnectionMatrix getPluggableConnections(); - - PipePluggable getPluggable(EnumFacing face); -} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java b/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java deleted file mode 100644 index e4bfc3f60..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipePluggableStaticRenderer.java +++ /dev/null @@ -1,19 +0,0 @@ -package buildcraft.api.transport.pluggable; - -import java.util.List; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.util.EnumFacing; - -import buildcraft.api.transport.IPipe; - -public interface IPipePluggableStaticRenderer { - List bakeCutout(IPipeRenderState render, IPipePluggableState pluggableState, IPipe pipe, PipePluggable pluggable, EnumFacing face); - - /** Use this if you need to render in the translucent pass. */ - public interface Translucent extends IPipePluggableStaticRenderer { - /** For performance return a list that is as small as possible */ - List bakeTranslucent(IPipeRenderState render, IPipePluggableState pluggableState, IPipe pipe, PipePluggable pluggable, - EnumFacing face); - } -} diff --git a/src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java b/src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java deleted file mode 100644 index d923061fd..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/IPipeRenderState.java +++ /dev/null @@ -1,5 +0,0 @@ -package buildcraft.api.transport.pluggable; - -public interface IPipeRenderState { - IConnectionMatrix getPipeConnectionMatrix(); -} diff --git a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java b/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java deleted file mode 100755 index 0a944e389..000000000 --- a/src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java +++ /dev/null @@ -1,60 +0,0 @@ -/** 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.math.AxisAlignedBB; -import net.minecraft.util.EnumFacing; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -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, EnumFacing direction) { - - } - - public void onAttachedPipe(IPipeTile pipe, EnumFacing direction) { - validate(pipe, direction); - } - - public void onDetachedPipe(IPipeTile pipe, EnumFacing direction) { - invalidate(); - } - - public abstract boolean isBlocking(IPipeTile pipe, EnumFacing direction); - - public void invalidate() { - - } - - public void validate(IPipeTile pipe, EnumFacing direction) { - - } - - public boolean isSolidOnSide(IPipeTile pipe, EnumFacing direction) { - return false; - } - - public abstract AxisAlignedBB getBoundingBox(EnumFacing side); - - @SideOnly(Side.CLIENT) - public abstract IPipePluggableStaticRenderer getRenderer(); - - @SideOnly(Side.CLIENT) - public IPipePluggableDynamicRenderer getDynamicRenderer() { - return null; - } - - public boolean requiresRenderUpdate(PipePluggable old) { - return true; - } -} diff --git a/src/api/java/cofh/api/energy/IEnergyConnection.java b/src/api/java/cofh/api/energy/IEnergyConnection.java deleted file mode 100644 index 29ef0a1ce..000000000 --- a/src/api/java/cofh/api/energy/IEnergyConnection.java +++ /dev/null @@ -1,22 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.util.EnumFacing; - - -/** - * Implement this interface on TileEntities which should connect to energy transportation blocks. This is intended for blocks which generate energy but do not - * accept it; otherwise just use IEnergyHandler. - *

- * Note that {@link IEnergyHandler} is an extension of this. - * - * @author King Lemming - * - */ -public interface IEnergyConnection { - - /** - * Returns TRUE if the TileEntity can connect on a given side. - */ - boolean canConnectEnergy(EnumFacing from); - -} diff --git a/src/api/java/cofh/api/energy/IEnergyHandler.java b/src/api/java/cofh/api/energy/IEnergyHandler.java deleted file mode 100644 index 16b236e7a..000000000 --- a/src/api/java/cofh/api/energy/IEnergyHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.util.EnumFacing; - -/** - * Implement this interface on Tile Entities which should handle energy, generally storing it in one or more internal {@link IEnergyStorage} objects. - *

- * A reference implementation is provided {@link TileEnergyHandler}. - *

- * Note that {@link IEnergyReceiver} and {@link IEnergyProvider} are extensions of this. - * - * @author King Lemming - * - */ -public interface IEnergyHandler extends IEnergyConnection { - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(EnumFacing from); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(EnumFacing from); - -} diff --git a/src/api/java/cofh/api/energy/IEnergyProvider.java b/src/api/java/cofh/api/energy/IEnergyProvider.java deleted file mode 100644 index ef0e09d06..000000000 --- a/src/api/java/cofh/api/energy/IEnergyProvider.java +++ /dev/null @@ -1,29 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.util.EnumFacing; - - -/** - * Implement this interface on Tile Entities which should provide energy, generally storing it in one or more internal {@link IEnergyStorage} objects. - *

- * A reference implementation is provided {@link TileEnergyHandler}. - * - * @author King Lemming - * - */ -public interface IEnergyProvider extends IEnergyHandler { - - /** - * Remove energy from an IEnergyProvider, internal distribution is left entirely to the IEnergyProvider. - * - * @param from - * Orientation the energy is extracted from. - * @param maxExtract - * Maximum amount of energy to extract. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted. - */ - int extractEnergy(EnumFacing from, int maxExtract, boolean simulate); - -} diff --git a/src/api/java/cofh/api/energy/IEnergyReceiver.java b/src/api/java/cofh/api/energy/IEnergyReceiver.java deleted file mode 100644 index 989e9baa5..000000000 --- a/src/api/java/cofh/api/energy/IEnergyReceiver.java +++ /dev/null @@ -1,29 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.util.EnumFacing; - - -/** - * Implement this interface on Tile Entities which should receive energy, generally storing it in one or more internal {@link IEnergyStorage} objects. - *

- * A reference implementation is provided {@link TileEnergyHandler}. - * - * @author King Lemming - * - */ -public interface IEnergyReceiver extends IEnergyHandler { - - /** - * Add energy to an IEnergyReceiver, internal distribution is left entirely to the IEnergyReceiver. - * - * @param from - * Orientation the energy is received from. - * @param maxReceive - * Maximum amount of energy to receive. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received. - */ - int receiveEnergy(EnumFacing from, int maxReceive, boolean simulate); - -} diff --git a/src/main/java/vazkii/botania/api/BotaniaAPI.java b/src/main/java/vazkii/botania/api/BotaniaAPI.java index d32e99367..76672e793 100644 --- a/src/main/java/vazkii/botania/api/BotaniaAPI.java +++ b/src/main/java/vazkii/botania/api/BotaniaAPI.java @@ -694,7 +694,7 @@ public final class BotaniaAPI { } private static String getMagnetKey(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) return ""; return "i_" + stack.getItem().getUnlocalizedName() + "@" + stack.getItemDamage(); diff --git a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java index a9cc8fc37..31d2b7d12 100644 --- a/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java +++ b/src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java @@ -142,7 +142,7 @@ public final class CorporeaHelper { * Bridge for requestItem() using an ItemStack. */ public static List requestItem(ItemStack stack, ICorporeaSpark spark, boolean checkNBT, boolean doit) { - return requestItem(stack, stack.stackSize, spark, checkNBT, doit); + return requestItem(stack, stack.getCount(), spark, checkNBT, doit); } /** @@ -232,14 +232,14 @@ public final class CorporeaHelper { * Gets if two stacks match. */ public static boolean stacksMatch(ItemStack stack1, ItemStack stack2, boolean checkNBT) { - return stack1 != null && stack2 != null && stack1.isItemEqual(stack2) && (!checkNBT || ItemStack.areItemStackTagsEqual(stack1, stack2)); + return !stack1.isEmpty() && !stack2.isEmpty() && stack1.isItemEqual(stack2) && (!checkNBT || ItemStack.areItemStackTagsEqual(stack1, stack2)); } /** * Gets if the name of a stack matches the string passed in. */ public static boolean stacksMatch(ItemStack stack, String s) { - if(stack == null) + if(stack.isEmpty()) return false; boolean contains = false; diff --git a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java index f45b5087d..51813c187 100644 --- a/src/main/java/vazkii/botania/api/internal/IManaNetwork.java +++ b/src/main/java/vazkii/botania/api/internal/IManaNetwork.java @@ -32,7 +32,7 @@ public interface IManaNetwork { /** * Gets the closest Mana Collector (eg. Mana Spreader) in the network to the Chunk * Coordinates passed in, in the given dimension.
- * A way of getting the dimension is via worldObj.provider.dimensionId
+ * A way of getting the dimension is via world.provider.dimensionId
* Note that this function *can* get performance intensive, it's reccomended you * call it sparingly and take cache of the value returned. * @param limit The maximum distance the closest block can be, if the closest block @@ -43,7 +43,7 @@ public interface IManaNetwork { /** * Gets the closest Mana Pool in the network to the Chunk Coordinates passed in, * in the given dimension.
- * A way of getting the dimension is via worldObj.provider.dimensionId
+ * A way of getting the dimension is via world.provider.dimensionId
* Note that this function *can* get performance intensive, it's reccomended you * call it sparingly and take cache of the value returned. * @param limit The maximum distance the closest block can be, if the closest block diff --git a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java index 57846994f..e25a7375a 100644 --- a/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java +++ b/src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java @@ -11,15 +11,24 @@ package vazkii.botania.api.internal; import net.minecraft.block.state.IBlockState; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; +import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; public final class VanillaPacketDispatcher { public static void dispatchTEToNearbyPlayers(TileEntity tile) { - IBlockState state = tile.getWorld().getBlockState(tile.getPos()); - tile.getWorld().notifyBlockUpdate(tile.getPos(), state, state, 8); + SPacketUpdateTileEntity packet = tile.getUpdatePacket(); + + if(packet != null && tile.getWorld() instanceof WorldServer) { + PlayerChunkMapEntry chunk = ((WorldServer) tile.getWorld()).getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4); + if(chunk != null) { + chunk.sendPacket(packet); + } + } } public static void dispatchTEToNearbyPlayers(World world, BlockPos pos) { diff --git a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java index 31890976d..9e413b11f 100644 --- a/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java +++ b/src/main/java/vazkii/botania/api/item/IManaProficiencyArmor.java @@ -33,7 +33,7 @@ public interface IManaProficiencyArmor { return false; } - default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player, @Nullable ItemStack rod) { + default boolean shouldGiveProficiency(ItemStack armorStack, EntityEquipmentSlot slot, EntityPlayer player, ItemStack rod) { return shouldGiveProficiency(armorStack, slot, player); } @@ -41,17 +41,17 @@ public interface IManaProficiencyArmor { @Deprecated public static boolean hasProficiency(EntityPlayer player) { - return hasProficiency(player, null); + return hasProficiency(player, ItemStack.EMPTY); } - public static boolean hasProficiency(EntityPlayer player, @Nullable ItemStack rod) { + public static boolean hasProficiency(EntityPlayer player, ItemStack rod) { boolean proficient = false; for(EntityEquipmentSlot e: EntityEquipmentSlot.values()) { if(e.getSlotType() != EntityEquipmentSlot.Type.ARMOR) continue; ItemStack armor = player.getItemStackFromSlot(e); - if(armor != null) { + if(!armor.isEmpty()) { Item item = armor.getItem(); if(item instanceof IManaProficiencyArmor && ((IManaProficiencyArmor) item).shouldGiveProficiency(armor, e, player, rod)) { proficient = true; diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java index 4c4150211..f007584cc 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java @@ -31,7 +31,7 @@ public class LexiconEntry implements Comparable { public final List pages = new ArrayList<>(); private boolean priority = false; - private ItemStack icon = null; + private ItemStack icon = ItemStack.EMPTY; private final List extraDisplayedRecipes = new ArrayList<>(); @@ -130,13 +130,10 @@ public class LexiconEntry implements Comparable { public List getDisplayedRecipes() { ArrayList list = new ArrayList<>(); for(LexiconPage page : pages) { - List l = page.getDisplayedRecipes(); + ArrayList itemsAddedThisPage = new ArrayList<>(); - if(l != null) { - ArrayList itemsAddedThisPage = new ArrayList<>(); - - for(ItemStack s : l) { - addItem: { + for(ItemStack s : page.getDisplayedRecipes()) { + addItem: { for(ItemStack s1 : itemsAddedThisPage) if(s1.getItem() == s.getItem()) break addItem; @@ -147,7 +144,6 @@ public class LexiconEntry implements Comparable { itemsAddedThisPage.add(s); list.add(s); } - } } } diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java index 199a9babc..3311e3264 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconPage.java @@ -12,6 +12,7 @@ package vazkii.botania.api.lexicon; import java.util.List; +import com.google.common.collect.ImmutableList; import net.minecraft.client.gui.GuiButton; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.relauncher.Side; @@ -84,10 +85,10 @@ public abstract class LexiconPage { /** * Shows the list of recipes present in this page for display in the category - * page. Can return null for an entry with no recipes. + * page. */ public List getDisplayedRecipes() { - return null; + return ImmutableList.of(); } public String getUnlocalizedName() { diff --git a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java index ef9f778ee..0174d2abb 100644 --- a/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java +++ b/src/main/java/vazkii/botania/api/lexicon/LexiconRecipeMappings.java @@ -35,7 +35,7 @@ public final class LexiconRecipeMappings { if(force || !mappings.containsKey(str)) mappings.put(str, data); - if(entry.getIcon() == null) + if(entry.getIcon().isEmpty()) entry.setIcon(stack.copy()); } @@ -59,7 +59,7 @@ public final class LexiconRecipeMappings { } public static String stackToString(ItemStack stack, boolean forceIgnore) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return "NULL"; if(stack.hasTagCompound() && stack.getItem() instanceof IRecipeKeyProvider) diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index b51ce62cd..944ab8896 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -84,12 +84,12 @@ public class Multiblock { } private void addStack(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) return; for(ItemStack oStack : materials) if(oStack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(oStack, stack)) { - oStack.stackSize += stack.stackSize; + oStack.grow(stack.getCount()); return; } diff --git a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java index 27cb28664..ed7e42f9d 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaDiscountEvent.java @@ -22,7 +22,7 @@ public class ManaDiscountEvent extends Event { private float discount; private ItemStack tool; - public ManaDiscountEvent(EntityPlayer entityPlayer, float discount, @Nullable ItemStack tool) { + public ManaDiscountEvent(EntityPlayer entityPlayer, float discount, ItemStack tool) { this.entityPlayer = entityPlayer; this.discount = discount; this.tool = tool; @@ -30,10 +30,10 @@ public class ManaDiscountEvent extends Event { @Deprecated public ManaDiscountEvent(EntityPlayer entityPlayer, float discount) { - this(entityPlayer, discount, null); + this(entityPlayer, discount, ItemStack.EMPTY); } - @Nullable + public ItemStack getTool() { return tool; } diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index e22673ed8..103333e30 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -19,9 +19,10 @@ import java.util.Map.Entry; import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; public final class ManaItemHandler { @@ -36,15 +37,15 @@ public final class ManaItemHandler { if (player == null) return new ArrayList(); - IInventory mainInv = player.inventory; + IItemHandler mainInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); List toReturn = new ArrayList(); - int size = mainInv.getSizeInventory(); + int size = mainInv.getSlots(); for(int slot = 0; slot < size; slot++) { ItemStack stackInSlot = mainInv.getStackInSlot(slot); - if(stackInSlot != null && stackInSlot.getItem() instanceof IManaItem) { + if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { toReturn.add(stackInSlot); } } @@ -63,18 +64,18 @@ public final class ManaItemHandler { if (player == null) return new HashMap(); - IInventory baublesInv = BotaniaAPI.internalHandler.getBaublesInventory(player); + IItemHandler baublesInv = BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player); if (baublesInv == null) return new HashMap(); Map toReturn = new HashMap(); - int size = baublesInv.getSizeInventory(); + int size = baublesInv.getSlots(); for(int slot = 0; slot < size; slot++) { ItemStack stackInSlot = baublesInv.getStackInSlot(slot); - if(stackInSlot != null && stackInSlot.getItem() instanceof IManaItem) { + if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { toReturn.put(slot, stackInSlot); } } @@ -90,7 +91,7 @@ public final class ManaItemHandler { * @return The amount of mana received from the request. */ public static int requestMana(ItemStack stack, EntityPlayer player, int manaToGet, boolean remove) { - if(stack == null) + if(stack.isEmpty()) return 0; List items = getManaItems(player); @@ -143,7 +144,7 @@ public final class ManaItemHandler { * @return If the request was succesful. */ public static boolean requestManaExact(ItemStack stack, EntityPlayer player, int manaToGet, boolean remove) { - if(stack == null) + if(stack.isEmpty()) return false; List items = getManaItems(player); @@ -191,7 +192,7 @@ public final class ManaItemHandler { * @return The amount of mana actually sent. */ public static int dispatchMana(ItemStack stack, EntityPlayer player, int manaToSend, boolean add) { - if(stack == null) + if(stack.isEmpty()) return 0; List items = getManaItems(player); @@ -251,7 +252,7 @@ public final class ManaItemHandler { * @return If an item received the mana sent. */ public static boolean dispatchManaExact(ItemStack stack, EntityPlayer player, int manaToSend, boolean add) { - if(stack == null) + if(stack.isEmpty()) return false; List items = getManaItems(player); @@ -328,11 +329,11 @@ public final class ManaItemHandler { * Gets the sum of all the discounts on IManaDiscountArmor items equipped * on the player passed in. This discount can vary based on what the passed tool is. */ - public static float getFullDiscountForTools(EntityPlayer player, @Nullable ItemStack tool) { + public static float getFullDiscountForTools(EntityPlayer player, ItemStack tool) { float discount = 0F; - for(int i = 0; i < player.inventory.armorInventory.length; i++) { - ItemStack armor = player.inventory.armorInventory[i]; - if(armor != null && armor.getItem() instanceof IManaDiscountArmor) + for(int i = 0; i < player.inventory.armorInventory.size(); i++) { + ItemStack armor = player.inventory.armorInventory.get(i); + if(!armor.isEmpty() && armor.getItem() instanceof IManaDiscountArmor) discount += ((IManaDiscountArmor) armor.getItem()).getDiscount(armor, i, player, tool); } diff --git a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java index 0600c7b98..17ff005aa 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java +++ b/src/main/java/vazkii/botania/api/mana/ManaProficiencyEvent.java @@ -10,10 +10,6 @@ */ package vazkii.botania.api.mana; -import java.util.List; - -import javax.annotation.Nullable; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.eventhandler.Event; @@ -24,7 +20,7 @@ public class ManaProficiencyEvent extends Event { private ItemStack rod; private boolean proficient; - public ManaProficiencyEvent(EntityPlayer entityPlayer, @Nullable ItemStack rod, boolean proficient) { + public ManaProficiencyEvent(EntityPlayer entityPlayer, ItemStack rod, boolean proficient) { this.entityPlayer = entityPlayer; this.rod = rod; this.proficient = proficient; @@ -34,7 +30,6 @@ public class ManaProficiencyEvent extends Event { return entityPlayer; } - @Nullable public ItemStack getRod() { return rod; } diff --git a/src/main/java/vazkii/botania/api/package-info.java b/src/main/java/vazkii/botania/api/package-info.java index 81354baf9..a2153e5d2 100644 --- a/src/main/java/vazkii/botania/api/package-info.java +++ b/src/main/java/vazkii/botania/api/package-info.java @@ -1,4 +1,4 @@ -@API(owner = "Botania", apiVersion = "85", provides = "BotaniaAPI") +@API(owner = "Botania", apiVersion = "86", provides = "BotaniaAPI") package vazkii.botania.api; import net.minecraftforge.fml.common.API; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java index f56f0175b..355e25392 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeBrew.java @@ -45,7 +45,7 @@ public class RecipeBrew { for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; if(stack.getItem() instanceof IBrewContainer) @@ -106,7 +106,7 @@ public class RecipeBrew { } public ItemStack getOutput(ItemStack stack) { - if(stack == null || !(stack.getItem() instanceof IBrewContainer)) + if(stack.isEmpty() || !(stack.getItem() instanceof IBrewContainer)) return new ItemStack(Items.GLASS_BOTTLE); // Fallback... IBrewContainer container = (IBrewContainer) stack.getItem(); diff --git a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java index 56beaa12c..ec1c3f0eb 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipeElvenTrade.java @@ -31,7 +31,7 @@ public class RecipeElvenTrade { List stacksToRemove = new ArrayList<>(); for(ItemStack stack : stacks) { - if(stack == null) { + if(stack.isEmpty()) { continue; } if(inputsMissing.isEmpty()) diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java index 1a65d9b60..af1285b7d 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePetals.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePetals.java @@ -42,7 +42,7 @@ public class RecipePetals { for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; int stackIndex = -1, oredictIndex = -1; diff --git a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java index 530741a26..1460c3ef4 100644 --- a/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java +++ b/src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java @@ -59,7 +59,7 @@ public class RecipePureDaisy { } private boolean isOreDict(ItemStack stack, String entry) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return false; List ores; diff --git a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java index 2e9938229..7fcc8042c 100644 --- a/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java +++ b/src/main/java/vazkii/botania/api/sound/BotaniaSoundEvents.java @@ -9,53 +9,53 @@ import net.minecraft.util.SoundEvent; */ public final class BotaniaSoundEvents { - public static final SoundEvent airRod = getRegisteredSoundEvent("botania:airRod"); - public static final SoundEvent agricarnation = getRegisteredSoundEvent("botania:agricarnation"); - public static final SoundEvent altarCraft = getRegisteredSoundEvent("botania:altarCraft"); - public static final SoundEvent babylonAttack = getRegisteredSoundEvent("botania:babylonAttack"); - public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("botania:babylonSpawn"); - public static final SoundEvent bellows = getRegisteredSoundEvent("botania:bellows"); - public static final SoundEvent bifrostRod = getRegisteredSoundEvent("botania:bifrostRod"); - public static final SoundEvent blackLotus = getRegisteredSoundEvent("botania:blackLotus"); - public static final SoundEvent dash = getRegisteredSoundEvent("botania:dash"); - public static final SoundEvent ding = getRegisteredSoundEvent("botania:ding"); - public static final SoundEvent divaCharm = getRegisteredSoundEvent("botania:divaCharm"); - public static final SoundEvent divinationRod = getRegisteredSoundEvent("botania:divinationRod"); - public static final SoundEvent doit = getRegisteredSoundEvent("botania:doit"); - public static final SoundEvent enchanterFade = getRegisteredSoundEvent("botania:enchanterForm"); - public static final SoundEvent enchanterForm = getRegisteredSoundEvent("botania:enchanterFade"); - public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("botania:enchanterEnchant"); - public static final SoundEvent endoflame = getRegisteredSoundEvent("botania:endoflame"); - public static final SoundEvent equipBauble = getRegisteredSoundEvent("botania:equipBauble"); - public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("botania:gaiaTrap"); - public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("botania:goldenLaurel"); - public static final SoundEvent holyCloak = getRegisteredSoundEvent("botania:holyCloak"); - public static final SoundEvent laputaStart = getRegisteredSoundEvent("botania:laputaStart"); - public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("botania:lexiconOpen"); - public static final SoundEvent lexiconPage = getRegisteredSoundEvent("botania:lexiconPage"); - public static final SoundEvent lightRelay = getRegisteredSoundEvent("botania:lightRelay"); - public static final SoundEvent manaBlaster = getRegisteredSoundEvent("botania:manaBlaster"); - public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("botania:manaPoolCraft"); - public static final SoundEvent missile = getRegisteredSoundEvent("botania:missile"); - public static final SoundEvent orechid = getRegisteredSoundEvent("botania:orechid"); - public static final SoundEvent potionCreate = getRegisteredSoundEvent("botania:potionCreate"); - public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("botania:runeAltarCraft"); - public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("botania:runeAltarStart"); - public static final SoundEvent spreaderFire = getRegisteredSoundEvent("botania:spreaderFire"); - public static final SoundEvent starcaller = getRegisteredSoundEvent("botania:starcaller"); - public static final SoundEvent terraBlade = getRegisteredSoundEvent("botania:terraBlade"); - public static final SoundEvent terraformRod = getRegisteredSoundEvent("botania:terraformRod"); - public static final SoundEvent terraPickMode = getRegisteredSoundEvent("botania:terraPickMode"); - public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("botania:terrasteelCraft"); - public static final SoundEvent thermalily = getRegisteredSoundEvent("botania:thermalily"); - public static final SoundEvent unholyCloak = getRegisteredSoundEvent("botania:unholyCloak"); - public static final SoundEvent way = getRegisteredSoundEvent("botania:way"); + public static final SoundEvent airRod = getRegisteredSoundEvent("airrod"); + public static final SoundEvent agricarnation = getRegisteredSoundEvent("agricarnation"); + public static final SoundEvent altarCraft = getRegisteredSoundEvent("altarcraft"); + public static final SoundEvent babylonAttack = getRegisteredSoundEvent("babylonattack"); + public static final SoundEvent babylonSpawn = getRegisteredSoundEvent("babylonspawn"); + public static final SoundEvent bellows = getRegisteredSoundEvent("bellows"); + public static final SoundEvent bifrostRod = getRegisteredSoundEvent("bifrostrod"); + public static final SoundEvent blackLotus = getRegisteredSoundEvent("blacklotus"); + public static final SoundEvent dash = getRegisteredSoundEvent("dash"); + public static final SoundEvent ding = getRegisteredSoundEvent("ding"); + public static final SoundEvent divaCharm = getRegisteredSoundEvent("divacharm"); + public static final SoundEvent divinationRod = getRegisteredSoundEvent("divinationrod"); + public static final SoundEvent doit = getRegisteredSoundEvent("doit"); + public static final SoundEvent enchanterFade = getRegisteredSoundEvent("enchanterform"); + public static final SoundEvent enchanterForm = getRegisteredSoundEvent("enchanterfade"); + public static final SoundEvent enchanterEnchant = getRegisteredSoundEvent("enchanterenchant"); + public static final SoundEvent endoflame = getRegisteredSoundEvent("endoflame"); + public static final SoundEvent equipBauble = getRegisteredSoundEvent("equipbauble"); + public static final SoundEvent gaiaTrap = getRegisteredSoundEvent("gaiatrap"); + public static final SoundEvent goldenLaurel = getRegisteredSoundEvent("goldenlaurel"); + public static final SoundEvent holyCloak = getRegisteredSoundEvent("holycloak"); + public static final SoundEvent laputaStart = getRegisteredSoundEvent("laputastart"); + public static final SoundEvent lexiconOpen = getRegisteredSoundEvent("lexiconopen"); + public static final SoundEvent lexiconPage = getRegisteredSoundEvent("lexiconpage"); + public static final SoundEvent lightRelay = getRegisteredSoundEvent("lightrelay"); + public static final SoundEvent manaBlaster = getRegisteredSoundEvent("manablaster"); + public static final SoundEvent manaPoolCraft = getRegisteredSoundEvent("manapoolcraft"); + public static final SoundEvent missile = getRegisteredSoundEvent("missile"); + public static final SoundEvent orechid = getRegisteredSoundEvent("orechid"); + public static final SoundEvent potionCreate = getRegisteredSoundEvent("potioncreate"); + public static final SoundEvent runeAltarCraft = getRegisteredSoundEvent("runealtarcraft"); + public static final SoundEvent runeAltarStart = getRegisteredSoundEvent("runealtarstart"); + public static final SoundEvent spreaderFire = getRegisteredSoundEvent("spreaderfire"); + public static final SoundEvent starcaller = getRegisteredSoundEvent("starcaller"); + public static final SoundEvent terraBlade = getRegisteredSoundEvent("terrablade"); + public static final SoundEvent terraformRod = getRegisteredSoundEvent("terraformrod"); + public static final SoundEvent terraPickMode = getRegisteredSoundEvent("terrapickmode"); + public static final SoundEvent terrasteelCraft = getRegisteredSoundEvent("terrasteelcraft"); + public static final SoundEvent thermalily = getRegisteredSoundEvent("thermalily"); + public static final SoundEvent unholyCloak = getRegisteredSoundEvent("unholycloak"); + public static final SoundEvent way = getRegisteredSoundEvent("way"); - public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("botania:music.gaia1"); - public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("botania:music.gaia2"); + public static final SoundEvent gaiaMusic1 = getRegisteredSoundEvent("music.gaia1"); + public static final SoundEvent gaiaMusic2 = getRegisteredSoundEvent("music.gaia2"); private static SoundEvent getRegisteredSoundEvent(String name) { - return SoundEvent.REGISTRY.getObject(new ResourceLocation(name)); + return SoundEvent.REGISTRY.getObject(new ResourceLocation("botania", name)); } private BotaniaSoundEvents() {} diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java index e98186e83..73c4b0c80 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileEntity.java @@ -133,7 +133,7 @@ public class SubTileEntity { /** * Called when a player right clicks this sub tile. */ - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { return false; } /** * Called when this sub tile is added to the world. diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java index 4eb541368..da56a4f32 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java @@ -137,7 +137,7 @@ public class SubTileFunctional extends SubTileEntity { return false; knownMana = mana; - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); return super.onWanded(player, wand); } @@ -199,7 +199,7 @@ public class SubTileFunctional extends SubTileEntity { double dist = pos.distanceSq(supertile.getPos()); if(range >= dist) { - TileEntity tile = player.worldObj.getTileEntity(pos); + TileEntity tile = player.world.getTileEntity(pos); if(tile instanceof IManaPool) { linkedPool = tile; return true; @@ -210,7 +210,7 @@ public class SubTileFunctional extends SubTileEntity { } public boolean isValidBinding() { - return linkedPool != null && linkedPool.hasWorldObj() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; + return linkedPool != null && linkedPool.hasWorld() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java index ce7da0c25..15002ddb8 100644 --- a/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java +++ b/src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java @@ -197,7 +197,7 @@ public class SubTileGenerating extends SubTileEntity { public void populateDropStackNBTs(List drops) { if(isPassiveFlower() && ticksExisted > 0 && BotaniaAPI.internalHandler.getPassiveFlowerDecay() > 0) { ItemStack drop = drops.get(0); - if(drop != null) { + if(!drop.isEmpty()) { if(!drop.hasTagCompound()) drop.setTagCompound(new NBTTagCompound()); NBTTagCompound cmp = drop.getTagCompound(); @@ -220,11 +220,11 @@ public class SubTileGenerating extends SubTileEntity { if(player == null) return false; - if(!player.worldObj.isRemote) + if(!player.world.isRemote) sync(); knownMana = mana; - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); return super.onWanded(player, wand); } @@ -289,7 +289,7 @@ public class SubTileGenerating extends SubTileEntity { double dist = pos.distanceSq(supertile.getPos()); if(range >= dist) { - TileEntity tile = player.worldObj.getTileEntity(pos); + TileEntity tile = player.world.getTileEntity(pos); if(tile instanceof IManaCollector) { linkedCollector = tile; return true; diff --git a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java index 65574df64..3055153d3 100644 --- a/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java +++ b/src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java @@ -53,10 +53,10 @@ public class SimpleWikiProvider implements IWikiProvider { ItemStack stack = state.getBlock().getPickBlock(state, pos, world, bPos, player); - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) stack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state)); - if(stack.getItem() == null) + if(stack.isEmpty()) return null; String name = stack.getDisplayName(); diff --git a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java index fd9ec4129..7b97968b5 100644 --- a/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/AstrolabePreviewHandler.java @@ -36,14 +36,14 @@ public final class AstrolabePreviewHandler { @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { - World world = Minecraft.getMinecraft().theWorld; + World world = Minecraft.getMinecraft().world; List playerEntities = world.playerEntities; for (EntityPlayer player : playerEntities) { ItemStack currentStack = player.getHeldItemMainhand(); - if(currentStack == null || !(currentStack.getItem() instanceof ItemAstrolabe)) + if(currentStack.isEmpty() || !(currentStack.getItem() instanceof ItemAstrolabe)) currentStack = player.getHeldItemOffhand(); - if(currentStack != null && currentStack.getItem() instanceof ItemAstrolabe) { + if(!currentStack.isEmpty() && currentStack.getItem() instanceof ItemAstrolabe) { Block block = ItemAstrolabe.getBlock(currentStack); if(block != Blocks.AIR) renderPlayerLook(player, currentStack); @@ -76,9 +76,6 @@ public final class AstrolabePreviewHandler { private static void renderBlockAt(Block block, int meta, BlockPos pos) { IBlockState state = block.getStateFromMeta(meta); - - if(state == null) - return; double renderPosX, renderPosY, renderPosZ; diff --git a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java index 79aaee9b9..9c643b480 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BaubleRenderHandler.java @@ -12,6 +12,7 @@ package vazkii.botania.client.core.handler; import javax.annotation.Nonnull; +import net.minecraftforge.items.IItemHandler; import org.lwjgl.opengl.GL11; import baubles.api.BaublesApi; @@ -24,7 +25,6 @@ import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import vazkii.botania.api.item.IBaubleRender; @@ -43,10 +43,10 @@ public final class BaubleRenderHandler implements LayerRenderer { if(!ConfigHandler.renderBaubles || player.getActivePotionEffect(MobEffects.INVISIBILITY) != null) return; - IInventory inv = BaublesApi.getBaubles(player); + IItemHandler inv = BaublesApi.getBaublesHandler(player); dispatchRenders(inv, player, RenderType.BODY, partialTicks); - if(inv.getStackInSlot(3) != null) + if(!inv.getStackInSlot(3).isEmpty()) renderManaTablet(player); float yaw = player.prevRotationYawHead + (player.rotationYawHead - player.prevRotationYawHead) * partialTicks; @@ -60,16 +60,16 @@ public final class BaubleRenderHandler implements LayerRenderer { dispatchRenders(inv, player, RenderType.HEAD, partialTicks); ItemStack helm = player.inventory.armorItemInSlot(3); - if(helm != null && helm.getItem() instanceof ItemTerrasteelHelm) + if(!helm.isEmpty() && helm.getItem() instanceof ItemTerrasteelHelm) ItemTerrasteelHelm.renderOnPlayer(helm, player); GlStateManager.popMatrix(); } - private void dispatchRenders(IInventory inv, EntityPlayer player, RenderType type, float partialTicks) { - for(int i = 0; i < inv.getSizeInventory(); i++) { + private void dispatchRenders(IItemHandler inv, EntityPlayer player, RenderType type, float partialTicks) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { Item item = stack.getItem(); if(item instanceof IPhantomInkable) { @@ -81,7 +81,7 @@ public final class BaubleRenderHandler implements LayerRenderer { if(item instanceof ICosmeticAttachable) { ICosmeticAttachable attachable = (ICosmeticAttachable) item; ItemStack cosmetic = attachable.getCosmeticItem(stack); - if(cosmetic != null) { + if(!cosmetic.isEmpty()) { GlStateManager.pushMatrix(); GL11.glColor3ub((byte) 255, (byte) 255, (byte) 255); // Some of the baubles use this so we must restore it manually as well GlStateManager.color(1F, 1F, 1F, 1F); @@ -107,11 +107,11 @@ public final class BaubleRenderHandler implements LayerRenderer { boolean renderedOne = false; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stack = player.inventory.getStackInSlot(i); - if(stack != null && stack.getItem() == ModItems.manaTablet) { + if(!stack.isEmpty() && stack.getItem() == ModItems.manaTablet) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.LEGS) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.LEGS).isEmpty(); GlStateManager.rotate(90, 0, 1, 0); GlStateManager.rotate(180, 0, 0, 1); GlStateManager.translate(0, -0.6, 0); diff --git a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java index ef7db6ce0..148edb6fe 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/BlockHighlightRenderHandler.java @@ -55,14 +55,14 @@ public final class BlockHighlightRenderHandler { if(Botania.proxy.isClientPlayerWearingMonocle() && pos != null && pos.entityHit == null) { BlockPos bPos = pos.getBlockPos(); - ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand); - if(stackHeld != null && ItemTwigWand.getBindMode(stackHeld)) { + ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand); + if(!stackHeld.isEmpty() && ItemTwigWand.getBindMode(stackHeld)) { BlockPos coords = ItemTwigWand.getBoundTile(stackHeld); if(coords.getY() != -1) bPos = coords; } - TileEntity tile = mc.theWorld.getTileEntity(bPos); + TileEntity tile = mc.world.getTileEntity(bPos); if(tile == null || !(tile instanceof ISubTileContainer)) break boundTile; ISubTileContainer container = (ISubTileContainer) tile; @@ -80,7 +80,7 @@ public final class BlockHighlightRenderHandler { } double offY = -1.0 / 16 + 0.005; - for(Entity e : mc.theWorld.loadedEntityList) + for(Entity e : mc.world.loadedEntityList) if(e instanceof EntityMagicLandmine) { BlockPos bpos = e.getPosition(); AxisAlignedBB aabb = new AxisAlignedBB(bpos).offset(0, offY, 0).expand(2.5, 0, 2.5); diff --git a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java index c053e4f7d..2aaf8544d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java @@ -50,16 +50,16 @@ public final class BoundTileRenderer { GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().player; int color = Color.HSBtoRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F); - if(player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { + if(!player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof ICoordBoundItem) { BlockPos coords = ((ICoordBoundItem) player.getHeldItemMainhand().getItem()).getBinding(player.getHeldItemMainhand()); if(coords != null) renderBlockOutlineAt(coords, color); } - if(player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() instanceof ICoordBoundItem) { + if(!player.getHeldItemOffhand().isEmpty() && player.getHeldItemOffhand().getItem() instanceof ICoordBoundItem) { BlockPos coords = ((ICoordBoundItem) player.getHeldItemOffhand().getItem()).getBinding(player.getHeldItemOffhand()); if(coords != null) renderBlockOutlineAt(coords, color); @@ -72,12 +72,11 @@ public final class BoundTileRenderer { for(int i = 0; i < joined.getSlots(); i++) { ItemStack stackInSlot = joined.getStackInSlot(i); - if(stackInSlot != null && stackInSlot.getItem() instanceof IWireframeCoordinateListProvider) { + if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IWireframeCoordinateListProvider) { IWireframeCoordinateListProvider provider = (IWireframeCoordinateListProvider) stackInSlot.getItem(); List coordsList = provider.getWireframesToDraw(player, stackInSlot); - if(coordsList != null) - for(BlockPos coords : coordsList) - renderBlockOutlineAt(coords, color); + for(BlockPos coords : coordsList) + renderBlockOutlineAt(coords, color); BlockPos coords = provider.getSourceWireframe(player, stackInSlot); if(coords != null && coords.getY() > -1) @@ -112,7 +111,7 @@ public final class BoundTileRenderer { Color colorRGB = new Color(color); GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 255); - World world = Minecraft.getMinecraft().theWorld; + World world = Minecraft.getMinecraft().world; IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); drawWireframe : { diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 55d1de7b6..36f6aa854 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -61,7 +61,7 @@ public final class ClientTickHandler { RedStringRenderer.tick(); ItemsRemainingRenderHandler.tick(); - if(Minecraft.getMinecraft().theWorld == null) { + if(Minecraft.getMinecraft().world == null) { ManaNetworkHandler.instance.clear(); TileCorporeaIndex.indexes.clear(); SubTileVinculotus.existingFlowers.clear(); @@ -72,10 +72,10 @@ public final class ClientTickHandler { ticksInGame++; partialTicks = 0; - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().player; if(player != null) { if(PlayerHelper.hasHeldItemClass(player, ModItems.twigWand)) { - for(TileSignature sig : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().theWorld))) { + for(TileSignature sig : ImmutableList.copyOf(ManaNetworkHandler.instance.getAllCollectorsInWorld(Minecraft.getMinecraft().world))) { if(!sig.isRemote()) continue; diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index 3154a1f10..6953721f3 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -138,11 +138,11 @@ public final class ColorHandler { items.registerItemColorHandler((s, t) -> { ItemStack lens = ItemManaGun.getLens(s); - if(lens != null && t == 0) + if(!lens.isEmpty() && t == 0) return Minecraft.getMinecraft().getItemColors().getColorFromItemstack(lens, t); if(t == 2) { - EntityManaBurst burst = ((ItemManaGun) s.getItem()).getBurst(Minecraft.getMinecraft().thePlayer, s, false); + EntityManaBurst burst = ((ItemManaGun) s.getItem()).getBurst(Minecraft.getMinecraft().player, s, false); Color color = new Color(burst == null ? 0x20FF20 : burst.getColor()); float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F); diff --git a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java index 3d962c27c..581337ff2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java @@ -18,6 +18,7 @@ import java.util.TreeSet; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.input.Keyboard; import com.google.common.collect.ImmutableList; @@ -50,7 +51,7 @@ public class CorporeaAutoCompleteHandler { public static void updateItemList() { itemNames.clear(); Iterator iterator = Item.REGISTRY.iterator(); - ArrayList curList = new ArrayList<>(); + NonNullList curList = NonNullList.create(); while(iterator.hasNext()) { Item item = iterator.next(); @@ -78,7 +79,7 @@ public class CorporeaAutoCompleteHandler { } GuiChat chat = (GuiChat) screen; if(isAutoCompleted) { - boolean valid = ReflectionHelper.getPrivateValue(GuiChat.class, chat, LibObfuscation.COMPLETE_FLAG); + boolean valid = false;//ReflectionHelper.getPrivateValue(GuiChat.class, chat, LibObfuscation.COMPLETE_FLAG); if(!valid) isAutoCompleted = false; } @@ -122,7 +123,7 @@ public class CorporeaAutoCompleteHandler { if(completions.isEmpty()) return; position = -1; - ReflectionHelper.setPrivateValue(GuiChat.class, chat, true, LibObfuscation.COMPLETE_FLAG); + //ReflectionHelper.setPrivateValue(GuiChat.class, chat, true, LibObfuscation.COMPLETE_FLAG); StringBuilder stringbuilder = new StringBuilder(); CompletionData data; for(Iterator iterator = completions.iterator(); iterator.hasNext(); stringbuilder.append(data.string)) { diff --git a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java index 2e9386b27..bf9183bea 100644 --- a/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/DebugHandler.java @@ -45,7 +45,7 @@ public final class DebugHandler { @SubscribeEvent public static void onDrawDebugText(RenderGameOverlayEvent.Text event) { - World world = Minecraft.getMinecraft().theWorld; + World world = Minecraft.getMinecraft().world; if(Minecraft.getMinecraft().gameSettings.showDebugInfo) { event.getLeft().add(""); String version = LibMisc.VERSION; @@ -56,10 +56,10 @@ public final class DebugHandler { event.getLeft().add(PREFIX + "(CLIENT) netColl: " + ManaNetworkHandler.instance.getAllCollectorsInWorld(world).size() + ", netPool: " + ManaNetworkHandler.instance.getAllPoolsInWorld(world).size() + ", rv: " + version); if (Minecraft.getMinecraft().isSingleplayer()) { - UUID id = Minecraft.getMinecraft().thePlayer.getUniqueID(); + UUID id = Minecraft.getMinecraft().player.getUniqueID(); Entity ent = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id); if (ent != null) { - World serverWorld = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id).worldObj; + World serverWorld = Minecraft.getMinecraft().getIntegratedServer().getEntityFromUuid(id).world; event.getLeft().add(PREFIX + String.format("(INTEGRATED SERVER DIM %d) netColl : %d, netPool: %d", serverWorld.provider.getDimension(), ManaNetworkHandler.instance.getAllCollectorsInWorld(serverWorld).size(), ManaNetworkHandler.instance.getAllPoolsInWorld(serverWorld).size())); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index 592c40973..9d3a0bdc9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -15,6 +15,8 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import org.lwjgl.opengl.GL11; import baubles.api.BaublesApi; @@ -30,7 +32,6 @@ import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.profiler.Profiler; @@ -88,24 +89,24 @@ public final class HUDHandler { if(event.getType() == ElementType.HEALTH) { profiler.startSection("botania-hud"); - IInventory baublesInv = BaublesApi.getBaubles(mc.thePlayer); + IItemHandler baublesInv = BaublesApi.getBaublesHandler(mc.player); ItemStack headpiece = baublesInv.getStackInSlot(4); - if(headpiece != null && headpiece.getItem() == ModItems.flightTiara) { + if(!headpiece.isEmpty() && headpiece.getItem() == ModItems.flightTiara) { profiler.startSection("flugelTiara"); - ItemFlightTiara.renderHUD(event.getResolution(), mc.thePlayer, headpiece); + ItemFlightTiara.renderHUD(event.getResolution(), mc.player, headpiece); profiler.endSection(); } dodgeRing: { ItemStack ring = baublesInv.getStackInSlot(1); - if(ring == null || !(ring.getItem() instanceof ItemDodgeRing)) { + if(ring.isEmpty() || !(ring.getItem() instanceof ItemDodgeRing)) { ring = baublesInv.getStackInSlot(2); - if(ring == null || !(ring.getItem() instanceof ItemDodgeRing)) + if(ring.isEmpty() || !(ring.getItem() instanceof ItemDodgeRing)) break dodgeRing; } profiler.startSection("dodgeRing"); - ItemDodgeRing.renderHUD(event.getResolution(), mc.thePlayer, ring, event.getPartialTicks()); + ItemDodgeRing.renderHUD(event.getResolution(), mc.player, ring, event.getPartialTicks()); profiler.endSection(); } @@ -117,31 +118,31 @@ public final class HUDHandler { public static void onDrawScreenPost(RenderGameOverlayEvent.Post event) { Minecraft mc = Minecraft.getMinecraft(); Profiler profiler = mc.mcProfiler; - ItemStack main = mc.thePlayer.getHeldItemMainhand(); - ItemStack offhand = mc.thePlayer.getHeldItemOffhand(); + ItemStack main = mc.player.getHeldItemMainhand(); + ItemStack offhand = mc.player.getHeldItemOffhand(); if(event.getType() == ElementType.ALL) { profiler.startSection("botania-hud"); RayTraceResult pos = mc.objectMouseOver; if(pos != null) { - IBlockState state = pos.typeOfHit == RayTraceResult.Type.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()) : null; + IBlockState state = pos.typeOfHit == RayTraceResult.Type.BLOCK ? mc.world.getBlockState(pos.getBlockPos()) : null; Block block = state == null ? null : state.getBlock(); - TileEntity tile = pos.typeOfHit == RayTraceResult.Type.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null; + TileEntity tile = pos.typeOfHit == RayTraceResult.Type.BLOCK ? mc.world.getTileEntity(pos.getBlockPos()) : null; - if(PlayerHelper.hasAnyHeldItem(mc.thePlayer)) { - if(pos != null && PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.twigWand)) { - renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.thePlayer, ModItems.twigWand), event.getResolution()); + if(PlayerHelper.hasAnyHeldItem(mc.player)) { + if(pos != null && PlayerHelper.hasHeldItem(mc.player, ModItems.twigWand)) { + renderWandModeDisplay(PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand), event.getResolution()); if(block instanceof IWandHUD) { profiler.startSection("wandItem"); - ((IWandHUD) block).renderHUD(mc, event.getResolution(), mc.theWorld, pos.getBlockPos()); + ((IWandHUD) block).renderHUD(mc, event.getResolution(), mc.world, pos.getBlockPos()); profiler.endSection(); } - } else if(block != null && PlayerHelper.hasHeldItemClass(mc.thePlayer, ILexicon.class)) - drawLexiconHUD(PlayerHelper.getFirstHeldItemClass(mc.thePlayer, ILexicon.class), state, pos, event.getResolution()); - if(tile != null && tile instanceof TilePool && mc.thePlayer.getHeldItemMainhand() != null) - renderPoolRecipeHUD(event.getResolution(), (TilePool) tile, mc.thePlayer.getHeldItemMainhand()); + } else if(block != null && PlayerHelper.hasHeldItemClass(mc.player, ILexicon.class)) + drawLexiconHUD(PlayerHelper.getFirstHeldItemClass(mc.player, ILexicon.class), state, pos, event.getResolution()); + if(tile != null && tile instanceof TilePool && !mc.player.getHeldItemMainhand().isEmpty()) + renderPoolRecipeHUD(event.getResolution(), (TilePool) tile, mc.player.getHeldItemMainhand()); } if(tile != null && tile instanceof TileAltar) ((TileAltar) tile).renderHUD(mc, event.getResolution()); @@ -153,7 +154,7 @@ public final class HUDHandler { } TileCorporeaIndex.getInputHandler(); - if(!InputHandler.getNearbyIndexes(mc.thePlayer).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { + if(!InputHandler.getNearbyIndexes(mc.player).isEmpty() && mc.currentScreen != null && mc.currentScreen instanceof GuiChat) { profiler.startSection("nearIndex"); renderNearIndexDisplay(event.getResolution()); profiler.endSection(); @@ -166,57 +167,57 @@ public final class HUDHandler { profiler.endSection(); } - if(main != null && main.getItem() instanceof ItemCraftingHalo) { + if(!main.isEmpty() && main.getItem() instanceof ItemCraftingHalo) { profiler.startSection("craftingHalo_main"); - ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, main); + ItemCraftingHalo.renderHUD(event.getResolution(), mc.player, main); profiler.endSection(); - } else if(offhand != null && offhand.getItem() instanceof ItemCraftingHalo) { + } else if(!offhand.isEmpty() && offhand.getItem() instanceof ItemCraftingHalo) { profiler.startSection("craftingHalo_off"); - ItemCraftingHalo.renderHUD(event.getResolution(), mc.thePlayer, offhand); + ItemCraftingHalo.renderHUD(event.getResolution(), mc.player, offhand); profiler.endSection(); } - if(main != null && main.getItem() instanceof ItemSextant) { + if(!main.isEmpty() && main.getItem() instanceof ItemSextant) { profiler.startSection("sextant"); - ItemSextant.renderHUD(event.getResolution(), mc.thePlayer, main); + ItemSextant.renderHUD(event.getResolution(), mc.player, main); profiler.endSection(); } /*if(equippedStack != null && equippedStack.getItem() == ModItems.flugelEye) { profiler.startSection("flugelEye"); - ItemFlugelEye.renderHUD(event.getResolution(), mc.thePlayer, equippedStack); + ItemFlugelEye.renderHUD(event.getResolution(), mc.player, equippedStack); profiler.endSection(); }*/ if(Botania.proxy.isClientPlayerWearingMonocle()) { profiler.startSection("monocle"); - ItemMonocle.renderHUD(event.getResolution(), mc.thePlayer); + ItemMonocle.renderHUD(event.getResolution(), mc.player); profiler.endSection(); } profiler.startSection("manaBar"); - EntityPlayer player = mc.thePlayer; + EntityPlayer player = mc.player; if(!player.isSpectator()) { int totalMana = 0; int totalMaxMana = 0; boolean anyRequest = false; boolean creative = false; - IInventory mainInv = player.inventory; - IInventory baublesInv = BaublesApi.getBaubles(player); + IItemHandler mainInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + IItemHandler baublesInv = BaublesApi.getBaublesHandler(player); - int invSize = mainInv.getSizeInventory(); + int invSize = mainInv.getSlots(); int size = invSize; if(baublesInv != null) - size += baublesInv.getSizeInventory(); + size += baublesInv.getSlots(); for(int i = 0; i < size; i++) { boolean useBaubles = i >= invSize; - IInventory inv = useBaubles ? baublesInv : mainInv; + IItemHandler inv = useBaubles ? baublesInv : mainInv; ItemStack stack = inv.getStackInSlot(i - (useBaubles ? invSize : 0)); - if(stack != null) { + if(!stack.isEmpty()) { Item item = stack.getItem(); if(item instanceof IManaUsingItem) anyRequest = anyRequest || ((IManaUsingItem) item).usesMana(stack); @@ -322,7 +323,7 @@ public final class HUDHandler { int y = res.getScaledHeight() / 2 + 10; int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22; - int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8; + int v = mc.player.getName().equals("haighyorkie") && mc.player.isSneaking() ? 23 : 8; GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); @@ -349,7 +350,7 @@ public final class HUDHandler { profiler.startSection("crystalCube"); ItemStack target = tile.getRequestTarget(); - if(target != null) { + if(!target.isEmpty()) { String s1 = target.getDisplayName(); String s2 = tile.getItemCount() + "x"; int strlen = Math.max(mc.fontRendererObj.getStringWidth(s1), mc.fontRendererObj.getStringWidth(s2)); @@ -386,7 +387,7 @@ public final class HUDHandler { int sy = res.getScaledHeight() / 2 + 2; if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(mc.theWorld, pos.getBlockPos(), mc.thePlayer, stack); + LexiconEntry entry = ((ILexiconable) block).getEntry(mc.world, pos.getBlockPos(), mc.player, stack); if(entry != null) { if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType())) font = mc.standardGalacticFontRenderer; @@ -399,12 +400,12 @@ public final class HUDHandler { if(!draw && pos.entityHit == null) { profiler.startSection("wikiLookup"); - if(!block.isAir(state, mc.theWorld, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { + if(!block.isAir(state, mc.world, pos.getBlockPos()) && !(block instanceof BlockLiquid)) { IWikiProvider provider = WikiHooks.getWikiFor(block); - String url = provider.getWikiURL(mc.theWorld, pos, mc.thePlayer); + String url = provider.getWikiURL(mc.world, pos, mc.player); if(url != null && !url.isEmpty()) { - String name = provider.getBlockName(mc.theWorld, pos, mc.thePlayer); - String wikiName = provider.getWikiName(mc.theWorld, pos, mc.thePlayer); + String name = provider.getBlockName(mc.world, pos, mc.player); + String wikiName = provider.getWikiName(mc.world, pos, mc.player); drawStr = name + " @ " + TextFormatting.AQUA + wikiName; draw = true; } @@ -413,7 +414,7 @@ public final class HUDHandler { } if(draw) { - if(!mc.thePlayer.isSneaking()) { + if(!mc.player.isSneaking()) { drawStr = "?"; secondLine = ""; font = mc.fontRendererObj; @@ -424,7 +425,7 @@ public final class HUDHandler { font.drawStringWithShadow(drawStr, sx + 20, sy + 4, 0xFFFFFFFF); font.drawStringWithShadow(secondLine, sx + 20, sy + 14, 0xFFAAAAAA); - if(!mc.thePlayer.isSneaking()) { + if(!mc.player.isSneaking()) { GlStateManager.scale(0.5F, 0.5F, 1F); mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF); GlStateManager.scale(2F, 2F, 1F); diff --git a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java index 6e663108b..0ca64a59c 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java @@ -29,13 +29,13 @@ public final class ItemsRemainingRenderHandler { private static final int maxTicks = 30; private static final int leaveTicks = 20; - private static ItemStack stack; + private static ItemStack stack = ItemStack.EMPTY; private static String customString; private static int ticks, count; @SideOnly(Side.CLIENT) public static void render(ScaledResolution resolution, float partTicks) { - if(ticks > 0 && stack != null) { + if(ticks > 0 && !stack.isEmpty()) { int pos = maxTicks - ticks; Minecraft mc = Minecraft.getMinecraft(); int x = resolution.getScaledWidth() / 2 + 10 + Math.max(0, pos - leaveTicks); @@ -64,7 +64,7 @@ public final class ItemsRemainingRenderHandler { String text = ""; if(customString == null) { - if(stack != null && stack.getItem() != null) { + if(!stack.isEmpty()) { text = TextFormatting.GREEN + stack.getDisplayName(); if(count >= 0) { int max = stack.getMaxStackSize(); @@ -105,15 +105,15 @@ public final class ItemsRemainingRenderHandler { ItemsRemainingRenderHandler.stack = stack; ItemsRemainingRenderHandler.count = count; ItemsRemainingRenderHandler.customString = str; - ticks = stack == null ? 0 : maxTicks; + ticks = stack.isEmpty() ? 0 : maxTicks; } public static void set(EntityPlayer player, ItemStack displayStack, Pattern pattern) { int count = 0; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stack = player.inventory.getStackInSlot(i); - if(stack != null && pattern.matcher(stack.getUnlocalizedName()).find()) - count += stack.stackSize; + if(!stack.isEmpty() && pattern.matcher(stack.getUnlocalizedName()).find()) + count += stack.getCount(); } set(displayStack, count); diff --git a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java index a3668f29f..2056401f2 100644 --- a/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/LightningHandler.java @@ -49,7 +49,7 @@ public class LightningHandler { profiler.endStartSection("lightning"); float frame = event.getPartialTicks(); - Entity entity = Minecraft.getMinecraft().thePlayer; + Entity entity = Minecraft.getMinecraft().player; TextureManager render = Minecraft.getMinecraft().renderEngine; double interpPosX = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * frame; diff --git a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java index 7cfb4b395..182cf26dd 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java +++ b/src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java @@ -39,7 +39,6 @@ import vazkii.botania.client.model.GunModel; import vazkii.botania.client.model.LexiconModel; import vazkii.botania.client.model.PlatformModel; import vazkii.botania.common.Botania; -import vazkii.botania.common.integration.buildcraft.TriggerManaLevel; import vazkii.botania.common.item.ItemSparkUpgrade; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.relic.ItemKingKey; @@ -70,7 +69,7 @@ public class MiscellaneousIcons { public TextureAtlasSprite[] sparkUpgradeIcons; public TextureAtlasSprite[] kingKeyWeaponIcons; - public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); + // todo buildcraft public final Map manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class); public TextureAtlasSprite[] tiaraWingIcons; public TextureAtlasSprite[] thirdEyeLayers; @@ -156,9 +155,9 @@ public class MiscellaneousIcons { manaDetectorIcon = IconHelper.forName(evt.getMap(), "triggers/manaDetector", "items"); runeAltarTriggerIcon = IconHelper.forName(evt.getMap(), "triggers/runeAltarCanCraft", "items"); - for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { + /*for (TriggerManaLevel.State s : TriggerManaLevel.State.values()) { todo buildcraft manaLevelTriggerIcons.put(s, IconHelper.forName(evt.getMap(), "triggers/mana" + WordUtils.capitalizeFully(s.name()), "items")); - } + }*/ tiaraWingIcons = new TextureAtlasSprite[ItemFlightTiara.WING_TYPES]; for (int i = 0; i < tiaraWingIcons.length; i++) { @@ -179,7 +178,7 @@ public class MiscellaneousIcons { @SubscribeEvent public void dumpAtlas(ArrowLooseEvent evt) { - if (!evt.getEntityPlayer().worldObj.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) + if (!evt.getEntityPlayer().world.isRemote || !((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) || !evt.getEntityPlayer().isSneaking()) return; Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java index 5e3656d79..aeb8ccddf 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java @@ -13,6 +13,7 @@ package vazkii.botania.client.core.handler; import javax.annotation.Nonnull; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Biomes; import net.minecraft.init.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; @@ -85,10 +86,10 @@ public class MultiblockBlockAccess implements IBlockAccess { @Nonnull @Override - public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { + public Biome getBiome(@Nonnull BlockPos pos) { if(hasBlockAccess) - return originalBlockAccess.getBiomeGenForCoords(pos); - return null; + return originalBlockAccess.getBiome(pos); + return Biomes.DEFAULT; } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java index bab099fee..7f427e658 100644 --- a/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java @@ -77,21 +77,21 @@ public final class MultiblockRenderHandler { angle = EnumFacing.SOUTH; Minecraft mc = Minecraft.getMinecraft(); - if(mc.theWorld != null) - dimension = mc.theWorld.provider.getDimension(); + if(mc.world != null) + dimension = mc.world.provider.getDimension(); } @SubscribeEvent public static void onWorldRenderLast(RenderWorldLastEvent event) { Minecraft mc = Minecraft.getMinecraft(); - if(mc.thePlayer != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.thePlayer.isSneaking() || anchor != null)) { - renderPlayerLook(mc.thePlayer, mc.objectMouseOver); + if(mc.player != null && mc.objectMouseOver != null && mc.objectMouseOver.getBlockPos() != null && (!mc.player.isSneaking() || anchor != null)) { + renderPlayerLook(mc.player, mc.objectMouseOver); } } @SubscribeEvent public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { - if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().thePlayer) { + if(currentMultiblock != null && anchor == null && event.getEntityPlayer() == Minecraft.getMinecraft().player) { anchor = event.getPos(); angle = event.getEntityPlayer().getHorizontalFacing(); event.setCanceled(true); @@ -99,7 +99,7 @@ public final class MultiblockRenderHandler { } private static void renderPlayerLook(EntityPlayer player, RayTraceResult src) { - if(currentMultiblock != null && dimension == player.worldObj.provider.getDimension()) { + if(currentMultiblock != null && dimension == player.world.provider.getDimension()) { BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos(); GlStateManager.pushMatrix(); @@ -111,7 +111,7 @@ public final class MultiblockRenderHandler { Multiblock mb = anchor != null ? currentMultiblock.getForFacing(angle) : currentMultiblock.getForEntity(player); boolean didAny = false; - blockAccess.update(player.worldObj, mb, anchorPos); + blockAccess.update(player.world, mb, anchorPos); ShaderHelper.useShader(ShaderHelper.alpha, shader -> { int alpha = ARBShaderObjects.glGetUniformLocationARB(shader, "alpha"); @@ -119,7 +119,7 @@ public final class MultiblockRenderHandler { }); for(MultiblockComponent comp : mb.getComponents()) { - if(renderComponentInWorld(player.worldObj, mb, comp, anchorPos)) + if(renderComponentInWorld(player.world, mb, comp, anchorPos)) didAny = true; } @@ -131,7 +131,7 @@ public final class MultiblockRenderHandler { if(!didAny) { setMultiblock(null); - player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setStyle(new Style().setColor(TextFormatting.GREEN))); + player.sendMessage(new TextComponentTranslation("botaniamisc.structureComplete").setStyle(new Style().setColor(TextFormatting.GREEN))); } } } diff --git a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java index 9108e8f4f..cb5e3f9f9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java +++ b/src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java @@ -56,7 +56,7 @@ public final class RedStringRenderer { } public static void tick() { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().player; boolean hasWand = player != null && PlayerHelper.hasHeldItem(player, ModItems.twigWand); if(sizeAlpha > 0F && !hasWand) sizeAlpha -= 0.1F; diff --git a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java index 7db04ae49..8dc54b0b9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java +++ b/src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java @@ -44,12 +44,12 @@ public class RenderLexicon { Minecraft mc = Minecraft.getMinecraft(); if(!ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 - || mc.thePlayer.getHeldItem(evt.getHand()) == null - || mc.thePlayer.getHeldItem(evt.getHand()).getItem() != ModItems.lexicon) + || mc.player.getHeldItem(evt.getHand()).isEmpty() + || mc.player.getHeldItem(evt.getHand()).getItem() != ModItems.lexicon) return; evt.setCanceled(true); try { - renderItemInFirstPerson(mc.thePlayer, evt.getPartialTicks(), evt.getInterpolatedPitch(), evt.getHand(), evt.getSwingProgress(), evt.getItemStack(), evt.getEquipProgress()); + renderItemInFirstPerson(mc.player, evt.getPartialTicks(), evt.getInterpolatedPitch(), evt.getHand(), evt.getSwingProgress(), evt.getItemStack(), evt.getEquipProgress()); } catch (Throwable throwable) { Botania.LOGGER.warn("Failed to render lexicon"); } @@ -61,8 +61,8 @@ public class RenderLexicon { EnumHandSide enumhandside = flag ? player.getPrimaryHand() : player.getPrimaryHand().opposite(); GlStateManager.pushMatrix(); boolean flag1 = enumhandside == EnumHandSide.RIGHT; - float f = -0.4F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * (float)Math.PI); - float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt_float(swingProgress) * ((float)Math.PI * 2F)); + float f = -0.4F * MathHelper.sin(MathHelper.sqrt(swingProgress) * (float)Math.PI); + float f1 = 0.2F * MathHelper.sin(MathHelper.sqrt(swingProgress) * ((float)Math.PI * 2F)); float f2 = -0.2F * MathHelper.sin(swingProgress * (float)Math.PI); int i = flag1 ? 1 : -1; GlStateManager.translate(i * f, f1, f2); @@ -115,7 +115,7 @@ public class RenderLexicon { font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100); if(quote == -1) - quote = mc.theWorld.rand.nextInt(QUOTES.length); + quote = mc.world.rand.nextInt(QUOTES.length); String quoteStr = QUOTES[quote]; @@ -159,7 +159,7 @@ public class RenderLexicon { // End add float f = MathHelper.sin(p_187453_2_ * p_187453_2_ * (float)Math.PI); GlStateManager.rotate(i * (45.0F + f * -20.0F), 0.0F, 1.0F, 0.0F); - float f1 = MathHelper.sin(MathHelper.sqrt_float(p_187453_2_) * (float)Math.PI); + float f1 = MathHelper.sin(MathHelper.sqrt(p_187453_2_) * (float)Math.PI); GlStateManager.rotate(i * f1 * -20.0F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(f1 * -80.0F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(i * -45.0F, 0.0F, 1.0F, 0.0F); diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 522462968..4c716b176 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -44,7 +44,8 @@ public final class TooltipAdditionDisplayHandler { @SubscribeEvent public static void onToolTipRender(RenderTooltipEvent.PostText evt) { - if(evt.getStack() == null) + // todo this null check is still needed. remove when Forge#3590 is pulled. + if(evt.getStack() == null || evt.getStack().isEmpty()) return; ItemStack stack = evt.getStack(); @@ -63,11 +64,11 @@ public final class TooltipAdditionDisplayHandler { EntryData data = LexiconRecipeMappings.getDataForStack(stack); if(data != null) { int lexSlot = -1; - ItemStack lexiconStack = null; + ItemStack lexiconStack = ItemStack.EMPTY; for(int i = 0; i < InventoryPlayer.getHotbarSize(); i++) { - ItemStack stackAt = mc.thePlayer.inventory.getStackInSlot(i); - if(stackAt != null && stackAt.getItem() instanceof ILexicon && ((ILexicon) stackAt.getItem()).isKnowledgeUnlocked(stackAt, data.entry.getKnowledgeType())) { + ItemStack stackAt = mc.player.inventory.getStackInSlot(i); + if(!stackAt.isEmpty() && stackAt.getItem() instanceof ILexicon && ((ILexicon) stackAt.getItem()).isKnowledgeUnlocked(stackAt, data.entry.getKnowledgeType())) { lexiconStack = stackAt; lexSlot = i; break; @@ -115,11 +116,11 @@ public final class TooltipAdditionDisplayHandler { GlStateManager.shadeModel(GL11.GL_FLAT); if(lexiconLookupTime >= time) { - mc.thePlayer.inventory.currentItem = lexSlot; + mc.player.inventory.currentItem = lexSlot; Botania.proxy.setEntryToOpen(data.entry); Botania.proxy.setLexiconStack(lexiconStack); - mc.thePlayer.closeScreen(); - ItemLexicon.openBook(mc.thePlayer, lexiconStack, mc.theWorld, false); + mc.player.closeScreen(); + ItemLexicon.openBook(mc.player, lexiconStack, mc.world, false); } } else lexiconLookupTime = 0F; diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java index 7bc70254e..0df7d514e 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java @@ -21,7 +21,7 @@ public final class TooltipHandler { @SubscribeEvent(priority = EventPriority.HIGHEST) public static void onTooltipEvent(ItemTooltipEvent event) { - if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) + if(event.getItemStack().hasTagCompound() && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false)) event.getToolTip().add(I18n.format("botaniamisc.hasKeepIvy")); } diff --git a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java index a3fc3d2e3..23955f16e 100644 --- a/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java +++ b/src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java @@ -25,6 +25,8 @@ import net.minecraft.client.multiplayer.PlayerControllerMP; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -172,6 +174,17 @@ import vazkii.botania.common.lib.LibObfuscation; public class ClientProxy implements IProxy { + public static final VertexFormat POSITION_TEX_LMAP_NORMAL = + new VertexFormat() + .addElement(DefaultVertexFormats.POSITION_3F) + .addElement(DefaultVertexFormats.TEX_2F) + .addElement(DefaultVertexFormats.TEX_2S) + .addElement(DefaultVertexFormats.NORMAL_3B); + public static final VertexFormat POSITION_TEX_LMAP = + new VertexFormat() + .addElement(DefaultVertexFormats.POSITION_3F) + .addElement(DefaultVertexFormats.TEX_2F) + .addElement(DefaultVertexFormats.TEX_2S); public static boolean jingleTheBells = false; public static boolean dootDoot = false; @@ -317,23 +330,23 @@ public class ClientProxy implements IProxy { @Override public boolean isTheClientPlayer(EntityLivingBase entity) { - return entity == Minecraft.getMinecraft().thePlayer; + return entity == Minecraft.getMinecraft().player; } @Override public EntityPlayer getClientPlayer() { - return Minecraft.getMinecraft().thePlayer; + return Minecraft.getMinecraft().player; } @Override public boolean isClientPlayerWearingMonocle() { - return ItemMonocle.hasMonocle(Minecraft.getMinecraft().thePlayer); + return ItemMonocle.hasMonocle(Minecraft.getMinecraft().player); } @Override public void setExtraReach(EntityLivingBase entity, float reach) { Minecraft mc = Minecraft.getMinecraft(); - EntityPlayer player = mc.thePlayer; + EntityPlayer player = mc.player; if(entity == player) { if(!(mc.playerController instanceof IExtendedPlayerController)) { NetHandlerPlayClient net = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.NET_CLIENT_HANDLER); @@ -353,7 +366,7 @@ public class ClientProxy implements IProxy { @Override public boolean openWikiPage(World world, Block block, RayTraceResult pos) { IWikiProvider wiki = WikiHooks.getWikiFor(block); - String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().thePlayer); + String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().player); if(url != null && !url.isEmpty()) { try { Desktop.getDesktop().browse(new URI(url)); @@ -379,17 +392,6 @@ public class ClientProxy implements IProxy { return s; } - @Override - public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) { - Minecraft mc = Minecraft.getMinecraft(); - if(record == null) - world.playEvent(null, 1010, pos, 0); - else { - world.playEvent(null, 1010, pos, Item.getIdFromItem(record)); - mc.ingameGUI.setRecordPlayingMessage(record.getRecordNameLocal()); - } - } - @Override public long getWorldElapsedTicks() { return ClientTickHandler.ticksInGame; @@ -441,10 +443,11 @@ public class ClientProxy implements IProxy { if(!doParticle() && !fake) return; - FXSparkle sparkle = new FXSparkle(Minecraft.getMinecraft().theWorld, x, y, z, size, r, g, b, m); - sparkle.fake = sparkle.noClip = fake; + FXSparkle sparkle = new FXSparkle(Minecraft.getMinecraft().world, x, y, z, size, r, g, b, m); + sparkle.fake = fake; + sparkle.setCanCollide(!fake); if(noclipEnabled) - sparkle.noClip = true; + sparkle.setCanCollide(false); if(corruptSparkle) sparkle.corrupt = true; Minecraft.getMinecraft().effectRenderer.addEffect(sparkle); @@ -468,7 +471,7 @@ public class ClientProxy implements IProxy { if(!doParticle()) return; - FXWisp wisp = new FXWisp(Minecraft.getMinecraft().theWorld, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); + FXWisp wisp = new FXWisp(Minecraft.getMinecraft().world, x, y, z, size, r, g, b, distanceLimit, depthTest, maxAgeMul); wisp.setSpeed(motionx, motiony, motionz); Minecraft.getMinecraft().effectRenderer.addEffect(wisp); } @@ -491,7 +494,7 @@ public class ClientProxy implements IProxy { @Override public void lightningFX(Vector3 vectorStart, Vector3 vectorEnd, float ticksPerMeter, long seed, int colorOuter, int colorInner) { - Minecraft.getMinecraft().effectRenderer.addEffect(new FXLightning(Minecraft.getMinecraft().theWorld, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); + Minecraft.getMinecraft().effectRenderer.addEffect(new FXLightning(Minecraft.getMinecraft().world, vectorStart, vectorEnd, ticksPerMeter, seed, colorOuter, colorInner)); } @Override diff --git a/src/main/java/vazkii/botania/client/fx/FXLightning.java b/src/main/java/vazkii/botania/client/fx/FXLightning.java index edcb9c92a..3b5a8aa1f 100644 --- a/src/main/java/vazkii/botania/client/fx/FXLightning.java +++ b/src/main/java/vazkii/botania/client/fx/FXLightning.java @@ -180,15 +180,15 @@ public class FXLightning extends Particle { } private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) { - RayTraceResult mop = worldObj.rayTraceBlocks(start.toVec3D(), end.toVec3D()); + RayTraceResult mop = world.rayTraceBlocks(start.toVec3D(), end.toVec3D()); if(mop == null) return prevresistance; if(mop.typeOfHit == RayTraceResult.Type.BLOCK) { - Block block = worldObj.getBlockState(mop.getBlockPos()).getBlock(); + Block block = world.getBlockState(mop.getBlockPos()).getBlock(); - if(worldObj.isAirBlock(mop.getBlockPos())) + if(world.isAirBlock(mop.getBlockPos())) return prevresistance; return prevresistance + block.getExplosionResistance(null) + 0.3F; diff --git a/src/main/java/vazkii/botania/client/fx/FXSparkle.java b/src/main/java/vazkii/botania/client/fx/FXSparkle.java index f777627a6..c6c68ef11 100644 --- a/src/main/java/vazkii/botania/client/fx/FXSparkle.java +++ b/src/main/java/vazkii/botania/client/fx/FXSparkle.java @@ -46,8 +46,6 @@ public class FXSparkle extends Particle { private float f4; private float f5; - public boolean noClip = false; - public FXSparkle(World world, double x, double y, double z, float size, float red, float green, float blue, int m) { super(world, x, y, z, 0.0D, 0.0D, 0.0D); @@ -60,7 +58,6 @@ public class FXSparkle extends Particle { particleScale *= size; particleMaxAge = 3 * m; multiplier = m; - noClip = false; setSize(0.01F, 0.01F); prevPosX = posX; prevPosY = posY; @@ -115,6 +112,10 @@ public class FXSparkle extends Particle { } + public void setCanCollide(boolean canCollide) { + this.canCollide = canCollide; + } + @Override public void renderParticle(VertexBuffer worldRendererIn, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { this.f = f; @@ -140,19 +141,17 @@ public class FXSparkle extends Particle { motionY -= 0.04D * particleGravity; - if (!noClip && !fake) - wiggleAround(posX, (getEntityBoundingBox().minY + getEntityBoundingBox().maxY) / 2.0D, posZ); + if (canCollide && !fake) + wiggleAround(posX, (getBoundingBox().minY + getBoundingBox().maxY) / 2.0D, posZ); - posX += motionX; - posY += motionY; - posZ += motionZ; + this.move(motionX, motionY, motionZ); if (slowdown) { motionX *= 0.908000001907348633D; motionY *= 0.908000001907348633D; motionZ *= 0.908000001907348633D; - if (isCollided) { + if (onGround) { motionX *= 0.69999998807907104D; motionZ *= 0.69999998807907104D; } @@ -175,59 +174,58 @@ public class FXSparkle extends Particle { double d2 = z - blockpos.getZ(); // Botania - change collision box list check to !airblock check - if (!worldObj.isAirBlock(blockpos)) + if (!world.isAirBlock(blockpos)) { EnumFacing enumfacing = EnumFacing.UP; double d3 = Double.MAX_VALUE; - if (!worldObj.isBlockFullCube(blockpos.west()) && d0 < d3) + if (!world.isBlockFullCube(blockpos.west()) && d0 < d3) { d3 = d0; enumfacing = EnumFacing.WEST; } - if (!worldObj.isBlockFullCube(blockpos.east()) && 1.0D - d0 < d3) + if (!world.isBlockFullCube(blockpos.east()) && 1.0D - d0 < d3) { d3 = 1.0D - d0; enumfacing = EnumFacing.EAST; } - - if (!worldObj.isBlockFullCube(blockpos.north()) && d2 < d3) + if (!world.isBlockFullCube(blockpos.north()) && d2 < d3) { d3 = d2; enumfacing = EnumFacing.NORTH; } - if (!worldObj.isBlockFullCube(blockpos.south()) && 1.0D - d2 < d3) + if (!world.isBlockFullCube(blockpos.south()) && 1.0D - d2 < d3) { d3 = 1.0D - d2; enumfacing = EnumFacing.SOUTH; } - if (!worldObj.isBlockFullCube(blockpos.up()) && 1.0D - d1 < d3) + if (!world.isBlockFullCube(blockpos.up()) && 1.0D - d1 < d3) { d3 = 1.0D - d1; enumfacing = EnumFacing.UP; } - float f = rand.nextFloat() * 0.05F + 0.01F; // Botania - made multiplier and add both smaller + float f = rand.nextFloat() * 0.05F + 0.025F; // Botania - made multiplier and add both smaller float f1 = enumfacing.getAxisDirection().getOffset(); float secondary = (rand.nextFloat() - rand.nextFloat()) * 0.1F; // Botania - Make and use a secondary movement variable below if (enumfacing.getAxis() == EnumFacing.Axis.X) { - motionX += f1 * f; + motionX = f1 * f; motionY = motionZ = secondary; } else if (enumfacing.getAxis() == EnumFacing.Axis.Y) { - motionY += f1 * f; + motionY = f1 * f; motionX = motionZ = secondary; } else if (enumfacing.getAxis() == EnumFacing.Axis.Z) { - motionZ += f1 * f; + motionZ = f1 * f; motionX = motionY = secondary; } diff --git a/src/main/java/vazkii/botania/client/fx/FXWisp.java b/src/main/java/vazkii/botania/client/fx/FXWisp.java index 138837f16..ceb8bcd86 100644 --- a/src/main/java/vazkii/botania/client/fx/FXWisp.java +++ b/src/main/java/vazkii/botania/client/fx/FXWisp.java @@ -140,22 +140,23 @@ public class FXWisp extends Particle { else queuedDepthIgnoringRenders.add(this); } + // [VanillaCopy] of super, without drag when onGround is true @Override public void onUpdate() { - prevPosX = posX; - prevPosY = posY; - prevPosZ = posZ; + this.prevPosX = this.posX; + this.prevPosY = this.posY; + this.prevPosZ = this.posZ; - if (particleAge++ >= particleMaxAge) - setExpired(); + if (this.particleAge++ >= this.particleMaxAge) + { + this.setExpired(); + } - motionY -= 0.04D * particleGravity; - posX += motionX; - posY += motionY; - posZ += motionZ; - motionX *= 0.98000001907348633D; - motionY *= 0.98000001907348633D; - motionZ *= 0.98000001907348633D; + this.motionY -= 0.04D * (double)this.particleGravity; + this.move(this.motionX, this.motionY, this.motionZ); + this.motionX *= 0.9800000190734863D; + this.motionY *= 0.9800000190734863D; + this.motionZ *= 0.9800000190734863D; } public void setGravity(float value) { diff --git a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java index d54d8a9d7..47b60a21f 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/ContainerFlowerBag.java @@ -54,9 +54,10 @@ public class ContainerFlowerBag extends Container { || player.getHeldItemOffhand() == flowerBagInv.bag; } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { - ItemStack itemstack = null; + ItemStack itemstack = ItemStack.EMPTY; Slot slot = inventorySlots.get(slotIndex); if(slot != null && slot.getHasStack()) { @@ -65,24 +66,24 @@ public class ContainerFlowerBag extends Container { if(slotIndex < 16) { if(!mergeItemStack(itemstack1, 16, 52, true)) - return null; + return ItemStack.EMPTY; } else { int i = itemstack.getItemDamage(); if(i < 16) { Slot slot1 = inventorySlots.get(i); if(slot1.isItemValid(itemstack) && !mergeItemStack(itemstack1, i, i + 1, true)) - return null; + return ItemStack.EMPTY; } } - if(itemstack1.stackSize == 0) - slot.putStack(null); + if(itemstack1.isEmpty()) + slot.putStack(ItemStack.EMPTY); else slot.onSlotChanged(); - if(itemstack1.stackSize == itemstack.stackSize) - return null; + if(itemstack1.getCount() == itemstack.getCount()) + return ItemStack.EMPTY; - slot.onPickupFromSlot(player, itemstack1); + slot.onTake(player, itemstack1); } return itemstack; diff --git a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java index e6b1b3830..0149bb26f 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java @@ -52,9 +52,9 @@ public class GuiFlowerBag extends GuiContainer { if(slot instanceof SlotItemHandler) { SlotItemHandler slotf = (SlotItemHandler) slot; if(!slotf.getHasStack()) { - ItemStack stack = new ItemStack(ModBlocks.flower, 0, slotf.getSlotIndex()); // index matches colors - int x = guiLeft + slotf.xDisplayPosition; - int y = guiTop + slotf.yDisplayPosition; + ItemStack stack = new ItemStack(ModBlocks.flower, 1, slotf.getSlotIndex()); // index matches colors + int x = guiLeft + slotf.xPos; + int y = guiTop + slotf.yPos; RenderHelper.enableGUIStandardItemLighting(); mc.getRenderItem().renderItemIntoGUI(stack, x, y); RenderHelper.disableStandardItemLighting(); diff --git a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java index a1038a876..a95e4dccd 100644 --- a/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java +++ b/src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java @@ -14,6 +14,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; +import javax.annotation.Nonnull; + public class InventoryFlowerBag implements IItemHandlerModifiable { private final IItemHandlerModifiable bagInv; @@ -25,7 +27,7 @@ public class InventoryFlowerBag implements IItemHandlerModifiable { } @Override - public void setStackInSlot(int slot, ItemStack stack) { + public void setStackInSlot(int slot, @Nonnull ItemStack stack) { bagInv.setStackInSlot(slot, stack); } @@ -34,18 +36,26 @@ public class InventoryFlowerBag implements IItemHandlerModifiable { return bagInv.getSlots(); } + @Nonnull @Override public ItemStack getStackInSlot(int slot) { return bagInv.getStackInSlot(slot); } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { return bagInv.insertItem(slot, stack, simulate); } + @Nonnull @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { return bagInv.extractItem(slot, amount, simulate); } + + @Override + public int getSlotLimit(int slot) { + return bagInv.getSlotLimit(slot); + } } diff --git a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java index cdd8d6037..6b7e8c2b0 100644 --- a/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java @@ -23,10 +23,14 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.SlotItemHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.client.gui.SlotLocked; +import java.util.List; + public class ContainerBaubleBox extends Container { private final InventoryBaubleBox baubleBoxInv; @@ -74,21 +78,17 @@ public class ContainerBaubleBox extends Container { || player.getHeldItemOffhand() == baubleBoxInv.box; } + @SideOnly(Side.CLIENT) @Override - public void onContainerClosed(EntityPlayer player) { - super.onContainerClosed(player); - // TODO do we need anything here? - } - - @Override - public void putStacksInSlots(ItemStack[] arr) { + public void setAll(List l) { baubles.setEventBlock(true); - super.putStacksInSlots(arr); + super.setAll(l); } + @Nonnull @Override public ItemStack transferStackInSlot(EntityPlayer player, int slotIndex) { - ItemStack itemstack = null; + ItemStack itemstack = ItemStack.EMPTY; Slot slot = inventorySlots.get(slotIndex); if(slot != null && slot.getHasStack()) { @@ -101,20 +101,20 @@ public class ContainerBaubleBox extends Container { if(slotIndex < boxEnd) { if(!mergeItemStack(itemstack1, boxEnd, invEnd, true)) - return null; + return ItemStack.EMPTY; } else { - if(itemstack1 != null && (itemstack1.getItem() instanceof IBauble || itemstack1.getItem() instanceof IManaItem) && !mergeItemStack(itemstack1, boxStart, boxEnd, false)) - return null; + if(!itemstack1.isEmpty() && (itemstack1.getItem() instanceof IBauble || itemstack1.getItem() instanceof IManaItem) && !mergeItemStack(itemstack1, boxStart, boxEnd, false)) + return ItemStack.EMPTY; } - if(itemstack1.stackSize == 0) - slot.putStack(null); + if(itemstack1.isEmpty()) + slot.putStack(ItemStack.EMPTY); else slot.onSlotChanged(); - if(itemstack1.stackSize == itemstack.stackSize) - return null; + if(itemstack1.getCount() == itemstack.getCount()) + return ItemStack.EMPTY; - slot.onPickupFromSlot(player, itemstack1); + slot.onTake(player, itemstack1); } return itemstack; diff --git a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java index 003ad47dc..4f5e72a58 100644 --- a/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java @@ -36,10 +36,10 @@ public class GuiBaubleBox extends GuiContainer { for(int i1 = 0; i1 < 7; ++i1) { Slot slot = inventorySlots.inventorySlots.get(i1); if(slot.getHasStack() && slot.getSlotStackLimit() == 1) - drawTexturedModalRect(guiLeft+slot.xDisplayPosition, guiTop+slot.yDisplayPosition, 200, 0, 16, 16); + drawTexturedModalRect(guiLeft+slot.xPos, guiTop+slot.yPos, 200, 0, 16, 16); } -// GuiInventory.drawEntityOnScreen(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer); +// GuiInventory.drawEntityOnScreen(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.player); } } diff --git a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java index 847cfc367..94203c23b 100644 --- a/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java +++ b/src/main/java/vazkii/botania/client/gui/box/InventoryBaubleBox.java @@ -14,6 +14,8 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; +import javax.annotation.Nonnull; + public class InventoryBaubleBox implements IItemHandlerModifiable { private final IItemHandlerModifiable boxInv; @@ -25,7 +27,7 @@ public class InventoryBaubleBox implements IItemHandlerModifiable { } @Override - public void setStackInSlot(int slot, ItemStack stack) { + public void setStackInSlot(int slot, @Nonnull ItemStack stack) { boxInv.setStackInSlot(slot, stack); } @@ -34,19 +36,27 @@ public class InventoryBaubleBox implements IItemHandlerModifiable { return boxInv.getSlots(); } + @Nonnull @Override public ItemStack getStackInSlot(int slot) { return boxInv.getStackInSlot(slot); } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { return boxInv.insertItem(slot, stack, simulate); } + @Nonnull @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { return boxInv.extractItem(slot, amount, simulate); } + @Override + public int getSlotLimit(int slot) { + return boxInv.getSlotLimit(slot); + } + } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java index bf10e44c5..352ec17f7 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java @@ -76,7 +76,7 @@ import vazkii.botania.common.lib.LibMisc; public class GuiLexicon extends GuiScreen { public static GuiLexicon currentOpenLexicon = new GuiLexicon(); - public static ItemStack stackUsed; + public static ItemStack stackUsed = ItemStack.EMPTY; public static final Map notes = new HashMap<>(); @@ -291,7 +291,7 @@ public class GuiLexicon extends GuiScreen { bookmarksNeedPopulation = false; } - if(mc.thePlayer.getName().equals("haighyorkie")) { + if(mc.player.getName().equals("haighyorkie")) { GlStateManager.color(1F, 1F, 1F, 1F); mc.renderEngine.bindTexture(texture); drawTexturedModalRect(left - 19, top + 42, 67, 180, 19, 26); @@ -435,7 +435,7 @@ public class GuiLexicon extends GuiScreen { mc.displayGuiScreen(new GuiBotaniaConfig(this)); break; case -2 : - mc.displayGuiScreen(new GuiAchievementsHacky(this, mc.thePlayer.getStatFileWriter())); + mc.displayGuiScreen(new GuiAchievementsHacky(this, mc.player.getStatFileWriter())); break; case -3 : mc.displayGuiScreen(new GuiLexiconChallengesList()); diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java index 78b59053a..7d882c7ac 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java @@ -165,7 +165,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa String cmd = "/botania-share " + entry.getUnlocalizedName(); mc.ingameGUI.getChatGUI().addToSentMessages(cmd); - mc.thePlayer.sendChatMessage(cmd); + mc.player.sendChatMessage(cmd); break; case 4 : try { @@ -213,7 +213,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa tutorial.poll(); positionTutorialArrow(); if(tutorial.isEmpty()) { - mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setStyle(new Style().setColor(TextFormatting.RED))); + mc.player.sendMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setStyle(new Style().setColor(TextFormatting.RED))); hasTutorialArrow = false; } } diff --git a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java index bcacd6a2e..215932eae 100644 --- a/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java +++ b/src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonInvisible.java @@ -32,7 +32,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG); final GuiLexiconIndex gui; - public ItemStack displayStack = null; + public ItemStack displayStack = ItemStack.EMPTY; public boolean dog = false; float timeHover = 0; @@ -67,7 +67,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon { hovered = par2 >= xPosition && par3 >= yPosition && par2 < xPosition + width && par3 < yPosition + height; int k = getHoverState(hovered); - boolean showStack = displayStack != null && !displayString.isEmpty(); + boolean showStack = !displayStack.isEmpty() && !displayString.isEmpty(); if(!displayString.isEmpty() && k == 2) { timeHover = Math.min(5, timeHover + gui.timeDelta); diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index bcd229a02..ef0e1fd07 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -14,7 +14,9 @@ import mezz.jei.api.IJeiHelpers; import mezz.jei.api.IJeiRuntime; import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; +import mezz.jei.api.ISubtypeRegistry; import mezz.jei.api.JEIPlugin; +import mezz.jei.api.ingredients.IModIngredientRegistration; import mezz.jei.api.recipe.VanillaRecipeCategoryUid; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -41,13 +43,19 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { + @Override + public void registerItemSubtypes(@Nonnull ISubtypeRegistry subtypeRegistry) { + subtypeRegistry.registerSubtypeInterpreter(Item.getItemFromBlock(ModBlocks.specialFlower), ItemBlockSpecialFlower::getType); + subtypeRegistry.registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); + } + + @Override + public void registerIngredients(@Nonnull IModIngredientRegistration registry) {} + @Override public void register(@Nonnull IModRegistry registry) { IJeiHelpers jeiHelpers = registry.getJeiHelpers(); - jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.specialFlower), ItemBlockSpecialFlower::getType); - jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower::getType); - registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 1112de100..77e3a4c3f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -12,11 +12,13 @@ import java.util.Collection; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -54,45 +56,37 @@ public class BreweryRecipeCategory implements IRecipeCategory { return background; } + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + @Override public void drawExtras(@Nonnull Minecraft minecraft) { } @Override - public void drawAnimations(@Nonnull Minecraft minecraft) { - } - - @SuppressWarnings("unchecked") - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof BreweryRecipeWrapper)) return; - BreweryRecipeWrapper wrapper = (BreweryRecipeWrapper) recipeWrapper; - List inputs = wrapper.getInputs(); + List> inputs = ingredients.getInputs(ItemStack.class); recipeLayout.getItemStacks().init(0, true, 39, 41); - if(inputs.get(0) instanceof ItemStack) { - recipeLayout.getItemStacks().set(0, (ItemStack) inputs.get(0)); - } else { - recipeLayout.getItemStacks().set(0, (Collection) inputs.get(0)); - } + recipeLayout.getItemStacks().set(0, inputs.get(0)); int index = 1, posX = 60; - for(int i = 1; i < wrapper.getInputs().size(); i++) { - Object o = wrapper.getInputs().get(i); + for(int i = 1; i < inputs.size(); i++) { + List o = inputs.get(i); recipeLayout.getItemStacks().init(index, true, posX, 6); - if(o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, (ItemStack) o); - } else if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, (Collection) o); - } + recipeLayout.getItemStacks().set(index, o); index++; posX += 18; } recipeLayout.getItemStacks().init(7, false, 87, 41); - recipeLayout.getItemStacks().set(7, wrapper.getOutputs()); + recipeLayout.getItemStacks().set(7, ingredients.getOutputs(ItemStack.class).get(0)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java index 3f33dd627..00feedda3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -22,16 +22,10 @@ public class BreweryRecipeHandler implements IRecipeHandler { return RecipeBrew.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.brewery"; - } - @Nonnull @Override public String getRecipeCategoryUid(@Nonnull RecipeBrew recipe) { // o is erased type param - return getRecipeCategoryUid(); + return "botania.brewery"; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index a33a82704..fcfdc9b5d 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableList; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -24,16 +25,16 @@ import vazkii.botania.common.item.ModItems; public class BreweryRecipeWrapper implements IRecipeWrapper { - private final List input; + private final List> input; private final List output; @SuppressWarnings("unchecked") public BreweryRecipeWrapper(RecipeBrew recipeBrew) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder> builder = ImmutableList.builder(); builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1))); for(Object o : recipeBrew.getInputs()) { if(o instanceof ItemStack) { - builder.add(o); + builder.add(ImmutableList.of((ItemStack) o)); } if(o instanceof String) { builder.add(OreDictionary.getOres((String) o)); @@ -45,33 +46,17 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { } @Override - public List getInputs() { - return input; - } - - @Override - public List getOutputs() { - return output; - } - - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } - - @Override - public List getFluidOutputs() { - return ImmutableList.of(); + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputLists(ItemStack.class, input); + ingredients.setOutputLists(ItemStack.class, ImmutableList.of(output)); } @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { return ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 1651ce094..e3e245567 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -9,9 +9,12 @@ package vazkii.botania.client.integration.jei.elventrade; import java.util.Collection; +import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import mezz.jei.api.ingredients.IIngredients; import org.lwjgl.opengl.GL11; import mezz.jei.api.IGuiHelper; @@ -62,6 +65,12 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { return background; } + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -69,10 +78,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { overlay.draw(minecraft, 0, 4); GlStateManager.disableBlend(); GlStateManager.disableAlpha(); - } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft) { minecraft.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); TextureAtlasSprite sprite = MiscellaneousIcons.INSTANCE.alfPortalTex; Tessellator tess = Tessellator.getInstance(); @@ -89,29 +95,23 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory { tess.draw(); } - @SuppressWarnings("unchecked") @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) return; - ElvenTradeRecipeWrapper wrapper = (ElvenTradeRecipeWrapper) recipeWrapper; int index = 0, posX = 42; - for(Object o : wrapper.getInputs()) { + for(List o : ingredients.getInputs(ItemStack.class)) { recipeLayout.getItemStacks().init(index, true, posX, 0); - if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, (Collection) o); - } else { - recipeLayout.getItemStacks().set(index, (ItemStack) o); - } + recipeLayout.getItemStacks().set(index, o); index++; posX += 18; } - for (int i = 0; i < wrapper.getOutputs().size(); i++) { - ItemStack stack = wrapper.getOutputs().get(i); + for (int i = 0; i < ingredients.getOutputs(ItemStack.class).size(); i++) { + List stacks = ingredients.getOutputs(ItemStack.class).get(i); recipeLayout.getItemStacks().init(index + i, false, 93 + i % 2 * 20, 41 + i / 2 * 20); - recipeLayout.getItemStacks().set(index + i, stack); + recipeLayout.getItemStacks().set(index + i, stacks); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java index a2514dcfc..6e372b8b3 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -22,16 +22,10 @@ public class ElvenTradeRecipeHandler implements IRecipeHandler return RecipeElvenTrade.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.elvenTrade"; - } - @Nonnull @Override public String getRecipeCategoryUid(@Nonnull RecipeElvenTrade recipe) { // o is erased type param - return getRecipeCategoryUid(); + return "botania.elvenTrade"; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java index d381c879b..7778a0787 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableList; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -23,15 +24,15 @@ import vazkii.botania.api.recipe.RecipeElvenTrade; public class ElvenTradeRecipeWrapper implements IRecipeWrapper { - private final List input; + private final List> input; private final List outputs; @SuppressWarnings("unchecked") public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder> builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { if(o instanceof ItemStack) { - builder.add(o); + builder.add(ImmutableList.of((ItemStack) o)); } if(o instanceof String) { builder.add(OreDictionary.getOres((String) o)); @@ -42,33 +43,15 @@ public class ElvenTradeRecipeWrapper implements IRecipeWrapper { } @Override - public List getInputs() { - return input; + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputLists(ItemStack.class, input); + ingredients.setOutputs(ItemStack.class, outputs); } @Override - public List getOutputs() { - return outputs; - } - - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } - - @Override - public List getFluidOutputs() { - return ImmutableList.of(); - } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - } - - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {} + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { return ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java index e253ce18f..622e51860 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -11,10 +11,12 @@ package vazkii.botania.client.integration.jei.manapool; import java.util.Collection; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -59,6 +61,12 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { return background; } + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -69,31 +77,21 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(@Nonnull Minecraft minecraft) { - } - - @SuppressWarnings("unchecked") - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof ManaPoolRecipeWrapper)) return; - ManaPoolRecipeWrapper wrapper = (ManaPoolRecipeWrapper) recipeWrapper; int index = 0; recipeLayout.getItemStacks().init(index, true, 40, 12); - if(wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(index, (Collection) wrapper.getInputs().get(0)); - } else { - recipeLayout.getItemStacks().set(index, (ItemStack) wrapper.getInputs().get(0)); - } + recipeLayout.getItemStacks().set(index, ingredients.getInputs(ItemStack.class).get(0)); index++; - if(wrapper.getInputs().size() > 1) { + if(ingredients.getInputs(ItemStack.class).size() > 1) { // Has catalyst recipeLayout.getItemStacks().init(index, true, 20, 12); - recipeLayout.getItemStacks().set(index, (ItemStack) wrapper.getInputs().get(1)); + recipeLayout.getItemStacks().set(index, ingredients.getInputs(ItemStack.class).get(1)); index++; } @@ -102,11 +100,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory { index++; recipeLayout.getItemStacks().init(index, false, 99, 12); - if(wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(index, (Collection) wrapper.getOutputs().get(0)); - } else { - recipeLayout.getItemStacks().set(index, (ItemStack) wrapper.getOutputs().get(0)); - } + recipeLayout.getItemStacks().set(index, ingredients.getOutputs(ItemStack.class).get(0)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java index 56d2b6682..5daec990a 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -22,16 +22,10 @@ public class ManaPoolRecipeHandler implements IRecipeHandler return RecipeManaInfusion.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.manaPool"; - } - @Nonnull @Override public String getRecipeCategoryUid(@Nonnull RecipeManaInfusion recipe) { // o is erased type param - return getRecipeCategoryUid(); + return "botania.manaPool"; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java index bac9550b9..ab9d7bb75 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -15,10 +15,12 @@ import javax.annotation.Nullable; import com.google.common.collect.ImmutableList; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -29,23 +31,23 @@ import vazkii.botania.common.block.tile.mana.TilePool; public class ManaPoolRecipeWrapper implements IRecipeWrapper { - private final List input; + private final List> input; private final ItemStack output; private final int mana; public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder> builder = ImmutableList.builder(); if(recipe.getInput() instanceof ItemStack) { - builder.add(recipe.getInput()); + builder.add(ImmutableList.of((ItemStack) recipe.getInput())); } else if(recipe.getInput() instanceof String) { builder.add(OreDictionary.getOres((String) recipe.getInput())); } if(recipe.getCatalyst() != null) { Block block = recipe.getCatalyst().getBlock(); - if (Item.getItemFromBlock(block) != null) { - builder.add(new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst()))); + if (Item.getItemFromBlock(block) != Items.AIR) { + builder.add(ImmutableList.of(new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst())))); } } @@ -55,23 +57,9 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { } @Override - public List getInputs() { - return input; - } - - @Override - public List getOutputs() { - return ImmutableList.of(output); - } - - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } - - @Override - public List getFluidOutputs() { - return ImmutableList.of(); + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputLists(ItemStack.class, input); + ingredients.setOutput(ItemStack.class, output); } @Override @@ -81,11 +69,7 @@ public class ManaPoolRecipeWrapper implements IRecipeWrapper { GlStateManager.disableAlpha(); } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - - @Nullable + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { return ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index e8b365792..b91bc5381 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -10,13 +10,16 @@ package vazkii.botania.client.integration.jei.petalapothecary; import java.awt.Point; import java.util.Collection; +import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -58,6 +61,12 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return background; } + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -68,37 +77,26 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(@Nonnull Minecraft minecraft) { - } - - @SuppressWarnings("unchecked") - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) return; - PetalApothecaryRecipeWrapper wrapper = (PetalApothecaryRecipeWrapper) recipeWrapper; recipeLayout.getItemStacks().init(0, true, 64, 52); recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); int index = 1; - double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + double angleBetweenEach = 360.0 / ingredients.getInputs(ItemStack.class).size(); Point point = new Point(64, 20), center = new Point(64, 52); - for(Object o : wrapper.getInputs()) { + for(List o : ingredients.getInputs(ItemStack.class)) { recipeLayout.getItemStacks().init(index, true, point.x, point.y); - if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, (Collection) o); - } - if(o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, (ItemStack) o); - } + recipeLayout.getItemStacks().set(index, o); index += 1; point = rotatePointAbout(point, center, angleBetweenEach); } recipeLayout.getItemStacks().init(index, false, 103, 17); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + recipeLayout.getItemStacks().set(index, ingredients.getOutputs(ItemStack.class).get(0)); } private Point rotatePointAbout(Point in, Point about, double degrees) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java index 868132929..579854fd8 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -22,16 +22,10 @@ public class PetalApothecaryRecipeHandler implements IRecipeHandler> input; private final ItemStack output; public PetalApothecaryRecipeWrapper(RecipePetals recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder> builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { if(o instanceof ItemStack) { - builder.add(o); + builder.add(ImmutableList.of((ItemStack) o)); } if(o instanceof String) { builder.add(OreDictionary.getOres((String) o)); @@ -41,33 +42,16 @@ public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { } @Override - public List getInputs() { - return input; - } - - @Override - public List getOutputs() { - return ImmutableList.of(output); - } - - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } - - @Override - public List getFluidOutputs() { - return ImmutableList.of(); + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputLists(ItemStack.class, input); + ingredients.setOutput(ItemStack.class, output); } @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { return ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 32e7fe6c6..682318761 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -11,10 +11,12 @@ package vazkii.botania.client.integration.jei.puredaisy; import java.util.Collection; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -22,6 +24,7 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; @@ -57,6 +60,12 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { return background; } + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -67,30 +76,19 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(@Nonnull Minecraft minecraft) { - } - - @SuppressWarnings("unchecked") - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof PureDaisyRecipeWrapper)) return; - PureDaisyRecipeWrapper wrapper = (PureDaisyRecipeWrapper) recipeWrapper; - boolean inputFluid = wrapper.getInputs().isEmpty(); - boolean outputFluid = wrapper.getOutputs().isEmpty(); - + boolean inputFluid = !ingredients.getInputs(FluidStack.class).isEmpty(); + boolean outputFluid = !ingredients.getOutputs(FluidStack.class).isEmpty(); if(inputFluid) { recipeLayout.getFluidStacks().init(0, true, 40, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(0, wrapper.getFluidInputs().get(0)); + recipeLayout.getFluidStacks().set(0, ingredients.getInputs(FluidStack.class).get(0)); } else { recipeLayout.getItemStacks().init(0, true, 40, 12); - if(wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(0, (Collection) wrapper.getInputs().get(0)); - } else { - recipeLayout.getItemStacks().set(0, (ItemStack) wrapper.getInputs().get(0)); - } + recipeLayout.getItemStacks().set(0, ingredients.getInputs(ItemStack.class).get(0)); } recipeLayout.getItemStacks().init(1, true, 70, 12); @@ -98,14 +96,10 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { if(outputFluid) { recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(2, wrapper.getFluidOutputs().get(0)); + recipeLayout.getFluidStacks().set(2, ingredients.getOutputs(FluidStack.class).get(0)); } else { recipeLayout.getItemStacks().init(2, false, 99, 12); - if(wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(2, (Collection) wrapper.getOutputs().get(0)); - } else { - recipeLayout.getItemStacks().set(2, (ItemStack) wrapper.getOutputs().get(0)); - } + recipeLayout.getItemStacks().set(2, ingredients.getOutputs(ItemStack.class).get(0)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java index 9a3a5e82b..1c2ddd50c 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -22,16 +22,10 @@ public class PureDaisyRecipeHandler implements IRecipeHandler { return RecipePureDaisy.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.pureDaisy"; - } - @Nonnull @Override public String getRecipeCategoryUid(@Nonnull RecipePureDaisy recipe) { // o is erased type param - return getRecipeCategoryUid(); + return "botania.pureDaisy"; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java index d93ac7b13..2cef6ff2e 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableList; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -25,18 +26,18 @@ import vazkii.botania.api.recipe.RecipePureDaisy; public class PureDaisyRecipeWrapper implements IRecipeWrapper { - private List inputs = ImmutableList.of(); - private List outputs = ImmutableList.of(); - private List fluidInputs = ImmutableList.of(); - private List fluidOutputs = ImmutableList.of(); + private List inputs = ImmutableList.of(); + private ItemStack output = ItemStack.EMPTY; + private FluidStack fluidInput = null; + private FluidStack fluidOutput = null; public PureDaisyRecipeWrapper(RecipePureDaisy recipe) { if(recipe.getInput() instanceof String) { - inputs = ImmutableList.of(OreDictionary.getOres((String) recipe.getInput())); + inputs = ImmutableList.copyOf(OreDictionary.getOres((String) recipe.getInput())); } else if(recipe.getInput() instanceof Block) { Block b = (Block) recipe.getInput(); if(FluidRegistry.lookupFluidForBlock(b) != null) { - fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000)); + fluidInput = new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000); } else { inputs = ImmutableList.of(new ItemStack(b, 1, b.getMetaFromState(b.getDefaultState()))); } @@ -44,40 +45,34 @@ public class PureDaisyRecipeWrapper implements IRecipeWrapper { Block outBlock = recipe.getOutputState().getBlock(); if(FluidRegistry.lookupFluidForBlock(outBlock) != null) { - fluidOutputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000)); + fluidOutput = new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000); } else { - outputs = ImmutableList.of(new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState()))); + output = new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState())); } } @Override - public List getInputs() { - return inputs; - } + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputs(ItemStack.class, inputs); - @Override - public List getOutputs() { - return outputs; - } + if (fluidInput != null) { + ingredients.setInput(FluidStack.class, fluidInput); + } - @Override - public List getFluidInputs() { - return fluidInputs; - } + if (!output.isEmpty()) { + ingredients.setOutput(ItemStack.class, output); + } - @Override - public List getFluidOutputs() { - return fluidOutputs; + if (fluidOutput != null) { + ingredients.setOutput(FluidStack.class, fluidOutput); + } } @Override public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { return ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java index 9346ed178..0b0ced980 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -10,12 +10,15 @@ package vazkii.botania.client.integration.jei.runicaltar; import java.awt.Point; import java.util.Collection; +import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; @@ -57,6 +60,12 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { return background; } + @Nullable + @Override + public IDrawable getIcon() { + return null; + } + @Override public void drawExtras(@Nonnull Minecraft minecraft) { GlStateManager.enableAlpha(); @@ -67,12 +76,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { } @Override - public void drawAnimations(@Nonnull Minecraft minecraft) { - } - - @SuppressWarnings("unchecked") - @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { if(!(recipeWrapper instanceof RunicAltarRecipeWrapper)) return; RunicAltarRecipeWrapper wrapper = (RunicAltarRecipeWrapper) recipeWrapper; @@ -81,23 +85,19 @@ public class RunicAltarRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar)); int index = 1; - double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + double angleBetweenEach = 360.0 / ingredients.getInputs(ItemStack.class).size(); Point point = new Point(64, 20), center = new Point(64, 52); - for(Object o : wrapper.getInputs()) { + for(List o : ingredients.getInputs(ItemStack.class)) { recipeLayout.getItemStacks().init(index, true, point.x, point.y); - if(o instanceof Collection) { - recipeLayout.getItemStacks().set(index, (Collection) o); - } - if(o instanceof ItemStack) { - recipeLayout.getItemStacks().set(index, (ItemStack) o); - } + recipeLayout.getItemStacks().set(index, o); index += 1; point = rotatePointAbout(point, center, angleBetweenEach); } recipeLayout.getItemStacks().init(index, false, 103, 17); - recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + recipeLayout.getItemStacks().set(index, ingredients.getOutputs(ItemStack.class).get(0)); + } private Point rotatePointAbout(Point in, Point about, double degrees) { diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java index f729656a9..000cc08f6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -22,16 +22,10 @@ public class RunicAltarRecipeHandler implements IRecipeHandler return RecipeRuneAltar.class; } - @Nonnull - @Override - public String getRecipeCategoryUid() { - return "botania.runicAltar"; - } - @Nonnull @Override public String getRecipeCategoryUid(@Nonnull RecipeRuneAltar recipe) { // o is erased type param - return getRecipeCategoryUid(); + return "botania.runicAltar"; } @Nonnull diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java index dba09702d..7ddee3bc6 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -14,6 +14,7 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableList; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -26,16 +27,16 @@ import vazkii.botania.common.block.tile.mana.TilePool; public class RunicAltarRecipeWrapper implements IRecipeWrapper { - private final List input; + private final List> input; private final ItemStack output; private final int manaUsage; @SuppressWarnings("unchecked") public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { - ImmutableList.Builder builder = ImmutableList.builder(); + ImmutableList.Builder> builder = ImmutableList.builder(); for(Object o : recipe.getInputs()) { if(o instanceof ItemStack) { - builder.add(o); + builder.add(ImmutableList.of((ItemStack) o)); } if(o instanceof String) { builder.add(OreDictionary.getOres((String) o)); @@ -47,23 +48,9 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { } @Override - public List getInputs() { - return input; - } - - @Override - public List getOutputs() { - return ImmutableList.of(output); - } - - @Override - public List getFluidInputs() { - return ImmutableList.of(); - } - - @Override - public List getFluidOutputs() { - return ImmutableList.of(); + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputLists(ItemStack.class, input); + ingredients.setOutput(ItemStack.class, output); } @Override @@ -73,10 +60,7 @@ public class RunicAltarRecipeWrapper implements IRecipeWrapper { GlStateManager.disableAlpha(); } - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { - } - + @Nonnull @Override public List getTooltipStrings(int mouseX, int mouseY) { return ImmutableList.of(); diff --git a/src/main/java/vazkii/botania/client/lib/LibResources.java b/src/main/java/vazkii/botania/client/lib/LibResources.java index ecdfa2336..e4431fd78 100644 --- a/src/main/java/vazkii/botania/client/lib/LibResources.java +++ b/src/main/java/vazkii/botania/client/lib/LibResources.java @@ -10,9 +10,11 @@ */ package vazkii.botania.client.lib; +import vazkii.botania.common.lib.LibMisc; + public final class LibResources { - public static final String PREFIX_MOD = "botania:"; + public static final String PREFIX_MOD = LibMisc.MOD_ID + ":"; public static final String PREFIX_LANG = "/assets/botania/lang/"; public static final String PREFIX_SHADER = "/assets/botania/shader/"; diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 86638ad0c..9211a0c37 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -218,7 +218,7 @@ public class FloatingFlowerModel implements IBakedModel { private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { // Items always have GRASS island IFloatingFlower.IslandType islandType = IFloatingFlower.IslandType.GRASS; String identifier; diff --git a/src/main/java/vazkii/botania/client/model/GunModel.java b/src/main/java/vazkii/botania/client/model/GunModel.java index b78a3bbe3..857968c07 100644 --- a/src/main/java/vazkii/botania/client/model/GunModel.java +++ b/src/main/java/vazkii/botania/client/model/GunModel.java @@ -49,9 +49,9 @@ public class GunModel implements IBakedModel { private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase entity) { + public IBakedModel handleItemState(@Nonnull IBakedModel model, ItemStack stack, World world, EntityLivingBase entity) { ItemStack lens = ItemManaGun.getLens(stack); - if(lens != null) { + if(!lens.isEmpty()) { IBakedModel lensModel = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getItemModel(lens); return GunModel.this.getModel(lensModel); } diff --git a/src/main/java/vazkii/botania/client/model/ModelBrewery.java b/src/main/java/vazkii/botania/client/model/ModelBrewery.java index 8c5db4d0b..0b64a8447 100644 --- a/src/main/java/vazkii/botania/client/model/ModelBrewery.java +++ b/src/main/java/vazkii/botania/client/model/ModelBrewery.java @@ -55,7 +55,7 @@ public class ModelBrewery extends ModelBase { GlStateManager.translate(0F, offset, 0F); GlStateManager.rotate(polerot, 0F, 1F, 0F); - if(hasTile && render.brewery.getItemHandler().getStackInSlot(0) != null) { + if(hasTile && !render.brewery.getItemHandler().getStackInSlot(0).isEmpty()) { GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(0, -0.45, 0); //GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F); @@ -78,7 +78,7 @@ public class ModelBrewery extends ModelBase { offset1 = 0F; GlStateManager.translate(0F, offset1, 0F); - if(hasTile && render.brewery.getItemHandler().getStackInSlot(i + 1) != null) { + if(hasTile && !render.brewery.getItemHandler().getStackInSlot(i + 1).isEmpty()) { float rot = Plate.rotateAngleY * 180F / (float) Math.PI; float transX = 0.3125F; float transY = 1.06F; diff --git a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java index a53331925..674139255 100644 --- a/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/client/model/ModelTeruTeruBozu.java @@ -43,7 +43,7 @@ public class ModelTeruTeruBozu extends ModelBase { public void render() { float f5 = 1F / 16F; - if(Minecraft.getMinecraft().theWorld.isRaining()) + if(Minecraft.getMinecraft().world.isRaining()) sadFace.render(f5); else happyFace.render(f5); thread.render(f5); diff --git a/src/main/java/vazkii/botania/client/model/PlatformModel.java b/src/main/java/vazkii/botania/client/model/PlatformModel.java index f9fdaee48..4be0e62de 100644 --- a/src/main/java/vazkii/botania/client/model/PlatformModel.java +++ b/src/main/java/vazkii/botania/client/model/PlatformModel.java @@ -148,8 +148,8 @@ public class PlatformModel implements IBakedModel { @Nonnull @Override - public Biome getBiomeGenForCoords(@Nonnull BlockPos pos) { - return compose.getBiomeGenForCoords(pos); + public Biome getBiome(@Nonnull BlockPos pos) { + return compose.getBiome(pos); } @Override diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 748752668..03f99cb29 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -147,9 +147,9 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public boolean accepts(ResourceLocation modelLocation) { return modelLocation.getResourceDomain().equals("botania_special") && ( - modelLocation.getResourcePath().equals("specialFlower") || - modelLocation.getResourcePath().equals("models/block/specialFlower") || - modelLocation.getResourcePath().equals("models/item/specialFlower")); + modelLocation.getResourcePath().equals("specialflower") || + modelLocation.getResourcePath().equals("models/block/specialflower") || + modelLocation.getResourcePath().equals("models/item/specialflower")); } @Override @@ -239,7 +239,7 @@ public class SpecialFlowerModel implements IModelCustomData { private final ItemOverrideList itemHandler = new ItemOverrideList(ImmutableList.of()) { @Nonnull @Override - public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, @Nonnull World world, @Nonnull EntityLivingBase living) { + public IBakedModel handleItemState(@Nonnull IBakedModel original, ItemStack stack, World world, EntityLivingBase living) { Optional item = bakedItemModels.getUnchecked(ItemBlockSpecialFlower.getType(stack)); if(!item.isPresent()) diff --git a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java index 97dbaece8..f4eb1902b 100644 --- a/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java +++ b/src/main/java/vazkii/botania/client/render/entity/LayerGaiaHead.java @@ -30,7 +30,7 @@ public class LayerGaiaHead implements LayerRenderer { public void doRenderLayer(@Nonnull EntityPlayer player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) { ItemStack itemstack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if (itemstack != null && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head + if (!itemstack.isEmpty() && itemstack.getItem() == ModItems.gaiaHead) // Botania - check for head { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java index 87ef9febd..e7bf9334a 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderCorporeaSpark.java @@ -30,11 +30,6 @@ public class RenderCorporeaSpark extends RenderSparkBase { super(manager); } - @Override - protected DataParameter getInvisibilityParam() { - return EntityCorporeaSpark.INVISIBILITY; - } - @Override public TextureAtlasSprite getBaseIcon(EntityCorporeaSpark entity) { return entity.isMaster() ? MiscellaneousIcons.INSTANCE.corporeaWorldIconMaster : MiscellaneousIcons.INSTANCE.corporeaWorldIcon; @@ -62,8 +57,8 @@ public class RenderCorporeaSpark extends RenderSparkBase { float absTime = Math.abs(time) - pticks; - ItemStack stack = entity.getDisplayedItem().orNull(); - if(stack == null) + ItemStack stack = entity.getDisplayedItem(); + if(stack.isEmpty()) return; GlStateManager.pushMatrix(); @@ -76,7 +71,7 @@ public class RenderCorporeaSpark extends RenderSparkBase { GlStateManager.translate(0F, 0F, -2F + (time < 0 ? -absTime : absTime) / 6); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.worldObj, null).getParticleTexture(); + TextureAtlasSprite icon = Minecraft.getMinecraft().getRenderItem().getItemModelWithOverrides(stack, entity.world, null).getParticleTexture(); if(icon != null) { float minU = icon.getMinU(); diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java index d2d86bed7..2c59c6d7d 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSpark.java @@ -22,11 +22,6 @@ public class RenderSpark extends RenderSparkBase { super(renderManager); } - @Override - protected DataParameter getInvisibilityParam() { - return EntitySpark.INVISIBILITY; - } - @Override public TextureAtlasSprite getSpinningIcon(EntitySpark entity) { int upgrade = entity.getUpgrade().ordinal() - 1; diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java index 2a0ebb0d2..43d3563cc 100644 --- a/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java +++ b/src/main/java/vazkii/botania/client/render/entity/RenderSparkBase.java @@ -22,12 +22,12 @@ import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.entity.Entity; import net.minecraft.network.datasync.DataParameter; import net.minecraft.util.ResourceLocation; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.proxy.ClientProxy; public abstract class RenderSparkBase extends Render { @@ -49,7 +49,7 @@ public abstract class RenderSparkBase extends Render { double time = ClientTickHandler.ticksInGame + par9; time += new Random(tEntity.getEntityId()).nextInt(); - float a = 0.1F + (1 - tEntity.getDataManager().get(getInvisibilityParam())) * 0.8F; + float a = 0.1F + (tEntity.isInvisible() ? 0 : 1) * 0.8F; GlStateManager.color(1F, 1F, 1F, (0.7F + 0.3F * (float) (Math.sin(time / 5.0) + 0.5) * 2) * a); @@ -62,14 +62,14 @@ public abstract class RenderSparkBase extends Render { float r = 180.0F - renderManager.playerViewY; GlStateManager.rotate(r, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(-renderManager.playerViewX, 1F, 0F, 0F); - func_77026_a(tessellator, iicon); + renderIcon(tessellator, iicon); TextureAtlasSprite spinningIcon = getSpinningIcon(tEntity); if(spinningIcon != null) { GlStateManager.translate(-0.02F + (float) Math.sin(time / 20) * 0.2F, 0.24F + (float) Math.cos(time / 20) * 0.2F, 0.005F); GlStateManager.scale(0.2F, 0.2F, 0.2F); colorSpinningIcon(tEntity, a); - func_77026_a(tessellator, spinningIcon); + renderIcon(tessellator, spinningIcon); } GlStateManager.popMatrix(); GlStateManager.color(1F, 1F, 1F, 1F); @@ -80,8 +80,6 @@ public abstract class RenderSparkBase extends Render { GlStateManager.popMatrix(); } - protected abstract DataParameter getInvisibilityParam(); - protected TextureAtlasSprite getBaseIcon(T entity) { return MiscellaneousIcons.INSTANCE.sparkWorldIcon; } @@ -100,22 +98,21 @@ public abstract class RenderSparkBase extends Render { return TextureMap.LOCATION_BLOCKS_TEXTURE; } - private void func_77026_a(Tessellator p_77026_1_, TextureAtlasSprite p_77026_2_) { - float f = p_77026_2_.getMinU(); - float f1 = p_77026_2_.getMaxU(); - float f2 = p_77026_2_.getMinV(); - float f3 = p_77026_2_.getMaxV(); + private void renderIcon(Tessellator tess, TextureAtlasSprite icon) { + float f = icon.getMinU(); + float f1 = icon.getMaxU(); + float f2 = icon.getMinV(); + float f3 = icon.getMaxV(); float f4 = 1.0F; float f5 = 0.5F; float f6 = 0.25F; - p_77026_1_.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); - //p_77026_1_.getBuffer().setBrightness(240); - p_77026_1_.getBuffer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getBuffer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getBuffer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.getBuffer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0.0F, 1.0F, 0.0F).endVertex(); - p_77026_1_.draw(); + tess.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP_NORMAL); + tess.getBuffer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.getBuffer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.getBuffer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.getBuffer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).lightmap(240, 240).normal(0.0F, 1.0F, 0.0F).endVertex(); + tess.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java b/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java deleted file mode 100644 index 3680e5dd1..000000000 --- a/src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java +++ /dev/null @@ -1,32 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Aug 27, 2015, 10:02:12 PM (GMT)] - */ -package vazkii.botania.client.render.entity; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.item.ItemStack; -import vazkii.botania.common.entity.EntityThornChakram; -import vazkii.botania.common.item.ModItems; - -// Basically a bit of an extension of RenderSnowball -public class RenderThornChakram extends RenderSnowball { - - public RenderThornChakram(RenderManager renderManager) { - super(renderManager, ModItems.thornChakram, Minecraft.getMinecraft().getRenderItem()); - } - - @Override - public ItemStack getStackToRender(EntityThornChakram entityIn) { - return new ItemStack(ModItems.thornChakram, 1, entityIn.isFire() ? 1 : 0); - } - -} diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java index 3a466f6db..0e9b43191 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java @@ -25,6 +25,7 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileAlfPortal; @@ -78,12 +79,11 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer { if(water) { int petals = 0; for(int i = 0; i < altar.getSizeInventory(); i++) - if(altar.getItemHandler().getStackInSlot(i) != null) + if(!altar.getItemHandler().getStackInSlot(i).isEmpty()) petals++; else break; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java index 863c366f6..626cdcd3d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java @@ -10,7 +10,7 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.lwjgl.opengl.GL11; @@ -41,7 +41,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { private static final ModelAvatar model = new ModelAvatar(); @Override - public void renderTileEntityAt(@Nonnull TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { + public void renderTileEntityAt(@Nullable TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) { if (avatar != null) if (!avatar.getWorld().isBlockLoaded(avatar.getPos(), false) || avatar.getWorld().getBlockState(avatar.getPos()).getBlock() != ModBlocks.avatar) @@ -71,7 +71,7 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer { } ItemStack stack = avatar.getItemHandler().getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { GlStateManager.pushMatrix(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); float s = 0.6F; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java index 91b85653d..b3e522708 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java @@ -10,7 +10,7 @@ */ package vazkii.botania.client.render.tile; -import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -31,7 +31,7 @@ public class RenderTileBellows extends TileEntitySpecialRenderer { private static final ModelBellows model = new ModelBellows(); @Override - public void renderTileEntityAt(@Nonnull TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nullable TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) { if (bellows != null) if (!bellows.getWorld().isBlockLoaded(bellows.getPos(), false) || bellows.getWorld().getBlockState(bellows.getPos()).getBlock() != ModBlocks.bellows) diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java index 4e9fe7b4d..348daeca7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java @@ -11,6 +11,7 @@ package vazkii.botania.client.render.tile; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; @@ -31,7 +32,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { public TileBrewery brewery; @Override - public void renderTileEntityAt(@Nonnull TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { + public void renderTileEntityAt(@Nullable TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) { this.brewery = brewery; GlStateManager.pushMatrix(); GlStateManager.enableRescaleNormal(); @@ -50,7 +51,7 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer { } public void renderItemStack(ItemStack stack) { - if(stack != null) { + if(!stack.isEmpty()) { Minecraft mc = Minecraft.getMinecraft(); GlStateManager.pushMatrix(); mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java index 02da83533..bba6c391e 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java @@ -51,7 +51,7 @@ public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer { public void renderIcon(int par1, int par2, TextureAtlasSprite par3Icon, int par4, int par5, int brightness) { Tessellator tessellator = Tessellator.getInstance(); - tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - //tessellator.getBuffer().setBrightness(brightness); - tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).endVertex(); - tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).endVertex(); - tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).endVertex(); - tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).endVertex(); + tessellator.getBuffer().begin(GL11.GL_QUADS, ClientProxy.POSITION_TEX_LMAP); + tessellator.getBuffer().pos(par1 + 0, par2 + par5, 0).tex(par3Icon.getMinU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + par5, 0).tex(par3Icon.getMaxU(), par3Icon.getMaxV()).lightmap(brightness, brightness).endVertex(); + tessellator.getBuffer().pos(par1 + par4, par2 + 0, 0).tex(par3Icon.getMaxU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex(); + tessellator.getBuffer().pos(par1 + 0, par2 + 0, 0).tex(par3Icon.getMinU(), par3Icon.getMinV()).lightmap(brightness, brightness).endVertex(); tessellator.draw(); } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java index 5ccd012cf..cf27345cc 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java @@ -34,7 +34,7 @@ public class RenderTilePrism extends TileEntitySpecialRenderer { ItemStack stack = prism.getItemHandler().getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); if(stack.getItem() instanceof ILens) { GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java index bbdedfe8f..e701fc04d 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java @@ -35,7 +35,7 @@ public class RenderTileRuneAltar extends TileEntitySpecialRenderer GlStateManager.scale(1F, -1F, -1F); ItemStack stack = spreader.getItemHandler().getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); stack.getItem(); GlStateManager.pushMatrix(); diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java index db0dd8032..31ef153ad 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java @@ -32,121 +32,206 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer= 1) + if (j >= 1) { - bindTexture(END_PORTAL_TEXTURE); + this.bindTexture(END_PORTAL_TEXTURE); + flag = true; + Minecraft.getMinecraft().entityRenderer.func_191514_d(true); } - if (i == 1) + if (j == 1) { GlStateManager.enableBlend(); - GlStateManager.blendFunc(1, 1); - f5 = 0.5F; + GlStateManager.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE); } - float f7 = (float)-(y + f3); - float f8 = f7 + (float)ActiveRenderInfo.getPosition().yCoord; - float f9 = f7 + f4 + (float)ActiveRenderInfo.getPosition().yCoord; - float f10 = f8 / f9; - f10 = (float)(y + f3) + f10; - GlStateManager.translate(f, f10, f2); - GlStateManager.texGen(GlStateManager.TexGen.S, 9217); - GlStateManager.texGen(GlStateManager.TexGen.T, 9217); - GlStateManager.texGen(GlStateManager.TexGen.R, 9217); - GlStateManager.texGen(GlStateManager.TexGen.Q, 9216); - GlStateManager.texGen(GlStateManager.TexGen.S, 9473, func_147525_a(1.0F, 0.0F, 0.0F, 0.0F)); - GlStateManager.texGen(GlStateManager.TexGen.T, 9473, func_147525_a(0.0F, 0.0F, 1.0F, 0.0F)); - GlStateManager.texGen(GlStateManager.TexGen.R, 9473, func_147525_a(0.0F, 0.0F, 0.0F, 1.0F)); - GlStateManager.texGen(GlStateManager.TexGen.Q, 9474, func_147525_a(0.0F, 1.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.S, 9216); + GlStateManager.texGen(GlStateManager.TexGen.T, 9216); + GlStateManager.texGen(GlStateManager.TexGen.R, 9216); + GlStateManager.texGen(GlStateManager.TexGen.S, 9474, this.getBuffer(1.0F, 0.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.T, 9474, this.getBuffer(0.0F, 1.0F, 0.0F, 0.0F)); + GlStateManager.texGen(GlStateManager.TexGen.R, 9474, this.getBuffer(0.0F, 0.0F, 1.0F, 0.0F)); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.S); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.T); GlStateManager.enableTexGenCoord(GlStateManager.TexGen.R); - GlStateManager.enableTexGenCoord(GlStateManager.TexGen.Q); GlStateManager.popMatrix(); GlStateManager.matrixMode(5890); GlStateManager.pushMatrix(); GlStateManager.loadIdentity(); - GlStateManager.translate(0.0F, Minecraft.getSystemTime() % 20000 / 20000.0F, 0.0F); - GlStateManager.scale(f5, f5, f5); GlStateManager.translate(0.5F, 0.5F, 0.0F); - GlStateManager.rotate((i * i * 4321 + i * 9) * 2.0F, 0.0F, 0.0F, 1.0F); - GlStateManager.translate(-0.5F, -0.5F, 0.0F); - GlStateManager.translate(-f, -f2, -f1); - f8 = f7 + (float)ActiveRenderInfo.getPosition().yCoord; - GlStateManager.translate((float)ActiveRenderInfo.getPosition().xCoord * f4 / f8, (float)ActiveRenderInfo.getPosition().zCoord * f4 / f8, -f1); + GlStateManager.scale(0.5F, 0.5F, 1.0F); + float f2 = (float)(j + 1); + GlStateManager.translate(17.0F / f2, (2.0F + f2 / 1.5F) * ((float)Minecraft.getSystemTime() % 800000.0F / 800000.0F), 0.0F); + GlStateManager.rotate((f2 * f2 * 4321.0F + f2 * 9.0F) * 2.0F, 0.0F, 0.0F, 1.0F); + GlStateManager.scale(4.5F - f2 / 4.0F, 4.5F - f2 / 4.0F, 1.0F); + GlStateManager.multMatrix(PROJECTION); + GlStateManager.multMatrix(MODELVIEW); Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer worldrenderer = tessellator.getBuffer(); - worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); - float f11 = (field_147527_e.nextFloat() * 0.5F + 0.1F) * f6; - float f12 = (field_147527_e.nextFloat() * 0.5F + 0.4F) * f6; - float f13 = (field_147527_e.nextFloat() * 0.5F + 0.5F) * f6; - - if (i == 0) - { - f11 = f12 = 1.0F * f6; - } + VertexBuffer vertexbuffer = tessellator.getBuffer(); + vertexbuffer.begin(7, DefaultVertexFormats.POSITION_COLOR); + float f3 = (RANDOM.nextFloat() * 0.5F + 0.1F) * f1; + float f4 = (RANDOM.nextFloat() * 0.5F + 0.4F) * f1; + float f5 = (RANDOM.nextFloat() * 0.5F + 0.5F) * f1; // Botania: change color based on time Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F); - f11 = color.getRed() / 255F; - f12 = color.getGreen() / 255F; - f13 = color.getBlue() / 255F; + f3 = color.getRed() / 255F; + f4 = color.getGreen() / 255F; + f5 = color.getBlue() / 255F; - f11 *= f6; f12 *= f6; f13 *= f6; + f3 *= f1; f4 *= f1; f5 *= f1; + + /* Botania - don't render other faces + if (te.shouldRenderFace(EnumFacing.SOUTH)) + { + vertexbuffer.pos(x, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + } + + if (te.shouldRenderFace(EnumFacing.NORTH)) + { + vertexbuffer.pos(x, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y, z).color(f3, f4, f5, 1.0F).endVertex(); + } + + if (te.shouldRenderFace(EnumFacing.EAST)) + { + vertexbuffer.pos(x + 1.0D, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y, z).color(f3, f4, f5, 1.0F).endVertex(); + } + + if (te.shouldRenderFace(EnumFacing.WEST)) + { + vertexbuffer.pos(x, y, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y + 1.0D, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y + 1.0D, z).color(f3, f4, f5, 1.0F).endVertex(); + } + + if (te.shouldRenderFace(EnumFacing.DOWN)) + { + vertexbuffer.pos(x, y, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + }*/ + + // Botania - always render up face if (te.shouldRenderFace(EnumFacing.UP)) + { + vertexbuffer.pos(x, y + (double)f, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y + (double)f, z + 1.0D).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x + 1.0D, y + (double)f, z).color(f3, f4, f5, 1.0F).endVertex(); + vertexbuffer.pos(x, y + (double)f, z).color(f3, f4, f5, 1.0F).endVertex(); + } - worldrenderer.pos(x, y + f3, z).color(f11, f12, f13, 1.0F).endVertex(); - worldrenderer.pos(x, y + f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); - worldrenderer.pos(x + 1.0D, y + f3, z + 1.0D).color(f11, f12, f13, 1.0F).endVertex(); - worldrenderer.pos(x + 1.0D, y + f3, z).color(f11, f12, f13, 1.0F).endVertex(); tessellator.draw(); GlStateManager.popMatrix(); GlStateManager.matrixMode(5888); - bindTexture(END_SKY_TEXTURE); + this.bindTexture(END_SKY_TEXTURE); } GlStateManager.disableBlend(); GlStateManager.disableTexGenCoord(GlStateManager.TexGen.S); GlStateManager.disableTexGenCoord(GlStateManager.TexGen.T); GlStateManager.disableTexGenCoord(GlStateManager.TexGen.R); - GlStateManager.disableTexGenCoord(GlStateManager.TexGen.Q); GlStateManager.enableLighting(); + + if (flag) + { + Minecraft.getMinecraft().entityRenderer.func_191514_d(false); + } } - private FloatBuffer func_147525_a(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) + private int getPasses(double p_191286_1_) { - field_147528_b.clear(); - field_147528_b.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_); - field_147528_b.flip(); - return field_147528_b; + int i; + + if (p_191286_1_ > 36864.0D) + { + i = 1; + } + else if (p_191286_1_ > 25600.0D) + { + i = 3; + } + else if (p_191286_1_ > 16384.0D) + { + i = 5; + } + else if (p_191286_1_ > 9216.0D) + { + i = 7; + } + else if (p_191286_1_ > 4096.0D) + { + i = 9; + } + else if (p_191286_1_ > 1024.0D) + { + i = 11; + } + else if (p_191286_1_ > 576.0D) + { + i = 13; + } + else if (p_191286_1_ > 256.0D) + { + i = 14; + } + else + { + i = 15; + } + + return i; + } + + private float getOffset() + { + return 0.24F; // Botania: move to bottom of block space + } + + private FloatBuffer getBuffer(float p_147525_1_, float p_147525_2_, float p_147525_3_, float p_147525_4_) + { + this.buffer.clear(); + this.buffer.put(p_147525_1_).put(p_147525_2_).put(p_147525_3_).put(p_147525_4_); + this.buffer.flip(); + return this.buffer; } } diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java index 8ec2811ad..6665e4eb7 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTileTerraPlate.java @@ -25,6 +25,7 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.common.block.tile.TileTerraPlate; public class RenderTileTerraPlate extends TileEntitySpecialRenderer { @@ -68,12 +69,11 @@ public class RenderTileTerraPlate extends TileEntitySpecialRenderer 0.0F) { @@ -375,7 +375,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { // Botania - no horizon rendering /* GlStateManager.disableTexture2D(); GlStateManager.color(0.0F, 0.0F, 0.0F); - double d0 = this.mc.thePlayer.getPositionEyes(partialTicks).yCoord - this.theWorld.getHorizon(); + double d0 = this.mc.player.getPositionEyes(partialTicks).yCoord - this.world.getHorizon(); if (d0 < 0.0D) { @@ -424,7 +424,7 @@ public class SkyblockSkyRenderer extends IRenderHandler { tessellator.draw(); } - if (this.theWorld.provider.isSkyColored()) + if (this.world.provider.isSkyColored()) { GlStateManager.color(f * 0.2F + 0.04F, f1 * 0.2F + 0.04F, f2 * 0.6F + 0.1F); } diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index fb374ab3c..597e15ce5 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -85,7 +85,6 @@ import vazkii.botania.common.entity.EntityPinkWither; import vazkii.botania.common.entity.EntitySignalFlare; import vazkii.botania.common.entity.EntitySpark; import vazkii.botania.common.entity.ModEntities; -import vazkii.botania.common.integration.buildcraft.StatementAPIPlugin; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibMisc; @@ -104,7 +103,6 @@ public class Botania { public static boolean bloodMagicLoaded = false; public static boolean coloredLightsLoaded = false; public static boolean etFuturumLoaded = false; - public static boolean rfApiLoaded = false; public static boolean storageDrawersLoaded = false; @Instance(LibMisc.MOD_ID) @@ -117,15 +115,14 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { - gardenOfGlassLoaded = Loader.isModLoaded("GardenOfGlass"); + gardenOfGlassLoaded = Loader.isModLoaded("gardenofglass"); - thaumcraftLoaded = Loader.isModLoaded("Thaumcraft"); + thaumcraftLoaded = Loader.isModLoaded("thaumcraft"); bcTriggersLoaded = ModAPIManager.INSTANCE.hasAPI("BuildCraftAPI|statements"); - bloodMagicLoaded = Loader.isModLoaded("BloodMagic"); // Psh, noob + bloodMagicLoaded = Loader.isModLoaded("bloodmagic"); // Psh, noob coloredLightsLoaded = Loader.isModLoaded("easycoloredlights"); etFuturumLoaded = Loader.isModLoaded("etfuturum"); - rfApiLoaded = ModAPIManager.INSTANCE.hasAPI("CoFHAPI|energy"); - storageDrawersLoaded = Loader.isModLoaded("StorageDrawers"); + storageDrawersLoaded = Loader.isModLoaded("storagedrawers"); BotaniaAPI.internalHandler = new InternalMethodHandler(); @@ -180,8 +177,8 @@ public class Botania { FMLInterModComms.sendMessage("ProjectE", "interdictionblacklist", EntityManaBurst.class.getCanonicalName()); - if(Botania.bcTriggersLoaded) - new StatementAPIPlugin(); + /*if(Botania.bcTriggersLoaded) todo buildcraft + new StatementAPIPlugin();*/ proxy.init(event); } @@ -198,7 +195,6 @@ public class Botania { } ModBlocks.addDispenserBehaviours(); - ModBlocks.registerMultiparts(); ConfigHandler.loadPostInit(); LexiconData.postInit(); diff --git a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java index 8399a1bcd..1de46ec16 100644 --- a/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java +++ b/src/main/java/vazkii/botania/common/achievement/AchievementTriggerer.java @@ -12,6 +12,7 @@ package vazkii.botania.common.achievement; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraftforge.event.entity.player.EntityItemPickupEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import net.minecraftforge.fml.common.gameevent.PlayerEvent.ItemPickupEvent; @@ -21,18 +22,18 @@ public final class AchievementTriggerer { private AchievementTriggerer() {} @SubscribeEvent - public static void onItemPickedUp(ItemPickupEvent event) { - ItemStack stack = event.pickedUp.getEntityItem(); - if(stack != null && stack.getItem() instanceof IPickupAchievement) { - Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.player, event.pickedUp); + public static void onItemPickedUp(EntityItemPickupEvent event) { + ItemStack stack = event.getItem().getEntityItem(); + if(!stack.isEmpty() && stack.getItem() instanceof IPickupAchievement) { + Achievement achievement = ((IPickupAchievement) stack.getItem()).getAchievementOnPickup(stack, event.getEntityPlayer(), event.getItem()); if(achievement != null) - event.player.addStat(achievement, 1); + event.getEntityPlayer().addStat(achievement, 1); } } @SubscribeEvent public static void onItemCrafted(ItemCraftedEvent event) { - if(event.crafting != null && event.crafting.getItem() instanceof ICraftAchievement) { + if(!event.crafting.isEmpty() && event.crafting.getItem() instanceof ICraftAchievement) { Achievement achievement = ((ICraftAchievement) event.crafting.getItem()).getAchievementOnCraft(event.crafting, event.player, event.craftMatrix); if(achievement != null) event.player.addStat(achievement, 1); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 2e5efd835..da55f5bc7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -27,6 +27,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -89,7 +90,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 6; i++) list.add(new ItemStack(item, 1, i)); } @@ -109,6 +110,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { } } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Blocks.DIRT.getItemDropped(state, rand, fortune); diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 481d74375..365b8e525 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -29,6 +29,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; @@ -40,9 +41,11 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -105,7 +108,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess worldIn, BlockPos pos) { - TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); + TileEntity te = worldIn instanceof ChunkCache ? ((ChunkCache)worldIn).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : worldIn.getTileEntity(pos); if (te instanceof TileAltar) { TileAltar altar = (TileAltar) te; @@ -130,16 +133,16 @@ public class BlockAltar extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 9; i++) list.add(new ItemStack(item, 1, i)); } @Override - public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity par5Entity) { - if(par5Entity instanceof EntityItem) { + public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) { + if(!world.isRemote && entity instanceof EntityItem) { TileAltar tile = (TileAltar) world.getTileEntity(pos); - if(tile.collideEntityItem((EntityItem) par5Entity)) + if(tile.collideEntityItem((EntityItem) entity)) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); } } @@ -153,20 +156,21 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { TileAltar tile = (TileAltar) world.getTileEntity(pos); + ItemStack stack = player.getHeldItem(hand); if(player.isSneaking()) { InventoryHelper.withdrawFromInventory(tile, player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile); - } else if(tile.isEmpty() && tile.hasWater && stack == null) + } else if(tile.isEmpty() && tile.hasWater && stack.isEmpty()) tile.trySetLastRecipe(player); else { - if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) { + if(!stack.isEmpty() && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) { if(!tile.hasWater) { if(stack.getItem() == ModItems.waterRod) ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true); else if(!player.capabilities.isCreativeMode) - drain(FluidRegistry.WATER, stack); + player.setHeldItem(hand, drain(FluidRegistry.WATER, stack)); tile.setWater(true); world.updateComparatorOutputLevel(pos, this); @@ -174,7 +178,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } return true; - } else if(stack != null && stack.getItem() == Items.LAVA_BUCKET) { + } else if(!stack.isEmpty() && stack.getItem() == Items.LAVA_BUCKET) { if(!player.capabilities.isCreativeMode) drain(FluidRegistry.LAVA, stack); @@ -184,14 +188,13 @@ public class BlockAltar extends BlockMod implements ILexiconable { world.checkLight(pos); return true; - } else if(stack != null && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { + } else if(!stack.isEmpty() && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) { ItemStack bucket = tile.hasLava ? new ItemStack(Items.LAVA_BUCKET) : new ItemStack(Items.WATER_BUCKET); - if(stack.stackSize == 1) + if(stack.getCount() == 1) player.setHeldItem(hand, bucket); else { - if(!player.inventory.addItemStackToInventory(bucket)) - player.dropItem(bucket, false); - stack.stackSize--; + ItemHandlerHelper.giveItemToPlayer(player, bucket); + stack.shrink(1); } if(tile.hasLava) @@ -226,11 +229,11 @@ public class BlockAltar extends BlockMod implements ILexiconable { } private boolean isValidWaterContainer(ItemStack stack) { - if(stack == null || stack.stackSize != 1) + if(stack.isEmpty() || stack.getCount() != 1) return false; - if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { - IFluidHandler handler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null)) { + IFluidHandler handler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); FluidStack simulate = handler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), false); if(simulate != null && simulate.getFluid() == FluidRegistry.WATER && simulate.amount == Fluid.BUCKET_VOLUME) return true; @@ -239,9 +242,10 @@ public class BlockAltar extends BlockMod implements ILexiconable { return false; } - private void drain(Fluid fluid, ItemStack stack) { - stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null) - .drain(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true); + private ItemStack drain(Fluid fluid, ItemStack stack) { + IFluidHandlerItem handler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); + handler.drain(new FluidStack(fluid, Fluid.BUCKET_VOLUME), true); + return handler.getContainer(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index a627c2fde..6c17f7f19 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -37,6 +37,8 @@ import vazkii.botania.common.block.tile.TileAnimatedTorch; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; +import javax.annotation.Nonnull; + public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD, ILexiconable { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); @@ -47,8 +49,8 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig } @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, ItemStack heldItem, EnumFacing side, float hitX, float hitY, float hitZ) { - if(hand == EnumHand.MAIN_HAND && playerIn.isSneaking() && playerIn.getHeldItem(hand) == null) { + public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + if(hand == EnumHand.MAIN_HAND && playerIn.isSneaking() && playerIn.getHeldItem(hand).isEmpty()) { ((TileAnimatedTorch) worldIn.getTileEntity(pos)).handRotate(); return true; } @@ -102,6 +104,7 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return 0; } + @Nonnull @Override public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; @@ -117,13 +120,14 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return false; } + @Nonnull @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return AABB; } @Override - public TileEntity createTileEntity(World world, IBlockState state) { + public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { return new TileAnimatedTorch(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 79c8eaeb8..b19cffa31 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -33,6 +33,7 @@ import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -89,19 +90,16 @@ public class BlockAvatar extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stackOnPlayer, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); - if(stackOnAvatar != null) { - ItemStack copyStack = stackOnAvatar.copy(); - avatar.getItemHandler().setStackInSlot(0, null); - if(!player.inventory.addItemStackToInventory(copyStack)) - player.dropItem(copyStack, true); + ItemStack stackOnPlayer = player.getHeldItem(hand); + if(!stackOnAvatar.isEmpty()) { + avatar.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); + ItemHandlerHelper.giveItemToPlayer(player, stackOnAvatar); return true; - } else if(stackOnPlayer != null && stackOnPlayer.getItem() instanceof IAvatarWieldable) { - ItemStack copyStack = stackOnPlayer.copy(); - avatar.getItemHandler().setStackInSlot(0, copyStack); - stackOnPlayer.stackSize--; + } else if(!stackOnPlayer.isEmpty() && stackOnPlayer.getItem() instanceof IAvatarWieldable) { + avatar.getItemHandler().setStackInSlot(0, stackOnPlayer.splitStack(1)); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java index edd838db3..6c4c1135d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/BlockCacophonium.java @@ -70,7 +70,7 @@ public class BlockCacophonium extends BlockMod { } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); @@ -111,7 +111,7 @@ public class BlockCacophonium extends BlockMod { if(tile != null && tile instanceof TileCacophonium) { stacks.add(new ItemStack(Blocks.NOTEBLOCK)); ItemStack thingy = ((TileCacophonium) tile).stack; - if(thingy != null) + if(!thingy.isEmpty()) stacks.add(thingy.copy()); } diff --git a/src/main/java/vazkii/botania/common/block/BlockCamo.java b/src/main/java/vazkii/botania/common/block/BlockCamo.java index 2360fd1af..780f2ff7a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCamo.java +++ b/src/main/java/vazkii/botania/common/block/BlockCamo.java @@ -34,17 +34,18 @@ public abstract class BlockCamo extends BlockMod { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack currentStack, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { TileEntity tile = world.getTileEntity(pos); if(world.isRemote) return true; - if(currentStack != null + ItemStack currentStack = player.getHeldItem(hand); + if(!currentStack.isEmpty() && Block.getBlockFromItem(currentStack.getItem()) != null && tile instanceof TileCamo) { TileCamo camo = (TileCamo) tile; - IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).onBlockPlaced(world, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), player); + IBlockState changeState = Block.getBlockFromItem(currentStack.getItem()).getStateForPlacement(world, pos, side, hitX, hitY, hitZ, currentStack.getItemDamage(), player); if(isValidBlock(changeState) && !(changeState.getBlock() instanceof BlockCamo) && changeState.getMaterial() != Material.AIR) { camo.camoState = changeState; diff --git a/src/main/java/vazkii/botania/common/block/BlockCocoon.java b/src/main/java/vazkii/botania/common/block/BlockCocoon.java index 826604e58..9c3d93ebb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCocoon.java +++ b/src/main/java/vazkii/botania/common/block/BlockCocoon.java @@ -20,15 +20,18 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.tile.TileCocoon; @@ -69,14 +72,29 @@ public class BlockCocoon extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack item, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { TileCocoon cocoon = (TileCocoon) world.getTileEntity(pos); - if(cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS && item != null && item.getItem() == Items.EMERALD) { - if(!player.capabilities.isCreativeMode) - item.stackSize--; - cocoon.emeraldsGiven++; - world.playEvent(2005, pos, 6 + world.rand.nextInt(4)); + ItemStack stack = player.getHeldItem(hand); + Item item = stack.getItem(); + + if(cocoon != null && (item == Items.EMERALD || item == Items.CHORUS_FRUIT)) { + if(!world.isRemote) { + if(item == Items.EMERALD && cocoon.emeraldsGiven < TileCocoon.MAX_EMERALDS) { + if(!player.capabilities.isCreativeMode) + stack.shrink(1); + cocoon.emeraldsGiven++; + world.playEvent(2005, pos, 6 + world.rand.nextInt(4)); + } else if(item == Items.CHORUS_FRUIT && cocoon.chorusFruitGiven < TileCocoon.MAX_CHORUS_FRUITS) { + if(!player.capabilities.isCreativeMode) + stack.shrink(1); + cocoon.chorusFruitGiven++; + ((WorldServer) world).spawnParticle(EnumParticleTypes.PORTAL, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, 32, 0, 0, 0, 0.5); + } + } + + return true; } + return false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java index 442a8b517..b97cd151c 100644 --- a/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java +++ b/src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java @@ -45,6 +45,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable { return false; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Blocks.DIRT.getItemDropped(state, rand, fortune); diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index b0d6db7d0..328038bdb 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -38,7 +38,7 @@ public class BlockFakeAir extends BlockMod { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); public BlockFakeAir() { - super(Material.field_189963_J, LibBlockNames.FAKE_AIR); + super(Material.STRUCTURE_VOID, LibBlockNames.FAKE_AIR); setTickRandomly(true); } @@ -58,7 +58,7 @@ public class BlockFakeAir extends BlockMod { public void registerItemForm() {} @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { if(shouldRemove(world, pos)) world.scheduleUpdate(pos, this, tickRate(world)); } @@ -104,7 +104,7 @@ public class BlockFakeAir extends BlockMod { } @Override - public boolean canBeReplacedByLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { + public boolean canBeReplacedByLeaves(@Nonnull IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return true; } @@ -120,8 +120,8 @@ public class BlockFakeAir extends BlockMod { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return null; + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { + return NULL_AABB; } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java index e41b7ab23..1f72c991b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java @@ -82,10 +82,11 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { EntityBlaze blaze = new EntityBlaze(world); blaze.setLocationAndAngles(pos.getX() + 0.5D, pos.getY() - 1.95D, pos.getZ() + 0.5D, 0.0F, 0.0F); blaze.getEntityData().setBoolean(TAG_FEL_SPAWNED, true); - world.spawnEntityInWorld(blaze); - world.notifyNeighborsOfStateChange(pos, Blocks.AIR); - world.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR); - world.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR); + blaze.onInitialSpawn(world.getDifficultyForLocation(pos), null); + world.spawnEntity(blaze); + world.notifyNeighborsOfStateChange(pos, Blocks.AIR, false); + world.notifyNeighborsOfStateChange(pos.down(), Blocks.AIR, false); + world.notifyNeighborsOfStateChange(pos.down(2), Blocks.AIR, false); } } @@ -98,11 +99,11 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable { public static void onDrops(LivingDropsEvent event) { if(event.getEntityLiving() instanceof EntityBlaze && event.getEntityLiving().getEntityData().getBoolean(TAG_FEL_SPAWNED)) if(event.getDrops().isEmpty()) - event.getDrops().add(new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.BLAZE_POWDER, 6))); + event.getDrops().add(new EntityItem(event.getEntityLiving().world, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, new ItemStack(Items.BLAZE_POWDER, 6))); else for(EntityItem item : event.getDrops()) { ItemStack stack = item.getEntityItem(); if(stack.getItem() == Items.BLAZE_ROD) - item.setEntityItemStack(new ItemStack(Items.BLAZE_POWDER, stack.stackSize * 10)); + item.setEntityItemStack(new ItemStack(Items.BLAZE_POWDER, stack.getCount() * 10)); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java index 160ac7e0b..f4da34ca9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java @@ -29,6 +29,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.ChunkCache; @@ -77,7 +78,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = super.getExtendedState(state, world, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileFloatingSpecialFlower) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.SUBTILE_ID, ((TileFloatingSpecialFlower) te).subTileName); } @@ -124,7 +125,7 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { stacks.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -178,13 +179,6 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I return list; } - @Override - public boolean eventReceived(IBlockState state, World world, BlockPos pos, int eventID, int value) { - super.eventReceived(state, world, pos, eventID, value); - TileEntity tileentity = world.getTileEntity(pos); - return tileentity != null ? tileentity.receiveClientEvent(eventID, value) : false; - } - @Override public boolean onUsedByWand(EntityPlayer player, ItemStack stack, World world, BlockPos pos, EnumFacing side) { return ((TileSpecialFlower) world.getTileEntity(pos)).onWanded(stack, player); @@ -196,8 +190,8 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ) || super.onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index 2a497f50a..83d6fcefe 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -71,6 +71,7 @@ public class BlockGaiaHead extends BlockSkull implements IModelRegister { return ret; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.gaiaHead; diff --git a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java index 1a248b1ae..7e5badc23 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGhostRail.java +++ b/src/main/java/vazkii/botania/common/block/BlockGhostRail.java @@ -75,9 +75,9 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode @SubscribeEvent public static void onMinecartUpdate(MinecartUpdateEvent event) { BlockPos entPos = new BlockPos(event.getEntity()); - IBlockState state = event.getEntity().worldObj.getBlockState(entPos); + IBlockState state = event.getEntity().world.getBlockState(entPos); Block block = state.getBlock(); - boolean air = block.isAir(state, event.getEntity().worldObj, entPos); + boolean air = block.isAir(state, event.getEntity().world, entPos); int floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); if(block == ModBlocks.ghostRail) @@ -85,21 +85,21 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable, IMode else if(block instanceof BlockRailBase || block == ModBlocks.dreamwood) { event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, 0); if(floatTicks > 0) - event.getEntity().worldObj.playEvent(2003, entPos, 0); + event.getEntity().world.playEvent(2003, entPos, 0); } floatTicks = event.getEntity().getEntityData().getInteger(TAG_FLOAT_TICKS); if(floatTicks > 0) { - IBlockState stateBelow = event.getEntity().worldObj.getBlockState(entPos.down()); + IBlockState stateBelow = event.getEntity().world.getBlockState(entPos.down()); Block blockBelow = stateBelow.getBlock(); - boolean airBelow = blockBelow.isAir(stateBelow, event.getEntity().worldObj, entPos.down()); + boolean airBelow = blockBelow.isAir(stateBelow, event.getEntity().world, entPos.down()); if(air && airBelow || !air && !airBelow) event.getEntity().noClip = true; event.getEntity().motionY = 0.2; event.getEntity().motionX *= 1.4; event.getEntity().motionZ *= 1.4; event.getEntity().getEntityData().setInteger(TAG_FLOAT_TICKS, floatTicks - 1); - event.getEntity().worldObj.playEvent(2000, entPos, 0); + event.getEntity().world.playEvent(2000, entPos, 0); } else event.getEntity().noClip = false; } diff --git a/src/main/java/vazkii/botania/common/block/BlockHourglass.java b/src/main/java/vazkii/botania/common/block/BlockHourglass.java index 3345015de..5a4ec1433 100644 --- a/src/main/java/vazkii/botania/common/block/BlockHourglass.java +++ b/src/main/java/vazkii/botania/common/block/BlockHourglass.java @@ -37,6 +37,7 @@ import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -91,28 +92,27 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable, } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileHourglass hourglass = (TileHourglass) world.getTileEntity(pos); ItemStack hgStack = hourglass.getItemHandler().getStackInSlot(0); - if(stack != null && stack.getItem() == ModItems.twigWand) + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty() && stack.getItem() == ModItems.twigWand) return false; if(hourglass.lock) { - if(!player.worldObj.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.hourglassLock")); + if(!player.world.isRemote) + player.sendMessage(new TextComponentTranslation("botaniamisc.hourglassLock")); return true; } - if(hgStack == null && TileHourglass.getStackItemTime(stack) > 0) { + if(hgStack.isEmpty() && TileHourglass.getStackItemTime(stack) > 0) { hourglass.getItemHandler().setStackInSlot(0, stack.copy()); hourglass.markDirty(); - stack.stackSize = 0; + stack.setCount(0); return true; - } else if(hgStack != null) { - ItemStack copy = hgStack.copy(); - if(!player.inventory.addItemStackToInventory(copy)) - player.dropItem(copy, false); - hourglass.getItemHandler().setStackInSlot(0, null); + } else if(!hgStack.isEmpty()) { + ItemHandlerHelper.giveItemToPlayer(player, hgStack); + hourglass.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); hourglass.markDirty(); return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java index 4404cb456..300a5fe0f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/BlockIncensePlate.java @@ -27,6 +27,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -72,28 +73,27 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { TileIncensePlate plate = (TileIncensePlate) world.getTileEntity(pos); ItemStack plateStack = plate.getItemHandler().getStackInSlot(0); + ItemStack stack = player.getHeldItem(hand); boolean did = false; if(world.isRemote) return true; - if(plateStack == null && plate.acceptsItem(stack)) { + if(plateStack.isEmpty() && plate.acceptsItem(stack)) { plate.getItemHandler().setStackInSlot(0, stack.copy()); - stack.stackSize--; + stack.shrink(1); did = true; - } else if(plateStack != null && !plate.burning) { - if(stack != null && stack.getItem() == Items.FLINT_AND_STEEL) { + } else if(!plateStack.isEmpty() && !plate.burning) { + if(!stack.isEmpty() && stack.getItem() == Items.FLINT_AND_STEEL) { plate.ignite(); stack.damageItem(1, player); did = true; } else { - ItemStack addStack = plateStack.copy(); - if(!player.inventory.addItemStackToInventory(addStack)) - player.dropItem(addStack, false); - plate.getItemHandler().setStackInSlot(0, null); + ItemHandlerHelper.giveItemToPlayer(player, plateStack); + plate.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); did = true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java index e4dc1accd..83c12bd48 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightLauncher.java @@ -92,7 +92,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable { } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0|| world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java index 6bb0fa870..8d9d672db 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockLightRelay.java @@ -27,6 +27,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -96,7 +97,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, i)); } @@ -112,14 +113,14 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { ((TileLightRelay) world.getTileEntity(pos)).mountEntity(player); return true; } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { - return null; + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { + return NULL_AABB; } @Override @@ -128,7 +129,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable } @Override - public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn) { + public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) { if(!worldIn.isRemote && state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.TOGGLE) { if(state.getValue(BotaniaStateProps.POWERED) && !worldIn.isBlockPowered(pos)) worldIn.setBlockState(pos, state.withProperty(BotaniaStateProps.POWERED, false)); diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java index 04b586b96..e1585ade0 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -83,7 +84,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingRockVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java index caf7731e6..0a16a32f3 100644 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.IBlockAccess; @@ -87,7 +88,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < LivingWoodVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java index 2c7378280..bf131f652 100644 --- a/src/main/java/vazkii/botania/common/block/BlockManaBomb.java +++ b/src/main/java/vazkii/botania/common/block/BlockManaBomb.java @@ -44,7 +44,7 @@ public class BlockManaBomb extends BlockMod implements IManaTrigger, ILexiconabl world.setBlockToAir(pos); EntityManaStorm storm = new EntityManaStorm(world); storm.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - world.spawnEntityInWorld(storm); + world.spawnEntity(storm); } } diff --git a/src/main/java/vazkii/botania/common/block/BlockMod.java b/src/main/java/vazkii/botania/common/block/BlockMod.java index b53c98072..25f833cba 100644 --- a/src/main/java/vazkii/botania/common/block/BlockMod.java +++ b/src/main/java/vazkii/botania/common/block/BlockMod.java @@ -13,8 +13,12 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.init.Items; import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -54,7 +58,14 @@ public abstract class BlockMod extends Block implements IModelRegister { @SideOnly(Side.CLIENT) @Override public void registerModels() { - if(Item.getItemFromBlock(this) != null) + if(Item.getItemFromBlock(this) != Items.AIR) ModelHandler.registerBlockToState(this, 0, getDefaultState()); } + + @Override + public boolean eventReceived(IBlockState state, World world, BlockPos pos, int id, int param) { + super.eventReceived(state, world, pos, id, param); + TileEntity tileentity = world.getTileEntity(pos); + return tileentity != null ? tileentity.receiveClientEvent(id, param) : false; + } } diff --git a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java index d0dcf174c..c9dc35373 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java @@ -28,11 +28,13 @@ import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.StatList; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -87,9 +89,10 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I @Override public abstract IBlockState getStateFromMeta(int meta); + @Nonnull @Override public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { - return null; + return Items.AIR; } @Override @@ -172,7 +175,7 @@ public abstract class BlockModDoubleFlower extends BlockDoublePlant implements I } @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < COUNT; ++i) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockModFlower.java b/src/main/java/vazkii/botania/common/block/BlockModFlower.java index fe6bf9316..3f1e0d6ea 100644 --- a/src/main/java/vazkii/botania/common/block/BlockModFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockModFlower.java @@ -30,6 +30,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -80,7 +81,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return AABB; } @@ -122,7 +123,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java index bdd05dcf1..34fccf087 100644 --- a/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/BlockOpenCrate.java @@ -28,6 +28,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; import net.minecraft.world.IBlockAccess; @@ -90,7 +91,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileCraftCrate) { TileCraftCrate tile = (TileCraftCrate) te; state = state.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.values()[tile.pattern + 1]); @@ -108,7 +109,7 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < CrateVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java index 9c5ffee66..d030d770f 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java +++ b/src/main/java/vazkii/botania/common/block/BlockPistonRelay.java @@ -222,7 +222,7 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl world.setBlockState(pos.offset(dir), ModBlocks.pistonRelay.getDefaultState()); else if(!world.isRemote) { ItemStack stack = new ItemStack(ModBlocks.pistonRelay); - world.spawnEntityInWorld(new EntityItem(world, x + dir.getFrontOffsetX(), y + dir.getFrontOffsetY(), z + dir.getFrontOffsetZ(), stack)); + world.spawnEntity(new EntityItem(world, x + dir.getFrontOffsetX(), y + dir.getFrontOffsetY(), z + dir.getFrontOffsetZ(), stack)); } checkedCoords.add(s); newPos = new DimWithPos(world.provider.getDimension(), pos.offset(dir)); diff --git a/src/main/java/vazkii/botania/common/block/BlockPlatform.java b/src/main/java/vazkii/botania/common/block/BlockPlatform.java index 50562ea27..0d4cf8e1d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPlatform.java +++ b/src/main/java/vazkii/botania/common/block/BlockPlatform.java @@ -28,6 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; @@ -97,7 +98,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_WORLD, world) .withProperty(BotaniaStateProps.HELD_POS, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileCamo) { TileCamo tile = (TileCamo) te; return ((IExtendedBlockState) state).withProperty(BotaniaStateProps.HELD_STATE, tile.camoState); @@ -124,16 +125,16 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < PlatformVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity, boolean isActualState) { PlatformVariant variant = state.getValue(BotaniaStateProps.PLATFORM_VARIANT); if(variant == PlatformVariant.INFRANGIBLE || variant == PlatformVariant.ABSTRUSE && par7Entity != null && par7Entity.posY > pos.getY() + 0.9 && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking())) - super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity); + super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity, isActualState); } @Override @@ -148,7 +149,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable, } @Override - public float getExplosionResistance(World world, BlockPos pos, Entity exploder, Explosion explosion) { + public float getExplosionResistance(World world, BlockPos pos, @Nonnull Entity exploder, Explosion explosion) { return world.getBlockState(pos).getValue(BotaniaStateProps.PLATFORM_VARIANT) != PlatformVariant.INFRANGIBLE ? super.getExplosionResistance(world, pos, exploder, explosion) : Float.MAX_VALUE; } diff --git a/src/main/java/vazkii/botania/common/block/BlockPylon.java b/src/main/java/vazkii/botania/common/block/BlockPylon.java index 3519b628f..bdd914025 100644 --- a/src/main/java/vazkii/botania/common/block/BlockPylon.java +++ b/src/main/java/vazkii/botania/common/block/BlockPylon.java @@ -24,6 +24,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -99,7 +100,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < PylonVariant.values().length; i++) par3.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/BlockRoot.java b/src/main/java/vazkii/botania/common/block/BlockRoot.java index 2712253d1..0d17cea0a 100644 --- a/src/main/java/vazkii/botania/common/block/BlockRoot.java +++ b/src/main/java/vazkii/botania/common/block/BlockRoot.java @@ -43,6 +43,7 @@ public class BlockRoot extends BlockMod implements ILexiconable { return new ItemStack(this); } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.manaResource; diff --git a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java index 4be08e0c7..b774af4c1 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSolidVines.java +++ b/src/main/java/vazkii/botania/common/block/BlockSolidVines.java @@ -45,7 +45,7 @@ public class BlockSolidVines extends BlockVine implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return getBoundingBox(state, world, pos); } diff --git a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java index e80781cfb..9620627f9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/BlockSparkChanger.java @@ -26,6 +26,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -91,7 +92,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); @@ -103,25 +104,21 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack pstack, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); + ItemStack pstack = player.getHeldItem(hand); ItemStack cstack = changer.getItemHandler().getStackInSlot(0); - if(cstack != null) { - changer.getItemHandler().setStackInSlot(0, null); + if(!cstack.isEmpty()) { + changer.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); - if(!player.inventory.addItemStackToInventory(cstack)) - player.dropItem(cstack, false); + ItemHandlerHelper.giveItemToPlayer(player, cstack); return true; - } else if(pstack != null && pstack.getItem() == ModItems.sparkUpgrade) { - changer.getItemHandler().setStackInSlot(0, pstack.copy().splitStack(1)); + } else if(!pstack.isEmpty() && pstack.getItem() == ModItems.sparkUpgrade) { + changer.getItemHandler().setStackInSlot(0, pstack.splitStack(1)); world.updateComparatorOutputLevel(pos, this); changer.markDirty(); - pstack.stackSize--; - if(pstack.stackSize == 0) - player.setHeldItem(hand, null); - return true; } @@ -146,7 +143,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable { public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) { TileSparkChanger changer = (TileSparkChanger) world.getTileEntity(pos); ItemStack stack = changer.getItemHandler().getStackInSlot(0); - if(stack == null) + if(stack.isEmpty()) return 0; return stack.getItemDamage() + 1; } diff --git a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java index 3dc375e12..bee546184 100644 --- a/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java @@ -35,6 +35,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -134,7 +135,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return AABB; } @@ -147,7 +148,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @Nonnull @Override public IExtendedBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileSpecialFlower && ((TileSpecialFlower) te).getSubTile() != null) { Class clazz = ((TileSpecialFlower) te).getSubTile().getClass(); String id = BotaniaAPI.getSubTileStringMapping(clazz); @@ -213,7 +214,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, @Nonnull NonNullList stacks) { for(String s : BotaniaAPI.subtilesForCreativeMenu) { stacks.add(ItemBlockSpecialFlower.ofType(s)); if(BotaniaAPI.miniFlowers.containsKey(s)) @@ -326,8 +327,9 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { - if(stack != null && stack.getItem() == ModItems.dye) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty() && stack.getItem() == ModItems.dye) { EnumDyeColor newColor = EnumDyeColor.byMetadata(stack.getItemDamage()); EnumDyeColor oldColor = state.getValue(BotaniaStateProps.COLOR); if(newColor != oldColor) @@ -335,7 +337,7 @@ public class BlockSpecialFlower extends BlockFlower implements ISpecialFlower, I return true; } - return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); + return ((TileSpecialFlower) world.getTileEntity(pos)).onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/block/BlockStorage.java b/src/main/java/vazkii/botania/common/block/BlockStorage.java index 1100263d9..7e5f81ca8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockStorage.java +++ b/src/main/java/vazkii/botania/common/block/BlockStorage.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -73,7 +74,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < StorageVariant.values().length; i++) par3.add(new ItemStack(item, 1, i)); } @@ -89,7 +90,7 @@ public class BlockStorage extends BlockMod implements ILexiconable { } @Override - public boolean isBeaconBase(IBlockAccess worldObj, BlockPos pos, BlockPos beaconPos) { + public boolean isBeaconBase(IBlockAccess world, BlockPos pos, BlockPos beaconPos) { return true; } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index 695ee8609..06e3007de 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -58,18 +58,17 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { EntityItem item = (EntityItem) e; ItemStack stack = item.getEntityItem(); if(isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world)) { - stack.stackSize--; - if(stack.stackSize == 0) - e.setDead(); + stack.shrink(1); } } } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { - if(stack != null && (isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world))) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty() && (isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world))) { if(!player.capabilities.isCreativeMode) - stack.stackSize--; + stack.shrink(1); return true; } return false; diff --git a/src/main/java/vazkii/botania/common/block/ModBanners.java b/src/main/java/vazkii/botania/common/block/ModBanners.java index cc1e9a64a..22782ec85 100644 --- a/src/main/java/vazkii/botania/common/block/ModBanners.java +++ b/src/main/java/vazkii/botania/common/block/ModBanners.java @@ -12,14 +12,14 @@ package vazkii.botania.common.block; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityBanner; +import net.minecraft.tileentity.BannerPattern; import net.minecraftforge.common.util.EnumHelper; import vazkii.botania.common.item.ModItems; public final class ModBanners { public static void init() { - Class> clazz = TileEntityBanner.EnumBannerPattern.class; + Class> clazz = BannerPattern.class; addPattern(clazz, "flower", "flr", new ItemStack(ModItems.manaResource, 1, 3)); addPattern(clazz, "lexicon", "lex", new ItemStack(ModItems.lexicon)); addPattern(clazz, "logo", "lgo", new ItemStack(ModItems.manaResource, 1, 4)); diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index 855bcd171..915cd512c 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -478,15 +478,6 @@ public final class ModBlocks { BotaniaAPI.registerSubTile(LibBlockNames.SUBTILE_BERGAMUTE, SubTileBergamute.class); } - public static void registerMultiparts() { - if(Loader.isModLoaded("ForgeMultipart")) { - try { - Class clazz = Class.forName("vazkii.botania.common.integration.multipart.MultipartHandler"); - clazz.newInstance(); - } catch(Throwable e) {} - } - } - private static void registerSubTileWithMini(String key, Class clazz) { BotaniaAPI.registerSubTile(key, clazz); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java index 5b830aaca..b1ed36fe5 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java @@ -93,8 +93,9 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { - if(stack != null) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty()) { TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) world.getTileEntity(pos); cube.setRequestTarget(stack); return true; diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 9802d6ba8..6cef98a9c 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -60,7 +60,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java index 381ade470..817bf67d6 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java @@ -76,15 +76,15 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl } @Override - public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer worldObj, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) + public boolean addLandingEffects(IBlockState state, net.minecraft.world.WorldServer world, BlockPos blockPosition, IBlockState iblockstate, EntityLivingBase entity, int numberOfParticles ) { - float f = MathHelper.ceiling_float_int(entity.fallDistance - 3.0F); + float f = MathHelper.ceil(entity.fallDistance - 3.0F); double d0 = Math.min(0.2F + f / 15.0F, 10.0F); if (d0 > 2.5D) { d0 = 2.5D; } int i = (int)(150.0D * d0); - worldObj.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM))); + world.spawnParticle(EnumParticleTypes.BLOCK_DUST, entity.posX, entity.posY, entity.posZ, i, 0.0D, 0.0D, 0.0D, 0.15000000596046448D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM))); return true; } @@ -101,7 +101,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl double d0 = pos.getX() + (j + 0.5D) / i; double d1 = pos.getY() + (k + 0.5D) / i; double d2 = pos.getZ() + (l + 0.5D) / i; - effectRenderer.addEffect(factory.getEntityFX(-1, world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); + effectRenderer.addEffect(factory.createParticle(-1, world, d0, d1, d2, d0 - pos.getX() - 0.5D, d1 - pos.getY() - 0.5D, d2 - pos.getZ() - 0.5D, Block.getStateId(ModBlocks.storage.getDefaultState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.ELEMENTIUM)))); } } } diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java index 2531da856..1f1a0921a 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java @@ -65,7 +65,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable, ICr } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java index 7215a946f..fdda51979 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java @@ -43,7 +43,7 @@ public class BlockBuriedPetals extends BlockModFlower { @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public AxisAlignedBB getBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return AABB; } @@ -67,6 +67,7 @@ public class BlockBuriedPetals extends BlockModFlower { return false; } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return ModItems.petal; diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java index 367342339..45ba03a39 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -84,7 +85,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 4; i < CustomBrickVariant.values().length; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index c7650f69c..702866e3c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -32,6 +32,7 @@ import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; @@ -127,7 +128,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @Override public IBlockState getExtendedState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { state = getActualState(state, world, pos); - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TileFloatingFlower) { state = ((IExtendedBlockState) state).withProperty(BotaniaStateProps.ISLAND_TYPE, ((TileFloatingFlower) te).getIslandType()); } else if (te instanceof TileFloatingSpecialFlower) { @@ -155,7 +156,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < 16; i++) par3.add(new ItemStack(item, 1, i)); } @@ -176,8 +177,9 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { - if(stack != null) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty()) { IFloatingFlower flower = (IFloatingFlower) world.getTileEntity(pos); IslandType type = null; if(stack.getItem() == Items.SNOWBALL) @@ -195,7 +197,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu } if(!player.capabilities.isCreativeMode) - stack.stackSize--; + stack.shrink(1); return true; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java index b97159aa3..26caa2ead 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java @@ -32,6 +32,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.common.block.BlockMod; @@ -92,18 +93,19 @@ public class BlockManaFlame extends BlockMod implements ILexiconable { } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return NULL_AABB; } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { if(WorldTypeSkyblock.isWorldSkyblock(world)) { - if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.SAPLING) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { - if(!world.isRemote) - stack.stackSize--; - if(!player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon))) - player.dropItem(new ItemStack(ModItems.lexicon), false); + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty() && stack.getItem() == Item.getItemFromBlock(Blocks.SAPLING) && !player.inventory.hasItemStack(new ItemStack(ModItems.lexicon))) { + if(!world.isRemote) { + stack.shrink(1); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.lexicon)); + } return true; } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index df075f4c6..bb41d497c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -28,6 +28,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -112,7 +113,7 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java index 91131c6c8..69cf9ef98 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPavement.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -102,7 +103,7 @@ public class BlockPavement extends BlockMod { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < TYPES; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java index d2839fc31..602854d72 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java @@ -24,6 +24,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -74,7 +75,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java index bfe44a15c..14d67dc5c 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java @@ -112,10 +112,10 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = world.getTileEntity(pos); if(tile instanceof TileTinyPotato) { - ((TileTinyPotato) tile).interact(player, hand, stack, par6); + ((TileTinyPotato) tile).interact(player, hand, player.getHeldItem(hand), par6); player.addStat(ModAchievements.tinyPotatoPet, 1); world.spawnParticle(EnumParticleTypes.HEART, pos.getX() + AABB.minX + Math.random() * (AABB.maxX - AABB.minX), pos.getY() + AABB.maxY, pos.getZ() + AABB.minZ + Math.random() * (AABB.maxZ - AABB.minZ), 0, 0 ,0); } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index eca5f2060..799c52eaa 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -21,6 +21,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; @@ -44,7 +45,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 16; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java index 2ff571e9c..6d2d531d0 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java @@ -23,6 +23,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -89,7 +90,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { @Nonnull @Override - public IBlockState onBlockPlaced(World world, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { + public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing side, float par6, float par7, float par8, int meta, EntityLivingBase placer) { if (meta == 2) { // Pillar quartz variant switch (side.getAxis()) { case Y: @@ -113,14 +114,15 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable { return getMetaFromState(state); } + @Nonnull @Override - public ItemStack createStackedBlock(@Nonnull IBlockState state) { + public ItemStack getSilkTouchDrop(@Nonnull IBlockState state) { return new ItemStack(this, 1, damageDropped(state)); } @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { stacks.add(new ItemStack(this, 1, 0)); stacks.add(new ItemStack(this, 1, 1)); stacks.add(new ItemStack(this, 1, 2)); diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 9ecb9c682..7ee9d9946 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -86,13 +86,15 @@ public class BlockSpecialQuartzSlab extends BlockModSlab { return new ItemStack(getSingleBlock()); } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } + @Nonnull @Override - public ItemStack createStackedBlock(@Nonnull IBlockState par1) { + public ItemStack getSilkTouchDrop(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java index b57242572..4350d5e06 100644 --- a/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java @@ -90,13 +90,15 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable, IM return new ItemStack(getSingleBlock()); } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(getSingleBlock()); } + @Nonnull @Override - public ItemStack createStackedBlock(@Nonnull IBlockState par1) { + public ItemStack getSilkTouchDrop(@Nonnull IBlockState par1) { return new ItemStack(getSingleBlock()); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index d9c345290..cbd5d9ddf 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -22,6 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; @@ -77,7 +78,7 @@ public class BlockBiomeStoneWall extends BlockModWall { @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull NonNullList list) { for(int i = 0; i < 8; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 15914c726..bab272943 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -23,6 +23,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -100,7 +101,7 @@ public abstract class BlockModWall extends BlockWall implements ILexiconable, IM @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tabs, @Nonnull NonNullList list) { list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java index ad7b67a1c..ddc3a4336 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourCocoaBeans.java @@ -26,6 +26,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BehaviourCocoaBeans extends BehaviorDefaultDispenseItem { IBehaviorDispenseItem vanillaBehaviour; @@ -33,11 +35,12 @@ public class BehaviourCocoaBeans extends BehaviorDefaultDispenseItem { vanillaBehaviour = vanilla; } + @Nonnull @Override public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { if(par2ItemStack.getItemDamage() == EnumDyeColor.BROWN.getDyeDamage()) { Block block = Blocks.COCOA; - EnumFacing facing = par1IBlockSource.func_189992_e().getValue(BlockDispenser.FACING); + EnumFacing facing = par1IBlockSource.getBlockState().getValue(BlockDispenser.FACING); BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); World world = par1IBlockSource.getWorld(); @@ -45,7 +48,7 @@ public class BehaviourCocoaBeans extends BehaviorDefaultDispenseItem { IBlockState logState = world.getBlockState(logPos); if(logState.getBlock() == Blocks.LOG && logState.getValue(BlockOldLog.VARIANT) == BlockPlanks.EnumType.JUNGLE && world.isAirBlock(pos) && block.canPlaceBlockAt(world, pos)) { world.setBlockState(pos, block.getDefaultState().withProperty(BlockHorizontal.FACING, facing)); - par2ItemStack.stackSize--; + par2ItemStack.shrink(1); return par2ItemStack; } } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java index bf2859d13..55daed748 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourFelPumpkin.java @@ -34,7 +34,7 @@ public class BehaviourFelPumpkin extends BehaviorDefaultDispenseItem { world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); } - --stack.stackSize; + stack.shrink(1); } else { diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java index 1ed122a0d..73f460879 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java @@ -53,7 +53,7 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem { if(stack.hasDisplayName()) entityminecart.setCustomNameTag(stack.getDisplayName()); - world.spawnEntityInWorld(entityminecart); + world.spawnEntity(entityminecart); stack.splitStack(1); return stack; } diff --git a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java index 83472686a..aa528f88f 100644 --- a/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java +++ b/src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java @@ -19,6 +19,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nonnull; + public class BehaviourSeeds extends BehaviorDefaultDispenseItem { Block block; @@ -27,15 +29,16 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem { this.block = block; } + @Nonnull @Override public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) { - EnumFacing facing = par1IBlockSource.func_189992_e().getValue(BlockDispenser.FACING); + EnumFacing facing = par1IBlockSource.getBlockState().getValue(BlockDispenser.FACING); BlockPos pos = par1IBlockSource.getBlockPos().offset(facing); World world = par1IBlockSource.getWorld(); if(world.isAirBlock(pos) && block.canPlaceBlockAt(world, pos)) { world.setBlockState(pos, block.getDefaultState()); - par2ItemStack.stackSize--; + par2ItemStack.shrink(1); return par2ItemStack; } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java index 4c1e464f0..c2eae38ed 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBellows.java @@ -90,7 +90,7 @@ public class BlockBellows extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { if(EntityDoppleganger.isTruePlayer(player)) ((TileBellows) world.getTileEntity(pos)).interact(); return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java index 46bafc256..157ee0693 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java @@ -86,14 +86,15 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float par7, float par8, float par9) { TileBrewery brew = (TileBrewery) world.getTileEntity(pos); if(player.isSneaking()) { if(brew.recipe == null && !state.getValue(BotaniaStateProps.POWERED)) InventoryHelper.withdrawFromInventory(brew, player); } else { - if(stack != null) + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty()) return brew.addItem(player, stack, hand); } return false; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java index 85b7ca055..cb75a7042 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java @@ -100,6 +100,7 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, return new TileEnchanter(); } + @Nonnull @Override public Item getItemDropped(IBlockState state, Random rand, int fortune) { return Item.getItemFromBlock(Blocks.LAPIS_BLOCK); @@ -111,25 +112,26 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float par7, float par8, float par9) { TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(pos); - if(stack != null && stack.getItem() == ModItems.twigWand) + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty() && stack.getItem() == ModItems.twigWand) return false; - boolean stackEnchantable = stack != null + boolean stackEnchantable = !stack.isEmpty() && stack.getItem() != Items.BOOK && stack.isItemEnchantable() - && stack.stackSize == 1; + && stack.getCount() == 1; - if(enchanter.itemToEnchant == null) { + if(enchanter.itemToEnchant.isEmpty()) { if(stackEnchantable) { enchanter.itemToEnchant = stack.copy(); - player.setHeldItem(hand, null); + player.setHeldItem(hand, ItemStack.EMPTY); enchanter.sync(); } } else if(enchanter.stage == TileEnchanter.State.IDLE) { ItemHandlerHelper.giveItemToPlayer(player, enchanter.itemToEnchant.copy()); - enchanter.itemToEnchant = null; + enchanter.itemToEnchant = ItemStack.EMPTY; enchanter.sync(); } @@ -142,18 +144,18 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, ItemStack itemstack = enchanter.itemToEnchant; - if (itemstack != null) { + if (!itemstack.isEmpty()) { float f = random.nextFloat() * 0.8F + 0.1F; float f1 = random.nextFloat() * 0.8F + 0.1F; EntityItem entityitem; - for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) { + for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.getCount() > 0; world.spawnEntity(entityitem)) { int k1 = random.nextInt(21) + 10; - if (k1 > itemstack.stackSize) - k1 = itemstack.stackSize; + if (k1 > itemstack.getCount()) + k1 = itemstack.getAnimationsToGo(); - itemstack.stackSize -= k1; + itemstack.shrink(k1); entityitem = new EntityItem(world, pos.getX() + f, pos.getY() + f1, pos.getZ() + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage())); float f3 = 0.05F; entityitem.motionX = (float)random.nextGaussian() * f3 * 0.5; 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 5278129a9..dbf8d8ff8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java @@ -30,6 +30,7 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; @@ -115,7 +116,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 3; i++) list.add(new ItemStack(item, 1, i)); } @@ -146,10 +147,13 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.posX + entity.width, entity.posY + entity.height, entity.posZ + entity.width)); for(EntityItem item : items) { ItemStack itemstack = item.getEntityItem(); - if(itemstack != null && itemstack.getItem() == Items.BUCKET) { - while(itemstack.stackSize > 0) { - entity.entityDropItem(new ItemStack(Items.MILK_BUCKET), 1.0F); - itemstack.stackSize--; + if(!itemstack.isEmpty() && itemstack.getItem() == Items.BUCKET && !world.isRemote) { + while(itemstack.getCount() > 0) { + EntityItem ent = entity.entityDropItem(new ItemStack(Items.MILK_BUCKET), 1.0F); + ent.motionY += world.rand.nextFloat() * 0.05F; + ent.motionX += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; + ent.motionZ += (world.rand.nextFloat() - world.rand.nextFloat()) * 0.1F; + itemstack.shrink(1); } item.setDead(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java index 03187396b..8b590590c 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java @@ -79,9 +79,9 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo } @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB par5AxisAlignedBB, @Nonnull List stacks, Entity par7Entity, boolean isActualState) { if(par7Entity != null && !(par7Entity instanceof IManaBurst)) - super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity); + super.addCollisionBoxToList(state, world, pos, par5AxisAlignedBB, stacks, par7Entity, isActualState); } @Override diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java index 2bc9952fc..e89481af8 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPool.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPool.java @@ -34,6 +34,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkCache; @@ -105,7 +106,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { - TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).func_190300_a(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); + TileEntity te = world instanceof ChunkCache ? ((ChunkCache)world).getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) : world.getTileEntity(pos); if (te instanceof TilePool) { return state.withProperty(BotaniaStateProps.COLOR, ((TilePool) te).color); } else { @@ -149,7 +150,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { par3.add(new ItemStack(item, 1, 0)); par3.add(new ItemStack(item, 1, 2)); par3.add(new ItemStack(item, 1, 3)); @@ -184,7 +185,7 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon @Override - public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity) { + public void addCollisionBoxToList(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull AxisAlignedBB entityBox, @Nonnull List boxes, Entity entity, boolean isActualState) { addCollisionBoxToList(pos, entityBox, boxes, BOTTOM_AABB); addCollisionBoxToList(pos, entityBox, boxes, NORTH_AABB); addCollisionBoxToList(pos, entityBox, boxes, SOUTH_AABB); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java index c71e126ab..ffe5e3fb2 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPrism.java @@ -31,6 +31,7 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -98,7 +99,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull World world, @Nonnull BlockPos pos) { + public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { return NULL_AABB; } @@ -113,27 +114,26 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float par7, float par8, float par9) { TileEntity tile = world.getTileEntity(pos); if(!(tile instanceof TilePrism)) return false; TilePrism prism = (TilePrism) tile; ItemStack lens = prism.getItemHandler().getStackInSlot(0); - boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; + ItemStack heldItem = player.getHeldItem(hand); + boolean isHeldItemLens = !heldItem.isEmpty() && heldItem.getItem() instanceof ILens; - if(lens == null && isHeldItemLens) { + if(lens.isEmpty() && isHeldItemLens) { if(!player.capabilities.isCreativeMode) - player.setHeldItem(hand, null); + player.setHeldItem(hand, ItemStack.EMPTY); prism.getItemHandler().setStackInSlot(0, heldItem.copy()); prism.markDirty(); world.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, true), 1 | 2); - } else if(lens != null) { - ItemStack add = lens.copy(); - if(!player.inventory.addItemStackToInventory(add)) - player.dropItem(add, false); - prism.getItemHandler().setStackInSlot(0, null); + } else if(!lens.isEmpty()) { + ItemHandlerHelper.giveItemToPlayer(player, lens); + prism.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); prism.markDirty(); world.setBlockState(pos, state.withProperty(BotaniaStateProps.HAS_LENS, false), 1 | 2); } @@ -142,7 +142,7 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java index 2e3e00861..94c6af01b 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRFGenerator.java @@ -38,14 +38,6 @@ public class BlockRFGenerator extends BlockMod implements ILexiconable { setSoundType(SoundType.STONE); } - @Override - @Optional.Method(modid = "CoFHAPI|energy") - public void onNeighborChange(IBlockAccess world, BlockPos pos, BlockPos tilePos) { - TileEntity tile = world.getTileEntity(pos); - if(tile != null && tile instanceof TileRFGenerator) - ((TileRFGenerator) tile).onNeighborTileChange(tilePos); - } - @Override public boolean hasTileEntity(IBlockState state) { return true; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java index e15d8383f..1b656a55a 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockRuneAltar.java @@ -65,21 +65,22 @@ public class BlockRuneAltar extends BlockMod implements IWandable, ILexiconable } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float par7, float par8, float par9) { if(world.isRemote) return true; TileRuneAltar altar = (TileRuneAltar) world.getTileEntity(pos); + ItemStack stack = player.getHeldItem(hand); if(player.isSneaking()) { if(altar.manaToGet == 0) { InventoryHelper.withdrawFromInventory(altar, player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); } - } else if(altar.isEmpty() && stack == null) { + } else if(altar.isEmpty() && stack.isEmpty()) { altar.trySetLastRecipe(player); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); - } else if(stack != null) { + } else if(!stack.isEmpty()) { boolean result = altar.addItem(player, stack, hand); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(altar); return result; diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java index abb670f14..2b819fd81 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpawnerClaw.java @@ -22,6 +22,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; @@ -49,7 +50,7 @@ public class BlockSpawnerClaw extends BlockMod implements ILexiconable { } @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs tab, NonNullList list) { list.add(new ItemStack(item)); list.add(new ItemStack(Blocks.MOB_SPAWNER)); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java index d7029f563..808835ba6 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockSpreader.java @@ -31,12 +31,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.ILens; @@ -94,14 +96,14 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubBlocks(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < 4; i++) par3.add(new ItemStack(item, 1, i)); } @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); + EnumFacing orientation = EnumFacing.getDirectionFromEntityLiving(pos, par5EntityLivingBase); TileSpreader spreader = (TileSpreader) world.getTileEntity(pos); world.setBlockState(pos, getStateFromMeta(par6ItemStack.getItemDamage()), 1 | 2); @@ -148,43 +150,41 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack heldItem, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { TileEntity tile = world.getTileEntity(pos); if(!(tile instanceof TileSpreader)) return false; TileSpreader spreader = (TileSpreader) tile; ItemStack lens = spreader.getItemHandler().getStackInSlot(0); - boolean isHeldItemLens = heldItem != null && heldItem.getItem() instanceof ILens; - boolean wool = heldItem != null && heldItem.getItem() == Item.getItemFromBlock(Blocks.WOOL); + ItemStack heldItem = player.getHeldItem(hand); + boolean isHeldItemLens = !heldItem.isEmpty() && heldItem.getItem() instanceof ILens; + boolean wool = !heldItem.isEmpty() && heldItem.getItem() == Item.getItemFromBlock(Blocks.WOOL); - if(heldItem != null) + if(!heldItem.isEmpty()) if(heldItem.getItem() == ModItems.twigWand) return false; - if(lens == null && isHeldItemLens) { + if(lens.isEmpty() && isHeldItemLens) { if (!player.capabilities.isCreativeMode) - player.setHeldItem(hand, null); + player.setHeldItem(hand, ItemStack.EMPTY); spreader.getItemHandler().setStackInSlot(0, heldItem.copy()); spreader.markDirty(); - } else if(lens != null && !wool) { - ItemStack add = lens.copy(); - if(!player.inventory.addItemStackToInventory(add)) - player.dropItem(add, false); - spreader.getItemHandler().setStackInSlot(0, null); + } else if(!lens.isEmpty() && !wool) { + ItemHandlerHelper.giveItemToPlayer(player, lens); + spreader.getItemHandler().setStackInSlot(0, ItemStack.EMPTY); spreader.markDirty(); } if(wool && spreader.paddingColor == -1) { spreader.paddingColor = heldItem.getItemDamage(); - heldItem.stackSize--; - if(heldItem.stackSize == 0) - player.setHeldItem(hand, null); - } else if(heldItem == null && spreader.paddingColor != -1 && lens == null) { + heldItem.shrink(1); + if(heldItem.isEmpty()) + player.setHeldItem(hand, ItemStack.EMPTY); + } else if(heldItem.isEmpty() && spreader.paddingColor != -1 && lens.isEmpty()) { ItemStack pad = new ItemStack(Blocks.WOOL, 1, spreader.paddingColor); - if(!player.inventory.addItemStackToInventory(pad)) - player.dropItem(pad, false); + ItemHandlerHelper.giveItemToPlayer(player, pad); spreader.paddingColor = -1; spreader.markDirty(); } diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java index 4dff71a15..b326cca82 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockTerraPlate.java @@ -53,22 +53,17 @@ public class BlockTerraPlate extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World worldObj, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing s, float xs, float ys, float zs) { - if(stack != null && stack.getItem() == ModItems.manaResource && stack.getItemDamage() < 3) { - if(player == null || !player.capabilities.isCreativeMode) { - stack.stackSize--; - if(stack.stackSize == 0 && player != null) - player.setHeldItem(hand, null); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty() && stack.getItem() == ModItems.manaResource && stack.getItemDamage() < 3) { + if(!world.isRemote) { + ItemStack target = stack.splitStack(1); + EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, target); + item.setPickupDelay(40); + item.motionX = item.motionY = item.motionZ = 0; + world.spawnEntity(item); } - ItemStack target = stack.copy(); - target.stackSize = 1; - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, target); - item.setPickupDelay(40); - item.motionX = item.motionY = item.motionZ = 0; - if(!worldObj.isRemote) - worldObj.spawnEntityInWorld(item); - return true; } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java index c5d3af1a8..b425f3c5c 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedString.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedString.java @@ -49,7 +49,7 @@ public abstract class BlockRedString extends BlockMod implements ILexiconable { @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase par5EntityLivingBase, ItemStack par6ItemStack) { - EnumFacing orientation = BlockPistonBase.getFacingFromEntity(pos, par5EntityLivingBase); + EnumFacing orientation = EnumFacing.getDirectionFromEntityLiving(pos, par5EntityLivingBase); world.setBlockState(pos, state.withProperty(BotaniaStateProps.FACING, orientation), 1 | 2); } diff --git a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java index 1f2b26b4b..e1af2cae4 100644 --- a/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/string/BlockRedStringDispenser.java @@ -65,7 +65,7 @@ public class BlockRedStringDispenser extends BlockRedString { } @Override - public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block) { + public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { boolean power = world.isBlockIndirectlyGettingPowered(pos) > 0 || world.isBlockIndirectlyGettingPowered(pos.up()) > 0; boolean powered = state.getValue(BotaniaStateProps.POWERED); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java index fb9b6d160..2c09a6c15 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileBellethorn.java @@ -61,7 +61,7 @@ public class SubTileBellethorn extends SubTileFunctional { if(entity instanceof EntityWitch) dmg = 20; - entity.attackEntityFrom(DamageSource.magic, dmg); + entity.attackEntityFrom(DamageSource.MAGIC, dmg); mana -= manaToUse; break; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java index 03e2e6f94..568720730 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileClayconia.java @@ -46,7 +46,7 @@ public class SubTileClayconia extends SubTileFunctional { if(ConfigHandler.blockBreakParticles) supertile.getWorld().playEvent(2001, coords, Block.getStateId(Blocks.SAND.getDefaultState())); EntityItem item = new EntityItem(supertile.getWorld(), coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, new ItemStack(Items.CLAY_BALL)); - supertile.getWorld().spawnEntityInWorld(item); + supertile.getWorld().spawnEntity(item); mana -= COST; } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java index 123ecc4e8..213e786af 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileDaffomill.java @@ -108,7 +108,7 @@ public class SubTileDaffomill extends SubTileFunctional { return false; if(player.isSneaking()) { - if(!player.worldObj.isRemote) { + if(!player.world.isRemote) { orientation = orientation.rotateY(); sync(); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java index d3094eaef..d8319b180 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileExoflame.java @@ -85,21 +85,21 @@ public class SubTileExoflame extends SubTileFunctional { } public static boolean canFurnaceSmelt(TileEntityFurnace furnace){ - if(furnace.getStackInSlot(0) == null) + if(furnace.getStackInSlot(0).isEmpty()) return false; else { ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(furnace.getStackInSlot(0)); - if(itemstack == null) + if(itemstack.isEmpty()) return false; - if(furnace.getStackInSlot(2) == null) + if(furnace.getStackInSlot(2).isEmpty()) return true; if(!furnace.getStackInSlot(2).isItemEqual(itemstack)) return false; - int result = furnace.getStackInSlot(2).stackSize + itemstack.stackSize; + int result = furnace.getStackInSlot(2).getCount() + itemstack.getCount(); return result <= 64 && result <= itemstack.getMaxStackSize(); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index 3b1c756b6..0a558eaef 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -65,7 +65,7 @@ public class SubTileHeiseiDream extends SubTileFunctional { if(target == null || !(target instanceof IMob)) { IMob newTarget; - do newTarget = mobs.get(entity.worldObj.rand.nextInt(mobs.size())); + do newTarget = mobs.get(entity.world.rand.nextInt(mobs.size())); while(newTarget == entity); if(newTarget instanceof EntityLiving) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java index 1dd8b35e1..5fb14e601 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHopperhock.java @@ -77,7 +77,7 @@ public class SubTileHopperhock extends SubTileFunctional { continue; } - if(age < 60 + slowdown || age >= 105 && age < 110 || item.isDead) + if(age < 60 + slowdown || age >= 105 && age < 110 || item.isDead || item.getEntityItem().isEmpty()) continue; ItemStack stack = item.getEntityItem(); @@ -94,7 +94,7 @@ public class SubTileHopperhock extends SubTileFunctional { boolean canAccept = canAcceptItem(stack, filter, filterType); ItemStack simulate = ItemHandlerHelper.insertItem(inv.handler, stack.copy(), true); - int availablePut = stack.stackSize - (simulate == null ? 0 : simulate.stackSize); + int availablePut = stack.getCount() - simulate.getCount(); canAccept &= availablePut > 0; @@ -117,8 +117,6 @@ public class SubTileHopperhock extends SubTileFunctional { SubTileSpectranthemum.spawnExplosionParticles(item, 3); ItemHandlerHelper.insertItem(invToPutItemIn, stack.splitStack(amountToPutIn), false); item.setEntityItemStack(stack); // Just in case someone subclasses EntityItem and changes something important. - if(item.getEntityItem().stackSize == 0) - item.setDead(); pulledAny = true; } } @@ -128,7 +126,7 @@ public class SubTileHopperhock extends SubTileFunctional { } public boolean canAcceptItem(ItemStack stack, List filter, int filterType) { - if(stack == null) + if(stack.isEmpty()) return false; if(filter.isEmpty()) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java index 6e61b5aef..7be43e2e7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHyacidus.java @@ -38,7 +38,7 @@ public class SubTileHyacidus extends SubTileFunctional { List entities = supertile.getWorld().getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); for(EntityLivingBase entity : entities) { - if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.worldObj.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { + if(!(entity instanceof EntityPlayer) && entity.getActivePotionEffect(MobEffects.POISON) == null && mana >= cost && !entity.world.isRemote && entity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD) { entity.addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); mana -= cost; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java index 2cacb631a..99626c48c 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileLoonuim.java @@ -23,12 +23,12 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityCaveSpider; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityEnderman; +import net.minecraft.entity.monster.EntityHusk; import net.minecraft.entity.monster.EntityMob; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntitySpider; +import net.minecraft.entity.monster.EntityStray; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.monster.SkeletonType; -import net.minecraft.entity.monster.ZombieType; import net.minecraft.init.MobEffects; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -77,7 +77,7 @@ public class SubTileLoonuim extends SubTileFunctional { if (stacks.isEmpty()) return; else stack = stacks.get(0); - } while(stack == null || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); + } while(stack.isEmpty() || BotaniaAPI.looniumBlacklist.contains(stack.getItem())); int bound = RANGE * 2 + 1; int xp = supertile.getPos().getX() - RANGE + rand.nextInt(bound); @@ -89,7 +89,7 @@ public class SubTileLoonuim extends SubTileFunctional { pos = pos.up(); if(pos.getY() >= 254) return; - } while(world.getBlockState(pos).getBlock().isVisuallyOpaque()); + } while(world.getBlockState(pos).causesSuffocation()); pos = pos.up(); double x = pos.getX() + Math.random(); @@ -108,12 +108,12 @@ public class SubTileLoonuim extends SubTileFunctional { case 0: entity = new EntityZombie(world); if(world.rand.nextInt(10) == 0) - ((EntityZombie) entity).func_189778_a(ZombieType.HUSK); // set zombie type + entity = new EntityHusk(world); break; case 1: entity = new EntitySkeleton(world); if(world.rand.nextInt(10) == 0) - ((EntitySkeleton) entity).func_189768_a(SkeletonType.STRAY); // set skeleton type + entity = new EntityStray(world); break; case 2: if(world.rand.nextInt(10) == 0) @@ -126,19 +126,18 @@ public class SubTileLoonuim extends SubTileFunctional { entity.motionX = entity.motionY = entity.motionZ = 0; Multimap map = HashMultimap.create(); - map.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier("Loonium Modififer Health", 2, 1)); - map.put(SharedMonsterAttributes.ATTACK_DAMAGE.getAttributeUnlocalizedName(), new AttributeModifier("Loonium Modififer Damage", 1.5, 1)); + map.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier("Loonium Modififer Health", 2, 1)); + map.put(SharedMonsterAttributes.ATTACK_DAMAGE.getName(), new AttributeModifier("Loonium Modififer Damage", 1.5, 1)); entity.getAttributeMap().applyAttributeModifiers(map); entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, Integer.MAX_VALUE, 0)); entity.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, Integer.MAX_VALUE, 0)); - NBTTagCompound cmp = new NBTTagCompound(); - stack.writeToNBT(cmp); + NBTTagCompound cmp = stack.writeToNBT(new NBTTagCompound()); entity.getEntityData().setTag(TAG_ITEMSTACK_TO_DROP, cmp); - - world.spawnEntityInWorld(entity); + entity.onInitialSpawn(world.getDifficultyForLocation(pos), null); + world.spawnEntity(entity); SubTileSpectranthemum.spawnExplosionParticles(entity, 5); mana -= COST; @@ -191,9 +190,9 @@ public class SubTileLoonuim extends SubTileFunctional { EntityLivingBase e = event.getEntityLiving(); if(e.getEntityData().hasKey(TAG_ITEMSTACK_TO_DROP)) { NBTTagCompound cmp = e.getEntityData().getCompoundTag(TAG_ITEMSTACK_TO_DROP); - ItemStack stack = ItemStack.loadItemStackFromNBT(cmp); + ItemStack stack = new ItemStack(cmp); event.getDrops().clear(); - event.getDrops().add(new EntityItem(e.worldObj, e.posX, e.posY, e.posZ, stack)); + event.getDrops().add(new EntityItem(e.world, e.posX, e.posY, e.posZ, stack)); } } diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java index 0e4db9d35..7a4e878a9 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileMarimorphosis.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.functional; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Set; import gnu.trove.list.array.TIntArrayList; import net.minecraft.block.Block; @@ -75,7 +76,7 @@ public class SubTileMarimorphosis extends SubTileFunctional { } public IBlockState getStoneToPut(BlockPos coords) { - List types = Arrays.asList(BiomeDictionary.getTypesForBiome(supertile.getWorld().getBiomeGenForCoords(coords))); + Set types = BiomeDictionary.getTypes(supertile.getWorld().getBiome(coords)); TIntArrayList values = new TIntArrayList(); for(int i = 0; i < TYPES.length; i++) { diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java index 8a944dbe3..50e2636cf 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileOrechid.java @@ -55,7 +55,7 @@ public class SubTileOrechid extends SubTileFunctional { BlockPos coords = getCoordsToPut(); if(coords != null) { ItemStack stack = getOreToPut(); - if(stack != null && stack.getItem() != null) { + if(!stack.isEmpty()) { Block block = Block.getBlockFromItem(stack.getItem()); int meta = stack.getItemDamage(); supertile.getWorld().setBlockState(coords, block.getStateFromMeta(meta), 1 | 2); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java index d3b856ce1..454d87110 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTilePollidisiac.java @@ -56,10 +56,8 @@ public class SubTilePollidisiac extends SubTileFunctional { continue; ItemStack stack = item.getEntityItem(); - if(animal.isBreedingItem(stack)) { - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); + if(!stack.isEmpty() && animal.isBreedingItem(stack)) { + stack.shrink(1); mana -= manaCost; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java index 4dacfb93f..1a72ec847 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileRannuncarpus.java @@ -88,7 +88,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { continue; } - if(age < 60 + slowdown || item.isDead) + if(age < 60 + slowdown || item.isDead || item.getEntityItem().isEmpty()) continue; ItemStack stack = item.getEntityItem(); @@ -147,9 +147,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { if(stackItem instanceof IFlowerPlaceable) ((IFlowerPlaceable) stackItem).onBlockPlacedByFlower(stack, this, coords); - stack.stackSize--; - if(stack.stackSize <= 0) - item.setDead(); + stack.shrink(1); if(mana > 1) mana--; @@ -182,7 +180,7 @@ public class SubTileRannuncarpus extends SubTileFunctional { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(recieverStack.getItem() != null) { + if(!recieverStack.isEmpty()) { String stackName = recieverStack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java index 26c21b11f..ba5d563df 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSolegnolia.java @@ -45,7 +45,7 @@ public class SubTileSolegnolia extends SubTileFunctional { public static boolean hasSolegnoliaAround(Entity e) { return existingFlowers.stream() .filter(f -> f.redstoneSignal == 0) - .filter(f -> f.supertile.getWorld() == e.worldObj) + .filter(f -> f.supertile.getWorld() == e.world) .filter(f -> f.supertile.getWorld().getTileEntity(f.supertile.getPos()) == f.supertile) .filter(f -> f.supertile.getDistanceSq(e.posX, e.posY, e.posZ) <= f.getRange() * f.getRange()) .findAny().isPresent(); diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java index a2c9d37e5..c87992c6e 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileSpectranthemum.java @@ -71,12 +71,12 @@ public class SubTileSpectranthemum extends SubTileFunctional { continue; ItemStack stack = item.getEntityItem(); - if(stack != null) { + if(!stack.isEmpty()) { Item sitem = stack.getItem(); if(sitem instanceof IManaItem) continue; - int cost = stack.stackSize * COST; + int cost = stack.getCount() * COST; if(mana >= cost) { spawnExplosionParticles(item, 10); item.setPosition(bindPos.getX() + 0.5, bindPos.getY() + 1.5, bindPos.getZ() + 0.5); @@ -95,7 +95,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { } static void spawnExplosionParticles(Entity item, int p) { - PacketHandler.sendToNearby(item.worldObj, new BlockPos(item), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.posX, item.posY, item.posZ, item.getEntityId(), p)); + PacketHandler.sendToNearby(item.world, new BlockPos(item), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ITEM_SMOKE, item.posX, item.posY, item.posZ, item.getEntityId(), p)); } @Override @@ -153,7 +153,7 @@ public class SubTileSpectranthemum extends SubTileFunctional { @Override @SideOnly(Side.CLIENT) public BlockPos getBinding() { - return Minecraft.getMinecraft().thePlayer.isSneaking() && bindPos.getY() != -1 ? bindPos : super.getBinding(); + return Minecraft.getMinecraft().player.isSneaking() && bindPos.getY() != -1 ? bindPos : super.getBinding(); } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java index 0f60132ea..d0695431a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileVinculotus.java @@ -79,7 +79,7 @@ public class SubTileVinculotus extends SubTileFunctional { if(event.getEntityLiving() instanceof EntityEnderman) { List possibleFlowers = new ArrayList<>(); for(SubTileVinculotus flower : existingFlowers) { - if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().worldObj || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) + if(flower.redstoneSignal > 0 || flower.mana <= cost || flower.supertile.getWorld() != event.getEntityLiving().world || flower.supertile.getWorld().getTileEntity(flower.supertile.getPos()) != flower.supertile) continue; double x = flower.supertile.getPos().getX() + 0.5; @@ -91,7 +91,7 @@ public class SubTileVinculotus extends SubTileFunctional { } if(!possibleFlowers.isEmpty()) { - SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().worldObj.rand.nextInt(possibleFlowers.size())); + SubTileVinculotus flower = possibleFlowers.get(event.getEntityLiving().world.rand.nextInt(possibleFlowers.size())); double x = flower.supertile.getPos().getX() + 0.5; double y = flower.supertile.getPos().getY() + 1.5; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java index ac24c082c..9c7cebc2d 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileEndoflame.java @@ -58,24 +58,21 @@ public class SubTileEndoflame extends SubTileGenerating { if(age >= 59 + slowdown && !item.isDead) { ItemStack stack = item.getEntityItem(); - if(stack.getItem().hasContainerItem(stack)) + if(stack.isEmpty() || stack.getItem().hasContainerItem(stack)) continue; - int burnTime = stack == null || stack.getItem() == Item.getItemFromBlock(ModBlocks.spreader) ? 0 : TileEntityFurnace.getItemBurnTime(stack); - if(burnTime > 0 && stack.stackSize > 0) { + int burnTime = stack.getItem() == Item.getItemFromBlock(ModBlocks.spreader) ? 0 : TileEntityFurnace.getItemBurnTime(stack); + if(burnTime > 0 && stack.getCount() > 0) { this.burnTime = Math.min(FUEL_CAP, burnTime) / 2; if(!supertile.getWorld().isRemote) { - stack.stackSize--; + stack.shrink(1); supertile.getWorld().playSound(null, supertile.getPos(), BotaniaSoundEvents.endoflame, SoundCategory.BLOCKS, 0.2F, 1F); - if(stack.stackSize == 0) - item.setDead(); - didSomething = true; } else { - item.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, item.posX, item.posY + 0.1, item.posZ, 0.0D, 0.0D, 0.0D); - item.worldObj.spawnParticle(EnumParticleTypes.FLAME, item.posX, item.posY, item.posZ, 0.0D, 0.0D, 0.0D); + item.world.spawnParticle(EnumParticleTypes.SMOKE_LARGE, item.posX, item.posY + 0.1, item.posZ, 0.0D, 0.0D, 0.0D); + item.world.spawnParticle(EnumParticleTypes.FLAME, item.posX, item.posY, item.posZ, 0.0D, 0.0D, 0.0D); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java index 4ac8317cf..c374e8d53 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileGourmaryllis.java @@ -66,7 +66,7 @@ public class SubTileGourmaryllis extends SubTileGenerating { continue; } - if(stack != null && stack.getItem() instanceof ItemFood && !item.isDead && age >= slowdown) { + if(!stack.isEmpty() && stack.getItem() instanceof ItemFood && !item.isDead && age >= slowdown) { if(cooldown <= 0) { int val = Math.min(12, ((ItemFood) stack.getItem()).getHealAmount(stack)); storedMana = val * val * 64; diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java index f04711f05..915953e68 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileHydroangeas.java @@ -179,7 +179,7 @@ public class SubTileHydroangeas extends SubTileGenerating { @Override public int getDelayBetweenPassiveGeneration() { - boolean rain = supertile.getWorld().getBiomeGenForCoords(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); + boolean rain = supertile.getWorld().getBiome(supertile.getPos()).getRainfall() > 0 && (supertile.getWorld().isRaining() || supertile.getWorld().isThundering()); return rain ? 2 : 3; } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java index 7ad7b66e4..76affc26a 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileNarslimmus.java @@ -45,7 +45,7 @@ public class SubTileNarslimmus extends SubTileGenerating { int size = slime.getSlimeSize(); int mul = (int) Math.pow(2, size); int mana = 820 * mul; - if(!slime.worldObj.isRemote) { + if(!slime.world.isRemote) { slime.setDead(); slime.playSound(size > 1 ? SoundEvents.ENTITY_SLIME_SQUISH : SoundEvents.ENTITY_SMALL_SLIME_SQUISH, 1, 0.02F); this.mana = Math.min(getMaxMana(), this.mana + mana); @@ -53,12 +53,12 @@ public class SubTileNarslimmus extends SubTileGenerating { } for (int j = 0; j < mul * 8; ++j) { - float f = slime.worldObj.rand.nextFloat() * (float)Math.PI * 2.0F; - float f1 = slime.worldObj.rand.nextFloat() * 0.5F + 0.5F; + float f = slime.world.rand.nextFloat() * (float)Math.PI * 2.0F; + float f1 = slime.world.rand.nextFloat() * 0.5F + 0.5F; float f2 = MathHelper.sin(f) * size * 0.5F * f1; float f3 = MathHelper.cos(f) * size * 0.5F * f1; - float f4 = slime.worldObj.rand.nextFloat() * size * 0.5F * f1; - slime.worldObj.spawnParticle(EnumParticleTypes.SLIME, slime.posX + f2, slime.getEntityBoundingBox().minY + f4, slime.posZ + f3, 0.0D, 0.0D, 0.0D); + float f4 = slime.world.rand.nextFloat() * size * 0.5F * f1; + slime.world.spawnParticle(EnumParticleTypes.SLIME, slime.posX + f2, slime.getEntityBoundingBox().minY + f4, slime.posZ + f3, 0.0D, 0.0D, 0.0D); } break; } @@ -90,7 +90,7 @@ public class SubTileNarslimmus extends SubTileGenerating { @SubscribeEvent public static void onSpawn(LivingSpawnEvent.CheckSpawn event) { - if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().worldObj, MathHelper.floor_double(event.getX()), MathHelper.floor_double(event.getZ()))) + if(event.getEntityLiving() instanceof EntitySlime && event.getResult() != Result.DENY && isSlimeChunk(event.getEntityLiving().world, MathHelper.floor(event.getX()), MathHelper.floor(event.getZ()))) event.getEntityLiving().getEntityData().setBoolean(TAG_WORLD_SPAWNED, true); } diff --git a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java index 14d4d61f1..804fecdac 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java +++ b/src/main/java/vazkii/botania/common/block/subtile/generating/SubTileSpectrolus.java @@ -13,6 +13,7 @@ package vazkii.botania.common.block.subtile.generating; import java.awt.Color; import java.util.List; +import net.minecraft.world.WorldServer; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; @@ -46,7 +47,9 @@ public class SubTileSpectrolus extends SubTileGenerating { public void onUpdate() { super.onUpdate(); - boolean remote = supertile.getWorld().isRemote; + if (supertile.getWorld().isRemote) + return; + Item wool = Item.getItemFromBlock(Blocks.WOOL); List items = supertile.getWorld().getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(supertile.getPos().add(-RANGE, -RANGE, -RANGE), supertile.getPos().add(RANGE + 1, RANGE + 1, RANGE + 1))); @@ -62,26 +65,17 @@ public class SubTileSpectrolus extends SubTileGenerating { continue; } - if(stack != null && stack.getItem() == wool && !item.isDead && age >= slowdown) { + if(!stack.isEmpty() && stack.getItem() == wool && !item.isDead && age >= slowdown) { int meta = stack.getItemDamage(); if(meta == nextColor) { - if(!remote) { - mana = Math.min(getMaxMana(), mana + 300); - nextColor = nextColor == 15 ? 0 : nextColor + 1; - sync(); - } + mana = Math.min(getMaxMana(), mana + 300); + nextColor = nextColor == 15 ? 0 : nextColor + 1; + sync(); - for(int i = 0; i < 10; i++) { - float m = 0.2F; - float mx = (float) (Math.random() - 0.5) * m; - float my = (float) (Math.random() - 0.5) * m; - float mz = (float) (Math.random() - 0.5) * m; - supertile.getWorld().spawnParticle(EnumParticleTypes.ITEM_CRACK, item.posX, item.posY, item.posZ, mx, my, mz, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); - } + ((WorldServer) supertile.getWorld()).spawnParticle(EnumParticleTypes.ITEM_CRACK, false, item.posX, item.posY, item.posZ, 20, 0.1D, 0.1D, 0.1D, 0.05D, Item.getIdFromItem(stack.getItem()), stack.getItemDamage()); } - if(!remote) - item.setDead(); + item.setDead(); } } } @@ -116,7 +110,7 @@ public class SubTileSpectrolus extends SubTileGenerating { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(stack != null && stack.getItem() != null) { + if(!stack.isEmpty()) { String stackName = stack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java index 6e28c18ba..9b72babd3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAlfPortal.java @@ -101,7 +101,7 @@ public class TileAlfPortal extends TileMod { @Override public void update() { - IBlockState iBlockState = worldObj.getBlockState(getPos()); + IBlockState iBlockState = world.getBlockState(getPos()); if(iBlockState.getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF) { ticksOpen = 0; return; @@ -121,8 +121,8 @@ public class TileAlfPortal extends TileMod { if(ConfigHandler.elfPortalParticlesEnabled) blockParticle(state); - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, aabb); - if(!worldObj.isRemote) + List items = world.getEntitiesWithinAABB(EntityItem.class, aabb); + if(!world.isRemote) for(EntityItem item : items) { if(item.isDead) continue; @@ -147,13 +147,13 @@ public class TileAlfPortal extends TileMod { } if(ticksSinceLastItem >= 4) { - if(!worldObj.isRemote) + if(!world.isRemote) resolveRecipes(); } } if(closeNow) { - worldObj.setBlockState(getPos(), ModBlocks.alfPortal.getDefaultState(), 1 | 2); + world.setBlockState(getPos(), ModBlocks.alfPortal.getDefaultState(), 1 | 2); for(int i = 0; i < 36; i++) blockParticle(state); closeNow = false; @@ -161,12 +161,12 @@ public class TileAlfPortal extends TileMod { if(newState == AlfPortalState.OFF) for(int i = 0; i < 36; i++) blockParticle(state); - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2); + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2); } } private void blockParticle(AlfPortalState state) { - int i = worldObj.rand.nextInt(AIR_POSITIONS.length); + int i = world.rand.nextInt(AIR_POSITIONS.length); double[] pos = new double[] { AIR_POSITIONS[i].getX() + 0.5F, AIR_POSITIONS[i].getY() + 0.5F, AIR_POSITIONS[i].getZ() + 0.5F }; @@ -178,11 +178,11 @@ public class TileAlfPortal extends TileMod { } public boolean onWanded() { - AlfPortalState state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE); + AlfPortalState state = world.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE); if(state == AlfPortalState.OFF) { AlfPortalState newState = getValidState(); if(newState != AlfPortalState.OFF) { - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2); + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.ALFPORTAL_STATE, newState), 1 | 2); return true; } } @@ -192,15 +192,15 @@ public class TileAlfPortal extends TileMod { private AxisAlignedBB getPortalAABB() { AxisAlignedBB aabb = new AxisAlignedBB(pos.add(-1, 1, 0), pos.add(2, 4, 1)); - if(worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X) + if(world.getBlockState(getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.ON_X) aabb = new AxisAlignedBB(pos.add(0, 1, -1), pos.add(1, 4, 2)); return aabb; } private void addItem(ItemStack stack) { - int size = stack.stackSize; - stack.stackSize = 1; + int size = stack.getCount(); + stack.setCount(1); for(int i = 0; i < size; i++) stacksIn.add(stack.copy()); } @@ -208,7 +208,7 @@ public class TileAlfPortal extends TileMod { private void resolveRecipes() { int i = 0; for(ItemStack stack : stacksIn) { - if(stack != null && stack.getItem() instanceof ILexicon) { + if(!stack.isEmpty() && stack.getItem() instanceof ILexicon) { ILexicon lexicon = (ILexicon) stack.getItem(); if (!lexicon.isKnowledgeUnlocked(stack, BotaniaAPI.elvenKnowledge)) { lexicon.unlockKnowledge(stack, BotaniaAPI.elvenKnowledge); @@ -234,9 +234,9 @@ public class TileAlfPortal extends TileMod { } private void spawnItem(ItemStack stack) { - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); + EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); item.getEntityData().setBoolean(TAG_PORTAL_FLAG, true); - worldObj.spawnEntityInWorld(item); + world.spawnEntity(item); ticksSinceLastItem = 0; } @@ -248,8 +248,7 @@ public class TileAlfPortal extends TileMod { cmp.setInteger(TAG_STACK_COUNT, stacksIn.size()); int i = 0; for(ItemStack stack : stacksIn) { - NBTTagCompound stackcmp = new NBTTagCompound(); - stack.writeToNBT(stackcmp); + NBTTagCompound stackcmp = stack.writeToNBT(new NBTTagCompound()); cmp.setTag(TAG_STACK + i, stackcmp); i++; } @@ -265,7 +264,7 @@ public class TileAlfPortal extends TileMod { stacksIn.clear(); for(int i = 0; i < count; i++) { NBTTagCompound stackcmp = cmp.getCompoundTag(TAG_STACK + i); - ItemStack stack = ItemStack.loadItemStackFromNBT(stackcmp); + ItemStack stack = new ItemStack(stackcmp); stacksIn.add(stack); } } @@ -337,7 +336,7 @@ public class TileAlfPortal extends TileMod { List pylons = locatePylons(); for(BlockPos pos : pylons) { - TileEntity tile = worldObj.getTileEntity(getPos().add(pos)); + TileEntity tile = world.getTileEntity(getPos().add(pos)); if(tile instanceof TilePylon) { TilePylon pylon = (TilePylon) tile; pylon.activated = true; @@ -365,21 +364,21 @@ public class TileAlfPortal extends TileMod { int expectedConsumption = costPer * pylons.size(); for(BlockPos pos : pylons) { - TileEntity tile = worldObj.getTileEntity(getPos().add(pos)); + TileEntity tile = world.getTileEntity(getPos().add(pos)); if(tile instanceof TilePylon) { TilePylon pylon = (TilePylon) tile; pylon.activated = true; pylon.centerPos = getPos(); } - tile = worldObj.getTileEntity(getPos().add(pos).down()); + tile = world.getTileEntity(getPos().add(pos).down()); if(tile instanceof TilePool) { TilePool pool = (TilePool) tile; if(pool.getCurrentMana() < costPer) { closeNow = closeNow || close; return false; - } else if(!worldObj.isRemote) { + } else if(!world.isRemote) { consumePools.add(pool); consumed += costPer; } @@ -412,10 +411,10 @@ public class TileAlfPortal extends TileMod { private boolean checkPosition(BlockPos pos, IBlockState state, boolean onlyCheckBlock) { BlockPos pos_ = getPos().add(pos); - IBlockState stateat = worldObj.getBlockState(pos_); + IBlockState stateat = world.getBlockState(pos_); Block blockat = stateat.getBlock(); - if(state.getBlock() == Blocks.AIR ? blockat.isAir(stateat, worldObj, pos_) : blockat == state.getBlock()) + if(state.getBlock() == Blocks.AIR ? blockat.isAir(stateat, world, pos_) : blockat == state.getBlock()) return onlyCheckBlock || stateat == state; return false; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java index 2f020c975..1a8bcd156 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAltar.java @@ -28,6 +28,8 @@ import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.NetworkManager; +import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.AxisAlignedBB; @@ -36,6 +38,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import net.minecraftforge.fluids.capability.IFluidHandler; +import net.minecraftforge.fluids.capability.IFluidHandlerItem; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.items.IItemHandlerModifiable; @@ -50,10 +53,16 @@ import vazkii.botania.api.state.enums.AltarVariant; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; + +import javax.annotation.Nonnull; public class TileAltar extends TileSimpleInventory implements IPetalApothecary { private static final Pattern SEED_PATTERN = Pattern.compile("(?:(?:(?:[A-Z-_.:]|^)seed)|(?:(?:[a-z-_.:]|^)Seed))(?:[sA-Z-_.:]|$)"); + private static final int SET_KEEP_TICKS_EVENT = 0; public static final String TAG_HAS_WATER = "hasWater"; public static final String TAG_HAS_LAVA = "hasLava"; @@ -69,43 +78,38 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { public boolean collideEntityItem(EntityItem item) { ItemStack stack = item.getEntityItem(); - if(stack == null || item.isDead) + if(world.isRemote || stack.isEmpty() || item.isDead) return false; - if(!isMossy && worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) { + if(!isMossy && world.getBlockState(getPos()).getValue(BotaniaStateProps.ALTAR_VARIANT) == AltarVariant.DEFAULT) { if(stack.getItem() == Item.getItemFromBlock(Blocks.VINE)) { isMossy = true; - if (worldObj.isRemote) { - worldObj.markBlockRangeForRenderUpdate(getPos(), getPos()); - } else { - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); - } + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); + stack.shrink(1); return true; } } - if(!hasWater() && !hasLava() && !worldObj.isRemote) { + if(!hasWater() && !hasLava()) { - if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null)) { - IFluidHandler fluidHandler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY, null); + if(stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null)) { + IFluidHandlerItem fluidHandler = stack.getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, null); FluidStack drainWater = fluidHandler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), false); FluidStack drainLava = fluidHandler.drain(new FluidStack(FluidRegistry.LAVA, Fluid.BUCKET_VOLUME), false); if(drainWater != null && drainWater.getFluid() == FluidRegistry.WATER && drainWater.amount == Fluid.BUCKET_VOLUME) { setWater(true); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); fluidHandler.drain(new FluidStack(FluidRegistry.WATER, Fluid.BUCKET_VOLUME), true); + item.setEntityItemStack(fluidHandler.getContainer()); return true; } else if(drainLava != null && drainLava.getFluid() == FluidRegistry.LAVA && drainLava.amount == Fluid.BUCKET_VOLUME) { setLava(true); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); fluidHandler.drain(new FluidStack(FluidRegistry.LAVA, Fluid.BUCKET_VOLUME), true); + item.setEntityItemStack(fluidHandler.getContainer()); return true; } } @@ -121,44 +125,32 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { boolean didChange = false; if(stack.getItem() instanceof IFlowerComponent && ((IFlowerComponent) stack.getItem()).canFit(stack, this)) { - if(itemHandler.getStackInSlot(getSizeInventory() - 1) != null) + if(!itemHandler.getStackInSlot(getSizeInventory() - 1).isEmpty()) return false; - if(!worldObj.isRemote) { - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); - - for(int i = 0; i < getSizeInventory(); i++) - if(itemHandler.getStackInSlot(i) == null) { - ItemStack stackToPut = stack.copy(); - stackToPut.stackSize = 1; - itemHandler.setStackInSlot(i, stackToPut); - didChange = true; - worldObj.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); - break; - } - } - } else if(stack.getItem() != null && SEED_PATTERN.matcher(stack.getItem().getUnlocalizedName(stack)).find()) { + for(int i = 0; i < getSizeInventory(); i++) + if(itemHandler.getStackInSlot(i).isEmpty()) { + itemHandler.setStackInSlot(i, stack.splitStack(1)); + didChange = true; + world.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); + break; + } + } else if(!stack.isEmpty() && SEED_PATTERN.matcher(stack.getItem().getUnlocalizedName(stack)).find()) { for(RecipePetals recipe : BotaniaAPI.petalRecipes) { if(recipe.matches(itemHandler)) { saveLastRecipe(); - if(!worldObj.isRemote) { - for(int i = 0; i < getSizeInventory(); i++) - itemHandler.setStackInSlot(i, null); + for(int i = 0; i < getSizeInventory(); i++) + itemHandler.setStackInSlot(i, ItemStack.EMPTY); - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); + stack.shrink(1); - ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - worldObj.spawnEntityInWorld(outputItem); + ItemStack output = recipe.getOutput().copy(); + EntityItem outputItem = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); + world.spawnEntity(outputItem); - setWater(false); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - } + setWater(false); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); craftingFanciness(); didChange = true; @@ -175,39 +167,33 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = itemHandler.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; lastRecipe.add(stack.copy()); } - recipeKeepTicks = 400; + world.addBlockEvent(getPos(), ModBlocks.altar, SET_KEEP_TICKS_EVENT, 400); } public void trySetLastRecipe(EntityPlayer player) { tryToSetLastRecipe(player, itemHandler, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } public static void tryToSetLastRecipe(EntityPlayer player, IItemHandlerModifiable inv, List lastRecipe) { - if(lastRecipe == null || lastRecipe.isEmpty() || player.worldObj.isRemote) + if(lastRecipe == null || lastRecipe.isEmpty() || player.world.isRemote) return; int index = 0; boolean didAny = false; for(ItemStack stack : lastRecipe) { - if(stack == null) + if(stack.isEmpty()) continue; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack pstack = player.inventory.getStackInSlot(i); - if(pstack != null && pstack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(stack, pstack)) { - pstack.stackSize--; - if(pstack.stackSize == 0) - player.inventory.setInventorySlotContents(i, null); - - ItemStack stackToPut = pstack.copy(); - stackToPut.stackSize = 1; - inv.setStackInSlot(index, stackToPut); + if(!pstack.isEmpty() && pstack.isItemEqual(stack) && ItemStack.areItemStackTagsEqual(stack, pstack)) { + inv.setStackInSlot(index, pstack.splitStack(1)); didAny = true; index++; break; @@ -216,28 +202,21 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { } if(didAny) { - if(inv instanceof TileAltar) - player.worldObj.playSound(null, ((TileAltar) inv).getPos(), SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); - if(player instanceof EntityPlayerMP) { - EntityPlayerMP mp = (EntityPlayerMP) player; - mp.inventoryContainer.detectAndSendChanges(); - } + player.world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); + EntityPlayerMP mp = (EntityPlayerMP) player; + mp.inventoryContainer.detectAndSendChanges(); } } private void craftingFanciness() { - worldObj.playSound(null, pos, BotaniaSoundEvents.altarCraft, SoundCategory.BLOCKS, 1F, 1F); - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); - } + world.playSound(null, pos, BotaniaSoundEvents.altarCraft, SoundCategory.BLOCKS, 1F, 1F); + PacketHandler.sendToNearby(world, getPos(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.APOTHECARY_CRAFT, getPos().getX(), getPos().getY(), getPos().getZ())); } public boolean isEmpty() { for(int i = 0; i < getSizeInventory(); i++) - if(itemHandler.getStackInSlot(i) != null) + if(!itemHandler.getStackInSlot(i).isEmpty()) return false; return true; @@ -245,36 +224,38 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { @Override public void update() { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1))); + if(!world.isRemote) { + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.add(0, 1D / 16D * 20D, 0), pos.add(1, 1D / 16D * 32D, 1))); - boolean didChange = false; - for(EntityItem item : items) - didChange = collideEntityItem(item) || didChange; + boolean didChange = false; + for(EntityItem item : items) + didChange = collideEntityItem(item) || didChange; - if(didChange) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + if(didChange) + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + } else { + for(int i = 0; i < getSizeInventory(); i++) { + ItemStack stackAt = itemHandler.getStackInSlot(i); + if(stackAt.isEmpty()) + break; - for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stackAt = itemHandler.getStackInSlot(i); - if(stackAt == null) - break; - - if(Math.random() >= 0.97) { - Color color = new Color(((IFlowerComponent) stackAt.getItem()).getParticleColor(stackAt)); - float red = color.getRed() / 255F; - float green = color.getGreen() / 255F; - float blue = color.getBlue() / 255F; - if(Math.random() >= 0.75F) - worldObj.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); - Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + if(Math.random() >= 0.97) { + Color color = new Color(((IFlowerComponent) stackAt.getItem()).getParticleColor(stackAt)); + float red = color.getRed() / 255F; + float green = color.getGreen() / 255F; + float blue = color.getBlue() / 255F; + if(Math.random() >= 0.75F) + world.playSound(null, pos, SoundEvents.ENTITY_GENERIC_SPLASH, SoundCategory.BLOCKS, 0.1F, 10F); + Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + } } - } - if(hasLava()) { - isMossy = false; - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); - if(Math.random() > 0.9) - worldObj.spawnParticle(EnumParticleTypes.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); + if(hasLava()) { + isMossy = false; + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.05, 0); + if(Math.random() > 0.9) + world.spawnParticle(EnumParticleTypes.LAVA, pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, 0, 0.01, 0); + } } if(recipeKeepTicks > 0) @@ -300,6 +281,24 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { isMossy = cmp.getBoolean(TAG_IS_MOSSY); } + @Override + public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) { + boolean lastMossy = isMossy; + super.onDataPacket(manager, packet); + if(isMossy != lastMossy) + world.markBlockRangeForRenderUpdate(pos, pos); + } + + @Override + public boolean receiveClientEvent(int id, int param) { + if(id == SET_KEEP_TICKS_EVENT) { + recipeKeepTicks = param; + return true; + } else { + return false; + } + } + @Override public int getSizeInventory() { return 16; @@ -309,7 +308,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } }; @@ -318,12 +317,12 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { @Override public void setWater(boolean water) { hasWater = water; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } public void setLava(boolean lava) { hasLava = lava; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } @Override @@ -344,7 +343,7 @@ public class TileAltar extends TileSimpleInventory implements IPetalApothecary { int radius = 24; int amt = 0; for(int i = 0; i < getSizeInventory(); i++) { - if(itemHandler.getStackInSlot(i) == null) + if(itemHandler.getStackInSlot(i).isEmpty()) break; amt++; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 5125aeaf6..e92ac2d01 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -52,8 +52,8 @@ public class TileAnimatedTorch extends TileMod { @Override public void onLoad() { - if(!worldObj.isRemote) - nextRandomRotation = worldObj.rand.nextInt(4); + if(!world.isRemote) + nextRandomRotation = world.rand.nextInt(4); } public void handRotate() { @@ -63,8 +63,8 @@ public class TileAnimatedTorch extends TileMod { public void toggle() { rotateTo(torchMode.modeSwitcher.rotate(this, side)); - if(!worldObj.isRemote) { - nextRandomRotation = worldObj.rand.nextInt(4); + if(!world.isRemote) { + nextRandomRotation = world.rand.nextInt(4); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } @@ -96,7 +96,7 @@ public class TileAnimatedTorch extends TileMod { this.side = side; rotating = true; - worldObj.notifyNeighborsOfStateChange(getPos(), getBlockType()); + world.notifyNeighborsOfStateChange(getPos(), getBlockType(), false); } @SideOnly(Side.CLIENT) @@ -117,7 +117,7 @@ public class TileAnimatedTorch extends TileMod { if(rotationTicks <= 0) { rotating = false; - worldObj.notifyNeighborsOfStateChange(getPos(), getBlockType()); + world.notifyNeighborsOfStateChange(getPos(), getBlockType(), false); } } else rotation = side * 90; @@ -128,7 +128,7 @@ public class TileAnimatedTorch extends TileMod { double z = getPos().getZ() + 0.5 + Math.sin((rotation + 90) / 180.0 * Math.PI) * 0.35; for(int i = 0; i < amt; i++) - worldObj.spawnParticle(EnumParticleTypes.REDSTONE, x, y, z, 0.0D, 0.0D, 0.0D, new int[0]); + world.spawnParticle(EnumParticleTypes.REDSTONE, x, y, z, 0.0D, 0.0D, 0.0D, new int[0]); } @Override @@ -145,7 +145,7 @@ public class TileAnimatedTorch extends TileMod { public void readPacketNBT(NBTTagCompound cmp) { side = cmp.getInteger(TAG_SIDE); rotating = cmp.getBoolean(TAG_ROTATING); - if(worldObj != null && !worldObj.isRemote) + if(world != null && !world.isRemote) rotationTicks = cmp.getInteger(TAG_ROTATION_TICKS); anglePerTick = cmp.getDouble(TAG_ANGLE_PER_TICK); nextRandomRotation = cmp.getInteger(TAG_NEXT_RANDOM_ROTATION); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java index dd7877dd2..bcd365475 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAvatar.java @@ -18,6 +18,8 @@ import vazkii.botania.api.item.IAvatarTile; import vazkii.botania.api.item.IAvatarWieldable; import vazkii.botania.api.state.BotaniaStateProps; +import javax.annotation.Nonnull; + public class TileAvatar extends TileSimpleInventory implements IAvatarTile { private static final int MAX_MANA = 6400; @@ -34,7 +36,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { public void update() { enabled = true; for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); + int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { enabled = false; break; @@ -42,7 +44,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { } ItemStack stack = itemHandler.getStackInSlot(0); - if(stack != null && stack.getItem() instanceof IAvatarWieldable) { + if(!stack.isEmpty() && stack.getItem() instanceof IAvatarWieldable) { IAvatarWieldable wieldable = (IAvatarWieldable) stack.getItem(); wieldable.onAvatarUpdate(this, stack); } @@ -76,7 +78,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } }; @@ -94,7 +96,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { @Override public boolean canRecieveManaFromBursts() { - return itemHandler.getStackInSlot(0) != null; + return !itemHandler.getStackInSlot(0).isEmpty(); } @Override @@ -109,7 +111,7 @@ public class TileAvatar extends TileSimpleInventory implements IAvatarTile { @Override public EnumFacing getAvatarFacing() { - return worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); + return world.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java index 10f90eac1..74998df45 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBifrost.java @@ -23,9 +23,9 @@ public class TileBifrost extends TileMod { @Override public void update() { - if(!worldObj.isRemote) { + if(!world.isRemote) { if(ticks <= 0) { - worldObj.setBlockToAir(pos); + world.setBlockToAir(pos); } else ticks--; } else if(Math.random() < 0.1) Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java index 245f19bac..335fa2eac 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileBrewery.java @@ -36,6 +36,8 @@ import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.client.core.helper.RenderHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; // This is mostly copypasta from TileRuneAltar public class TileBrewery extends TileSimpleInventory implements IManaReceiver { @@ -48,33 +50,33 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { public int signal = 0; public boolean addItem(@Nullable EntityPlayer player, ItemStack stack, @Nullable EnumHand hand) { - if(recipe != null || stack == null || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0) == null != stack.getItem() instanceof IBrewContainer) + if(recipe != null || stack.isEmpty() || stack.getItem() instanceof IBrewItem && ((IBrewItem) stack.getItem()).getBrew(stack) != null && ((IBrewItem) stack.getItem()).getBrew(stack) != BotaniaAPI.fallbackBrew || itemHandler.getStackInSlot(0).isEmpty() != stack.getItem() instanceof IBrewContainer) return false; boolean did = false; for(int i = 0; i < getSizeInventory(); i++) - if(itemHandler.getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i).isEmpty()) { did = true; ItemStack stackToAdd = stack.copy(); - stackToAdd.stackSize = 1; + stackToAdd.setCount(1); itemHandler.setStackInSlot(i, stackToAdd); if(player == null || !player.capabilities.isCreativeMode) { - stack.stackSize--; - if(stack.stackSize == 0 && player != null) - player.setHeldItem(hand, null); + stack.shrink(1); + if(stack.isEmpty() && player != null) + player.setHeldItem(hand, ItemStack.EMPTY); } break; } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(itemHandler) && recipe.getOutput(itemHandler.getStackInSlot(0)) != null) { this.recipe = recipe; - worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + world.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } } @@ -87,7 +89,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { for(RecipeBrew recipe : BotaniaAPI.brewRecipes) if(recipe.matches(itemHandler)) { this.recipe = recipe; - worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + world.setBlockState(pos, ModBlocks.brewery.getDefaultState().withProperty(BotaniaStateProps.POWERED, true), 1 | 2); } if(recipe == null) @@ -97,20 +99,19 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { // Update every tick. recieveMana(0); - if(!worldObj.isRemote && recipe == null) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1)); + if(!world.isRemote && recipe == null) { + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX(), pos.getY(), pos.getZ(), pos.getX() + 1, pos.getY() + 1, pos.getZ() + 1)); for(EntityItem item : items) - if(!item.isDead && item.getEntityItem() != null) { + if(!item.isDead && !item.getEntityItem().isEmpty()) { ItemStack stack = item.getEntityItem(); - if(addItem(null, stack, null) && stack.stackSize == 0) - item.setDead(); + addItem(null, stack, null); } } if(recipe != null) { if(!recipe.matches(itemHandler)) { recipe = null; - worldObj.setBlockState(pos, ModBlocks.brewery.getDefaultState(), 1 | 2); + world.setBlockState(pos, ModBlocks.brewery.getDefaultState(), 1 | 2); } if(recipe != null) { @@ -126,17 +127,17 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { } } - if(mana >= getManaCost() && !worldObj.isRemote) { + if(mana >= getManaCost() && !world.isRemote) { int mana = getManaCost(); recieveMana(-mana); - if(!worldObj.isRemote) { + if(!world.isRemote) { ItemStack output = recipe.getOutput(itemHandler.getStackInSlot(0)); - EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - worldObj.spawnEntityInWorld(outputItem); + EntityItem outputItem = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); + world.spawnEntity(outputItem); } for(int i = 0; i < getSizeInventory(); i++) - itemHandler.setStackInSlot(i, null); + itemHandler.setStackInSlot(i, ItemStack.EMPTY); craftingFanciness(); } @@ -149,7 +150,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { if(newSignal != signal) { signal = newSignal; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } manaLastTick = mana; @@ -157,23 +158,15 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { public int getManaCost() { ItemStack stack = itemHandler.getStackInSlot(0); - if(recipe == null || stack == null || !(stack.getItem() instanceof IBrewContainer)) + if(recipe == null || stack.isEmpty() || !(stack.getItem() instanceof IBrewContainer)) return 0; IBrewContainer container = (IBrewContainer) stack.getItem(); return container.getManaCost(recipe.getBrew(), stack); } public void craftingFanciness() { - worldObj.playSound(null, pos, BotaniaSoundEvents.potionCreate, SoundCategory.BLOCKS, 1F, 1.5F + (float) Math.random() * 0.25F); - for(int i = 0; i < 25; i++) { - Color color = new Color(recipe.getBrew().getColor(itemHandler.getStackInSlot(0))); - float r = color.getRed() / 255F; - float g = color.getGreen() / 255F; - float b = color.getBlue() / 255F; - Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, r, g, b, (float) Math.random() * 2F + 0.5F, 10); - for(int j = 0; j < 2; j++) - Botania.proxy.wispFX(pos.getX() + 0.7 - Math.random() * 0.4, pos.getY() + 0.9 - Math.random() * 0.2, pos.getZ() + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); - } + world.playSound(null, pos, BotaniaSoundEvents.potionCreate, SoundCategory.BLOCKS, 1F, 1.5F + (float) Math.random() * 0.25F); + PacketHandler.sendToNearby(world, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BREWERY_FINISH, pos.getX(), pos.getY(), pos.getZ(), recipe.getBrew().getColor(itemHandler.getStackInSlot(0)))); } @Override @@ -205,7 +198,7 @@ public class TileBrewery extends TileSimpleInventory implements IManaReceiver { protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } }; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java index 78328b463..9fead3817 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCacophonium.java @@ -19,10 +19,10 @@ public class TileCacophonium extends TileMod { private static final String TAG_STACK = "stack"; - public ItemStack stack; + public ItemStack stack = ItemStack.EMPTY; public void annoyDirewolf() { - ItemCacophonium.playSound(worldObj, stack, pos.getX(), pos.getY(), pos.getZ(), SoundCategory.BLOCKS, 1F); + ItemCacophonium.playSound(world, stack, pos.getX(), pos.getY(), pos.getZ(), SoundCategory.BLOCKS, 1F); } @Override @@ -30,8 +30,8 @@ public class TileCacophonium extends TileMod { super.writePacketNBT(cmp); NBTTagCompound cmp1 = new NBTTagCompound(); - if(stack != null) - stack.writeToNBT(cmp1); + if(!stack.isEmpty()) + cmp1 = stack.writeToNBT(cmp1); cmp.setTag(TAG_STACK, cmp1); } @@ -40,7 +40,7 @@ public class TileCacophonium extends TileMod { super.readPacketNBT(cmp); NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_STACK); - stack = ItemStack.loadItemStackFromNBT(cmp1); + stack = new ItemStack(cmp1); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java index 9ef0f7720..30f7026f3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCamo.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCamo.java @@ -43,6 +43,6 @@ public class TileCamo extends TileMod { @Override public void onDataPacket(NetworkManager manager, SPacketUpdateTileEntity packet) { super.onDataPacket(manager, packet); - worldObj.markBlockRangeForRenderUpdate(pos, pos); + world.markBlockRangeForRenderUpdate(pos, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCell.java b/src/main/java/vazkii/botania/common/block/tile/TileCell.java index dc86cc8e9..d20fb60c6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCell.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCell.java @@ -37,7 +37,7 @@ public class TileCell extends TileMod { validCoords = getPos(); ticked = true; } else if(!matchCoords(validCoords, this) || !matchCoords(flowerCoords, flower)) - worldObj.setBlockToAir(pos); + world.setBlockToAir(pos); } public boolean isSameFlower(TileEntity flower) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java index 121d45766..1f6051041 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCocoon.java @@ -10,8 +10,9 @@ */ package vazkii.botania.common.block.tile; -import net.minecraft.block.Block; import net.minecraft.entity.EntityAgeable; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.monster.EntityShulker; import net.minecraft.entity.passive.EntityChicken; import net.minecraft.entity.passive.EntityCow; import net.minecraft.entity.passive.EntityHorse; @@ -22,19 +23,26 @@ import net.minecraft.entity.passive.EntityRabbit; import net.minecraft.entity.passive.EntitySheep; import net.minecraft.entity.passive.EntityVillager; import net.minecraft.entity.passive.EntityWolf; +import net.minecraft.item.EnumDyeColor; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.datasync.DataParameter; import net.minecraftforge.fml.common.registry.VillagerRegistry; +import net.minecraftforge.fml.relauncher.ReflectionHelper; +import vazkii.botania.common.lib.LibObfuscation; public class TileCocoon extends TileMod { private static final String TAG_TIME_PASSED = "timePassed"; private static final String TAG_EMERALDS_GIVEN = "emeraldsGiven"; + private static final String TAG_CHORUS_FRUIT_GIVEN = "chorusFruitGiven"; public static final int TOTAL_TIME = 2400; public static final int MAX_EMERALDS = 20; + public static final int MAX_CHORUS_FRUITS = 20; public int timePassed; public int emeraldsGiven; + public int chorusFruitGiven; @Override public void update() { @@ -44,52 +52,54 @@ public class TileCocoon extends TileMod { } private void hatch() { - if(!worldObj.isRemote) { - worldObj.playEvent(2001, pos, Block.getStateId(getBlockType().getStateFromMeta(getBlockMetadata()))); - worldObj.setBlockToAir(pos); + if(!world.isRemote) { + world.destroyBlock(pos, false); - EntityAgeable entity = null; + EntityLiving entity = null; float villagerChance = Math.min(1F, (float) emeraldsGiven / (float) MAX_EMERALDS); + float shulkerChance = Math.min(1F, (float) chorusFruitGiven / (float) MAX_CHORUS_FRUITS); - if(Math.random() < villagerChance) { - EntityVillager villager = new EntityVillager(worldObj); - VillagerRegistry.setRandomProfession(villager, worldObj.rand); + if(Math.random() < shulkerChance) { + entity = new EntityShulker(world); + } else if(Math.random() < villagerChance) { + EntityVillager villager = new EntityVillager(world); + VillagerRegistry.setRandomProfession(villager, world.rand); entity = villager; } else { float specialChance = 0.05F; if(Math.random() < specialChance) { - int entityType = worldObj.rand.nextInt(3); + int entityType = world.rand.nextInt(3); switch(entityType) { case 0: - entity = new EntityHorse(worldObj); + entity = new EntityHorse(world); break; case 1: - entity = new EntityWolf(worldObj); + entity = new EntityWolf(world); break; case 2: - entity = new EntityOcelot(worldObj); + entity = new EntityOcelot(world); break; } } else { - int entityType = worldObj.rand.nextInt(5); + int entityType = world.rand.nextInt(5); switch(entityType) { case 0: - entity = new EntitySheep(worldObj); + entity = new EntitySheep(world); break; case 1: if(Math.random() < 0.01) - entity = new EntityMooshroom(worldObj); - else entity = new EntityCow(worldObj); + entity = new EntityMooshroom(world); + else entity = new EntityCow(world); break; case 2: - entity = new EntityPig(worldObj); + entity = new EntityPig(world); break; case 3: - entity = new EntityChicken(worldObj); + entity = new EntityChicken(world); break; case 4: - entity = new EntityRabbit(worldObj); + entity = new EntityRabbit(world); break; } } @@ -97,8 +107,10 @@ public class TileCocoon extends TileMod { if(entity != null) { entity.setPosition(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - entity.setGrowingAge(-24000); - worldObj.spawnEntityInWorld(entity); + if(entity instanceof EntityAgeable) + ((EntityAgeable) entity).setGrowingAge(-24000); + entity.onInitialSpawn(world.getDifficultyForLocation(getPos()), null); + world.spawnEntity(entity); entity.spawnExplosionParticle(); } } @@ -108,12 +120,14 @@ public class TileCocoon extends TileMod { public void writePacketNBT(NBTTagCompound cmp) { cmp.setInteger(TAG_TIME_PASSED, timePassed); cmp.setInteger(TAG_EMERALDS_GIVEN, emeraldsGiven); + cmp.setInteger(TAG_CHORUS_FRUIT_GIVEN, chorusFruitGiven); } @Override public void readPacketNBT(NBTTagCompound cmp) { timePassed = cmp.getInteger(TAG_TIME_PASSED); emeraldsGiven = cmp.getInteger(TAG_EMERALDS_GIVEN); + chorusFruitGiven = cmp.getInteger(TAG_CHORUS_FRUIT_GIVEN); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java index 19a8ab067..7f3a61499 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileCraftCrate.java @@ -83,12 +83,13 @@ public class TileCraftCrate extends TileOpenCrate { protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { if(slot != 9 && !isLocked(slot)) return super.insertItem(slot, stack, simulate); else return stack; @@ -102,7 +103,7 @@ public class TileCraftCrate extends TileOpenCrate { @Override public void update() { - if (worldObj.isRemote) + if (world.isRemote) return; if(canEject() && isFull() && craft(true)) @@ -110,12 +111,12 @@ public class TileCraftCrate extends TileOpenCrate { int newSignal = 0; for(; newSignal < 9; newSignal++) // dis for loop be derpy - if(!isLocked(newSignal) && itemHandler.getStackInSlot(newSignal) == null) + if(!isLocked(newSignal) && itemHandler.getStackInSlot(newSignal).isEmpty()) break; if(newSignal != signal) { signal = newSignal; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } } @@ -132,7 +133,7 @@ public class TileCraftCrate extends TileOpenCrate { for(int i = 0; i < 9; i++) { ItemStack stack = itemHandler.getStackInSlot(i); - if(stack == null || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) + if(stack.isEmpty() || isLocked(i) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 11) continue; craft.setInventorySlotContents(i, stack.copy()); @@ -140,12 +141,12 @@ public class TileCraftCrate extends TileOpenCrate { List recipes = CraftingManager.getInstance().getRecipeList(); for(IRecipe recipe : recipes) - if(recipe.matches(craft, worldObj)) { + if(recipe.matches(craft, world)) { itemHandler.setStackInSlot(9, recipe.getCraftingResult(craft)); for(int i = 0; i < 9; i++) { ItemStack stack = itemHandler.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) continue; ItemStack container = stack.getItem().getContainerItem(stack); @@ -159,7 +160,7 @@ public class TileCraftCrate extends TileOpenCrate { boolean isFull() { for(int i = 0; i < 9; i++) - if(!isLocked(i) && itemHandler.getStackInSlot(i) == null) + if(!isLocked(i) && itemHandler.getStackInSlot(i).isEmpty()) return false; return true; @@ -168,9 +169,9 @@ public class TileCraftCrate extends TileOpenCrate { private void ejectAll() { for(int i = 0; i < getSizeInventory(); ++i) { ItemStack stack = itemHandler.getStackInSlot(i); - if(stack != null) + if(!stack.isEmpty()) eject(stack, false); - itemHandler.setStackInSlot(i, null); + itemHandler.setStackInSlot(i, ItemStack.EMPTY); } markDirty(); } @@ -212,7 +213,7 @@ public class TileCraftCrate extends TileOpenCrate { int lastPattern = pattern; super.onDataPacket(manager, packet); if(pattern != lastPattern) - worldObj.markBlockRangeForRenderUpdate(pos, pos); + world.markBlockRangeForRenderUpdate(pos, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java index 6fbccb4d4..df153d67d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnchanter.java @@ -73,7 +73,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { private int manaRequired = -1; private int mana = 0; - public ItemStack itemToEnchant = null; + public ItemStack itemToEnchant = ItemStack.EMPTY; private final List enchants = new ArrayList<>(); private static final BlockPos[] OBSIDIAN_LOCATIONS = { @@ -114,13 +114,13 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void onWanded(EntityPlayer player, ItemStack wand) { - if(stage != State.IDLE || itemToEnchant == null || !itemToEnchant.isItemEnchantable()) + if(stage != State.IDLE || itemToEnchant.isEmpty() || !itemToEnchant.isItemEnchantable()) return; - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); int count = items.size(); - if(count > 0 && !worldObj.isRemote) { + if(count > 0 && !world.isRemote) { for(EntityItem entity : items) { ItemStack item = entity.getEntityItem(); if(item.getItem() == Items.ENCHANTED_BOOK) { @@ -140,11 +140,11 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { @Override public void update() { - IBlockState state = worldObj.getBlockState(getPos()); + IBlockState state = world.getBlockState(getPos()); EnumFacing.Axis axis = state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION); for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) { - TileEntity tile = worldObj.getTileEntity(pos.add(pylon)); + TileEntity tile = world.getTileEntity(pos.add(pylon)); if(tile != null && tile instanceof TilePylon) { ((TilePylon) tile).activated = stage == State.GATHER_MANA; if(stage == State.GATHER_MANA) @@ -155,24 +155,24 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { if(stage != State.IDLE) stageTicks++; - if(worldObj.isRemote) + if(world.isRemote) return; - if(!canEnchanterExist(worldObj, pos, axis)) { - worldObj.setBlockState(pos, Blocks.LAPIS_BLOCK.getDefaultState(), 1 | 2); - PacketHandler.sendToNearby(worldObj, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_DESTROY, + if(!canEnchanterExist(world, pos, axis)) { + world.setBlockState(pos, Blocks.LAPIS_BLOCK.getDefaultState(), 1 | 2); + PacketHandler.sendToNearby(world, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_DESTROY, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5)); - worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); + world.playSound(null, pos, BotaniaSoundEvents.enchanterFade, SoundCategory.BLOCKS, 0.5F, 10F); } switch(stage) { case GATHER_ENCHANTS : { // Get books if(stageTicks % 20 == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos.getX() - 2, pos.getY(), pos.getZ() - 2, pos.getX() + 3, pos.getY() + 1, pos.getZ() + 3)); int count = items.size(); boolean addedEnch = false; - if(count > 0 && !worldObj.isRemote) { + if(count > 0 && !world.isRemote) { for(EntityItem entity : items) { ItemStack item = entity.getEntityItem(); if(item.getItem() == Items.ENCHANTED_BOOK) { @@ -184,7 +184,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { Enchantment ench = Enchantment.getEnchantmentByID(enchantId); if(!hasEnchantAlready(ench) && isEnchantmentValid(ench)) { this.enchants.add(new EnchantmentData(ench, enchantLvl)); - worldObj.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, BotaniaSoundEvents.ding, SoundCategory.BLOCKS, 1F, 1F); addedEnch = true; break; } @@ -215,13 +215,13 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } else if(mana >= manaRequired) { manaRequired = 0; for(BlockPos pylon : PYLON_LOCATIONS.get(axis)) - ((TilePylon) worldObj.getTileEntity(pos.add(pylon))).activated = false; + ((TilePylon) world.getTileEntity(pos.add(pylon))).activated = false; advanceStage(); } else { ISparkEntity spark = getAttachedSpark(); if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + List sparkEntities = SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); for(ISparkEntity otherSpark : sparkEntities) { if(spark == otherSpark) continue; @@ -283,8 +283,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } private void craftingFanciness() { - worldObj.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); - PacketHandler.sendToNearby(worldObj, pos, + world.playSound(null, pos, BotaniaSoundEvents.enchanterEnchant, SoundCategory.BLOCKS, 1F, 1F); + PacketHandler.sendToNearby(world, pos, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ENCHANTER_CRAFT, pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5)); } @@ -315,7 +315,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void sync() { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } @Override @@ -327,8 +327,8 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { cmp.setInteger(TAG_STAGE_3_END_TICKS, stage3EndTicks); NBTTagCompound itemCmp = new NBTTagCompound(); - if(itemToEnchant != null) - itemToEnchant.writeToNBT(itemCmp); + if(!itemToEnchant.isEmpty()) + itemCmp = itemToEnchant.writeToNBT(itemCmp); cmp.setTag(TAG_ITEM, itemCmp); String enchStr = enchants.stream() @@ -346,7 +346,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { stage3EndTicks = cmp.getInteger(TAG_STAGE_3_END_TICKS); NBTTagCompound itemCmp = cmp.getCompoundTag(TAG_ITEM); - itemToEnchant = ItemStack.loadItemStackFromNBT(itemCmp); + itemToEnchant = new ItemStack(itemCmp); enchants.clear(); String enchStr = cmp.getString(TAG_ENCHANTS); @@ -375,7 +375,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { for(EnchantmentData data : enchants) { Enchantment otherEnch = data.enchantmentobj; - if(!otherEnch.canApplyTogether(ench) || !ench.canApplyTogether(otherEnch)) + if (!ench.func_191560_c(otherEnch)) return false; } @@ -408,7 +408,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, pos.getY() + 2, pos.getZ() + 1), Predicates.instanceOf(ISparkEntity.class)); + List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.getX(), pos.getY() + 1, pos.getZ(), pos.getX() + 1, pos.getY() + 2, pos.getZ() + 1), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { Entity e = sparks.get(0); return (ISparkEntity) e; @@ -428,7 +428,7 @@ public class TileEnchanter extends TileMod implements ISparkAttachable { } public void renderHUD(ScaledResolution res) { - if(manaRequired > 0 && itemToEnchant != null) { + if(manaRequired > 0 && !itemToEnchant.isEmpty()) { int x = res.getScaledWidth() / 2 + 20; int y = res.getScaledHeight() / 2 - 8; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java index 20b52028b..bd945a1b1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileEnderEye.java @@ -28,35 +28,35 @@ public class TileEnderEye extends TileMod { @Override public void update() { - if (worldObj.isRemote) + if (world.isRemote) return; - boolean wasLooking = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + boolean wasLooking = world.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); int range = 80; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range, range, range))); boolean looking = false; for(EntityPlayer player : players) { ItemStack helm = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if(helm != null && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) + if(!helm.isEmpty() && helm.getItem() == Item.getItemFromBlock(Blocks.PUMPKIN)) continue; - RayTraceResult pos = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); + RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, true, 64); if(pos != null && pos.getBlockPos() != null && pos.getBlockPos().equals(getPos())) { looking = true; break; } } - if(looking != wasLooking && !worldObj.isRemote) - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, looking), 1 | 2); + if(looking != wasLooking && !world.isRemote) + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, looking), 1 | 2); if(looking) { double x = getPos().getX() - 0.1 + Math.random() * 1.2; double y = getPos().getY() - 0.1 + Math.random() * 1.2; double z = getPos().getZ() - 0.1 + Math.random() * 1.2; - ((WorldServer) worldObj).spawnParticle(EnumParticleTypes.REDSTONE, false, x, y, z, 0, 1.0D, 0.0D, 0.0D, 1.0D); + ((WorldServer) world).spawnParticle(EnumParticleTypes.REDSTONE, false, x, y, z, 0, 1.0D, 0.0D, 0.0D, 1.0D); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java index 51116c706..f833afbdd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFakeAir.java @@ -30,7 +30,7 @@ public class TileFakeAir extends TileMod { } public boolean canStay() { - return SubTileBubbell.isValidBubbell(worldObj, flowerPos); + return SubTileBubbell.isValidBubbell(world, flowerPos); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java index eedaa0ce8..32ffb8f81 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileFloatingFlower.java @@ -20,18 +20,18 @@ import vazkii.botania.common.block.ModBlocks; public class TileFloatingFlower extends TileMod implements IFloatingFlower { public static final String TAG_ISLAND_TYPE = "islandType"; - public static ItemStack forcedStack = null; + public static ItemStack forcedStack = ItemStack.EMPTY; IslandType type = IslandType.GRASS; @Override public ItemStack getDisplayStack() { - if(forcedStack != null) { + if(!forcedStack.isEmpty()) { ItemStack retStack = forcedStack; - forcedStack = null; + forcedStack = ItemStack.EMPTY; return retStack; } - EnumDyeColor color = worldObj.getBlockState(getPos()).getBlock() != ModBlocks.floatingFlower ? EnumDyeColor.WHITE - : worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR); + EnumDyeColor color = world.getBlockState(getPos()).getBlock() != ModBlocks.floatingFlower ? EnumDyeColor.WHITE + : world.getBlockState(getPos()).getValue(BotaniaStateProps.COLOR); return new ItemStack(ModBlocks.shinyFlower, 1, color.getMetadata()); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java index a5bea103e..5f52a3625 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileForestEye.java @@ -19,13 +19,13 @@ public class TileForestEye extends TileMod { @Override public void update() { - if (worldObj.isRemote) + if (world.isRemote) return; int range = 6; - int entityCount = worldObj.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); + int entityCount = world.getEntitiesWithinAABB(EntityAnimal.class, new AxisAlignedBB(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))).size(); if(entityCount != entities) { entities = entityCount; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java index 24d023697..baf5b99b1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileHourglass.java @@ -30,6 +30,8 @@ import vazkii.botania.api.item.IHourglassTrigger; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class TileHourglass extends TileSimpleInventory { private static final String TAG_TIME = "time"; @@ -52,7 +54,7 @@ public class TileHourglass extends TileSimpleInventory { public void update() { int totalTime = getTotalTime(); ItemStack dustStack = itemHandler.getStackInSlot(0); - dust = dustStack != null && dustStack.getItem() == ModItems.manaResource; + dust = !dustStack.isEmpty() && dustStack.getItem() == ModItems.manaResource; if(totalTime > 0 || dust) { if(move && !dust) @@ -62,17 +64,17 @@ public class TileHourglass extends TileSimpleInventory { time = 0; flip = !flip; flipTicks = 4; - if(!worldObj.isRemote) { - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + if(!world.isRemote) { + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); - worldObj.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(worldObj)); + world.scheduleUpdate(pos, getBlockType(), getBlockType().tickRate(world)); } for(EnumFacing facing : EnumFacing.VALUES) { BlockPos pos = getPos().offset(facing); - IBlockState state = worldObj.getBlockState(pos); + IBlockState state = world.getBlockState(pos); if(state.getBlock() instanceof IHourglassTrigger) - ((IHourglassTrigger) state.getBlock()).onTriggeredByHourglass(worldObj, pos, this); + ((IHourglassTrigger) state.getBlock()).onTriggeredByHourglass(world, pos, this); } } @@ -89,7 +91,7 @@ public class TileHourglass extends TileSimpleInventory { } public void onManaCollide() { - if(!worldObj.isRemote) { + if(!world.isRemote) { if(dust) time++; else move = !move; @@ -99,14 +101,14 @@ public class TileHourglass extends TileSimpleInventory { public int getTotalTime() { ItemStack stack = itemHandler.getStackInSlot(0); - if(stack == null) + if(stack.isEmpty()) return 0; - return getStackItemTime(stack) * stack.stackSize; + return getStackItemTime(stack) * stack.getCount(); } public static int getStackItemTime(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) return 0; if(stack.getItem() == Item.getItemFromBlock(Blocks.SAND)) return stack.getItemDamage() == 1 ? 200 : 20; @@ -119,7 +121,7 @@ public class TileHourglass extends TileSimpleInventory { public int getColor() { ItemStack stack = itemHandler.getStackInSlot(0); - if(stack == null) + if(stack.isEmpty()) return 0; if(stack.getItem() == Item.getItemFromBlock(Blocks.SAND)) return stack.getItemDamage() == 1 ? 0xE95800 : 0xFFEC49; @@ -134,9 +136,10 @@ public class TileHourglass extends TileSimpleInventory { @Override protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if(stack != null && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 23) + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if(!stack.isEmpty() && (stack.getItem() == Item.getItemFromBlock(Blocks.SAND) || stack.getItem() == Item.getItemFromBlock(Blocks.SOUL_SAND)) || stack.getItem() == ModItems.manaResource && stack.getItemDamage() == 23) return super.insertItem(slot, stack, simulate); else return stack; } @@ -185,7 +188,7 @@ public class TileHourglass extends TileSimpleInventory { int y = res.getScaledHeight() / 2 - 10; ItemStack stack = itemHandler.getStackInSlot(0); - if(stack != null) { + if(!stack.isEmpty()) { RenderHelper.enableGUIStandardItemLighting(); GlStateManager.enableRescaleNormal(); mc.getRenderItem().renderItemIntoGUI(stack, x, y); diff --git a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java index 74fdc6341..d5ba00718 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileIncensePlate.java @@ -28,6 +28,8 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.brew.ItemIncenseStick; +import javax.annotation.Nonnull; + public class TileIncensePlate extends TileSimpleInventory { private static final String TAG_TIME_LEFT = "timeLeft"; @@ -42,13 +44,13 @@ public class TileIncensePlate extends TileSimpleInventory { @Override public void update() { ItemStack stack = itemHandler.getStackInSlot(0); - if(stack != null && burning) { + if(!stack.isEmpty() && burning) { Brew brew = ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack); PotionEffect effect = brew.getPotionEffects(stack).get(0); if(timeLeft > 0) { timeLeft--; - if(!worldObj.isRemote) { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.getX() + 0.5 - RANGE, pos.getY() + 0.5 - RANGE, pos.getZ() + 0.5 - RANGE, pos.getX() + 0.5 + RANGE, pos.getY() + 0.5 + RANGE, pos.getZ() + 0.5 + RANGE)); + if(!world.isRemote) { + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(pos.getX() + 0.5 - RANGE, pos.getY() + 0.5 - RANGE, pos.getZ() + 0.5 - RANGE, pos.getX() + 0.5 + RANGE, pos.getY() + 0.5 + RANGE, pos.getZ() + 0.5 + RANGE)); for(EntityPlayer player : players) { PotionEffect currentEffect = player.getActivePotionEffect(effect.getPotion()); boolean nightVision = effect.getPotion() == MobEffects.NIGHT_VISION; @@ -58,8 +60,8 @@ public class TileIncensePlate extends TileSimpleInventory { } } - if(worldObj.rand.nextInt(20) == 0) - worldObj.playSound(null, pos, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 0.1F, 1); + if(world.rand.nextInt(20) == 0) + world.playSound(null, pos, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 0.1F, 1); } else { double x = pos.getX() + 0.5; double y = pos.getY() + 0.5; @@ -72,26 +74,26 @@ public class TileIncensePlate extends TileSimpleInventory { Botania.proxy.wispFX(x - (Math.random() - 0.5) * 0.2, y - (Math.random() - 0.5) * 0.2, z - (Math.random() - 0.5) * 0.2, 0.2F, 0.2F, 0.2F, 0.05F + (float) Math.random() * 0.02F, 0.005F - (float) Math.random() * 0.01F, 0.01F + (float) Math.random() * 0.001F, 0.005F - (float) Math.random() * 0.01F); } } else { - itemHandler.setStackInSlot(0, null); + itemHandler.setStackInSlot(0, ItemStack.EMPTY); burning = false; VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } } else timeLeft = 0; int newComparator = 0; - if(stack != null) + if(!stack.isEmpty()) newComparator = 1; if(burning) newComparator = 2; if(comparatorOutput != newComparator) { comparatorOutput = newComparator; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } } public void ignite() { ItemStack stack = itemHandler.getStackInSlot(0); - if(stack == null || burning) + if(stack.isEmpty() || burning) return; burning = true; @@ -119,22 +121,24 @@ public class TileIncensePlate extends TileSimpleInventory { } public boolean acceptsItem(ItemStack stack) { - return stack != null && stack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack) != BotaniaAPI.fallbackBrew; + return !stack.isEmpty() && stack.getItem() == ModItems.incenseStick && ((ItemIncenseStick) ModItems.incenseStick).getBrew(stack) != BotaniaAPI.fallbackBrew; } @Override protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { if(acceptsItem(stack)) return super.insertItem(slot, stack, simulate); else return stack; } + @Nonnull @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { - return null; + return ItemStack.EMPTY; } }; } @@ -142,7 +146,7 @@ public class TileIncensePlate extends TileSimpleInventory { @Override public void markDirty() { super.markDirty(); - if(!worldObj.isRemote) + if(!world.isRemote) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java index 751b886b8..f840a6182 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileLightRelay.java @@ -56,11 +56,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { public void mountEntity(Entity e) { BlockPos nextDest = getNextDestination(); - if(e.isRiding() || worldObj.isRemote || nextDest == null || !isValidBinding()) + if(e.isRiding() || world.isRemote || nextDest == null || !isValidBinding()) return; - EntityPlayerMover mover = new EntityPlayerMover(worldObj, pos, nextDest); - worldObj.spawnEntityInWorld(mover); + EntityPlayerMover mover = new EntityPlayerMover(world, pos, nextDest); + world.spawnEntity(mover); e.startRiding(mover); if(!(e instanceof EntityItem)) { mover.playSound(BotaniaSoundEvents.lightRelay, 0.2F, (float) Math.random() * 0.3F + 0.7F); @@ -75,7 +75,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos nextDest = getNextDestination(); if(nextDest != null && nextDest.getY() > -1 && isValidBinding()) { - if(worldObj.isRemote) { + if(world.isRemote) { Vector3 vec = getMovementVector(); if(vec != null) { double dist = 0.1; @@ -102,9 +102,9 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos endpoint = getEndpoint(); if(endpoint != null) { - AxisAlignedBB aabb = ModBlocks.lightRelay.getBoundingBox(worldObj.getBlockState(pos), worldObj, pos).offset(pos); + AxisAlignedBB aabb = ModBlocks.lightRelay.getBoundingBox(world.getBlockState(pos), world, pos).offset(pos); float range = 0.5F; - List enderPearls = worldObj.getEntitiesWithinAABB(EntityEnderPearl.class, aabb.expandXyz(range)); + List enderPearls = world.getEntitiesWithinAABB(EntityEnderPearl.class, aabb.expandXyz(range)); for(EntityEnderPearl pearl : enderPearls) { pearl.setPositionAndUpdate( endpoint.getX() + pearl.posX - pos.getX(), @@ -122,7 +122,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { if(nextDest == null) return false; - Block block = worldObj.getBlockState(nextDest).getBlock(); + Block block = world.getBlockState(nextDest).getBlock(); return block == ModBlocks.lightRelay; } @@ -142,7 +142,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { if(coords == null) return lastCoords; - TileEntity tile = worldObj.getTileEntity(coords); + TileEntity tile = world.getTileEntity(coords); if(tile != null && tile instanceof TileLightRelay) relay = (TileLightRelay) tile; else return lastCoords; @@ -167,7 +167,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { } public BlockPos getNextDestination() { - IBlockState state = worldObj.getBlockState(pos); + IBlockState state = world.getBlockState(pos); if(state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.TOGGLE && state.getValue(BotaniaStateProps.POWERED)) return null; else if(state.getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.FORK) { @@ -175,7 +175,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { for(int i = -2; i < 3; i++) { BlockPos testPos = pos.add(0, i, 0); - IBlockState testState = worldObj.getBlockState(testPos); + IBlockState testState = world.getBlockState(testPos); if(testState.getBlock() == ModBlocks.animatedTorch) { torchPos = testPos; break; @@ -183,11 +183,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { } if(torchPos != null) { - TileAnimatedTorch torch = (TileAnimatedTorch) worldObj.getTileEntity(torchPos); + TileAnimatedTorch torch = (TileAnimatedTorch) world.getTileEntity(torchPos); EnumFacing side = TileAnimatedTorch.SIDES[torch.side].getOpposite(); for(int i = 1; i < MAX_DIST; i++) { BlockPos testPos = pos.offset(side, i); - IBlockState testState = worldObj.getBlockState(testPos); + IBlockState testState = world.getBlockState(testPos); if(testState.getBlock() == ModBlocks.lightRelay) return testPos; } @@ -204,7 +204,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { @Override public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) { - if(player.worldObj.getBlockState(pos).getBlock() != ModBlocks.lightRelay || pos.distanceSq(getPos()) > MAX_DIST * MAX_DIST) + if(player.world.getBlockState(pos).getBlock() != ModBlocks.lightRelay || pos.distanceSq(getPos()) > MAX_DIST * MAX_DIST) return false; bindPos = pos; @@ -256,7 +256,7 @@ public class TileLightRelay extends TileMod implements IWandBindable { public void onUpdate() { super.onUpdate(); - if(getPassengers().isEmpty() && !worldObj.isRemote) { + if(getPassengers().isEmpty() && !world.isRemote) { setDead(); return; } @@ -269,11 +269,11 @@ public class TileLightRelay extends TileMod implements IWandBindable { BlockPos exitPos = getExitPos(); if(pos.equals(exitPos)) { - TileEntity tile = worldObj.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileLightRelay) { - if(worldObj.getBlockState(pos).getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR) { - worldObj.setBlockState(pos, worldObj.getBlockState(pos).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); - worldObj.scheduleUpdate(pos, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); + if(world.getBlockState(pos).getValue(BotaniaStateProps.LUMINIZER_VARIANT) == LuminizerVariant.DETECTOR) { + world.setBlockState(pos, world.getBlockState(pos).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + world.scheduleUpdate(pos, tile.getBlockType(), tile.getBlockType().tickRate(world)); } TileLightRelay relay = (TileLightRelay) tile; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java index 2bc859ada..ac611d730 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileManaFlame.java @@ -32,7 +32,7 @@ public class TileManaFlame extends TileMod { public void update() { float c = 0.3F; - if(worldObj.isRemote && Math.random() < c) { + if(world.isRemote && Math.random() < c) { float v = 0.1F; float r = (float) (color >> 16 & 0xFF) / 0xFF; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java index 7bd995f85..7fdb36038 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileOpenCrate.java @@ -42,12 +42,12 @@ public class TileOpenCrate extends TileSimpleInventory { @Override public void update() { - if (worldObj.isRemote) + if (world.isRemote) return; boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); + int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { redstone = true; break; @@ -56,19 +56,19 @@ public class TileOpenCrate extends TileSimpleInventory { if(canEject()) { ItemStack stack = itemHandler.getStackInSlot(0); - if(stack != null) + if(!stack.isEmpty()) eject(stack, redstone); } } public boolean canEject() { - IBlockState stateBelow = worldObj.getBlockState(pos.down()); + IBlockState stateBelow = world.getBlockState(pos.down()); Block blockBelow = stateBelow.getBlock(); - return blockBelow.isAir(stateBelow, worldObj, pos.down()) || stateBelow.getCollisionBoundingBox(worldObj, pos.down()) == null; + return blockBelow.isAir(stateBelow, world, pos.down()) || stateBelow.getCollisionBoundingBox(world, pos.down()) == null; } public void eject(ItemStack stack, boolean redstone) { - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() - 0.5, pos.getZ() + 0.5, stack); + EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() - 0.5, pos.getZ() + 0.5, stack); item.motionX = 0; item.motionY = 0; item.motionZ = 0; @@ -80,8 +80,8 @@ public class TileOpenCrate extends TileSimpleInventory { } - itemHandler.setStackInSlot(0, null); - worldObj.spawnEntityInWorld(item); + itemHandler.setStackInSlot(0, ItemStack.EMPTY); + world.spawnEntity(item); } public boolean onWanded(World world, EntityPlayer player, ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java index d93df2794..54d79cbcd 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePlatform.java @@ -36,7 +36,7 @@ public class TilePlatform extends TileCamo { void swapSurroudings(TilePlatform tile, boolean empty) { for(EnumFacing dir : EnumFacing.VALUES) { BlockPos pos = tile.getPos().offset(dir); - TileEntity tileAt = worldObj.getTileEntity(pos); + TileEntity tileAt = world.getTileEntity(pos); if(tileAt != null && tileAt instanceof TilePlatform) { TilePlatform platform = (TilePlatform) tileAt; if(empty ? platform.camoState != null : platform.camoState == null) @@ -47,7 +47,7 @@ public class TilePlatform extends TileCamo { void swap(TilePlatform tile, boolean empty) { tile.camoState = empty ? null : camoState; - worldObj.notifyBlockUpdate(tile.getPos(), worldObj.getBlockState(tile.getPos()), worldObj.getBlockState(tile.getPos()), 8); + world.notifyBlockUpdate(tile.getPos(), world.getBlockState(tile.getPos()), world.getBlockState(tile.getPos()), 8); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java index e31b9ebe9..62d4824e0 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TilePylon.java +++ b/src/main/java/vazkii/botania/common/block/tile/TilePylon.java @@ -34,14 +34,14 @@ public class TilePylon extends TileEntity implements ITickable { public void update() { ++ticks; - if(worldObj.getBlockState(getPos()).getBlock() != ModBlocks.pylon) + if(world.getBlockState(getPos()).getBlock() != ModBlocks.pylon) return; - PylonVariant variant = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); + PylonVariant variant = world.getBlockState(getPos()).getValue(BotaniaStateProps.PYLON_VARIANT); - if(activated && worldObj.isRemote) { - if(worldObj.getBlockState(centerPos).getBlock() != getBlockForMeta() - || variant == PylonVariant.NATURA && (portalOff() || worldObj.getBlockState(getPos().down()).getBlock() != ModBlocks.pool)) { + if(activated && world.isRemote) { + if(world.getBlockState(centerPos).getBlock() != getBlockForMeta() + || variant == PylonVariant.NATURA && (portalOff() || world.getBlockState(getPos().down()).getBlock() != ModBlocks.pool)) { activated = false; return; } @@ -63,21 +63,21 @@ public class TilePylon extends TileEntity implements ITickable { Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); Botania.proxy.wispFX(x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, -0.075F - (float) Math.random() * 0.015F); - if(worldObj.rand.nextInt(3) == 0) + if(world.rand.nextInt(3) == 0) Botania.proxy.wispFX(x, pos.getY() + 0.25, z, (float) Math.random() * 0.25F, 0.75F + (float) Math.random() * 0.25F, (float) Math.random() * 0.25F, 0.25F + (float) Math.random() * 0.1F, (float) movementVector.x, (float) movementVector.y, (float) movementVector.z); } } else { Vector3 ourCoords = Vector3.fromTileEntityCenter(this).add(0, 1 + (Math.random() - 0.5 * 0.25), 0); Vector3 movementVector = centerBlock.subtract(ourCoords).normalize().multiply(0.2); - Block block = worldObj.getBlockState(pos.down()).getBlock(); + Block block = world.getBlockState(pos.down()).getBlock(); if(block == ModBlocks.flower || block == ModBlocks.shinyFlower) { - int hex = worldObj.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; + int hex = world.getBlockState(pos.down()).getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; - if(worldObj.rand.nextInt(4) == 0) + if(world.rand.nextInt(4) == 0) Botania.proxy.sparkleFX(centerBlock.x + (Math.random() - 0.5) * 0.5, centerBlock.y, centerBlock.z + (Math.random() - 0.5) * 0.5, r / 255F, g / 255F, b / 255F, (float) Math.random(), 8); Botania.proxy.wispFX(pos.getX() + 0.5 + (Math.random() - 0.5) * 0.25, pos.getY() - 0.5, pos.getZ() + 0.5 + (Math.random() - 0.5) * 0.25, r / 255F, g / 255F, b / 255F, (float) Math.random() / 3F, -0.04F); @@ -87,17 +87,17 @@ public class TilePylon extends TileEntity implements ITickable { } } - if(worldObj.rand.nextBoolean() && worldObj.isRemote) + if(world.rand.nextBoolean() && world.isRemote) Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random() * 1.5, pos.getZ() + Math.random(), variant == PylonVariant.GAIA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 1F : 0.5F, variant == PylonVariant.NATURA ? 0.5F : 1F, (float) Math.random(), 2); } private Block getBlockForMeta() { - return worldObj.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; + return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? ModBlocks.enchanter : ModBlocks.alfPortal; } private boolean portalOff() { - return worldObj.getBlockState(centerPos).getBlock() != ModBlocks.alfPortal - || worldObj.getBlockState(centerPos).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF; + return world.getBlockState(centerPos).getBlock() != ModBlocks.alfPortal + || world.getBlockState(centerPos).getValue(BotaniaStateProps.ALFPORTAL_STATE) == AlfPortalState.OFF; } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java index 6337b26b6..f92861704 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileRuneAltar.java @@ -41,11 +41,15 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.network.PacketBotaniaEffect; +import vazkii.botania.common.network.PacketHandler; public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver { private static final String TAG_MANA = "mana"; private static final String TAG_MANA_TO_GET = "manaToGet"; + private static final int SET_KEEP_TICKS_EVENT = 0; + private static final int SET_COOLDOWN_EVENT = 1; RecipeRuneAltar currentRecipe; @@ -62,18 +66,14 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver return false; if(stack.getItem() == Item.getItemFromBlock(ModBlocks.livingrock) && stack.getItemDamage() == 0) { - if(player == null || !player.capabilities.isCreativeMode) { - stack.stackSize--; - if(stack.stackSize == 0 && player != null) - player.setHeldItem(hand, null); + if(!world.isRemote) { + ItemStack toSpawn = player != null && player.capabilities.isCreativeMode ? stack.copy().splitStack(1) : stack.splitStack(1); + EntityItem item = new EntityItem(world, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, toSpawn); + item.setPickupDelay(40); + item.motionX = item.motionY = item.motionZ = 0; + world.spawnEntity(item); } - EntityItem item = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1, getPos().getZ() + 0.5, new ItemStack(ModBlocks.livingrock)); - item.setPickupDelay(40); - item.motionX = item.motionY = item.motionZ = 0; - if(!worldObj.isRemote) - worldObj.spawnEntityInWorld(item); - return true; } @@ -83,74 +83,81 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver boolean did = false; for(int i = 0; i < getSizeInventory(); i++) - if(itemHandler.getStackInSlot(i) == null) { + if(itemHandler.getStackInSlot(i).isEmpty()) { did = true; ItemStack stackToAdd = stack.copy(); - stackToAdd.stackSize = 1; + stackToAdd.setCount(1); itemHandler.setStackInSlot(i, stackToAdd); if(player == null || !player.capabilities.isCreativeMode) { - stack.stackSize--; - if(stack.stackSize == 0 && player != null) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + stack.shrink(1); } break; } if(did) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); return true; } + @Override + public boolean receiveClientEvent(int id, int param) { + switch (id) { + case SET_KEEP_TICKS_EVENT: recipeKeepTicks = param; return true; + case SET_COOLDOWN_EVENT: cooldown = param; return true; + default: return super.receiveClientEvent(id, param); + } + } + @Override public void update() { // Update every tick. recieveMana(0); - if(!worldObj.isRemote && manaToGet == 0) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); - for(EntityItem item : items) - if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() != Item.getItemFromBlock(ModBlocks.livingrock)) { - ItemStack stack = item.getEntityItem(); - if(addItem(null, stack, null) && stack.stackSize == 0) - item.setDead(); - } - } + if(!world.isRemote) { + if(manaToGet == 0) { + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); + for(EntityItem item : items) + if(!item.isDead && !item.getEntityItem().isEmpty() && item.getEntityItem().getItem() != Item.getItemFromBlock(ModBlocks.livingrock)) { + ItemStack stack = item.getEntityItem(); + addItem(null, stack, null); + } + } + int newSignal = 0; + if(manaToGet > 0) { + newSignal++; + if(mana >= manaToGet) + newSignal++; + } - if(worldObj.isRemote && manaToGet > 0 && mana >= manaToGet) { - if(worldObj.rand.nextInt(20) == 0) { + if(newSignal != signal) { + signal = newSignal; + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); + } + + updateRecipe(); + } else { + if (manaToGet > 0 && mana >= manaToGet && world.rand.nextInt(20) == 0) { Vector3 vec = Vector3.fromTileEntityCenter(this); Vector3 endVec = vec.add(0, 2.5, 0); Botania.proxy.lightningFX(vec, endVec, 2F, 0x00948B, 0x00E4D7); } + + if (cooldown > 0) + Botania.proxy.wispFX(pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); } if(cooldown > 0) { cooldown--; - Botania.proxy.wispFX(pos.getX() + Math.random(), pos.getY() + 0.8, pos.getZ() + Math.random(), 0.2F, 0.2F, 0.2F, 0.2F, -0.025F); - } - - int newSignal = 0; - if(manaToGet > 0) { - newSignal++; - if(mana >= manaToGet) - newSignal++; - } - - if(newSignal != signal) { - signal = newSignal; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); } if(recipeKeepTicks > 0) --recipeKeepTicks; else lastRecipe = null; - - updateRecipe(); } public void updateRecipe() { @@ -170,8 +177,8 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } if(manaToGet != this.manaToGet) { - worldObj.playSound(null, pos, BotaniaSoundEvents.runeAltarStart, SoundCategory.BLOCKS, 1, 1); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + world.playSound(null, pos, BotaniaSoundEvents.runeAltarStart, SoundCategory.BLOCKS, 1, 1); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } @@ -179,17 +186,17 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver lastRecipe = new ArrayList<>(); for(int i = 0; i < getSizeInventory(); i++) { ItemStack stack = itemHandler.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; lastRecipe.add(stack.copy()); } - recipeKeepTicks = 400; + world.addBlockEvent(getPos(), ModBlocks.runeAltar, SET_KEEP_TICKS_EVENT, 400); } public void trySetLastRecipe(EntityPlayer player) { TileAltar.tryToSetLastRecipe(player, itemHandler, lastRecipe); if(!isEmpty()) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } public boolean hasValidRecipe() { @@ -201,6 +208,9 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } public void onWanded(EntityPlayer player, ItemStack wand) { + if (world.isRemote) + return; + RecipeRuneAltar recipe = null; if(currentRecipe != null) @@ -213,10 +223,10 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver } if(manaToGet > 0 && mana >= manaToGet) { - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); EntityItem livingrock = null; for(EntityItem item : items) - if(!item.isDead && item.getEntityItem() != null && item.getEntityItem().getItem() == Item.getItemFromBlock(ModBlocks.livingrock)) { + if(!item.isDead && !item.getEntityItem().isEmpty() && item.getEntityItem().getItem() == Item.getItemFromBlock(ModBlocks.livingrock)) { livingrock = item; break; } @@ -224,52 +234,41 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver if(livingrock != null) { int mana = recipe.getManaUsage(); recieveMana(-mana); - if(!worldObj.isRemote) { - ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); - worldObj.spawnEntityInWorld(outputItem); - currentRecipe = null; - cooldown = 60; - } + ItemStack output = recipe.getOutput().copy(); + EntityItem outputItem = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); + world.spawnEntity(outputItem); + currentRecipe = null; + world.addBlockEvent(getPos(), ModBlocks.runeAltar, SET_COOLDOWN_EVENT, 60); saveLastRecipe(); - if(!worldObj.isRemote) { - for(int i = 0; i < getSizeInventory(); i++) { - ItemStack stack = itemHandler.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() == ModItems.rune && (player == null || !player.capabilities.isCreativeMode)) { - EntityItem outputItem = new EntityItem(worldObj, getPos().getX() + 0.5, getPos().getY() + 1.5, getPos().getZ() + 0.5, stack.copy()); - worldObj.spawnEntityInWorld(outputItem); - } - - itemHandler.setStackInSlot(i, null); + for(int i = 0; i < getSizeInventory(); i++) { + ItemStack stack = itemHandler.getStackInSlot(i); + if(!stack.isEmpty()) { + if(stack.getItem() == ModItems.rune && (player == null || !player.capabilities.isCreativeMode)) { + EntityItem outputRune = new EntityItem(world, getPos().getX() + 0.5, getPos().getY() + 1.5, getPos().getZ() + 0.5, stack.copy()); + world.spawnEntity(outputRune); } - } - ItemStack livingrockItem = livingrock.getEntityItem(); - livingrockItem.stackSize--; - if(livingrockItem.stackSize == 0) - livingrock.setDead(); + itemHandler.setStackInSlot(i, ItemStack.EMPTY); + } } + livingrock.getEntityItem().shrink(1); + craftingFanciness(); } } } public void craftingFanciness() { - worldObj.playSound(null, pos, BotaniaSoundEvents.runeAltarCraft, SoundCategory.BLOCKS, 1, 1); - for(int i = 0; i < 25; i++) { - float red = (float) Math.random(); - float green = (float) Math.random(); - float blue = (float) Math.random(); - Botania.proxy.sparkleFX(pos.getX() + 0.5 + Math.random() * 0.4 - 0.2, pos.getY() + 1, pos.getZ() + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); - } + world.playSound(null, pos, BotaniaSoundEvents.runeAltarCraft, SoundCategory.BLOCKS, 1, 1); + PacketHandler.sendToNearby(world, getPos(), + new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.RUNE_CRAFT, getPos().getX(), getPos().getY(), getPos().getZ())); } public boolean isEmpty() { for(int i = 0; i < getSizeInventory(); i++) - if(itemHandler.getStackInSlot(i) != null) + if(!itemHandler.getStackInSlot(i).isEmpty()) return false; return true; @@ -306,7 +305,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, false) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } }; @@ -340,7 +339,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver int radius = 24; int amt = 0; for(int i = 0; i < getSizeInventory(); i++) { - if(itemHandler.getStackInSlot(i) == null) + if(itemHandler.getStackInSlot(i).isEmpty()) break; amt++; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java index 4417dc316..bb38319f6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSimpleInventory.java @@ -46,13 +46,12 @@ public abstract class TileSimpleInventory extends TileMod { } @Override - public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, EnumFacing side) { return cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY || super.hasCapability(cap, side); } - @Nonnull @Override - public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public T getCapability(@Nonnull Capability cap, EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(itemHandler); return super.getCapability(cap, side); @@ -71,18 +70,20 @@ public abstract class TileSimpleInventory extends TileMod { tile = inv; } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { if(allowWrite) { return super.insertItem(slot, stack, simulate); } else return stack; } + @Nonnull @Override public ItemStack extractItem(int slot, int amount, boolean simulate) { if(allowWrite) { return super.extractItem(slot, amount, simulate); - } else return null; + } else return ItemStack.EMPTY; } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java index 5d62ad505..3139759fa 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSparkChanger.java @@ -23,22 +23,24 @@ import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkUpgradeType; import vazkii.botania.common.item.ModItems; +import javax.annotation.Nonnull; + public class TileSparkChanger extends TileSimpleInventory { public void doSwap() { - if(worldObj.isRemote) + if(world.isRemote) return; ItemStack changeStack = itemHandler.getStackInSlot(0); List attachables = new ArrayList<>(); for(EnumFacing dir : EnumFacing.HORIZONTALS) { - TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); + TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; ISparkEntity spark = attach.getAttachedSpark(); if(spark != null) { SparkUpgradeType upg = spark.getUpgrade(); - SparkUpgradeType newUpg = changeStack == null ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; + SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; if(upg != newUpg) attachables.add(attach); } @@ -46,17 +48,17 @@ public class TileSparkChanger extends TileSimpleInventory { } if(attachables.size() > 0) { - ISparkAttachable attach = attachables.get(worldObj.rand.nextInt(attachables.size())); + ISparkAttachable attach = attachables.get(world.rand.nextInt(attachables.size())); ISparkEntity spark = attach.getAttachedSpark(); SparkUpgradeType upg = spark.getUpgrade(); - ItemStack sparkStack = upg == SparkUpgradeType.NONE ? null : new ItemStack(ModItems.sparkUpgrade, 1, upg.ordinal() - 1); - SparkUpgradeType newUpg = changeStack == null ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; + ItemStack sparkStack = upg == SparkUpgradeType.NONE ? ItemStack.EMPTY : new ItemStack(ModItems.sparkUpgrade, 1, upg.ordinal() - 1); + SparkUpgradeType newUpg = changeStack.isEmpty() ? SparkUpgradeType.NONE : SparkUpgradeType.values()[changeStack.getItemDamage() + 1]; spark.setUpgrade(newUpg); Collection transfers = spark.getTransfers(); if(transfers != null) transfers.clear(); itemHandler.setStackInSlot(0, sparkStack); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); markDirty(); } } @@ -70,13 +72,14 @@ public class TileSparkChanger extends TileSimpleInventory { protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if(stack != null && stack.getItem() == ModItems.sparkUpgrade) + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if(!stack.isEmpty() && stack.getItem() == ModItems.sparkUpgrade) return super.insertItem(slot, stack, simulate); else return stack; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java index 3a6912c61..d1f830627 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpawnerClaw.java @@ -37,7 +37,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { @Override public void update() { - TileEntity tileBelow = worldObj.getTileEntity(pos.down()); + TileEntity tileBelow = world.getTileEntity(pos.down()); if(mana >= 5 && tileBelow instanceof TileEntityMobSpawner) { TileEntityMobSpawner spawner = (TileEntityMobSpawner) tileBelow; MobSpawnerBaseLogic logic = spawner.getSpawnerBaseLogic(); @@ -45,7 +45,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver { try { // Directly drawn from MobSpawnerBaseLogic, with inverted isActivated check and mana consumption if(!((boolean) MethodHandles.isActivated.invokeExact(logic))) { - if(!worldObj.isRemote) + if(!world.isRemote) mana -= 6; if(logic.getSpawnerWorld().isRemote) { diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java index f2dd5eb49..4774dee89 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpecialFlower.java @@ -76,7 +76,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil @Override public void update() { if(subTile != null) { - TileEntity tileBelow = worldObj.getTileEntity(pos.down()); + TileEntity tileBelow = world.getTileEntity(pos.down()); if(tileBelow instanceof TileRedStringRelay) { BlockPos coords = ((TileRedStringRelay) tileBelow).getBinding(); if(coords != null) { @@ -104,7 +104,7 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil } public boolean isOnSpecialSoil() { - return worldObj.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil; + return world.getBlockState(pos.down()).getBlock() == ModBlocks.enchantedSoil; } @Override @@ -146,8 +146,8 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil subTile.onBlockPlacedBy(world, pos, state, entity, stack); } - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing side, float hitX, float hitY, float hitZ) { - return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, hand, stack, side, hitX, hitY, hitZ); + public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + return subTile == null ? false : subTile.onBlockActivated(world, pos, state, player, hand, side, hitX, hitY, hitZ); } public void onBlockAdded(World world, BlockPos pos, IBlockState state) { @@ -214,12 +214,12 @@ public class TileSpecialFlower extends TileMod implements IWandBindable, ISubTil @Override public int getSlowdownFactor() { - Block below = worldObj.getBlockState(getPos().down()).getBlock(); + Block below = world.getBlockState(getPos().down()).getBlock(); if(below == Blocks.MYCELIUM) return SLOWDOWN_FACTOR_MYCEL; if(below == Blocks.DIRT) { - BlockDirt.DirtType type = worldObj.getBlockState(getPos().down()).getValue(BlockDirt.VARIANT); + BlockDirt.DirtType type = world.getBlockState(getPos().down()).getValue(BlockDirt.VARIANT); if(type == BlockDirt.DirtType.PODZOL) return SLOWDOWN_FACTOR_PODZOL; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java index 650c4762b..c2ef014a1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileSpiritShrine.java @@ -18,7 +18,7 @@ public class TileSpiritShrine extends TileMod { @Override public void update() { - if(worldObj.isRemote) { + if(world.isRemote) { if(ticks >= 40) { float[][] colors = new float[][] { { 0F, 0.25F, 1F }, diff --git a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java index 14dcc1971..dae6a8b43 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileStarfield.java @@ -17,11 +17,11 @@ public class TileStarfield extends TileMod { @Override public void update() { - boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); - if(!worldObj.isRemote) { - boolean newState = !worldObj.isDaytime(); + boolean state = world.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + if(!world.isRemote) { + boolean newState = !world.isDaytime(); if(newState != state) { - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, newState), 1 | 2); + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, newState), 1 | 2); state = newState; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java index 034f9577a..613011515 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTerraPlate.java @@ -73,7 +73,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public void update() { - if(worldObj.isRemote) + if(world.isRemote) return; boolean removeMana = true; @@ -84,7 +84,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { removeMana = false; ISparkEntity spark = getAttachedSpark(); if(spark != null) { - List sparkEntities = SparkHelper.getSparksAround(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + List sparkEntities = SparkHelper.getSparksAround(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); for(ISparkEntity otherSpark : sparkEntities) { if(spark == otherSpark) continue; @@ -94,8 +94,8 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } } if(mana > 0) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); - PacketHandler.sendToNearby(worldObj, getPos(), + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); + PacketHandler.sendToNearby(world, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.TERRA_PLATE, getPos().getX(), getPos().getY(), getPos().getZ())); } @@ -105,10 +105,10 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { if(otherItem != item) otherItem.setDead(); else item.setEntityItemStack(new ItemStack(ModItems.manaResource, 1, 4)); - worldObj.playSound(null, item.posX, item.posY, item.posZ, BotaniaSoundEvents.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); + world.playSound(null, item.posX, item.posY, item.posZ, BotaniaSoundEvents.terrasteelCraft, SoundCategory.BLOCKS, 1, 1); mana = 0; - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } } @@ -118,19 +118,19 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } List getItems() { - return worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); + return world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); } boolean areItemsValid(List items) { if(items.size() != 3) return false; - ItemStack ingot = null; - ItemStack pearl = null; - ItemStack diamond = null; + ItemStack ingot = ItemStack.EMPTY; + ItemStack pearl = ItemStack.EMPTY; + ItemStack diamond = ItemStack.EMPTY; for(EntityItem item : items) { ItemStack stack = item.getEntityItem(); - if(stack.getItem() != ModItems.manaResource || stack.stackSize != 1) + if(stack.getItem() != ModItems.manaResource || stack.getCount() != 1) return false; int meta = stack.getItemDamage(); @@ -143,7 +143,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { else return false; } - return ingot != null && pearl != null && diamond != null; + return !ingot.isEmpty() && !pearl.isEmpty() && !diamond.isEmpty(); } boolean hasValidPlatform() { @@ -160,7 +160,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { } boolean checkPlatform(int xOff, int zOff, Block block) { - return worldObj.getBlockState(pos.add(xOff, -1, zOff)).getBlock() == block; + return world.getBlockState(pos.add(xOff, -1, zOff)).getBlock() == block; } @Override @@ -186,7 +186,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public void recieveMana(int mana) { this.mana = Math.max(0, Math.min(MAX_MANA, this.mana + mana)); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } @Override @@ -204,7 +204,7 @@ public class TileTerraPlate extends TileMod implements ISparkAttachable { @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); + List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { Entity e = sparks.get(0); return (ISparkEntity) e; diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java index e4f0bfc2d..c8fbe428a 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTeruTeruBozu.java @@ -18,17 +18,17 @@ public class TileTeruTeruBozu extends TileMod { @Override public void update() { - if (worldObj.isRemote) + if (world.isRemote) return; - boolean isRaining = worldObj.isRaining(); - if(isRaining && worldObj.rand.nextInt(9600) == 0) { - worldObj.getWorldInfo().setRaining(false); - resetRainTime(worldObj); + boolean isRaining = world.isRaining(); + if(isRaining && world.rand.nextInt(9600) == 0) { + world.getWorldInfo().setRaining(false); + resetRainTime(world); } if(wasRaining != isRaining) - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); wasRaining = isRaining; } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java index 23b1731a0..a6e0f23f9 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPlanet.java @@ -16,7 +16,7 @@ public class TileTinyPlanet extends TileMod { @Override public void update() { - ItemTinyPlanet.applyEffect(worldObj, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); + ItemTinyPlanet.applyEffect(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java index 58835d541..590ea77c1 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileTinyPotato.java @@ -18,6 +18,7 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextComponentString; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.block.ModBlocks; @@ -33,19 +34,16 @@ public class TileTinyPotato extends TileSimpleInventory { int index = side.getIndex(); if(index >= 0) { ItemStack stackAt = getItemHandler().getStackInSlot(index); - if(stackAt != null && stack == null) { + if(!stackAt.isEmpty() && stack.isEmpty()) { player.setHeldItem(hand, stackAt); - getItemHandler().setStackInSlot(index, null); - } else if(stack != null) { - ItemStack copy = stack.copy(); - copy.stackSize = 1; - stack.stackSize--; + getItemHandler().setStackInSlot(index, ItemStack.EMPTY); + } else if(!stack.isEmpty()) { + ItemStack copy = stack.splitStack(1); - if(stack.stackSize == 0) + if(stack.isEmpty()) player.setHeldItem(hand, stackAt); - else if(stackAt != null) { - if(!player.inventory.addItemStackToInventory(stackAt)) - player.dropItem(stackAt, false); + else if(!stackAt.isEmpty()) { + ItemHandlerHelper.giveItemToPlayer(player, stackAt); } getItemHandler().setStackInSlot(index, copy); @@ -54,16 +52,16 @@ public class TileTinyPotato extends TileSimpleInventory { jump(); - if(!worldObj.isRemote) { + if(!world.isRemote) { if(name.toLowerCase().trim().endsWith("shia labeouf") && nextDoIt == 0) { nextDoIt = 40; - worldObj.playSound(null, pos, BotaniaSoundEvents.doit, SoundCategory.BLOCKS, 1F, 1F); + world.playSound(null, pos, BotaniaSoundEvents.doit, SoundCategory.BLOCKS, 1F, 1F); } for(int i = 0; i < getSizeInventory(); i++) { ItemStack stackAt = getItemHandler().getStackInSlot(i); - if(stackAt != null && stackAt.getItem() == Item.getItemFromBlock(ModBlocks.tinyPotato)) { - player.addChatComponentMessage(new TextComponentString("Don't talk to me or my son ever again.")); + if(!stackAt.isEmpty() && stackAt.getItem() == Item.getItemFromBlock(ModBlocks.tinyPotato)) { + player.sendMessage(new TextComponentString("Don't talk to me or my son ever again.")); return; } } @@ -77,7 +75,7 @@ public class TileTinyPotato extends TileSimpleInventory { @Override public void update() { - if(worldObj.rand.nextInt(100) == 0) + if(world.rand.nextInt(100) == 0) jump(); if(jumpTicks > 0) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java index 303823611..46ed829f7 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaBase.java @@ -17,7 +17,7 @@ import vazkii.botania.common.block.tile.TileSimpleInventory; public abstract class TileCorporeaBase extends TileSimpleInventory { public ICorporeaSpark getSpark() { - return CorporeaHelper.getSparkForBlock(worldObj, getPos()); + return CorporeaHelper.getSparkForBlock(world, getPos()); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java index 267f04f80..de59bcd3f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaCrystalCube.java @@ -39,7 +39,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor private static final double LOG_2 = Math.log(2); - ItemStack requestTarget; + ItemStack requestTarget = ItemStack.EMPTY; int itemCount = 0; int ticks = 0; public int compValue = 0; @@ -62,12 +62,12 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } public void setRequestTarget(ItemStack stack) { - if(stack != null) { + if(!stack.isEmpty()) { ItemStack copy = stack.copy(); - copy.stackSize = 1; + copy.setCount(1); requestTarget = copy; updateCount(); - if(!worldObj.isRemote) + if(!world.isRemote) VanillaPacketDispatcher.dispatchTEToNearbyPlayers(this); } @@ -82,7 +82,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } public void doRequest(boolean fullStack) { - if(worldObj.isRemote) + if(world.isRemote) return; ICorporeaSpark spark = getSpark(); @@ -93,7 +93,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } private void updateCount() { - if(worldObj.isRemote) + if(world.isRemote) return; int oldCount = itemCount; @@ -102,7 +102,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor if(spark != null && spark.getMaster() != null && requestTarget != null) { List stacks = CorporeaHelper.requestItem(requestTarget, -1, spark, true, false); for(ItemStack stack : stacks) - itemCount += stack.stackSize; + itemCount += stack.getCount(); } if(itemCount != oldCount) { @@ -113,15 +113,15 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor private void onUpdateCount() { compValue = getComparatorValue(); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } @Override public void writePacketNBT(NBTTagCompound par1nbtTagCompound) { super.writePacketNBT(par1nbtTagCompound); NBTTagCompound cmp = new NBTTagCompound(); - if(requestTarget != null) - requestTarget.writeToNBT(cmp); + if(!requestTarget.isEmpty()) + cmp = requestTarget.writeToNBT(cmp); par1nbtTagCompound.setTag(TAG_REQUEST_TARGET, cmp); par1nbtTagCompound.setInteger(TAG_ITEM_COUNT, itemCount); } @@ -130,7 +130,7 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor public void readPacketNBT(NBTTagCompound par1nbtTagCompound) { super.readPacketNBT(par1nbtTagCompound); NBTTagCompound cmp = par1nbtTagCompound.getCompoundTag(TAG_REQUEST_TARGET); - requestTarget = ItemStack.loadItemStackFromNBT(cmp); + requestTarget = new ItemStack(cmp); itemCount = par1nbtTagCompound.getInteger(TAG_ITEM_COUNT); } @@ -160,9 +160,9 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor boolean did = false; for(ItemStack reqStack : stacks) if(requestTarget != null) { - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); - worldObj.spawnEntityInWorld(item); - itemCount -= reqStack.stackSize; + EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); + world.spawnEntity(item); + itemCount -= reqStack.getCount(); did = true; } @@ -173,13 +173,12 @@ public class TileCorporeaCrystalCube extends TileCorporeaBase implements ICorpor } @Override - public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, EnumFacing side) { return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); } - @Nonnull @Override - public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public T getCapability(@Nonnull Capability cap, EnumFacing side) { if(cap == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } else return super.getCapability(cap, side); diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java index 6abdbb3e7..b4c840ebb 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaFunnel.java @@ -33,10 +33,10 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq if(spark != null && spark.getMaster() != null) { List filter = getFilter(); if(!filter.isEmpty()) { - ItemStack stack = filter.get(worldObj.rand.nextInt(filter.size())); + ItemStack stack = filter.get(world.rand.nextInt(filter.size())); - if(stack != null) - doCorporeaRequest(stack, stack.stackSize, spark); + if(!stack.isEmpty()) + doCorporeaRequest(stack, stack.getCount(), spark); } } } @@ -49,14 +49,14 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq }; for(EnumFacing dir : EnumFacing.HORIZONTALS) { - List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); + List frames = world.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); for(EntityItemFrame frame : frames) { EnumFacing orientation = frame.facingDirection; if(orientation == dir) { ItemStack stack = frame.getDisplayedItem(); - if(stack != null) { + if(!stack.isEmpty()) { ItemStack copy = stack.copy(); - copy.stackSize = rotationToStackSize[frame.getRotation()]; + copy.setCount(rotationToStackSize[frame.getRotation()]); filter.add(copy); } } @@ -86,27 +86,27 @@ public class TileCorporeaFunnel extends TileCorporeaBase implements ICorporeaReq List stacks = CorporeaHelper.requestItem(request, count, spark, true, true); spark.onItemsRequested(stacks); for(ItemStack reqStack : stacks) { - if(inv != null && ItemHandlerHelper.insertItemStacked(inv, reqStack, true) == null) + if(inv != null && ItemHandlerHelper.insertItemStacked(inv, reqStack, true).isEmpty()) ItemHandlerHelper.insertItemStacked(inv, reqStack, false); else { - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); - worldObj.spawnEntityInWorld(item); + EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, reqStack); + world.spawnEntity(item); } } } private IItemHandler getInv() { - TileEntity te = worldObj.getTileEntity(pos.down()); - IItemHandler ret = InventoryHelper.getInventory(worldObj, pos.down(), EnumFacing.UP); + TileEntity te = world.getTileEntity(pos.down()); + IItemHandler ret = InventoryHelper.getInventory(world, pos.down(), EnumFacing.UP); if(ret == null) - ret = InventoryHelper.getInventory(worldObj, pos.down(), null); + ret = InventoryHelper.getInventory(world, pos.down(), null); if(ret != null && !(te instanceof TileCorporeaFunnel)) return ret; - te = worldObj.getTileEntity(pos.down(2)); - ret = InventoryHelper.getInventory(worldObj, pos.down(2), EnumFacing.UP); + te = world.getTileEntity(pos.down(2)); + ret = InventoryHelper.getInventory(world, pos.down(2), EnumFacing.UP); if(ret == null) - ret = InventoryHelper.getInventory(worldObj, pos.down(2), null); + ret = InventoryHelper.getInventory(world, pos.down(2), null); if(ret != null && !(te instanceof TileCorporeaFunnel)) return ret; diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java index d8f1d7c5d..487488c52 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaIndex.java @@ -154,7 +154,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ double y = pos.getY() + 0.5; double z = pos.getZ() + 0.5; - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(x - RADIUS, y - RADIUS, z - RADIUS, x + RADIUS, y + RADIUS, z + RADIUS)); + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(x - RADIUS, y - RADIUS, z - RADIUS, x + RADIUS, y + RADIUS, z + RADIUS)); hasCloseby = false; for(EntityPlayer player : players) if(isInRangeOfIndex(player, this)) { @@ -200,14 +200,14 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ List stacks = CorporeaHelper.requestItem((String) request, count, spark, true); spark.onItemsRequested(stacks); for(ItemStack stack : stacks) - if(stack != null) { - EntityItem item = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); - worldObj.spawnEntityInWorld(item); + if(!stack.isEmpty()) { + EntityItem item = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, stack); + world.spawnEntity(item); } } public static boolean isInRangeOfIndex(EntityPlayer player, TileCorporeaIndex index) { - return player.worldObj.provider.getDimension() == index.worldObj.provider.getDimension() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.posX, player.posZ) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.posY + (player.worldObj.isRemote ? 0 : 1.6)) < 5; + return player.world.provider.getDimension() == index.world.provider.getDimension() && MathHelper.pointDistancePlane(index.getPos().getX() + 0.5, index.getPos().getZ() + 0.5, player.posX, player.posZ) < RADIUS && Math.abs(index.getPos().getY() + 0.5 - player.posY + (player.world.isRemote ? 0 : 1.6)) < 5; } public static void addPattern(String pattern, IRegexStacker stacker) { @@ -241,7 +241,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ if(!nearbyIndexes.isEmpty()) { String msg = event.getMessage().toLowerCase().trim(); for(TileCorporeaIndex index : nearbyIndexes) { - if(index.worldObj.isRemote) + if(index.world.isRemote) continue; ICorporeaSpark spark = index.getSpark(); @@ -260,13 +260,13 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ if(name.equals("this")) { ItemStack stack = event.getPlayer().getHeldItemMainhand(); - if(stack != null) + if(!stack.isEmpty()) name = stack.getDisplayName().toLowerCase().trim(); } index.doCorporeaRequest(name, count, spark); - event.getPlayer().addChatMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + event.getPlayer().sendMessage(new TextComponentTranslation("botaniamisc.requestMsg", count, WordUtils.capitalizeFully(name), CorporeaHelper.lastRequestMatches, CorporeaHelper.lastRequestExtractions).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); if(CorporeaHelper.lastRequestExtractions >= 50000) event.getPlayer().addStat(ModAchievements.superCorporeaRequest, 1); } @@ -279,7 +279,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ public static List getNearbyIndexes(EntityPlayer player) { List indexList = new ArrayList<>(); for(TileCorporeaIndex index : indexes) - if(isInRangeOfIndex(player, index) && index.worldObj.isRemote == player.worldObj.isRemote) + if(isInRangeOfIndex(player, index) && index.world.isRemote == player.world.isRemote) indexList.add(index); return indexList; } @@ -287,7 +287,7 @@ public class TileCorporeaIndex extends TileCorporeaBase implements ICorporeaRequ @Override @SideOnly(Side.CLIENT) public boolean shouldAutoComplete() { - return !getNearbyIndexes(Minecraft.getMinecraft().thePlayer).isEmpty(); + return !getNearbyIndexes(Minecraft.getMinecraft().player).isEmpty(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java index af7972e0e..0b7b15a98 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaInterceptor.java @@ -46,15 +46,15 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor if(requestMatches(request, stack)) { int missing = count; for(ItemStack stack_ : stacks) - missing -= stack_.stackSize; + missing -= stack_.getCount(); - if(missing > 0 && !worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)) { - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); - worldObj.scheduleUpdate(getPos(), getBlockType(), 2); + if(missing > 0 && !world.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED)) { + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, true), 1 | 2); + world.scheduleUpdate(getPos(), getBlockType(), 2); TileEntity requestor = source.getSparkInventory().world.getTileEntity(source.getSparkInventory().pos); for(EnumFacing dir : EnumFacing.HORIZONTALS) { - TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); + TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileCorporeaRetainer) ((TileCorporeaRetainer) tile).setPendingRequest(requestor.getPos(), request, count); } @@ -66,12 +66,12 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor } public boolean requestMatches(Object request, ItemStack filter) { - if(filter == null) + if(filter.isEmpty()) return false; if(request instanceof ItemStack) { ItemStack stack = (ItemStack) request; - return stack != null && stack.isItemEqual(filter) && ItemStack.areItemStackTagsEqual(filter, stack); + return !stack.isEmpty() && stack.isItemEqual(filter) && ItemStack.areItemStackTagsEqual(filter, stack); } String name = (String) request; @@ -82,7 +82,7 @@ public class TileCorporeaInterceptor extends TileCorporeaBase implements ICorpor List filter = new ArrayList<>(); for(EnumFacing dir : EnumFacing.HORIZONTALS) { - List frames = worldObj.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); + List frames = world.getEntitiesWithinAABB(EntityItemFrame.class, new AxisAlignedBB(pos.offset(dir), pos.offset(dir).add(1, 1, 1))); for(EntityItemFrame frame : frames) { EnumFacing orientation = frame.facingDirection; if(orientation == dir) diff --git a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java index 8b5bf8829..2d4998e1f 100644 --- a/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/corporea/TileCorporeaRetainer.java @@ -47,7 +47,7 @@ public class TileCorporeaRetainer extends TileMod { this.request = request; this.requestCount = requestCount; pendingRequest = true; - worldObj.updateComparatorOutputLevel(getPos(), worldObj.getBlockState(getPos()).getBlock()); + world.updateComparatorOutputLevel(getPos(), world.getBlockState(getPos()).getBlock()); } public boolean hasPendingRequest() { @@ -58,14 +58,14 @@ public class TileCorporeaRetainer extends TileMod { if(!hasPendingRequest()) return; - ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(worldObj, requestPos); + ICorporeaSpark spark = CorporeaHelper.getSparkForBlock(world, requestPos); if(spark != null) { InvWithLocation inv = spark.getSparkInventory(); if(inv != null && inv.world.getTileEntity(inv.pos) instanceof ICorporeaRequestor) { ICorporeaRequestor requestor = (ICorporeaRequestor) inv.world.getTileEntity(inv.pos); requestor.doCorporeaRequest(request, requestCount, spark); pendingRequest = false; - worldObj.updateComparatorOutputLevel(getPos(), worldObj.getBlockState(getPos()).getBlock()); + world.updateComparatorOutputLevel(getPos(), world.getBlockState(getPos()).getBlock()); } } } @@ -89,8 +89,7 @@ public class TileCorporeaRetainer extends TileMod { cmp.setString(TAG_REQUEST_CONTENTS, (String) request); break; case REQUEST_ITEMSTACK: - NBTTagCompound cmp1 = new NBTTagCompound(); - ((ItemStack) request).writeToNBT(cmp1); + NBTTagCompound cmp1 = ((ItemStack) request).writeToNBT(new NBTTagCompound()); cmp.setTag(TAG_REQUEST_STACK, cmp1); break; default: break; @@ -115,7 +114,7 @@ public class TileCorporeaRetainer extends TileMod { break; case REQUEST_ITEMSTACK: NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_REQUEST_STACK); - request = ItemStack.loadItemStackFromNBT(cmp1); + request = new ItemStack(cmp1); break; default: break; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java index 1c543d2e4..797a4fba5 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileBellows.java @@ -58,7 +58,7 @@ public class TileBellows extends TileMod { if(movePos < max && active && moving >= 0F) { if(moving == 0F) - worldObj.playSound(null, pos, BotaniaSoundEvents.bellows, SoundCategory.BLOCKS, 0.1F, 3F); + world.playSound(null, pos, BotaniaSoundEvents.bellows, SoundCategory.BLOCKS, 0.1F, 3F); if(tile instanceof TileEntityFurnace) { TileEntityFurnace furnace = (TileEntityFurnace) tile; @@ -67,32 +67,32 @@ public class TileBellows extends TileMod { furnace.setField(0, Math.max(0, furnace.getField(0) - 10)); // burnTime } - if(furnace.hasWorldObj() && furnace.getBlockType() == Blocks.LIT_FURNACE) { + if(furnace.hasWorld() && furnace.getBlockType() == Blocks.LIT_FURNACE) { // Copypasta from BlockFurnace - EnumFacing enumfacing = worldObj.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); + EnumFacing enumfacing = world.getBlockState(furnace.getPos()).getValue(BlockFurnace.FACING); double d0 = pos.getX() + 0.5D; - double d1 = pos.getY() + worldObj.rand.nextDouble() * 6.0D / 16.0D; + double d1 = pos.getY() + world.rand.nextDouble() * 6.0D / 16.0D; double d2 = pos.getZ() + 0.5D; double d3 = 0.52D; - double d4 = worldObj.rand.nextDouble() * 0.6D - 0.3D; + double d4 = world.rand.nextDouble() * 0.6D - 0.3D; switch (enumfacing) { case WEST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, d0 - d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case EAST: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, d0 + d3, d1, d2 + d4, 0.0D, 0.0D, 0.0D); break; case NORTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 - d3, 0.0D, 0.0D, 0.0D); break; case SOUTH: - worldObj.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); - worldObj.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.FLAME, d0 + d4, d1, d2 + d3, 0.0D, 0.0D, 0.0D); default: break; } } @@ -118,8 +118,8 @@ public class TileBellows extends TileMod { } public TileEntity getLinkedTile() { - EnumFacing side = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); - return worldObj.getTileEntity(getPos().offset(side)); + EnumFacing side = world.getBlockState(getPos()).getValue(BotaniaStateProps.CARDINALS); + return world.getTileEntity(getPos().offset(side)); } @Override @@ -133,11 +133,11 @@ public class TileBellows extends TileMod { } public void setActive(boolean active) { - if(!worldObj.isRemote) { + if(!world.isRemote) { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java index 6f8855365..54f099859 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileDistributor.java @@ -26,11 +26,11 @@ public class TileDistributor extends TileMod implements IManaReceiver { @Override public void update() { - if (worldObj.isRemote) + if (world.isRemote) return; validPools.clear(); for(EnumFacing dir : EnumFacing.HORIZONTALS) { - TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); + TileEntity tileAt = world.getTileEntity(pos.offset(dir)); if(tileAt != null && tileAt instanceof IManaPool && !tileAt.isInvalid()) { IManaReceiver receiver = (IManaReceiver) tileAt; if(!receiver.isFull()) @@ -57,7 +57,7 @@ public class TileDistributor extends TileMod implements IManaReceiver { for(IManaReceiver pool : validPools) { pool.recieveMana(manaForEach); TileEntity tile = (TileEntity) pool; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, tile.getPos()); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, tile.getPos()); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java index 70184a0f1..9f9d65bcf 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileManaDetector.java @@ -23,10 +23,10 @@ public class TileManaDetector extends TileMod { @Override public void update() { - boolean state = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); - boolean expectedState = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; - if(state != expectedState && !worldObj.isRemote) - worldObj.setBlockState(getPos(), worldObj.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); + boolean state = world.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + boolean expectedState = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos, pos.add(1, 1, 1)), Predicates.instanceOf(IManaBurst.class)).size() != 0; + if(state != expectedState && !world.isRemote) + world.setBlockState(getPos(), world.getBlockState(getPos()).withProperty(BotaniaStateProps.POWERED, expectedState), 1 | 2); if(expectedState) for(int i = 0; i < 4; i++) diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java index f4c951fcf..6f1fbb58e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePool.java @@ -118,14 +118,14 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public boolean isFull() { - Block blockBelow = worldObj.getBlockState(pos.down()).getBlock(); + Block blockBelow = world.getBlockState(pos.down()).getBlock(); return blockBelow != ModBlocks.manaVoid && getCurrentMana() >= manaCap; } @Override public void recieveMana(int mana) { this.mana = Math.max(0, Math.min(getCurrentMana() + mana, manaCap)); - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); markDispatchable(); } @@ -161,15 +161,13 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } public boolean collideEntityItem(EntityItem item) { - if(worldObj.isRemote || item.isDead) + if(world.isRemote || item.isDead) return false; ItemStack stack = item.getEntityItem(); if(stack.getItem() instanceof IManaDissolvable) { ((IManaDissolvable) stack.getItem()).onDissolveTick(this, stack, item); - if(stack.stackSize == 0) - item.setDead(); } int age; @@ -180,23 +178,21 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(age > 100 && age < 130) return false; - RecipeManaInfusion recipe = getMatchingRecipe(stack, worldObj.getBlockState(pos.down())); + RecipeManaInfusion recipe = getMatchingRecipe(stack, world.getBlockState(pos.down())); if(recipe != null) { int mana = recipe.getManaToConsume(); if(getCurrentMana() >= mana) { recieveMana(-mana); - stack.stackSize--; - if(stack.stackSize == 0) - item.setDead(); + stack.shrink(1); ItemStack output = recipe.getOutput().copy(); - EntityItem outputItem = new EntityItem(worldObj, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); + EntityItem outputItem = new EntityItem(world, pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5, output); try { MethodHandles.itemAge_setter.invokeExact(outputItem, 105); } catch (Throwable ignored) {} - worldObj.spawnEntityInWorld(outputItem); + world.spawnEntity(outputItem); craftingFanciness(); return true; @@ -208,23 +204,23 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt private void craftingFanciness() { if(soundTicks == 0) { - worldObj.playSound(null, pos, BotaniaSoundEvents.manaPoolCraft, SoundCategory.BLOCKS, 0.4F, 4F); + world.playSound(null, pos, BotaniaSoundEvents.manaPoolCraft, SoundCategory.BLOCKS, 0.4F, 4F); soundTicks = 6; } - PacketHandler.sendToNearby(worldObj, getPos(), + PacketHandler.sendToNearby(world, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CRAFT, pos.getX(), pos.getY(), pos.getZ())); } @Override public void update() { if(manaCap == -1) - manaCap = worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; + manaCap = world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.DILUTED ? MAX_MANA_DILLUTED : MAX_MANA; if(!ManaNetworkHandler.instance.isPoolIn(this) && !isInvalid()) ManaNetworkEvent.addPool(this); - if(worldObj.isRemote) { + if(world.isRemote) { double particleChance = 1F - (double) getCurrentMana() / (double) manaCap * 0.1; if(Math.random() > particleChance) Botania.proxy.wispFX(pos.getX() + 0.3 + Math.random() * 0.5, pos.getY() + 0.6 + Math.random() * 0.25, pos.getZ() + Math.random(), PARTICLE_COLOR.getRed() / 255F, PARTICLE_COLOR.getGreen() / 255F, PARTICLE_COLOR.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); @@ -243,13 +239,13 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt sendPacket = false; } - List items = worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); + List items = world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(pos, pos.add(1, 1, 1))); for(EntityItem item : items) { if(item.isDead) continue; ItemStack stack = item.getEntityItem(); - if(stack != null && stack.getItem() instanceof IManaItem) { + if(!stack.isEmpty() && stack.getItem() instanceof IManaItem) { IManaItem mana = (IManaItem) stack.getItem(); if(outputting && mana.canReceiveManaFromPool(stack, this) || !outputting && mana.canExportManaToPool(stack, this)) { boolean didSomething = false; @@ -257,7 +253,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt int bellowCount = 0; if(outputting) for(EnumFacing dir : EnumFacing.HORIZONTALS) { - TileEntity tile = worldObj.getTileEntity(pos.offset(dir)); + TileEntity tile = world.getTileEntity(pos.offset(dir)); if(tile != null && tile instanceof TileBellows && ((TileBellows) tile).getLinkedTile() == this) bellowCount++; } @@ -284,8 +280,8 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt } if(didSomething) { - if(ConfigHandler.chargingAnimationEnabled && worldObj.rand.nextInt(20) == 0) { - PacketHandler.sendToNearby(worldObj, getPos(), + if(ConfigHandler.chargingAnimationEnabled && world.rand.nextInt(20) == 0) { + PacketHandler.sendToNearby(world, getPos(), new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.POOL_CHARGE, getPos().getX(), getPos().getY(), getPos().getZ(), outputting ? 1 : 0)); } isDoingTransfer = outputting; @@ -349,10 +345,10 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt if(player.isSneaking()) { outputting = !outputting; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } - if(!worldObj.isRemote) { + if(!world.isRemote) { NBTTagCompound nbttagcompound = new NBTTagCompound(); writePacketNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, getCurrentMana()); @@ -360,12 +356,12 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } - worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.11F, 1F); } @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - ItemStack pool = new ItemStack(ModBlocks.pool, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); + ItemStack pool = new ItemStack(ModBlocks.pool, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.POOL_VARIANT).ordinal()); String name = I18n.format(pool.getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = 0x4444FF; HUDHandler.drawSimpleManaHUD(color, knownMana, manaCap, name, res); @@ -407,8 +403,8 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public int getCurrentMana() { - if(worldObj != null) { - IBlockState state = worldObj.getBlockState(getPos()); + if(world != null) { + IBlockState state = world.getBlockState(getPos()); if(state.getProperties().containsKey(BotaniaStateProps.POOL_VARIANT)) return state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.CREATIVE ? MAX_MANA : mana; } @@ -436,7 +432,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public ISparkEntity getAttachedSpark() { - List sparks = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); + List sparks = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(pos.up(), pos.up().add(1, 1, 1)), Predicates.instanceOf(ISparkEntity.class)); if(sparks.size() == 1) { Entity e = (Entity) sparks.get(0); return (ISparkEntity) e; @@ -463,7 +459,7 @@ public class TilePool extends TileMod implements IManaPool, IKeyLocked, ISparkAt @Override public void setColor(EnumDyeColor color) { this.color = color; - worldObj.notifyBlockUpdate(pos, worldObj.getBlockState(pos), worldObj.getBlockState(pos), 0b1011); + world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 0b1011); } @Override diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java index 3f2fe71b7..349d2aa58 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePrism.java @@ -20,15 +20,17 @@ import vazkii.botania.api.mana.ITinyPlanetExcempt; import vazkii.botania.api.state.BotaniaStateProps; import vazkii.botania.common.block.tile.TileSimpleInventory; +import javax.annotation.Nonnull; + public class TilePrism extends TileSimpleInventory { public void onBurstCollision(IManaBurst burst) { ItemStack lens = itemHandler.getStackInSlot(0); - boolean active = !worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); - boolean valid = lens != null && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); + boolean active = !world.getBlockState(getPos()).getValue(BotaniaStateProps.POWERED); + boolean valid = !lens.isEmpty() && lens.getItem() instanceof ILens && (!(lens.getItem() instanceof ITinyPlanetExcempt) || ((ITinyPlanetExcempt) lens.getItem()).shouldPull(lens)); if(active) { - burst.setSourceLens(valid ? lens.copy() : null); + burst.setSourceLens(valid ? lens.copy() : ItemStack.EMPTY); burst.setColor(0xFFFFFF); burst.setGravity(0F); @@ -56,9 +58,10 @@ public class TilePrism extends TileSimpleInventory { @Override protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if(stack != null && stack.getItem() instanceof ILens) + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if(!stack.isEmpty() && stack.getItem() instanceof ILens) return super.insertItem(slot, stack, simulate); else return stack; } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java index ea71dbb86..1091fd51d 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TilePump.java @@ -56,13 +56,12 @@ public class TilePump extends TileMod { } @Override - public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, EnumFacing side) { return cap == CapabilityAnimation.ANIMATION_CAPABILITY || super.hasCapability(cap, side); } - @Nonnull @Override - public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public T getCapability(@Nonnull Capability cap, EnumFacing side) { if (cap == CapabilityAnimation.ANIMATION_CAPABILITY) { return CapabilityAnimation.ANIMATION_CAPABILITY.cast(asm); } @@ -73,7 +72,7 @@ public class TilePump extends TileMod { public void update() { hasRedstone = false; for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); + int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) { hasRedstone = true; break; @@ -92,7 +91,7 @@ public class TilePump extends TileMod { innerRingPos = Math.min(max, innerRingPos); moving = 0F; for(int x = 0; x < 2; x++) - worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), 0, 0, 0); + world.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, getPos().getX() + Math.random(), getPos().getY() + Math.random(), getPos().getZ() + Math.random(), 0, 0, 0); } } else if(innerRingPos > min) { innerRingPos -= incr * 2; @@ -103,7 +102,7 @@ public class TilePump extends TileMod { } } - if(worldObj.isRemote) + if(world.isRemote) move.setValue(innerRingPos / 8 * 0.5F); // rescale to 0 - 0.5 for json animation if(!hasCartOnTop) @@ -117,7 +116,7 @@ public class TilePump extends TileMod { hasCartOnTop = false; if(comparator != lastComparator) - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); lastComparator = comparator; } @@ -130,17 +129,17 @@ public class TilePump extends TileMod { public void readPacketNBT(NBTTagCompound cmp) { boolean prevActive = active; active = cmp.getBoolean(TAG_ACTIVE); - if(worldObj != null && worldObj.isRemote) + if(world != null && world.isRemote) if(prevActive != active) asm.transition(active ? "moving" : "default"); } public void setActive(boolean active) { - if(!worldObj.isRemote) { + if(!world.isRemote) { boolean diff = this.active != active; this.active = active; if(diff) - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java index fa3a580fa..1c7b6cd29 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileRFGenerator.java @@ -13,106 +13,112 @@ package vazkii.botania.common.block.tile.mana; import java.util.EnumMap; import java.util.Map; -import cofh.api.energy.IEnergyConnection; -import cofh.api.energy.IEnergyReceiver; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.energy.IEnergyStorage; import net.minecraftforge.fml.common.Optional; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -@Optional.Interface(iface = "cofh.api.energy.IEnergyConnection", modid = "CoFHAPI|energy") -public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyConnection { +import javax.annotation.Nonnull; +import javax.annotation.Nullable; - private static final int CONVERSION_RATE = 10; - private static final int MAX_MANA = 1280 * CONVERSION_RATE; +public class TileRFGenerator extends TileMod implements IManaReceiver { + + private static final int MANA_TO_FE = 10; + private static final int MAX_ENERGY = 1280 * MANA_TO_FE; private static final String TAG_MANA = "mana"; - int mana = 0; + int energy = 0; - // Thanks to skyboy for help with this cuz I'm a noob with RF - private final EnumMap receiverCache = new EnumMap<>(EnumFacing.class); - private boolean deadCache; + private final IEnergyStorage energyHandler = new IEnergyStorage() { + @Override + public int getEnergyStored() { + return energy; + } + + @Override + public int getMaxEnergyStored() { + return Integer.MAX_VALUE; + } + + // todo allow pulling? + @Override public boolean canExtract() { return false; } + @Override public int extractEnergy(int maxExtract, boolean simulate) { return 0; } + + @Override public int receiveEnergy(int maxReceive, boolean simulate) { return 0; } + @Override public boolean canReceive() { return false; } + }; @Override - @Optional.Method(modid = "CoFHAPI|energy") - public void validate() { - super.validate(); - deadCache = true; + public boolean hasCapability(@Nonnull Capability cap, @Nullable EnumFacing side) { + return cap == CapabilityEnergy.ENERGY || super.hasCapability(cap, side); + } + + @Override + @Nullable + public T getCapability(@Nonnull Capability cap, @Nullable EnumFacing side) { + if(cap == CapabilityEnergy.ENERGY) { + return CapabilityEnergy.ENERGY.cast(energyHandler); + } else return super.getCapability(cap, side); } @Override public void update() { - if(!worldObj.isRemote && Botania.rfApiLoaded) { - if(deadCache) - reCache(); - - int transfer = Math.min(mana, 160 * CONVERSION_RATE); - mana -= transfer; - mana += transmitEnergy(transfer); + if(!world.isRemote) { + int transfer = Math.min(energy, 160 * MANA_TO_FE); + energy -= transfer; + energy += transmitEnergy(transfer); } } - @Optional.Method(modid = "CoFHAPI|energy") - private final int transmitEnergy(int energy) { - for(Map.Entry e : receiverCache.entrySet()) { - IEnergyReceiver tile = e.getValue(); - if (tile == null) + private int transmitEnergy(int energy) { + for(EnumFacing e : EnumFacing.VALUES) { + BlockPos neighbor = getPos().offset(e); + if(!world.isBlockLoaded(neighbor)) continue; - energy -= tile.receiveEnergy(e.getKey().getOpposite(), energy, false); + TileEntity te = world.getTileEntity(neighbor); + if(te == null) + continue; - if (energy <= 0) - return 0; + IEnergyStorage storage = null; + + if(te.hasCapability(CapabilityEnergy.ENERGY, e.getOpposite())) { + storage = te.getCapability(CapabilityEnergy.ENERGY, e.getOpposite()); + } else if(te.hasCapability(CapabilityEnergy.ENERGY, null)) { + storage = te.getCapability(CapabilityEnergy.ENERGY, null); + } + + if(storage != null) { + energy -= storage.receiveEnergy(energy, false); + + if (energy <= 0) + return 0; + } } return energy; } - @Optional.Method(modid = "CoFHAPI|energy") - private void reCache() { - if(deadCache) { - for(EnumFacing dir : EnumFacing.VALUES) - onNeighborTileChange(pos.offset(dir)); - deadCache = false; - } - } - - @Optional.Method(modid = "CoFHAPI|energy") - public void onNeighborTileChange(BlockPos pos) { - TileEntity tile = worldObj.getTileEntity(pos); - - BlockPos q = getPos(); - EnumFacing side = EnumFacing.getFacingFromVector(pos.getX() - q.getX(), pos.getY() - q.getY(), pos.getZ() - q.getZ()); - - addCache(tile, side); - } - - @Optional.Method(modid = "CoFHAPI|energy") - private void addCache(TileEntity tile, EnumFacing side) { - receiverCache.remove(side); - - if(tile instanceof IEnergyReceiver) { - receiverCache.put(side, (IEnergyReceiver)tile); - } - } - @Override public int getCurrentMana() { - return mana / CONVERSION_RATE; + return energy / MANA_TO_FE; } @Override public boolean isFull() { - return mana >= MAX_MANA; + return energy >= MAX_ENERGY; } @Override public void recieveMana(int mana) { - this.mana = Math.min(MAX_MANA, this.mana + mana * CONVERSION_RATE); + this.energy = Math.min(MAX_ENERGY, this.energy + mana * MANA_TO_FE); } @Override @@ -122,17 +128,12 @@ public class TileRFGenerator extends TileMod implements IManaReceiver, IEnergyCo @Override public void writePacketNBT(NBTTagCompound cmp) { - cmp.setInteger(TAG_MANA, mana); + cmp.setInteger(TAG_MANA, energy); } @Override public void readPacketNBT(NBTTagCompound cmp) { - mana = cmp.getInteger(TAG_MANA); - } - - @Override - public boolean canConnectEnergy(EnumFacing from) { - return true; + energy = cmp.getInteger(TAG_MANA); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java index b06212a5d..49d1e3e1e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileSpreader.java @@ -195,8 +195,8 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { - TileEntity tileAt = worldObj.getTileEntity(pos.offset(dir)); - if(worldObj.isBlockLoaded(pos.offset(dir), false) && tileAt instanceof IManaPool) { + TileEntity tileAt = world.getTileEntity(pos.offset(dir)); + if(world.isBlockLoaded(pos.offset(dir), false) && tileAt instanceof IManaPool) { IManaPool pool = (IManaPool) tileAt; if(wasInNetwork && (pool != receiver || isRedstone())) { if(pool instanceof IKeyLocked && !((IKeyLocked) pool).getOutputKey().equals(getInputKey())) @@ -212,7 +212,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } } - int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); + int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) redstone = true; } @@ -226,7 +226,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, double y = lastPingbackY; double z = lastPingbackZ; AxisAlignedBB aabb = new AxisAlignedBB(x, y, z, x, y, z).expand(PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE, PINGBACK_EXPIRED_SEARCH_DISTANCE); - List bursts = worldObj.getEntitiesWithinAABB(Entity.class, aabb, Predicates.instanceOf(IManaBurst.class)); + List bursts = world.getEntitiesWithinAABB(Entity.class, aabb, Predicates.instanceOf(IManaBurst.class)); IManaBurst found = null; UUID identity = getIdentifier(); for(IManaBurst burst : (List) bursts) @@ -263,9 +263,9 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(shouldShoot) tryShootBurst(); - if(receiverLastTick != receiver && !worldObj.isRemote) { + if(receiverLastTick != receiver && !world.isRemote) { requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } redstoneLastTick = redstone; @@ -353,19 +353,19 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, lastPingbackY = cmp.getDouble(TAG_LAST_PINGBACK_Y); lastPingbackZ = cmp.getDouble(TAG_LAST_PINGBACK_Z); - if(requestsClientUpdate && worldObj != null) { + if(requestsClientUpdate && world != null) { int x = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_X); int y = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_Y); int z = cmp.getInteger(TAG_FORCE_CLIENT_BINDING_Z); if(y != -1) { - TileEntity tile = worldObj.getTileEntity(new BlockPos(x, y, z)); + TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); if(tile instanceof IManaReceiver) receiver = (IManaReceiver) tile; else receiver = null; } else receiver = null; } - if(worldObj != null && worldObj.isRemote) + if(world != null && world.isRemote) hasReceivedInitialPacket = true; } @@ -384,17 +384,17 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, return; if(!player.isSneaking()) { - if(!worldObj.isRemote) { + if(!world.isRemote) { NBTTagCompound nbttagcompound = new NBTTagCompound(); writePacketNBT(nbttagcompound); nbttagcompound.setInteger(TAG_KNOWN_MANA, mana); if(player instanceof EntityPlayerMP) ((EntityPlayerMP) player).connection.sendPacket(new SPacketUpdateTileEntity(pos, -999, nbttagcompound)); } - worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1); + world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1); } else { - RayTraceResult pos = raytraceFromEntity(worldObj, player, true, 5); - if(pos != null && pos.hitVec != null && !worldObj.isRemote) { + RayTraceResult pos = raytraceFromEntity(world, player, true, 5); + if(pos != null && pos.hitVec != null && !world.isRemote) { double x = pos.hitVec.xCoord - getPos().getX() - 0.5; double y = pos.hitVec.yCoord - getPos().getY() - 0.5; double z = pos.hitVec.zCoord - getPos().getZ() - 0.5; @@ -414,20 +414,20 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, checkForReceiver(); requestsClientUpdate = true; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, getPos()); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, getPos()); } } } private boolean needsNewBurstSimulation() { - if(worldObj.isRemote && !hasReceivedInitialPacket) + if(world.isRemote && !hasReceivedInitialPacket) return false; if(lastTentativeBurst == null) return true; for(PositionProperties props : lastTentativeBurst) - if(!props.contentsEqual(worldObj)) { + if(!props.contentsEqual(world)) { invalidTentativeBurst = props.invalid; return !invalidTentativeBurst; } @@ -440,13 +440,13 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(canShootBurst && (isRedstone() || receiver.canRecieveManaFromBursts() && !receiver.isFull())) { EntityManaBurst burst = getBurst(false); if(burst != null) { - if(!worldObj.isRemote) { + if(!world.isRemote) { mana -= burst.getStartingMana(); burst.setShooterUUID(getIdentifier()); - worldObj.spawnEntityInWorld(burst); + world.spawnEntity(burst); burst.ping(); if(!ConfigHandler.silentSpreaders) - worldObj.playSound(null, pos, BotaniaSoundEvents.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); + world.playSound(null, pos, BotaniaSoundEvents.spreaderFire, SoundCategory.BLOCKS, 0.05F * (paddingColor != -1 ? 0.2F : 1F), 0.7F + 0.3F * (float) Math.random()); } } } @@ -455,18 +455,18 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, public boolean isRedstone() { updateContainingBlockInfo(); - return worldObj == null ? staticRedstone : getBlockMetadata() == SpreaderVariant.REDSTONE.ordinal(); + return world == null ? staticRedstone : getBlockMetadata() == SpreaderVariant.REDSTONE.ordinal(); } public boolean isDreamwood() { updateContainingBlockInfo(); int variant = getBlockMetadata(); - return worldObj == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal() || variant == SpreaderVariant.GAIA.ordinal(); + return world == null ? staticDreamwood : variant == SpreaderVariant.ELVEN.ordinal() || variant == SpreaderVariant.GAIA.ordinal(); } public boolean isULTRA_SPREADER() { updateContainingBlockInfo(); - return worldObj == null ? staticUltra : getBlockMetadata() == SpreaderVariant.GAIA.ordinal(); + return world == null ? staticUltra : getBlockMetadata() == SpreaderVariant.GAIA.ordinal(); } public void checkForReceiver() { @@ -481,7 +481,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(receiver != null && receiver instanceof IManaReceiver - && receiver.hasWorldObj() + && receiver.hasWorld() && receiver.getWorld().isBlockLoaded(receiver.getPos(), !receiver.getWorld().isRemote)) this.receiver = (IManaReceiver) receiver; else this.receiver = null; @@ -510,7 +510,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, BurstProperties props = new BurstProperties(maxMana, ticksBeforeManaLoss, manaLossPerTick, gravity, motionModifier, color); ItemStack lens = itemHandler.getStackInSlot(0); - if(lens != null && lens.getItem() instanceof ILensEffect) + if(!lens.isEmpty() && lens.getItem() instanceof ILensEffect) ((ILensEffect) lens.getItem()).apply(lens, props); burst.setSourceLens(lens); @@ -539,7 +539,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, } public ILensControl getLensController(ItemStack stack) { - if(stack != null && stack.getItem() instanceof ILensControl) { + if(!stack.isEmpty() && stack.getItem() instanceof ILensControl) { ILensControl control = (ILensControl) stack.getItem(); if(control.isControlLens(stack)) return control; @@ -573,12 +573,12 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @SideOnly(Side.CLIENT) public void renderHUD(Minecraft mc, ScaledResolution res) { - String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); + String name = I18n.format(new ItemStack(ModBlocks.spreader, 1, world.getBlockState(getPos()).getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal()).getUnlocalizedName().replaceAll("tile.", "tile." + LibResources.PREFIX_MOD) + ".name"); int color = isRedstone() ? 0xFF0000 : isDreamwood() ? 0xFF00AE : 0x00FF00; HUDHandler.drawSimpleManaHUD(color, knownMana, getMaxMana(), name, res); ItemStack lens = itemHandler.getStackInSlot(0); - if(lens != null) { + if(!lens.isEmpty()) { GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); String lensName = lens.getDisplayName(); @@ -596,10 +596,10 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, if(receiver != null) { TileEntity receiverTile = (TileEntity) receiver; - ItemStack recieverStack = new ItemStack(worldObj.getBlockState(receiverTile.getPos()).getBlock(), 1, receiverTile.getBlockMetadata()); + ItemStack recieverStack = new ItemStack(world.getBlockState(receiverTile.getPos()).getBlock(), 1, receiverTile.getBlockMetadata()); GlStateManager.enableBlend(); GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); - if(recieverStack != null && recieverStack.getItem() != null) { + if(!recieverStack.isEmpty()) { String stackName = recieverStack.getDisplayName(); int width = 16 + mc.fontRendererObj.getStringWidth(stackName) / 2; int x = res.getScaledWidth() / 2 - width; @@ -620,7 +620,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void onClientDisplayTick() { - if(worldObj != null) { + if(world != null) { EntityManaBurst burst = getBurst(true); burst.getCollidedTile(false); } @@ -640,13 +640,14 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, protected SimpleItemStackHandler createItemHandler() { return new SimpleItemStackHandler(this, true) { @Override - protected int getStackLimit(int slot, ItemStack stack) { + protected int getStackLimit(int slot, @Nonnull ItemStack stack) { return 1; } + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if(stack != null && stack.getItem() instanceof ILens) + public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { + if(!stack.isEmpty() && stack.getItem() instanceof ILens) return super.insertItem(slot, stack, simulate); else return stack; } @@ -656,7 +657,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, @Override public void markDirty() { checkForReceiver(); - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } @Override @@ -693,7 +694,7 @@ public class TileSpreader extends TileSimpleInventory implements IManaCollector, Vector3 thisVec = Vector3.fromTileEntityCenter(this); Vector3 blockVec = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); - AxisAlignedBB axis = player.worldObj.getBlockState(pos).getCollisionBoundingBox(player.worldObj, pos); + AxisAlignedBB axis = player.world.getBlockState(pos).getCollisionBoundingBox(player.world, pos); if(axis != null) axis = axis.offset(pos); else axis = new AxisAlignedBB(pos, pos.add(1, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java index ed540806e..c872d6b37 100644 --- a/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java +++ b/src/main/java/vazkii/botania/common/block/tile/mana/TileTurntable.java @@ -37,19 +37,19 @@ public class TileTurntable extends TileMod { boolean redstone = false; for(EnumFacing dir : EnumFacing.VALUES) { - int redstoneSide = worldObj.getRedstonePower(pos.offset(dir), dir); + int redstoneSide = world.getRedstonePower(pos.offset(dir), dir); if(redstoneSide > 0) redstone = true; } if(!redstone) { - TileEntity tile = worldObj.getTileEntity(pos.up()); + TileEntity tile = world.getTileEntity(pos.up()); if(tile instanceof TileSpreader) { TileSpreader spreader = (TileSpreader) tile; spreader.rotationX += speed * (backwards ? -1 : 1); if(spreader.rotationX >= 360F) spreader.rotationX -= 360F; - if(!worldObj.isRemote) + if(!world.isRemote) spreader.checkForReceiver(); } } @@ -74,7 +74,7 @@ public class TileTurntable extends TileMod { if(player.isSneaking()) backwards = !backwards; else speed = speed == 6 ? 1 : speed + 1; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } public void renderHUD(Minecraft mc, ScaledResolution res) { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java index 93d16b398..e2da73025 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedString.java @@ -37,10 +37,10 @@ public abstract class TileRedString extends TileMod implements ITileBound { for(int i = 0; i < range; i++) { pos_ = pos_.offset(dir); - if(worldObj.isAirBlock(pos_)) + if(world.isAirBlock(pos_)) continue; - TileEntity tile = worldObj.getTileEntity(pos_); + TileEntity tile = world.getTileEntity(pos_); if(tile instanceof TileRedString) continue; @@ -77,17 +77,17 @@ public abstract class TileRedString extends TileMod implements ITileBound { } public EnumFacing getOrientation() { - return worldObj.getBlockState(getPos()).getValue(BotaniaStateProps.FACING); + return world.getBlockState(getPos()).getValue(BotaniaStateProps.FACING); } public TileEntity getTileAtBinding() { BlockPos binding = getBinding(); - return binding == null ? null : worldObj.getTileEntity(binding); + return binding == null ? null : world.getTileEntity(binding); } public IBlockState getStateAtBinding() { BlockPos binding = getBinding(); - return binding == null ? Blocks.AIR.getDefaultState() : worldObj.getBlockState(binding); + return binding == null ? Blocks.AIR.getDefaultState() : world.getBlockState(binding); } public Block getBlockAtBinding() { diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java index 4b046786b..5f8c5e5d6 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringComparator.java @@ -25,11 +25,11 @@ public class TileRedStringComparator extends TileRedString { int origVal = comparatorValue; if(state.hasComparatorInputOverride()) { - comparatorValue = state.getComparatorInputOverride(worldObj, binding); + comparatorValue = state.getComparatorInputOverride(world, binding); } else comparatorValue = 0; if(origVal != comparatorValue) - worldObj.updateComparatorOutputLevel(pos, worldObj.getBlockState(pos).getBlock()); + world.updateComparatorOutputLevel(pos, world.getBlockState(pos).getBlock()); } public int getComparatorValue() { @@ -38,7 +38,7 @@ public class TileRedStringComparator extends TileRedString { @Override public boolean acceptBlock(BlockPos pos) { - return worldObj.getBlockState(pos).hasComparatorInputOverride(); + return world.getBlockState(pos).hasComparatorInputOverride(); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java index 58c548082..15f33d771 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringContainer.java @@ -24,14 +24,14 @@ public class TileRedStringContainer extends TileRedString { @Override public boolean acceptBlock(BlockPos pos) { - TileEntity tile = worldObj.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); return tile != null && Arrays.stream(EnumFacing.VALUES) .anyMatch(e -> tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, e)); } @Override - public boolean hasCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public boolean hasCapability(@Nonnull Capability cap, EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getTileAtBinding() != null && getTileAtBinding().hasCapability(cap, side)) @@ -39,9 +39,8 @@ public class TileRedStringContainer extends TileRedString { return super.hasCapability(cap, side); } - @Nonnull @Override - public T getCapability(@Nonnull Capability cap, @Nonnull EnumFacing side) { + public T getCapability(@Nonnull Capability cap, EnumFacing side) { if(cap == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY && getTileAtBinding() != null && getTileAtBinding().hasCapability(cap, side)) diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java index 426da9629..11e7f6964 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringDispenser.java @@ -18,16 +18,16 @@ public class TileRedStringDispenser extends TileRedStringContainer { @Override public boolean acceptBlock(BlockPos pos) { - TileEntity tile = worldObj.getTileEntity(pos); + TileEntity tile = world.getTileEntity(pos); return tile != null && tile instanceof TileEntityDispenser; } public void tickDispenser() { BlockPos bind = getBinding(); if(bind != null) { - TileEntity tile = worldObj.getTileEntity(bind); + TileEntity tile = world.getTileEntity(bind); if(tile instanceof TileEntityDispenser) - worldObj.scheduleUpdate(bind, tile.getBlockType(), tile.getBlockType().tickRate(worldObj)); + world.scheduleUpdate(bind, tile.getBlockType(), tile.getBlockType().tickRate(world)); } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java index df15d1ace..780718ca3 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringFertilizer.java @@ -41,7 +41,7 @@ public class TileRedStringFertilizer extends TileRedString { @Override public boolean acceptBlock(BlockPos pos) { - return worldObj.getBlockState(pos).getBlock() instanceof IGrowable; + return world.getBlockState(pos).getBlock() instanceof IGrowable; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java index ee656a1a5..67f990dca 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringInterceptor.java @@ -31,17 +31,17 @@ public class TileRedStringInterceptor extends TileRedString { @Override public void update() { super.update(); - if(!worldObj.isRemote) + if(!world.isRemote) interceptors.add(this); } @Override public boolean acceptBlock(BlockPos pos) { - return worldObj.getTileEntity(pos) != null; + return world.getTileEntity(pos) != null; } private boolean saneState() { - return !isInvalid() && worldObj.getTileEntity(pos) == this; + return !isInvalid() && world.getTileEntity(pos) == this; } public static void onInteract(EntityPlayer player, World world, BlockPos pos, EnumHand hand) { @@ -58,7 +58,7 @@ public class TileRedStringInterceptor extends TileRedString { continue; } - if(inter.worldObj == world) { + if(inter.world == world) { BlockPos coords = inter.getBinding(); if(coords != null && coords.equals(pos)) { Block block = inter.getBlockType(); diff --git a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java index 189c4ef37..7a853e08e 100644 --- a/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java +++ b/src/main/java/vazkii/botania/common/block/tile/string/TileRedStringRelay.java @@ -25,8 +25,8 @@ public class TileRedStringRelay extends TileRedString { if(pos.equals(getPos().up())) return false; - Block block = worldObj.getBlockState(pos).getBlock(); - TileEntity tile = worldObj.getTileEntity(pos); + Block block = world.getBlockState(pos).getBlock(); + TileEntity tile = world.getTileEntity(pos); return (block instanceof BlockFlower || block instanceof BlockMushroom || block instanceof BlockDoublePlant) && (tile == null || !(tile instanceof ISubTileContainer)); } diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 2f8042bd8..b096e3d7b 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -10,14 +10,13 @@ */ package vazkii.botania.common.core; -import java.util.List; - import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import vazkii.botania.client.lib.LibResources; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; @@ -29,7 +28,7 @@ import vazkii.botania.common.lib.LibMisc; public final class BotaniaCreativeTab extends CreativeTabs { public static final BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); - List list; + NonNullList list; public BotaniaCreativeTab() { super(LibMisc.MOD_ID); @@ -44,8 +43,8 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public Item getTabIconItem() { - return getIconItemStack().getItem(); + public ItemStack getTabIconItem() { + return getIconItemStack(); } @Override @@ -54,7 +53,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { } @Override - public void displayAllRelevantItems(@Nonnull List list) { + public void displayAllRelevantItems(@Nonnull NonNullList list) { this.list = list; addItem(ModItems.lexicon); @@ -257,7 +256,6 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.unholyCloak); addItem(ModItems.balanceCloak); addItem(ModItems.goddessCharm); - addItem(ModItems.goldLaurel); addItem(ModItems.divaCharm); addItem(ModItems.thirdEye); addItem(ModItems.flightTiara); diff --git a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java index df51d0bd7..603def6f1 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandDownloadLatest.java @@ -27,13 +27,13 @@ public class CommandDownloadLatest extends CommandBase { @Nonnull @Override - public String getCommandName() { + public String getName() { return "botania-download-latest"; } @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender var1) { + public String getUsage(@Nonnull ICommandSender var1) { return "/botania-download-latest "; } @@ -45,13 +45,13 @@ public class CommandDownloadLatest extends CommandBase { @Override public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender var1, @Nonnull String[] var2) { if(!ENABLED) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED))); + var1.sendMessage(new TextComponentTranslation("botania.versioning.disabled").setStyle(new Style().setColor(TextFormatting.RED))); else if(var2.length == 1) if(VersionChecker.downloadedFile) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setStyle(new Style().setColor(TextFormatting.RED))); + var1.sendMessage(new TextComponentTranslation("botania.versioning.downloadedAlready").setStyle(new Style().setColor(TextFormatting.RED))); else if(VersionChecker.startedDownload) - var1.addChatMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setStyle(new Style().setColor(TextFormatting.RED))); + var1.sendMessage(new TextComponentTranslation("botania.versioning.downloadingAlready").setStyle(new Style().setColor(TextFormatting.RED))); else new ThreadDownloadMod("Botania " + var2[0] + ".jar"); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java index 415f5f88d..3d256cbaf 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandOpen.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandOpen.java @@ -27,13 +27,13 @@ public class CommandOpen extends CommandBase { @Nonnull @Override - public String getCommandName() { + public String getName() { return "botania-open"; } @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender sender) { + public String getUsage(@Nonnull ICommandSender sender) { return ""; } @@ -42,10 +42,10 @@ public class CommandOpen extends CommandBase { if(sender instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) sender; ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemLexicon.class); - if(stack != null) { + if(!stack.isEmpty()) { ItemLexicon.setForcedPage(stack, args[0]); ItemLexicon.setQueueTicks(stack, 5); - } else sender.addChatMessage(new TextComponentTranslation("botaniamisc.noLexicon").setStyle(new Style().setColor(TextFormatting.RED))); + } else sender.sendMessage(new TextComponentTranslation("botaniamisc.noLexicon").setStyle(new Style().setColor(TextFormatting.RED))); } } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandShare.java b/src/main/java/vazkii/botania/common/core/command/CommandShare.java index 19abcac5c..ff0d3e601 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandShare.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandShare.java @@ -23,13 +23,13 @@ public class CommandShare extends CommandBase { @Nonnull @Override - public String getCommandName() { + public String getName() { return "botania-share"; } @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender sender) { + public String getUsage(@Nonnull ICommandSender sender) { return ""; } @@ -41,7 +41,7 @@ public class CommandShare extends CommandBase { json = json.replaceAll("%entryname%", I18n.translateToLocal(args[0])); ITextComponent component = ITextComponent.Serializer.jsonToComponent(json); - server.getPlayerList().sendChatMsg(component); + server.getPlayerList().sendMessage(component); } diff --git a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java index b3158f6f9..a07555691 100644 --- a/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java +++ b/src/main/java/vazkii/botania/common/core/command/CommandSkyblockSpread.java @@ -26,13 +26,13 @@ public class CommandSkyblockSpread extends CommandBase { @Nonnull @Override - public String getCommandName() { + public String getName() { return "botania-skyblock-spread"; } @Nonnull @Override - public String getCommandUsage(@Nonnull ICommandSender sender) { + public String getUsage(@Nonnull ICommandSender sender) { return " []"; } @@ -58,12 +58,12 @@ public class CommandSkyblockSpread extends CommandBase { EntityPlayer player = getPlayer(server, sender, args[0]); if(player != null) { - BlockPos spawn = player.worldObj.getSpawnPoint(); + BlockPos spawn = player.world.getSpawnPoint(); int x, z; do { - x = player.worldObj.rand.nextInt(maxrange) - maxrange / 2 + spawn.getX(); - z = player.worldObj.rand.nextInt(maxrange) - maxrange / 2 + spawn.getZ(); + x = player.world.rand.nextInt(maxrange) - maxrange / 2 + spawn.getX(); + z = player.world.rand.nextInt(maxrange) - maxrange / 2 + spawn.getZ(); } while(MathHelper.pointDistancePlane(x, z, spawn.getX(), spawn.getZ()) < minDist); SkyblockWorldEvents.spawnPlayer(player, new BlockPos(x, spawn.getY(), z), true); diff --git a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index 8b2eaf254..3a995fbbd 100644 --- a/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -33,8 +33,8 @@ public final class BiomeDecorationHandler { boolean flowers = true; if(event.getWorld().provider instanceof IFlowerlessWorld) flowers = ((IFlowerlessWorld) event.getWorld().provider).generateFlowers(event.getWorld()); - else if(event.getWorld().getBiomeGenForCoords(event.getPos()) instanceof IFlowerlessBiome) - flowers = ((IFlowerlessBiome) event.getWorld().getBiomeGenForCoords(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); + else if(event.getWorld().getBiome(event.getPos()) instanceof IFlowerlessBiome) + flowers = ((IFlowerlessBiome) event.getWorld().getBiome(event.getPos())).canGenerateFlowers(event.getWorld(), event.getPos().getX(), event.getPos().getZ()); if(!flowers) return; @@ -53,7 +53,7 @@ public final class BiomeDecorationHandler { int y1 = y + event.getRand().nextInt(4) - event.getRand().nextInt(4); int z1 = z + event.getRand().nextInt(dist * 2) - dist; BlockPos pos2 = new BlockPos(x1, y1, z1); - if(event.getWorld().isAirBlock(pos2) && (!event.getWorld().provider.getHasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.getWorld(), pos2)) { + if(event.getWorld().isAirBlock(pos2) && (!event.getWorld().provider.hasNoSky() || y1 < 127) && ModBlocks.flower.canPlaceBlockAt(event.getWorld(), pos2)) { event.getWorld().setBlockState(pos2, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, color), 2); if(event.getRand().nextDouble() < ConfigHandler.flowerTallChance && ((BlockModFlower) ModBlocks.flower).canGrow(event.getWorld(), pos2, event.getWorld().getBlockState(pos2), false)) BlockModFlower.placeDoubleFlower(event.getWorld(), pos2, color, 0); diff --git a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java index 34ed05953..693dde733 100644 --- a/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/ConfigHandler.java @@ -384,9 +384,9 @@ public final class ConfigHandler { if(changes.size() == 0) return; - player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setStyle(new Style().setColor(TextFormatting.GOLD))); + player.sendMessage(new TextComponentTranslation("botaniamisc.adaptativeConfigChanges").setStyle(new Style().setColor(TextFormatting.GOLD))); for(String change : changes) - player.addChatMessage(new TextComponentString(change).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.sendMessage(new TextComponentString(change).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); } public void addMappingInt(int version, String key, int val) { diff --git a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java index 8430f95fe..67eb9a069 100644 --- a/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/InternalMethodHandler.java @@ -16,7 +16,6 @@ import java.util.List; import baubles.api.BaublesApi; import baubles.common.network.PacketHandler; import baubles.common.network.PacketSync; -import buildcraft.api.transport.IPipeTile; import net.minecraft.block.Block; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -193,8 +192,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override public IItemHandlerModifiable getBaublesInventoryWrapped(EntityPlayer player) { - IInventory inv = getBaublesInventory(player); - return inv == null ? null : new InvWrapper(inv); + return BaublesApi.getBaublesHandler(player); } @Override @@ -240,7 +238,7 @@ public class InternalMethodHandler extends DummyMethodHandler { @Override @Optional.Method(modid = "BuildCraft|Transport") public boolean isBuildcraftPipe(TileEntity tile) { - return tile instanceof IPipeTile; + return false; // tile instanceof IPipeTile; todo buildcraft } @Override diff --git a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java index e7fc9f616..2d953223c 100644 --- a/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/PixieHandler.java @@ -4,12 +4,13 @@ import baubles.api.BaublesApi; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.MobEffects; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.item.IPixieSpawner; import vazkii.botania.common.core.helper.PlayerHelper; import vazkii.botania.common.entity.EntityPixie; @@ -29,7 +30,7 @@ public final class PixieHandler { @SubscribeEvent public static void onDamageTaken(LivingHurtEvent event) { - if(!event.getEntityLiving().worldObj.isRemote && event.getEntityLiving() instanceof EntityPlayer && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityLivingBase) { + if(!event.getEntityLiving().world.isRemote && event.getEntityLiving() instanceof EntityPlayer && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityLivingBase) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, IPixieSpawner.class); @@ -37,30 +38,31 @@ public final class PixieHandler { for (ItemStack element : player.inventory.armorInventory) chance += getChance(element); - IInventory baubles = BaublesApi.getBaubles(player); - for(int i = 0; i < baubles.getSizeInventory(); i++) + IItemHandler baubles = BaublesApi.getBaublesHandler(player); + for(int i = 0; i < baubles.getSlots(); i++) chance += getChance(baubles.getStackInSlot(i)); if(Math.random() < chance) { - EntityPixie pixie = new EntityPixie(player.worldObj); + EntityPixie pixie = new EntityPixie(player.world); pixie.setPosition(player.posX, player.posY + 2, player.posZ); if(((ItemElementiumHelm) ModItems.elementiumHelm).hasArmorSet(player)) { - pixie.setApplyPotionEffect(new PotionEffect(potions[event.getEntityLiving().worldObj.rand.nextInt(potions.length)], 40, 0)); + pixie.setApplyPotionEffect(new PotionEffect(potions[event.getEntityLiving().world.rand.nextInt(potions.length)], 40, 0)); } float dmg = 4; - if(stack != null && stack.getItem() == ModItems.elementiumSword) + if(!stack.isEmpty() && stack.getItem() == ModItems.elementiumSword) dmg += 2; pixie.setProps((EntityLivingBase) event.getSource().getEntity(), player, 0, dmg); - player.worldObj.spawnEntityInWorld(pixie); + pixie.onInitialSpawn(player.world.getDifficultyForLocation(new BlockPos(pixie)), null); + player.world.spawnEntity(pixie); } } } private static float getChance(ItemStack stack) { - if(stack == null || !(stack.getItem() instanceof IPixieSpawner)) + if(stack.isEmpty() || !(stack.getItem() instanceof IPixieSpawner)) return 0F; else return ((IPixieSpawner) stack.getItem()).getPixieChance(stack); } diff --git a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java index 1b1a7d5e1..a34b39d4d 100644 --- a/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java +++ b/src/main/java/vazkii/botania/common/core/handler/SheddingHandler.java @@ -13,6 +13,7 @@ package vazkii.botania.common.core.handler; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import java.util.Objects; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -24,6 +25,8 @@ import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.fml.common.registry.EntityEntry; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lexicon.page.PageShedding; @@ -36,13 +39,13 @@ public final class SheddingHandler { @SubscribeEvent public static void onLivingUpdate(LivingUpdateEvent event) { - if(event.getEntityLiving().worldObj.isRemote) + if(event.getEntityLiving().world.isRemote) return; ShedPattern pattern = getShedPattern(event.getEntityLiving()); if(pattern != null) { - if(event.getEntityLiving().worldObj.rand.nextInt(pattern.getRate()) == 0) + if(event.getEntityLiving().world.rand.nextInt(pattern.getRate()) == 0) event.getEntityLiving().entityDropItem(pattern.getItemStack(), 0.0F); } } @@ -65,7 +68,7 @@ public final class SheddingHandler { int i = 1; for(ShedPattern pattern : patterns) { - PageShedding page = new PageShedding(String.valueOf(i), EntityList.CLASS_TO_NAME.get(pattern.EntityClass), pattern.lexiconSize, pattern.getItemStack()); + PageShedding page = new PageShedding(String.valueOf(i), Objects.toString(EntityList.getKey(pattern.EntityClass)), pattern.lexiconSize, pattern.getItemStack()); LexiconData.shedding.addPage(page); } } @@ -87,9 +90,9 @@ public final class SheddingHandler { defaultNames.add(pattern.getEntityString()); } - for(Entry> entry : EntityList.NAME_TO_CLASS.entrySet()) { - if(EntityLiving.class.isAssignableFrom(entry.getValue())) { - String name = entry.getKey(); + for(Entry entry : ForgeRegistries.ENTITIES.getEntries()) { + if(EntityLiving.class.isAssignableFrom(entry.getValue().getEntityClass())) { + String name = entry.getKey().toString(); if(!defaultNames.contains(name)) loadFromConfig(config, name, null); } @@ -117,7 +120,7 @@ public final class SheddingHandler { lexiconSize = config.get("Shedding", key + ".lexiconDisplaySize", lexiconSize).getInt(); if(itemName != null && Item.REGISTRY.getObject(new ResourceLocation(itemName)) != null && rate != -1) - patterns.add(new ShedPattern(EntityList.NAME_TO_CLASS.get(key), new ItemStack(Item.REGISTRY.getObject(new ResourceLocation(itemName)), 1, metadata), rate, lexiconSize)); + patterns.add(new ShedPattern(EntityList.getClass(new ResourceLocation(key)), new ItemStack(Item.REGISTRY.getObject(new ResourceLocation(itemName)), 1, metadata), rate, lexiconSize)); } private static class ShedPattern { @@ -142,7 +145,7 @@ public final class SheddingHandler { } public String getEntityString() { - return EntityList.CLASS_TO_NAME.get(EntityClass); + return Objects.toString(EntityList.getKey(EntityClass)); } } diff --git a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java index fa7c52dfd..b382d7f53 100644 --- a/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/InventoryHelper.java @@ -60,7 +60,7 @@ public class InventoryHelper { for(int j1 = 0; j1 < inv.getSizeInventory(); ++j1) { ItemStack itemstack = inv.getItemHandler().getStackInSlot(j1); - if(itemstack != null) { + if(!itemstack.isEmpty()) { net.minecraft.inventory.InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), itemstack); } } @@ -72,11 +72,11 @@ public class InventoryHelper { public static void withdrawFromInventory(TileSimpleInventory inv, EntityPlayer player) { for(int i = inv.getSizeInventory() - 1; i >= 0; i--) { ItemStack stackAt = inv.getItemHandler().getStackInSlot(i); - if(stackAt != null) { + if(!stackAt.isEmpty()) { ItemStack copy = stackAt.copy(); ItemHandlerHelper.giveItemToPlayer(player, copy); - inv.getItemHandler().setStackInSlot(i, null); - player.worldObj.updateComparatorOutputLevel(inv.getPos(), null); + inv.getItemHandler().setStackInSlot(i, ItemStack.EMPTY); + player.world.updateComparatorOutputLevel(inv.getPos(), null); break; } } diff --git a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java index 449012319..14e427de7 100644 --- a/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/ItemNBTHelper.java @@ -21,29 +21,11 @@ public final class ItemNBTHelper { private static final int[] EMPTY_INT_ARRAY = new int[0]; - /** Checks if an ItemStack has a Tag Compound **/ - public static boolean detectNBT(ItemStack stack) { - return stack.hasTagCompound(); - } - - /** Tries to initialize an NBT Tag Compound in an ItemStack, - * this will not do anything if the stack already has a tag - * compound **/ - public static void initNBT(ItemStack stack) { - if(!detectNBT(stack)) - injectNBT(stack, new NBTTagCompound()); - } - - /** Injects an NBT Tag Compound to an ItemStack, no checks - * are made previously **/ - public static void injectNBT(ItemStack stack, NBTTagCompound nbt) { - stack.setTagCompound(nbt); - } - /** Gets the NBTTagCompound in an ItemStack. Tries to init it * previously in case there isn't one present **/ public static NBTTagCompound getNBT(ItemStack stack) { - initNBT(stack); + if(!stack.hasTagCompound()) + stack.setTagCompound(new NBTTagCompound()); return stack.getTagCompound(); } @@ -101,7 +83,7 @@ public final class ItemNBTHelper { // GETTERS /////////////////////////////////////////////////////////////////// public static boolean verifyExistance(ItemStack stack, String tag) { - return stack != null && getNBT(stack).hasKey(tag); + return !stack.isEmpty() && getNBT(stack).hasKey(tag); } public static boolean getBoolean(ItemStack stack, String tag, boolean defaultExpected) { diff --git a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java index e7e32f23b..b9c09aec5 100644 --- a/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java +++ b/src/main/java/vazkii/botania/common/core/helper/PlayerHelper.java @@ -11,13 +11,13 @@ public final class PlayerHelper { // Checks if either of the player's hands has an item. public static boolean hasAnyHeldItem(EntityPlayer player) { - return player.getHeldItemMainhand() != null || player.getHeldItemOffhand() != null; + return !player.getHeldItemMainhand().isEmpty() || !player.getHeldItemOffhand().isEmpty(); } // Checks main hand, then off hand for this item. public static boolean hasHeldItem(EntityPlayer player, Item item) { - return player.getHeldItemMainhand() != null && player.getHeldItemMainhand().getItem() == item - || player.getHeldItemOffhand() != null && player.getHeldItemOffhand().getItem() == item; + return !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() == item + || !player.getHeldItemOffhand().isEmpty() && player.getHeldItemOffhand().getItem() == item; } // Checks main hand, then off hand for this item class. @@ -27,30 +27,30 @@ public final class PlayerHelper { // Checks main hand, then off hand for this item class. public static boolean hasHeldItemClass(EntityPlayer player, Class template) { - return player.getHeldItemMainhand() != null && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass()) - || player.getHeldItemOffhand() != null && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass()); + return !player.getHeldItemMainhand().isEmpty() && template.isAssignableFrom(player.getHeldItemMainhand().getItem().getClass()) + || !player.getHeldItemOffhand().isEmpty() && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass()); } // Checks main hand, then off hand for this item. Null otherwise. public static ItemStack getFirstHeldItem(EntityPlayer player, Item item) { ItemStack main = player.getHeldItemMainhand(); ItemStack offhand = player.getHeldItemOffhand(); - if(main != null && item == main.getItem()) { + if(!main.isEmpty() && item == main.getItem()) { return main; - } else if(offhand != null && item == offhand.getItem()) { + } else if(!offhand.isEmpty() && item == offhand.getItem()) { return offhand; - } else return null; + } else return ItemStack.EMPTY; } // Checks main hand, then off hand for this item class. Null otherwise. public static ItemStack getFirstHeldItemClass(EntityPlayer player, Class template) { ItemStack main = player.getHeldItemMainhand(); ItemStack offhand = player.getHeldItemOffhand(); - if(main != null && template.isAssignableFrom(main.getItem().getClass())) { + if(!main.isEmpty() && template.isAssignableFrom(main.getItem().getClass())) { return main; - } else if(offhand != null && template.isAssignableFrom(offhand.getItem().getClass())) { + } else if(!offhand.isEmpty() && template.isAssignableFrom(offhand.getItem().getClass())) { return offhand; - } else return null; + } else return ItemStack.EMPTY; } public static ItemStack getAmmo(EntityPlayer player, Predicate ammoFunc) { @@ -75,20 +75,18 @@ public final class PlayerHelper { } } - return null; + return ItemStack.EMPTY; } } public static boolean hasAmmo(EntityPlayer player, Predicate ammoFunc) { - return getAmmo(player, ammoFunc) != null; + return !getAmmo(player, ammoFunc).isEmpty(); } public static void consumeAmmo(EntityPlayer player, Predicate ammoFunc) { ItemStack ammo = getAmmo(player, ammoFunc); - if(ammo != null) { - ammo.stackSize--; - if(ammo.stackSize == 0) - player.inventory.deleteStack(ammo); + if(!ammo.isEmpty()) { + ammo.shrink(1); } } diff --git a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java index 417ea8c55..c22fe24d4 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/IProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/IProxy.java @@ -40,8 +40,6 @@ public interface IProxy { boolean openWikiPage(World world, Block block, RayTraceResult pos); - void playRecordClientSided(World world, BlockPos pos, ItemRecord record); - void setMultiblock(World world, int x, int y, int z, double radius, Block block); void removeSextantMultiblock(); diff --git a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java index dfc8f3ed4..93c8cc602 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java +++ b/src/main/java/vazkii/botania/common/core/proxy/ServerProxy.java @@ -79,9 +79,6 @@ public class ServerProxy implements IProxy { return false; } - @Override - public void playRecordClientSided(World world, BlockPos pos, ItemRecord record) {} - @Override public void setMultiblock(World world, int x, int y, int z, double radius, Block block) {} @@ -90,7 +87,7 @@ public class ServerProxy implements IProxy { @Override public long getWorldElapsedTicks() { - return FMLCommonHandler.instance().getMinecraftServerInstance().worldServers[0].getTotalWorldTime(); + return FMLCommonHandler.instance().getMinecraftServerInstance().worlds[0].getTotalWorldTime(); } @Override diff --git a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java index 1b7bab0ea..3ba96a2de 100644 --- a/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java +++ b/src/main/java/vazkii/botania/common/core/version/AdaptorNotifier.java @@ -24,8 +24,8 @@ public final class AdaptorNotifier { @SubscribeEvent public static void onTick(ClientTickEvent event) { - if(!triedToWarnPlayer && Minecraft.getMinecraft().thePlayer != null) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + if(!triedToWarnPlayer && Minecraft.getMinecraft().player != null) { + EntityPlayer player = Minecraft.getMinecraft().player; ConfigHandler.adaptor.tellChanges(player); triedToWarnPlayer = true; diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java index b03374e0e..a7c78fe02 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadDownloadMod.java @@ -46,8 +46,8 @@ public class ThreadDownloadMod extends Thread { public void run() { try { ITextComponent component = ITextComponent.Serializer.jsonToComponent(I18n.format("botania.versioning.startingDownload", fileName)); - if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatMessage(component); + if(Minecraft.getMinecraft().player != null) + Minecraft.getMinecraft().player.sendMessage(component); VersionChecker.startedDownload = true; @@ -79,8 +79,8 @@ public class ThreadDownloadMod extends Thread { if(!f1.exists()) f.renameTo(f1); - if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setStyle(new Style().setColor(TextFormatting.GREEN))); + if(Minecraft.getMinecraft().player != null) + Minecraft.getMinecraft().player.sendMessage(new TextComponentTranslation("botania.versioning.doneDownloading", fileName).setStyle(new Style().setColor(TextFormatting.GREEN))); Desktop.getDesktop().open(dir); VersionChecker.downloadedFile = true; @@ -92,7 +92,7 @@ public class ThreadDownloadMod extends Thread { } private void sendError() { - if(Minecraft.getMinecraft().thePlayer != null) - Minecraft.getMinecraft().thePlayer.addChatComponentMessage(new TextComponentTranslation("botania.versioning.error").setStyle(new Style().setColor(TextFormatting.RED))); + if(Minecraft.getMinecraft().player != null) + Minecraft.getMinecraft().player.sendMessage(new TextComponentTranslation("botania.versioning.error").setStyle(new Style().setColor(TextFormatting.RED))); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index ff58015a5..dfdfcd0af 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -43,17 +43,17 @@ public final class VersionChecker { @SubscribeEvent public static void onTick(ClientTickEvent event) { - if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().thePlayer != null && !triedToWarnPlayer) { + if(doneChecking && event.phase == Phase.END && Minecraft.getMinecraft().player != null && !triedToWarnPlayer) { if(!onlineVersion.isEmpty()) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().player; int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); - player.addChatComponentMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); + player.sendMessage(new TextComponentTranslation("botania.versioning.flavour" + player.world.rand.nextInt(FLAVOUR_MESSAGES)).setStyle(new Style().setColor(TextFormatting.LIGHT_PURPLE))); + player.sendMessage(new TextComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); ITextComponent component = ITextComponent.Serializer.fromJsonLenient(I18n.translateToLocal("botania.versioning.updateMessage").replaceAll("%version%", onlineVersion)); - player.addChatComponentMessage(component); + player.sendMessage(component); } } diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 76983f0a3..4d6b2d4e9 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -118,7 +118,6 @@ public final class ModCraftingRecipes { public static IRecipe recipeKnocbackBelt; public static IRecipe recipeIcePendant; public static IRecipe recipeFirePendant; - public static IRecipe recipeGoldenLaurel; public static IRecipe recipeTinyPlanetBlock; public static IRecipe recipeAlchemyCatalyst; public static IRecipe recipeOpenCrate; @@ -783,14 +782,6 @@ public final class ModCraftingRecipes { 'F', LibOreDict.RUNE[1]); recipeFirePendant = BotaniaAPI.getLatestAddedRecipe(); - // Golden Laurel Crown Recipe - addOreDictRecipe(new ItemStack(ModItems.goldLaurel), - "G G", "LEL", "LLL", - 'G', "ingotGold", - 'L', "treeLeaves", - 'E', LibOreDict.LIFE_ESSENCE); - recipeGoldenLaurel = BotaniaAPI.getLatestAddedRecipe(); - // Tiny Planet Block Recipe addOreDictRecipe(new ItemStack(ModBlocks.tinyPlanet), "SSS", "SPS", "SSS", diff --git a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java index 301dc7483..480b2119d 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModPetalRecipes.java @@ -124,7 +124,7 @@ public final class ModPetalRecipes { marimorphosisRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_MARIMORPHOSIS), gray, yellow, green, red, runeEarth, runeFire, redstoneRoot); bubbellRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BUBBELL), cyan, cyan, lightBlue, lightBlue, blue, blue, runeWater, runeSummer, pixieDust); solegnoliaRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_SOLEGNOLIA), brown, brown, red, blue, redstoneRoot); - bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot); // todo temporary + bergamuteRecipe = BotaniaAPI.registerPetalRecipe(ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_BERGAMUTE), orange, green, green, redstoneRoot); ItemStack stack = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(stack, "SkullOwner", "Vazkii"); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java index af8d876ae..c01bda203 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AesirRingRecipe.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IRelic; @@ -32,7 +33,7 @@ public class AesirRingRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() == ModItems.thorRing && !foundThorRing) foundThorRing = true; else if(stack.getItem() == ModItems.odinRing && !foundOdinRing) @@ -46,6 +47,7 @@ public class AesirRingRecipe implements IRecipe { return foundThorRing && foundOdinRing && foundLokiRing; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { String soulbind = null; @@ -54,7 +56,7 @@ public class AesirRingRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof IRelic) { if(((IRelic) stack.getItem()).hasUUID(stack)) { hasUUID = true; @@ -62,16 +64,16 @@ public class AesirRingRecipe implements IRecipe { if(soulbindUUID == null) soulbindUUID = bindUUID; else if(!soulbindUUID.equals(bindUUID)) - return null; + return ItemStack.EMPTY; } else { String bind = ((IRelic) stack.getItem()).getSoulbindUsername(stack); if(soulbind == null) soulbind = bind; else if(!soulbind.equals(bind)) - return null; + return ItemStack.EMPTY; } - } else return null; + } else return ItemStack.EMPTY; } } @@ -88,14 +90,15 @@ public class AesirRingRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java index 7b8e5224e..c94f7700c 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/AncientWillRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IAncientWillContainer; @@ -29,7 +30,7 @@ public class AncientWillRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() == ModItems.ancientWill && !foundWill) foundWill = true; else if(!foundItem) { @@ -43,15 +44,16 @@ public class AncientWillRecipe implements IRecipe { return foundWill && foundItem; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack item = null; + ItemStack item = ItemStack.EMPTY; int will = -1; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() instanceof IAncientWillContainer && item == null) + if(!stack.isEmpty()) { + if(stack.getItem() instanceof IAncientWillContainer && item.isEmpty()) item = stack; else will = stack.getItemDamage(); } @@ -59,7 +61,7 @@ public class AncientWillRecipe implements IRecipe { IAncientWillContainer container = (IAncientWillContainer) item.getItem(); if(container.hasAncientWill(item, will)) - return null; + return ItemStack.EMPTY; ItemStack copy = item.copy(); container.addAncientWill(copy, will); @@ -71,14 +73,15 @@ public class AncientWillRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java index cc4ce7a43..55ece2aa9 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ArmorUpgradeRecipe.java @@ -28,7 +28,7 @@ public class ArmorUpgradeRecipe extends ShapedOreRecipe { ItemStack out = output.copy(); for (int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if (stack != null && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { + if (!stack.isEmpty() && stack.getItem() instanceof ItemArmor && stack.hasTagCompound()) { EnchantmentHelper.setEnchantments(EnchantmentHelper.getEnchantments(stack), out); byte runicHardening = ItemNBTHelper.getByte(stack, "RS.HARDEN", (byte)0); if (runicHardening != 0) diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java index 7fda8ca86..644e80edf 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/BlackHoleTalismanExtractRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemBlackHoleTalisman; @@ -29,7 +30,7 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() == ModItems.blackHoleTalisman && !foundTalisman) foundTalisman = true; else return false; @@ -39,24 +40,27 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { return foundTalisman; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack talisman = null; + ItemStack talisman = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) + if(!stack.isEmpty()) talisman = stack; } int count = ItemBlackHoleTalisman.getBlockCount(talisman); if(count > 0) { Block block = ItemBlackHoleTalisman.getBlock(talisman); - int meta = ItemBlackHoleTalisman.getBlockMeta(talisman); - return new ItemStack(block, Math.min(64, count), meta); + if(block != null) { + int meta = ItemBlackHoleTalisman.getBlockMeta(talisman); + return new ItemStack(block, Math.min(64, count), meta); + } } - return null; + return ItemStack.EMPTY; } @Override @@ -64,14 +68,15 @@ public class BlackHoleTalismanExtractRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java index c7b7ad423..81b11e045 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CompositeLensRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.init.Items; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.mana.ICompositableLens; @@ -32,7 +33,7 @@ public class CompositeLensRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ICompositableLens && !foundSecondLens) { if(foundLens) foundSecondLens = true; @@ -46,16 +47,17 @@ public class CompositeLensRecipe implements IRecipe { return foundSecondLens && foundSlimeball; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack lens = null; - ItemStack secondLens = null; + ItemStack lens = ItemStack.EMPTY; + ItemStack secondLens = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ICompositableLens) - if(lens == null) + if(lens.isEmpty()) lens = stack; else secondLens = stack; } @@ -63,8 +65,8 @@ public class CompositeLensRecipe implements IRecipe { if(lens.getItem() instanceof ICompositableLens) { ICompositableLens lensItem = (ICompositableLens) lens.getItem(); - if(secondLens == null || !lensItem.canCombineLenses(lens, secondLens) || lensItem.getCompositeLens(lens) != null || lensItem.getCompositeLens(secondLens) != null) - return null; + if(secondLens.isEmpty() || !lensItem.canCombineLenses(lens, secondLens) || !lensItem.getCompositeLens(lens).isEmpty() || !lensItem.getCompositeLens(secondLens).isEmpty()) + return ItemStack.EMPTY; ItemStack lensCopy = lens.copy(); ((ItemLens) ModItems.lens).setCompositeLens(lensCopy, secondLens); @@ -72,7 +74,7 @@ public class CompositeLensRecipe implements IRecipe { return lensCopy; } - return null; + return ItemStack.EMPTY; } @Override @@ -80,14 +82,15 @@ public class CompositeLensRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java index 5d9cc983c..5af0ad9c1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticAttachRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; @@ -29,11 +30,11 @@ public class CosmeticAttachRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ICosmeticBauble && !foundCosmetic) foundCosmetic = true; else if(!foundAttachable) { - if(stack.getItem() instanceof ICosmeticAttachable && !(stack.getItem() instanceof ICosmeticBauble) && ((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack) == null) + if(stack.getItem() instanceof ICosmeticAttachable && !(stack.getItem() instanceof ICosmeticBauble) && ((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack).isEmpty()) foundAttachable = true; else return false; } @@ -43,26 +44,27 @@ public class CosmeticAttachRecipe implements IRecipe { return foundCosmetic && foundAttachable; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack cosmeticItem = null; - ItemStack attachableItem = null; + ItemStack cosmeticItem = ItemStack.EMPTY; + ItemStack attachableItem = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() instanceof ICosmeticBauble && cosmeticItem == null) + if(!stack.isEmpty()) { + if(stack.getItem() instanceof ICosmeticBauble && cosmeticItem.isEmpty()) cosmeticItem = stack; else attachableItem = stack; } } if(!(attachableItem.getItem() instanceof ICosmeticAttachable)) - return null; + return ItemStack.EMPTY; ICosmeticAttachable attachable = (ICosmeticAttachable) attachableItem.getItem(); - if(attachable.getCosmeticItem(attachableItem) != null) - return null; + if(!attachable.getCosmeticItem(attachableItem).isEmpty()) + return ItemStack.EMPTY; ItemStack copy = attachableItem.copy(); attachable.setCosmeticItem(copy, cosmeticItem); @@ -74,14 +76,15 @@ public class CosmeticAttachRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java index bfa000f2f..a7a06247d 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/CosmeticRemoveRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.ICosmeticAttachable; @@ -28,8 +29,8 @@ public class CosmeticRemoveRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() instanceof ICosmeticAttachable && !(stack.getItem() instanceof ICosmeticBauble) && ((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack) != null) + if(!stack.isEmpty()) { + if(stack.getItem() instanceof ICosmeticAttachable && !(stack.getItem() instanceof ICosmeticBauble) && !((ICosmeticAttachable) stack.getItem()).getCosmeticItem(stack).isEmpty()) foundAttachable = true; else return false; } @@ -38,22 +39,23 @@ public class CosmeticRemoveRecipe implements IRecipe { return foundAttachable; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack attachableItem = null; + ItemStack attachableItem = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) + if(!stack.isEmpty()) attachableItem = stack; } ICosmeticAttachable attachable = (ICosmeticAttachable) attachableItem.getItem(); - if(attachable.getCosmeticItem(attachableItem) == null) - return null; + if(attachable.getCosmeticItem(attachableItem).isEmpty()) + return ItemStack.EMPTY; ItemStack copy = attachableItem.copy(); - attachable.setCosmeticItem(copy, null); + attachable.setCosmeticItem(copy, ItemStack.EMPTY); return copy; } @@ -62,14 +64,15 @@ public class CosmeticRemoveRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java index 38f733185..14a8b0b0b 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HeadRecipe.java @@ -32,7 +32,7 @@ public class HeadRecipe extends RecipeRuneAltar { if(matches) { for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack == null) + if(stack.isEmpty()) break; if(stack.getItem() == Items.NAME_TAG) { diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java index 539539f16..0b3655918 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/HelmRevealingRecipe.java @@ -17,6 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; @@ -35,7 +36,7 @@ public class HelmRevealingRecipe implements IRecipe { boolean foundHelm = false; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(checkHelm(stack)) foundHelm = true; else if(stack.getItem() == goggles) @@ -46,18 +47,19 @@ public class HelmRevealingRecipe implements IRecipe { return foundGoggles && foundHelm; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack helm = null; + ItemStack helm = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && checkHelm(stack)) + if(!stack.isEmpty() && checkHelm(stack)) helm = stack; } - if(helm == null) - return null; + if(helm.isEmpty()) + return ItemStack.EMPTY; ItemStack helmCopy = helm.copy(); Item helmItem = helmCopy.getItem(); @@ -70,7 +72,7 @@ public class HelmRevealingRecipe implements IRecipe { newHelm = new ItemStack(ModItems.terrasteelHelmRevealing); else if(helmItem == ModItems.elementiumHelm) newHelm = new ItemStack(ModItems.elementiumHelmRevealing); - else return null; + else return ItemStack.EMPTY; //Copy Ancient Wills for(int i = 0; i < 6; i++) @@ -94,6 +96,7 @@ public class HelmRevealingRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { return new ItemStack(ModItems.manasteelHelmRevealing); @@ -106,7 +109,7 @@ public class HelmRevealingRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java index 5d4611664..1ef87b0e1 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/KeepIvyRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -30,10 +31,10 @@ public class KeepIvyRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() == ModItems.keepIvy) foundIvy = true; - else if(!foundItem && !(ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && !stack.getItem().hasContainerItem(stack)) + else if(!foundItem && !(stack.hasTagCompound() && ItemNBTHelper.getBoolean(stack, ItemKeepIvy.TAG_KEEP, false)) && !stack.getItem().hasContainerItem(stack)) foundItem = true; else return false; } @@ -42,19 +43,20 @@ public class KeepIvyRecipe implements IRecipe { return foundIvy && foundItem; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack item = null; + ItemStack item = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.getItem() != ModItems.keepIvy) + if(!stack.isEmpty() && stack.getItem() != ModItems.keepIvy) item = stack; } ItemStack copy = item.copy(); ItemNBTHelper.setBoolean(copy, ItemKeepIvy.TAG_KEEP, true); - copy.stackSize = 1; + copy.setCount(1); return copy; } @@ -63,14 +65,15 @@ public class KeepIvyRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java index b5cb9453b..e14175089 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/LensDyeingRecipe.java @@ -18,6 +18,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.oredict.OreDictionary; @@ -36,7 +37,7 @@ public class LensDyeingRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ILens && !foundLens) foundLens = true; else if(!foundDye) { @@ -52,15 +53,16 @@ public class LensDyeingRecipe implements IRecipe { return foundLens && foundDye; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack lens = null; + ItemStack lens = ItemStack.EMPTY; int color = -1; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() instanceof ILens && lens == null) + if(!stack.isEmpty()) { + if(stack.getItem() instanceof ILens && lens.isEmpty()) lens = stack; else color = getStackColor(stack);//We can assume if its not a lens its a dye because we checked it in matches() } @@ -74,7 +76,7 @@ public class LensDyeingRecipe implements IRecipe { return lensCopy; } - return null; + return ItemStack.EMPTY; } @Override @@ -82,9 +84,10 @@ public class LensDyeingRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } int getStackColor(ItemStack stack) { @@ -100,7 +103,7 @@ public class LensDyeingRecipe implements IRecipe { @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java index a15173940..2b6a353e3 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunClipRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; @@ -29,7 +30,7 @@ public class ManaGunClipRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ItemManaGun && !ItemManaGun.hasClip(stack)) foundGun = true; @@ -43,21 +44,22 @@ public class ManaGunClipRecipe implements IRecipe { return foundGun && foundClip; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack gun = null; + ItemStack gun = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemManaGun) + if(!stack.isEmpty() && stack.getItem() instanceof ItemManaGun) gun = stack; } - if(gun == null) - return null; + if(gun.isEmpty()) + return ItemStack.EMPTY; ItemStack lens = ItemManaGun.getLens(gun); - ItemManaGun.setLens(gun, null); + ItemManaGun.setLens(gun, ItemStack.EMPTY); ItemStack gunCopy = gun.copy(); ItemManaGun.setClip(gunCopy, true); ItemManaGun.setLensAtPos(gunCopy, lens, 0); @@ -69,14 +71,15 @@ public class ManaGunClipRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java index 8547457d9..d050127b5 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunLensRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.mana.ILens; @@ -30,8 +31,8 @@ public class ManaGunLensRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() instanceof ItemManaGun && ItemManaGun.getLens(stack) == null) + if(!stack.isEmpty()) { + if(stack.getItem() instanceof ItemManaGun && ItemManaGun.getLens(stack).isEmpty()) foundGun = true; else if(stack.getItem() instanceof ILens) { @@ -47,14 +48,15 @@ public class ManaGunLensRecipe implements IRecipe { return foundLens && foundGun; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack lens = null; - ItemStack gun = null; + ItemStack lens = ItemStack.EMPTY; + ItemStack gun = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ItemManaGun) gun = stack; else if(stack.getItem() instanceof ILens) @@ -62,8 +64,8 @@ public class ManaGunLensRecipe implements IRecipe { } } - if(lens == null || gun == null) - return null; + if(lens.isEmpty() || gun.isEmpty()) + return ItemStack.EMPTY; ItemStack gunCopy = gun.copy(); ItemManaGun.setLens(gunCopy, lens); @@ -77,14 +79,15 @@ public class ManaGunLensRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java index 54852cc57..0c148643c 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaGunRemoveLensRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ItemManaGun; @@ -27,8 +28,8 @@ public class ManaGunRemoveLensRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { - if(stack.getItem() instanceof ItemManaGun && ItemManaGun.getLens(stack) != null) + if(!stack.isEmpty()) { + if(stack.getItem() instanceof ItemManaGun && !ItemManaGun.getLens(stack).isEmpty()) foundGun = true; else return false; // Found an invalid item, breaking the recipe @@ -38,20 +39,21 @@ public class ManaGunRemoveLensRecipe implements IRecipe { return foundGun; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack gun = null; + ItemStack gun = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ItemManaGun) gun = stack; } } ItemStack gunCopy = gun.copy(); - ItemManaGun.setLens(gunCopy, null); + ItemManaGun.setLens(gunCopy, ItemStack.EMPTY); return gunCopy; } @@ -61,14 +63,15 @@ public class ManaGunRemoveLensRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java index 7ae17d6f2..bbcc1c3d0 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/ManaUpgradeRecipe.java @@ -27,7 +27,7 @@ public class ManaUpgradeRecipe extends ShapedOreRecipe { IManaItem outItem = (IManaItem) out.getItem(); for (int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if (stack != null) { + if (!stack.isEmpty()) { if (stack.getItem() instanceof IManaItem) { IManaItem item = (IManaItem) stack.getItem(); outItem.addMana(out, item.getMana(stack)); diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java index 107bb23d0..b09676b7f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/PhantomInkRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.item.IPhantomInkable; @@ -29,11 +30,11 @@ public class PhantomInkRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() == ModItems.phantomInk && !foundInk) foundInk = true; else if(!foundItem) { - if(stack.getItem() instanceof IPhantomInkable && stack.getItem().getContainerItem(stack) == null) + if(stack.getItem() instanceof IPhantomInkable && stack.getItem().getContainerItem(stack).isEmpty()) foundItem = true; else return false; } else return false; @@ -43,13 +44,14 @@ public class PhantomInkRecipe implements IRecipe { return foundInk && foundItem; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack item = null; + ItemStack item = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof IPhantomInkable && item == null) + if(!stack.isEmpty() && stack.getItem() instanceof IPhantomInkable && item.isEmpty()) item = stack; } @@ -64,14 +66,15 @@ public class PhantomInkRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java index bab7926d8..8a9ae7b2f 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpecialFloatingFlowerRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.block.ModBlocks; @@ -30,7 +31,7 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() == Item.getItemFromBlock(ModBlocks.floatingFlower)) foundFloatingFlower = true; @@ -44,18 +45,19 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { return foundFloatingFlower && foundSpecialFlower; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack specialFlower = null; + ItemStack specialFlower = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) + if(!stack.isEmpty() && stack.getItem() == Item.getItemFromBlock(ModBlocks.specialFlower)) specialFlower = stack; } - if(specialFlower == null) - return null; + if(specialFlower.isEmpty()) + return ItemStack.EMPTY; return ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), ItemBlockSpecialFlower.getType(specialFlower)); } @@ -65,14 +67,15 @@ public class SpecialFloatingFlowerRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java index d1d38a0d3..cc62146e7 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/SpellClothRecipe.java @@ -16,6 +16,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; @@ -29,7 +30,7 @@ public class SpellClothRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.isItemEnchanted() && !foundEnchanted && stack.getItem() != ModItems.spellCloth) foundEnchanted = true; @@ -43,19 +44,20 @@ public class SpellClothRecipe implements IRecipe { return foundCloth && foundEnchanted; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack stackToDisenchant = null; + ItemStack stackToDisenchant = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.isItemEnchanted()) { + if(!stack.isEmpty() && stack.isItemEnchanted()) { stackToDisenchant = stack.copy(); break; } } - if(stackToDisenchant == null) - return null; + if(stackToDisenchant.isEmpty()) + return ItemStack.EMPTY; NBTTagCompound cmp = stackToDisenchant.getTagCompound().copy(); cmp.removeTag("ench"); // Remove enchantments @@ -69,14 +71,15 @@ public class SpellClothRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java index d24d75119..e63b8cb38 100644 --- a/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java +++ b/src/main/java/vazkii/botania/common/crafting/recipe/TerraPickTippingRecipe.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.common.item.ModItems; @@ -29,7 +30,7 @@ public class TerraPickTippingRecipe implements IRecipe { for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null) { + if(!stack.isEmpty()) { if(stack.getItem() instanceof ItemTerraPick && !ItemTerraPick.isTipped(stack)) foundTerraPick = true; @@ -43,18 +44,19 @@ public class TerraPickTippingRecipe implements IRecipe { return foundTerraPick && foundElementiumPick; } + @Nonnull @Override public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1) { - ItemStack terraPick = null; + ItemStack terraPick = ItemStack.EMPTY; for(int i = 0; i < var1.getSizeInventory(); i++) { ItemStack stack = var1.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemTerraPick) + if(!stack.isEmpty() && stack.getItem() instanceof ItemTerraPick) terraPick = stack; } - if(terraPick == null) - return null; + if(terraPick.isEmpty()) + return ItemStack.EMPTY; ItemStack terraPickCopy = terraPick.copy(); ItemTerraPick.setTipped(terraPickCopy); @@ -66,14 +68,15 @@ public class TerraPickTippingRecipe implements IRecipe { return 10; } + @Nonnull @Override public ItemStack getRecipeOutput() { - return null; + return ItemStack.EMPTY; } @Nonnull @Override - public ItemStack[] getRemainingItems(@Nonnull InventoryCrafting inv) { + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java index 15c41592a..848f2df35 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java +++ b/src/main/java/vazkii/botania/common/entity/EntityBabylonWeapon.java @@ -79,15 +79,15 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { @Override public void onUpdate() { EntityLivingBase thrower = getThrower(); - if(!worldObj.isRemote && (thrower == null || !(thrower instanceof EntityPlayer) || thrower.isDead)) { + if(!world.isRemote && (thrower == null || !(thrower instanceof EntityPlayer) || thrower.isDead)) { setDead(); return; } EntityPlayer player = (EntityPlayer) thrower; boolean charging = isCharging(); - if(!worldObj.isRemote) { - ItemStack stack = player == null ? null : PlayerHelper.getFirstHeldItem(player, ModItems.kingKey); - boolean newCharging = stack != null && ItemKingKey.isCharging(stack); + if(!world.isRemote) { + ItemStack stack = player == null ? ItemStack.EMPTY : PlayerHelper.getFirstHeldItem(player, ModItems.kingKey); + boolean newCharging = !stack.isEmpty() && ItemKingKey.isCharging(stack); if(charging != newCharging) { setCharging(newCharging); charging = newCharging; @@ -110,8 +110,8 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { int chargeTime = getChargeTicks(); setChargeTicks(chargeTime + 1); - if(worldObj.rand.nextInt(20) == 0) - worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + worldObj.rand.nextFloat() * 3F); + if(world.rand.nextInt(20) == 0) + world.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonSpawn, SoundCategory.PLAYERS, 0.1F, 1F + world.rand.nextFloat() * 3F); } else { if(liveTime < delay) { motionX = 0; @@ -119,7 +119,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { motionZ = 0; } else if (liveTime == delay && player != null) { Vector3 playerLook; - RayTraceResult lookat = ToolCommons.raytraceFromEntity(worldObj, player, true, 64); + RayTraceResult lookat = ToolCommons.raytraceFromEntity(world, player, true, 64); if(lookat == null) playerLook = new Vector3(player.getLookVec()).multiply(64).add(Vector3.fromEntity(player)); else playerLook = new Vector3(lookat.getBlockPos().getX() + 0.5, lookat.getBlockPos().getY() + 0.5, lookat.getBlockPos().getZ() + 0.5); @@ -130,13 +130,13 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { x = motionVec.x; y = motionVec.y; z = motionVec.z; - worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + worldObj.rand.nextFloat() * 3F); + world.playSound(null, posX, posY, posZ, BotaniaSoundEvents.babylonAttack, SoundCategory.PLAYERS, 2F, 0.1F + world.rand.nextFloat() * 3F); } setLiveTicks(liveTime + 1); - if(!worldObj.isRemote) { + if(!world.isRemote) { AxisAlignedBB axis = new AxisAlignedBB(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); - List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { if(living == thrower) continue; @@ -144,7 +144,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { if(living.hurtTime == 0) { if(player != null) living.attackEntityFrom(DamageSource.causePlayerDamage(player), 20); - else living.attackEntityFrom(DamageSource.generic, 20); + else living.attackEntityFrom(DamageSource.GENERIC, 20); onImpact(new RayTraceResult(living)); return; } @@ -169,7 +169,7 @@ public class EntityBabylonWeapon extends EntityThrowableCopy { protected void onImpact(RayTraceResult pos) { EntityLivingBase thrower = getThrower(); if(pos.entityHit == null || pos.entityHit != thrower) { - worldObj.createExplosion(this, posX, posY, posZ, 3F, false); + world.createExplosion(this, posX, posY, posZ, 3F, false); setDead(); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java index 83643234f..2ef10ae3c 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntityCorporeaSpark.java @@ -48,9 +48,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { private static final DataParameter MASTER = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.BOOLEAN); private static final DataParameter NETWORK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); - public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); private static final DataParameter ITEM_DISPLAY_TICKS = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.VARINT); - private static final DataParameter> DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.OPTIONAL_ITEM_STACK); + private static final DataParameter DISPLAY_STACK = EntityDataManager.createKey(EntityCorporeaSpark.class, DataSerializers.OPTIONAL_ITEM_STACK); private ICorporeaSpark master; private List connections = new ArrayList<>(); @@ -65,11 +64,10 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataManager.register(INVISIBILITY, 0); dataManager.register(MASTER, false); dataManager.register(NETWORK, 0); dataManager.register(ITEM_DISPLAY_TICKS, 0); - dataManager.register(DISPLAY_STACK, Optional.absent()); + dataManager.register(DISPLAY_STACK, ItemStack.EMPTY); } @Nonnull @@ -87,7 +85,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { public void onUpdate() { super.onUpdate(); - if(worldObj.isRemote) + if(world.isRemote) return; InvWithLocation inv = getSparkInventory(); @@ -131,9 +129,8 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public void registerConnections(ICorporeaSpark master, ICorporeaSpark referrer, List connections) { - List sparks = getNearbySparks(); relatives.clear(); - for(ICorporeaSpark spark : sparks) { + for(ICorporeaSpark spark : getNearbySparks()) { if(spark == null || connections.contains(spark) || spark.getNetwork() != getNetwork() || spark.isMaster() || ((Entity) spark).isDead) continue; @@ -147,8 +144,7 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } private List getNearbySparks() { - List ret = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); - return ret; + return (List) world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - SCAN_RANGE, posY - SCAN_RANGE, posZ - SCAN_RANGE, posX + SCAN_RANGE, posY + SCAN_RANGE, posZ + SCAN_RANGE), Predicates.instanceOf(ICorporeaSpark.class)); } private void restartNetwork() { @@ -164,19 +160,16 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { } private void findNetwork() { - List sparks = getNearbySparks(); - if(sparks.size() > 0) { - for(ICorporeaSpark spark : sparks) - if(spark.getNetwork() == getNetwork() && !((Entity) spark).isDead) { - ICorporeaSpark master = spark.getMaster(); - if(master != null) { - this.master = master; - restartNetwork(); + for(ICorporeaSpark spark : getNearbySparks()) + if(spark.getNetwork() == getNetwork() && !((Entity) spark).isDead) { + ICorporeaSpark master = spark.getMaster(); + if(master != null) { + this.master = master; + restartNetwork(); - break; - } + break; } - } + } } private static void displayRelatives(EntityPlayer player, List checked, ICorporeaSpark spark) { @@ -197,10 +190,10 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { @Override public InvWithLocation getSparkInventory() { - int x = MathHelper.floor_double(posX); - int y = MathHelper.floor_double(posY - 1); - int z = MathHelper.floor_double(posZ); - return InventoryHelper.getInventoryWithLocation(worldObj, new BlockPos(x, y, z), EnumFacing.UP); + int x = MathHelper.floor(posX); + int y = MathHelper.floor(posY - 1); + int z = MathHelper.floor(posZ); + return InventoryHelper.getInventoryWithLocation(world, new BlockPos(x, y, z), EnumFacing.UP); } @Override @@ -258,57 +251,52 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { dataManager.set(ITEM_DISPLAY_TICKS, ticks); } - public Optional getDisplayedItem() { + public ItemStack getDisplayedItem() { return dataManager.get(DISPLAY_STACK); } public void setDisplayedItem(ItemStack stack) { - dataManager.set(DISPLAY_STACK, Optional.fromNullable(stack)); + dataManager.set(DISPLAY_STACK, stack); } @Override - public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { - if(stack != null) { + public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty()) { + if(player.world.isRemote) { + boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.dye || stack.getItem() == ModItems.phantomInk; + if(valid) + player.swingArm(hand); + return valid; + } + if(stack.getItem() == ModItems.twigWand) { if(player.isSneaking()) { - if(!player.worldObj.isRemote) { - dropAndKill(); - if(isMaster()) - restartNetwork(); - } else player.swingArm(hand); - return true; + dropAndKill(); + if(isMaster()) + restartNetwork(); } else { - if(!player.worldObj.isRemote) { - displayRelatives(player, new ArrayList<>(), master); - } - return true; + displayRelatives(player, new ArrayList<>(), master); } + return true; } else if(stack.getItem() == ModItems.dye) { int color = stack.getItemDamage(); if(color != getNetwork().getMetadata()) { - if(!worldObj.isRemote) { - setNetwork(EnumDyeColor.byMetadata(color)); + setNetwork(EnumDyeColor.byMetadata(color)); - if(master != null) - restartNetwork(); - else findNetwork(); + if(master != null) + restartNetwork(); + else findNetwork(); - stack.stackSize--; - } else player.swingArm(hand); + stack.shrink(1); + return true; } + } else if(stack.getItem() == ModItems.phantomInk) { + setInvisible(true); + return true; } } - return doPhantomInk(stack); - } - - public boolean doPhantomInk(ItemStack stack) { - if(stack != null && stack.getItem() == ModItems.phantomInk && !worldObj.isRemote) { - int invis = dataManager.get(INVISIBILITY); - dataManager.set(INVISIBILITY, ~invis & 1); - return true; - } - return false; } @@ -316,14 +304,14 @@ public class EntityCorporeaSpark extends Entity implements ICorporeaSpark { protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setMaster(cmp.getBoolean(TAG_MASTER)); setNetwork(EnumDyeColor.byMetadata(cmp.getInteger(TAG_NETWORK))); - dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); + setInvisible(cmp.getInteger(TAG_INVIS) == 1); } @Override protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setBoolean(TAG_MASTER, isMaster()); cmp.setInteger(TAG_NETWORK, getNetwork().getMetadata()); - cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); + cmp.setInteger(TAG_INVIS, isInvisible() ? 1 : 0); } } diff --git a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java index 41ecc6dfb..35a52ebbd 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java +++ b/src/main/java/vazkii/botania/common/entity/EntityDoppleganger.java @@ -14,12 +14,15 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Random; import java.util.UUID; import java.util.regex.Pattern; import java.util.stream.Collectors; import javax.annotation.Nonnull; +import net.minecraft.entity.monster.EntityWitherSkeleton; +import net.minecraft.item.Item; import org.lwjgl.opengl.ARBShaderObjects; import com.google.common.base.Optional; @@ -39,7 +42,6 @@ import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityWitch; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.monster.SkeletonType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; @@ -91,6 +93,7 @@ import vazkii.botania.common.achievement.ModAchievements; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; +import vazkii.botania.common.lib.LibEntityNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.network.PacketBotaniaEffect; import vazkii.botania.common.network.PacketHandler; @@ -133,8 +136,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { private static final List CHEATY_BLOCKS = Arrays.asList("OpenBlocks:beartrap", "ThaumicTinkerer:magnet"); - private static boolean isPlayingMusic = false; - + private boolean isPlayingMusic = false; private boolean spawnLandmines = false; private boolean spawnPixies = false; private boolean anyWithArmor = false; @@ -142,14 +144,12 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { private int tpDelay = 0; private int mobSpawnTicks = 0; private final List playersWhoAttacked = new ArrayList<>(); - private final BossInfoServer bossInfo = (BossInfoServer) new BossInfoServer(getDisplayName(), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS).setCreateFog(true); + private final BossInfoServer bossInfo = (BossInfoServer) new BossInfoServer(new TextComponentTranslation("entity." + LibEntityNames.DOPPLEGANGER_REGISTRY + ".name"), BossInfo.Color.PINK, BossInfo.Overlay.PROGRESS).setCreateFog(true);; public EntityPlayer trueKiller = null; public EntityDoppleganger(World world) { super(world); setSize(0.6F, 1.8F); - tasks.addTask(0, new EntityAISwimming(this)); - tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, ARENA_RANGE * 1.5F)); isImmuneToFire = true; experienceValue = 825; Botania.proxy.addBoss(this); @@ -175,7 +175,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(world.getTileEntity(pos) instanceof TileEntityBeacon && isTruePlayer(player)) { if(world.getDifficulty() == EnumDifficulty.PEACEFUL) { if(!world.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setStyle(new Style().setColor(TextFormatting.RED))); + player.sendMessage(new TextComponentTranslation("botaniamisc.peacefulNoob").setStyle(new Style().setColor(TextFormatting.RED))); return false; } @@ -186,7 +186,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { Block blockat = state.getBlock(); if(blockat != ModBlocks.pylon || state.getValue(BotaniaStateProps.PYLON_VARIANT) != PylonVariant.GAIA) { if(!world.isRemote) - player.addChatMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); + player.sendMessage(new TextComponentTranslation("botaniamisc.needsCatalysts").setStyle(new Style().setColor(TextFormatting.RED))); return false; } } @@ -196,7 +196,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { PacketHandler.sendTo((EntityPlayerMP) player, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.ARENA_INDICATOR, pos.getX(), pos.getY(), pos.getZ())); - player.addChatMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); + player.sendMessage(new TextComponentTranslation("botaniamisc.badArena").setStyle(new Style().setColor(TextFormatting.RED))); } return false; @@ -209,7 +209,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(world.isRemote) return true; - stack.stackSize--; + stack.shrink(1); EntityDoppleganger e = new EntityDoppleganger(world); e.setPosition(pos.getX() + 0.5, pos.getY() + 3, pos.getZ() + 0.5); @@ -226,7 +226,8 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { e.getAttributeMap().getAttributeInstance(SharedMonsterAttributes.ARMOR).setBaseValue(15); e.playSound(SoundEvents.ENTITY_ENDERDRAGON_GROWL, 10F, 0.1F); - world.spawnEntityInWorld(e); + e.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(e)), null); + world.spawnEntity(e); return true; } @@ -288,6 +289,12 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { return true; } + @Override + protected void initEntityAI() { + tasks.addTask(0, new EntityAISwimming(this)); + tasks.addTask(1, new EntityAIWatchClosest(this, EntityPlayer.class, ARENA_RANGE * 1.5F)); + } + @Override protected void entityInit() { super.entityInit(); @@ -362,6 +369,16 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(par1nbtTagCompound.hasKey(TAG_PLAYER_COUNT)) setPlayerCount(par1nbtTagCompound.getInteger(TAG_PLAYER_COUNT)); else setPlayerCount(1); + + if (this.hasCustomName()) { + this.bossInfo.setName(this.getDisplayName()); + } + } + + @Override + public void setCustomNameTag(@Nonnull String name) { + super.setCustomNameTag(name); + this.bossInfo.setName(this.getDisplayName()); } @Override @@ -429,8 +446,8 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { ((EntityPlayer) entitylivingbase).addStat(ModAchievements.gaiaGuardianNoArmor, 1); } - playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (worldObj.rand.nextFloat() - worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); + playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 20F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); + world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, posX, posY, posZ, 1D, 0D, 0D); } @Override @@ -464,12 +481,12 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { super.dropEquipment(wasRecentlyHit, lootingModifier); for (EntityEquipmentSlot e : EntityEquipmentSlot.values()) { - setItemStackToSlot(e, null); + setItemStackToSlot(e, ItemStack.EMPTY); } // Generate loot table for every single attacking player for (UUID u : playersWhoAttacked) { - EntityPlayer player = worldObj.getPlayerEntityByUUID(u); + EntityPlayer player = world.getPlayerEntityByUUID(u); if (player == null) continue; @@ -495,8 +512,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { @Override public void setDead() { Botania.proxy.removeBoss(this); - BlockPos source = getSource(); - Botania.proxy.playRecordClientSided(worldObj, source, null); + world.playEvent(1010, getSource(), 0); isPlayingMusic = false; super.setDead(); } @@ -504,12 +520,12 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { private List getPlayersAround() { BlockPos source = getSource(); float range = 15F; - return worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); + return world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); } - private static int getGaiaGuardiansAround(World worldObj, BlockPos source) { + private static int getGaiaGuardiansAround(World world, BlockPos source) { float range = 15F; - List l = worldObj.getEntitiesWithinAABB(EntityDoppleganger.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); + List l = world.getEntitiesWithinAABB(EntityDoppleganger.class, new AxisAlignedBB(source.getX() + 0.5 - range, source.getY() + 0.5 - range, source.getZ() + 0.5 - range, source.getX() + 0.5 + range, source.getY() + 0.5 + range, source.getZ() + 0.5 + range)); return l.size(); } @@ -521,7 +537,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { float range = ARENA_RANGE; int invul = getInvulTime(); - if (worldObj.isRemote) { + if (world.isRemote) { for(int i = 0; i < 360; i += 8) { float r = 0.6F; float g = 0F; @@ -537,11 +553,6 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { Botania.proxy.wispFX(x, y, z, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * mv, (float) (Math.random() - 0.5F) * m); } - if(worldObj.isRemote && !isPlayingMusic && !isDead && !getPlayersAround().isEmpty()) { - Botania.proxy.playRecordClientSided(worldObj, source, (ItemRecord) (isHardMode() ? ModItems.recordGaia2 : ModItems.recordGaia1)); - isPlayingMusic = true; - } - EntityPlayer player = Botania.proxy.getClientPlayer(); player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; @@ -572,19 +583,24 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { return; } + if(!isPlayingMusic && !isDead && !getPlayersAround().isEmpty()) { + world.playEvent(1010, source, Item.getIdFromItem(isHardMode() ? ModItems.recordGaia2 : ModItems.recordGaia1)); + isPlayingMusic = true; + } + dataManager.set(BOSSINFO_ID, Optional.of(bossInfo.getUniqueId())); bossInfo.setPercent(getHealth() / getMaxHealth()); if(!getPassengers().isEmpty()) dismountRidingEntity(); - if(worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) + if(world.getDifficulty() == EnumDifficulty.PEACEFUL) setDead(); int radius = 1; - int posXInt = MathHelper.floor_double(posX); - int posYInt = MathHelper.floor_double(posY); - int posZInt = MathHelper.floor_double(posZ); + int posXInt = MathHelper.floor(posX); + int posYInt = MathHelper.floor(posY); + int posZInt = MathHelper.floor(posZ); for(int i = -radius; i < radius + 1; i++) for(int j = -radius; j < radius + 1; j++) for(int k = -radius; k < radius + 1; k++) { @@ -592,8 +608,8 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { int yp = posYInt + j; int zp = posZInt + k; BlockPos posp = new BlockPos(xp, yp, zp); - if(isCheatyBlock(worldObj, posp)) { - worldObj.destroyBlock(posp, true); + if(isCheatyBlock(world, posp)) { + world.destroyBlock(posp, true); } } @@ -601,12 +617,12 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { List players = getPlayersAround(); int playerCount = getPlayerCount(); - if(players.isEmpty() && !worldObj.playerEntities.isEmpty()) + if(players.isEmpty() && !world.playerEntities.isEmpty()) setDead(); else { for(EntityPlayer player : players) { for(EntityEquipmentSlot e : EntityEquipmentSlot.values()) { - if(e.getSlotType() == EntityEquipmentSlot.Type.ARMOR && player.getItemStackFromSlot(e) != null) { + if(e.getSlotType() == EntityEquipmentSlot.Type.ARMOR && !player.getItemStackFromSlot(e).isEmpty()) { anyWithArmor = true; break; } @@ -620,7 +636,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { potionsToRemove.forEach(potion -> { player.removePotionEffect(potion); - ((WorldServer) worldObj).getPlayerChunkMap().getEntry(posXInt >> 4, posZInt >> 4).sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), potion)); + ((WorldServer) world).getPlayerChunkMap().getEntry(posXInt >> 4, posZInt >> 4).sendPacket(new SPacketRemoveEntityEffect(player.getEntityId(), potion)); }); player.capabilities.isFlying = player.capabilities.isFlying && player.capabilities.isCreativeMode; @@ -644,7 +660,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(invul > 0 && mobSpawnTicks == MOB_SPAWN_TICKS) { if(invul < SPAWN_TICKS) { - if(invul > SPAWN_TICKS / 2 && worldObj.rand.nextInt(SPAWN_TICKS - invul + 1) == 0) + if(invul > SPAWN_TICKS / 2 && world.rand.nextInt(SPAWN_TICKS - invul + 1) == 0) for(int i = 0; i < 2; i++) spawnExplosionParticle(); } @@ -669,32 +685,31 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { if(reverseTicks > MOB_SPAWN_START_TICKS * 2 && mobSpawnTicks > MOB_SPAWN_END_TICKS && mobSpawnTicks % MOB_SPAWN_WAVE_TIME == 0) { for(int pl = 0; pl < playerCount; pl++) - for(int i = 0; i < 3 + worldObj.rand.nextInt(2); i++) { + for(int i = 0; i < 3 + world.rand.nextInt(2); i++) { EntityLiving entity = null; - switch(worldObj.rand.nextInt(2)) { + switch(world.rand.nextInt(2)) { case 0 : { - entity = new EntityZombie(worldObj); - if(worldObj.rand.nextInt(hard ? 3 : 12) == 0) - entity = new EntityWitch(worldObj); + entity = new EntityZombie(world); + if(world.rand.nextInt(hard ? 3 : 12) == 0) + entity = new EntityWitch(world); break; } case 1 : { - entity = new EntitySkeleton(worldObj); - entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(Items.BOW)); - if(worldObj.rand.nextInt(8) == 0) { - ((EntitySkeleton) entity).func_189768_a(SkeletonType.WITHER); - entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(hard ? ModItems.elementiumSword : Items.STONE_SWORD)); + entity = new EntitySkeleton(world); + if(world.rand.nextInt(8) == 0) { + entity = new EntityWitherSkeleton(world); } break; } case 3 : { if(!players.isEmpty()) - for(int j = 0; j < 1 + worldObj.rand.nextInt(hard ? 8 : 5); j++) { - EntityPixie pixie = new EntityPixie(worldObj); + for(int j = 0; j < 1 + world.rand.nextInt(hard ? 8 : 5); j++) { + EntityPixie pixie = new EntityPixie(world); pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); pixie.setPosition(posX + width / 2, posY + 2, posZ + width / 2); - worldObj.spawnEntityInWorld(pixie); + pixie.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pixie)), null); + world.spawnEntity(pixie); } } } @@ -704,7 +719,11 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { entity.addPotionEffect(new PotionEffect(MobEffects.FIRE_RESISTANCE, 600, 0)); range = 6F; entity.setPosition(posX + 0.5 + Math.random() * range - range / 2, posY - 1, posZ + 0.5 + Math.random() * range - range / 2); - worldObj.spawnEntityInWorld(entity); + entity.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(entity)), null); + if (entity instanceof EntityWitherSkeleton && hard) { + entity.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, new ItemStack(ModItems.elementiumSword)); + } + world.spawnEntity(entity); } } @@ -734,23 +753,24 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { for(int i = 0; i < count; i++) { int x = source.getX() - 10 + rand.nextInt(20); int z = source.getZ() - 10 + rand.nextInt(20); - int y = worldObj.getTopSolidOrLiquidBlock(new BlockPos(x, -1, z)).getY(); + int y = world.getTopSolidOrLiquidBlock(new BlockPos(x, -1, z)).getY(); - EntityMagicLandmine landmine = new EntityMagicLandmine(worldObj); + EntityMagicLandmine landmine = new EntityMagicLandmine(world); landmine.setPosition(x + 0.5, y, z + 0.5); landmine.summoner = this; - worldObj.spawnEntityInWorld(landmine); + world.spawnEntity(landmine); } } if(!players.isEmpty()) for(int pl = 0; pl < playerCount; pl++) - for(int i = 0; i < (spawnPixies ? worldObj.rand.nextInt(hard ? 6 : 3) : 1); i++) { - EntityPixie pixie = new EntityPixie(worldObj); + for(int i = 0; i < (spawnPixies ? world.rand.nextInt(hard ? 6 : 3) : 1); i++) { + EntityPixie pixie = new EntityPixie(world); pixie.setProps(players.get(rand.nextInt(players.size())), this, 1, 8); pixie.setPosition(posX + width / 2, posY + 2, posZ + width / 2); - worldObj.spawnEntityInWorld(pixie); + pixie.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pixie)), null); + world.spawnEntity(pixie); } tpDelay = hard ? dying ? 35 : 45 : dying ? 40 : 60; @@ -763,7 +783,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { spawnMissile(); } else { range = 3F; - players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); if(!players.isEmpty()) damageEntity(DamageSource.causePlayerDamage(players.get(0)), 0); } @@ -806,7 +826,7 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { missile.setPosition(posX + (Math.random() - 0.5 * 0.1), posY + 2.4 + (Math.random() - 0.5 * 0.1), posZ + (Math.random() - 0.5 * 0.1)); if(missile.getTarget()) { playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); - worldObj.spawnEntityInWorld(missile); + world.spawnEntity(missile); } } @@ -816,73 +836,112 @@ public class EntityDoppleganger extends EntityLiving implements IBotaniaBoss { return CHEATY_BLOCKS.contains(name); } - // EntityEnderman code below ============================================================================ - + // [VanillaCopy] EntityEnderman.teleportRandomly, edits noted. private boolean teleportRandomly() { - double d0 = posX + (rand.nextDouble() - 0.5D) * 64.0D; - double d1 = posY + (rand.nextInt(64) - 32); - double d2 = posZ + (rand.nextDouble() - 0.5D) * 64.0D; - return teleportTo(d0, d1, d2); + double d0 = this.posX + (this.rand.nextDouble() - 0.5D) * 64.0D; + double d1 = this.posY + (double)(this.rand.nextInt(64) - 32); + double d2 = this.posZ + (this.rand.nextDouble() - 0.5D) * 64.0D; + return this.teleportTo(d0, d1, d2); } - private boolean teleportTo(double par1, double par3, double par5) { - double d3 = posX; - double d4 = posY; - double d5 = posZ; - posX = par1; - posY = par3; - posZ = par5; - boolean flag = false; - BlockPos pos = new BlockPos(this); + // [VanillaCopy] EntityEnderman.teleportTo, edits noted. + private boolean teleportTo(double x, double y, double z) { + /* Botania - no events + net.minecraftforge.event.entity.living.EnderTeleportEvent event = new net.minecraftforge.event.entity.living.EnderTeleportEvent(this, x, y, z, 0); + if (net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(event)) return false; + boolean flag = this.attemptTeleport(event.getTargetX(), event.getTargetY(), event.getTargetZ()); + */ - if(worldObj.isBlockLoaded(pos)) { + boolean flag = this.attemptTeleport(x, y, z); + + if (flag) + { + this.world.playSound((EntityPlayer)null, this.prevPosX, this.prevPosY, this.prevPosZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, this.getSoundCategory(), 1.0F, 1.0F); + this.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + } + + return flag; + } + + // [VanillaCopy] of super, edits noted + @Override + public boolean attemptTeleport(double x, double y, double z) { + double d0 = this.posX; + double d1 = this.posY; + double d2 = this.posZ; + this.posX = x; + this.posY = y; + this.posZ = z; + boolean flag = false; + BlockPos blockpos = new BlockPos(this); + World world = this.world; + Random random = this.getRNG(); + + if (world.isBlockLoaded(blockpos)) + { boolean flag1 = false; - while(!flag1 && pos.getY() > 0) { - IBlockState state = worldObj.getBlockState(pos.down()); - Block block = state.getBlock(); + while (!flag1 && blockpos.getY() > 0) + { + BlockPos blockpos1 = blockpos.down(); + IBlockState iblockstate = world.getBlockState(blockpos1); - if(block.getMaterial(state).blocksMovement()) + if (iblockstate.getMaterial().blocksMovement()) + { flag1 = true; - else { - --posY; - pos = pos.down(); + } + else + { + --this.posY; + blockpos = blockpos1; } } - if(flag1) { - setPosition(posX, posY, posZ); + if (flag1) + { + this.setPositionAndUpdate(this.posX, this.posY, this.posZ); - if(worldObj.getCollisionBoxes(this, getEntityBoundingBox()).isEmpty() && !worldObj.containsAnyLiquid(getEntityBoundingBox())) + if (world.getCollisionBoxes(this, this.getEntityBoundingBox()).isEmpty() && !world.containsAnyLiquid(this.getEntityBoundingBox())) + { flag = true; + } - // Prevent out of bounds teleporting + // Botania - Prevent out of bounds teleporting BlockPos source = getSource(); if(vazkii.botania.common.core.helper.MathHelper.pointDistanceSpace(posX, posY, posZ, source.getX(), source.getY(), source.getZ()) > 12) flag = false; } } - if (!flag) { - setPosition(d3, d4, d5); + if (!flag) + { + this.setPositionAndUpdate(d0, d1, d2); return false; - } else { - short short1 = 128; + } + else + { + int i = 128; - for(int l = 0; l < short1; ++l) { - double d6 = l / (short1 - 1.0D); - float f = (rand.nextFloat() - 0.5F) * 0.2F; - float f1 = (rand.nextFloat() - 0.5F) * 0.2F; - float f2 = (rand.nextFloat() - 0.5F) * 0.2F; - double d7 = d3 + (posX - d3) * d6 + (rand.nextDouble() - 0.5D) * width * 2.0D; - double d8 = d4 + (posY - d4) * d6 + rand.nextDouble() * height; - double d9 = d5 + (posZ - d5) * d6 + (rand.nextDouble() - 0.5D) * width * 2.0D; - worldObj.spawnParticle(EnumParticleTypes.PORTAL, d7, d8, d9, f, f1, f2); + for (int j = 0; j < 128; ++j) + { + double d6 = (double)j / 127.0D; + float f = (random.nextFloat() - 0.5F) * 0.2F; + float f1 = (random.nextFloat() - 0.5F) * 0.2F; + float f2 = (random.nextFloat() - 0.5F) * 0.2F; + double d3 = d0 + (this.posX - d0) * d6 + (random.nextDouble() - 0.5D) * (double)this.width * 2.0D; + double d4 = d1 + (this.posY - d1) * d6 + random.nextDouble() * (double)this.height; + double d5 = d2 + (this.posZ - d2) * d6 + (random.nextDouble() - 0.5D) * (double)this.width * 2.0D; + world.spawnParticle(EnumParticleTypes.PORTAL, d3, d4, d5, (double)f, (double)f1, (double)f2, new int[0]); } - playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + // Botania - invalid/unneeded check + /*if (this instanceof EntityCreature) + { + ((EntityCreature)this).getNavigator().clearPathEntity(); + }*/ - Vec3d origPos = new Vec3d(d3, d4 + height / 2, d5); + // Botania - damage any players in our way + Vec3d origPos = new Vec3d(d0, d1 + height / 2, d2); Vec3d newPos = new Vec3d(posX, posY + height / 2, posZ); if(origPos.squareDistanceTo(newPos) > 1) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java index 88cffdf11..7bbedf264 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java +++ b/src/main/java/vazkii/botania/common/entity/EntityEnderAirBottle.java @@ -39,14 +39,14 @@ public class EntityEnderAirBottle extends EntityThrowable { @Override protected void onImpact(@Nonnull RayTraceResult pos) { - if(pos.getBlockPos() != null && !worldObj.isRemote) { + if(pos.getBlockPos() != null && !world.isRemote) { List coordsList = getCoordsToPut(pos.getBlockPos()); - worldObj.playEvent(2002, new BlockPos(this), 8); + world.playEvent(2002, new BlockPos(this), 8); for(BlockPos coords : coordsList) { - worldObj.setBlockState(coords, Blocks.END_STONE.getDefaultState()); + world.setBlockState(coords, Blocks.END_STONE.getDefaultState()); if(Math.random() < 0.1) - worldObj.playEvent(2001, coords, Block.getStateId(Blocks.END_STONE.getDefaultState())); + world.playEvent(2001, coords, Block.getStateId(Blocks.END_STONE.getDefaultState())); } setDead(); } @@ -58,9 +58,9 @@ public class EntityEnderAirBottle extends EntityThrowable { int rangeY = 4; for (BlockPos bPos : BlockPos.getAllInBox(pos.add(-range, -rangeY, -range), pos.add(range, rangeY, range))) { - IBlockState state = worldObj.getBlockState(bPos); + IBlockState state = world.getBlockState(bPos); Block block = state.getBlock(); - if(block.isReplaceableOreGen(state, worldObj, bPos, BlockStateMatcher.forBlock(Blocks.STONE))) + if(block.isReplaceableOreGen(state, world, bPos, BlockStateMatcher.forBlock(Blocks.STONE))) possibleCoords.add(bPos); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java index 7fe7b9e0e..119b5aa15 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFallingStar.java @@ -48,9 +48,9 @@ public class EntityFallingStar extends EntityThrowableCopy { } EntityLivingBase thrower = getThrower(); - if(!worldObj.isRemote && thrower != null) { + if(!world.isRemote && thrower != null) { AxisAlignedBB axis = new AxisAlignedBB(posX, posY, posZ, lastTickPosX, lastTickPosY, lastTickPosZ).expand(2, 2, 2); - List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { if(living == thrower) continue; @@ -68,20 +68,20 @@ public class EntityFallingStar extends EntityThrowableCopy { @Override protected void onImpact(RayTraceResult pos) { - if (worldObj.isRemote) + if (world.isRemote) return; EntityLivingBase thrower = getThrower(); if(pos.entityHit != null && thrower != null && pos.entityHit != thrower && !pos.entityHit.isDead) { if(thrower instanceof EntityPlayer) pos.entityHit.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) thrower), Math.random() < 0.25 ? 10 : 5); - else pos.entityHit.attackEntityFrom(DamageSource.generic, Math.random() < 0.25 ? 10 : 5); + else pos.entityHit.attackEntityFrom(DamageSource.GENERIC, Math.random() < 0.25 ? 10 : 5); } if (pos.getBlockPos() != null) { - IBlockState state = worldObj.getBlockState(pos.getBlockPos()); - if(ConfigHandler.blockBreakParticles && !state.getBlock().isAir(state, worldObj, pos.getBlockPos())) - worldObj.playEvent(2001, pos.getBlockPos(), Block.getStateId(state)); + IBlockState state = world.getBlockState(pos.getBlockPos()); + if(ConfigHandler.blockBreakParticles && !state.getBlock().isAir(state, world, pos.getBlockPos())) + world.playEvent(2001, pos.getBlockPos(), Block.getStateId(state)); } setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java index 9e1fae442..213d0eb9e 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java +++ b/src/main/java/vazkii/botania/common/entity/EntityFlameRing.java @@ -50,7 +50,7 @@ public class EntityFlameRing extends Entity { if(a % 2 == 0) a = 45 + a; - if(worldObj.rand.nextInt(ticksExisted < 90 ? 8 : 20) == 0) { + if(world.rand.nextInt(ticksExisted < 90 ? 8 : 20) == 0) { float rad = (float) (a * 4 * Math.PI / 180F); double x = Math.cos(rad) * renderRadius; double z = Math.sin(rad) * renderRadius; @@ -65,10 +65,10 @@ public class EntityFlameRing extends Entity { } } - if(worldObj.rand.nextInt(20) == 0) - worldObj.playSound(posX, posY, posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F, false); + if(world.rand.nextInt(20) == 0) + world.playSound(posX, posY, posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.BLOCKS, 1F, 1F, false); - if(worldObj.isRemote) + if(world.isRemote) return; if(ticksExisted >= 300) { @@ -78,7 +78,7 @@ public class EntityFlameRing extends Entity { if(ticksExisted > 45) { AxisAlignedBB boundingBox = new AxisAlignedBB(posX, posY, posZ, posX, posY, posZ).expand(radius, radius, radius); - List entities = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); + List entities = world.getEntitiesWithinAABB(EntityLivingBase.class, boundingBox); if(entities.isEmpty()) return; diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java index c197c9135..3cc630602 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicLandmine.java @@ -48,20 +48,20 @@ public class EntityMagicLandmine extends Entity { float g = 0F; float b = 0.2F; - //Botania.proxy.wispFX(worldObj, posX, posY, posZ, r, g, b, 0.6F, -0.2F, 1); + //Botania.proxy.wispFX(world, posX, posY, posZ, r, g, b, 0.6F, -0.2F, 1); for(int i = 0; i < 6; i++) Botania.proxy.wispFX(posX - range + Math.random() * range * 2, posY, posZ - range + Math.random() * range * 2, r, g, b, 0.4F, -0.015F, 1); if(ticksExisted >= 55) { - worldObj.playSound(null, posX, posY, posZ, BotaniaSoundEvents.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); + world.playSound(null, posX, posY, posZ, BotaniaSoundEvents.gaiaTrap, SoundCategory.NEUTRAL, 0.3F, 1F); float m = 0.35F; g = 0.4F; for(int i = 0; i < 25; i++) Botania.proxy.wispFX(posX, posY + 1, posZ, r, g, b, 0.5F, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m, (float) (Math.random() - 0.5F) * m); - if(!worldObj.isRemote) { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); + if(!world.isRemote) { + List players = world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range)); for(EntityPlayer player : players) { player.attackEntityFrom(DamageSource.causeIndirectMagicDamage(this, summoner), 10); player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 25, 0)); diff --git a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java index 179c6536d..73778f176 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java +++ b/src/main/java/vazkii/botania/common/entity/EntityMagicMissile.java @@ -52,7 +52,7 @@ public class EntityMagicMissile extends EntityThrowable { } public EntityMagicMissile(EntityLivingBase thrower, boolean evil) { - this(thrower.worldObj); + this(thrower.world); ReflectionHelper.setPrivateValue(EntityThrowable.class, this, thrower, LibObfuscation.THROWER); setEvil(evil); } @@ -77,7 +77,7 @@ public class EntityMagicMissile extends EntityThrowable { public EntityLivingBase getTargetEntity() { int id = dataManager.get(TARGET); - Entity e = worldObj.getEntityByID(id); + Entity e = world.getEntityByID(id); if(e != null && e instanceof EntityLivingBase) return (EntityLivingBase) e; @@ -92,7 +92,7 @@ public class EntityMagicMissile extends EntityThrowable { super.onUpdate(); - if(!worldObj.isRemote && (!getTarget() || time > 40)) { + if(!world.isRemote && (!getTarget() || time > 40)) { setDead(); return; } @@ -108,7 +108,7 @@ public class EntityMagicMissile extends EntityThrowable { Botania.proxy.setSparkleFXCorrupt(evil); for(int i = 0; i < steps; i++) { Botania.proxy.sparkleFX(particlePos.x, particlePos.y, particlePos.z, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); - if(worldObj.rand.nextInt(steps) <= 1) + if(world.rand.nextInt(steps) <= 1) Botania.proxy.sparkleFX(particlePos.x + (Math.random() - 0.5) * 0.4, particlePos.y + (Math.random() - 0.5) * 0.4, particlePos.z + (Math.random() - 0.5) * 0.4, 1F, evil ? 0F : 0.4F, 1F, 0.8F, 2); particlePos = particlePos.add(step); @@ -132,13 +132,13 @@ public class EntityMagicMissile extends EntityThrowable { motionY = Math.abs(motionY); motionZ = motionVec.z; - List targetList = worldObj.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); + List targetList = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(posX - 0.5, posY - 0.5, posZ - 0.5, posX + 0.5, posY + 0.5, posZ + 0.5)); if(targetList.contains(target) && target != null) { EntityLivingBase thrower = getThrower(); if(thrower != null) { EntityPlayer player = thrower instanceof EntityPlayer ? (EntityPlayer) thrower : null; target.attackEntityFrom(player == null ? DamageSource.causeMobDamage(thrower) : DamageSource.causePlayerDamage(player), evil ? 12 : 7); - } else target.attackEntityFrom(DamageSource.generic, evil ? 12 : 7); + } else target.attackEntityFrom(DamageSource.GENERIC, evil ? 12 : 7); setDead(); } @@ -165,15 +165,15 @@ public class EntityMagicMissile extends EntityThrowable { public boolean getTarget() { EntityLivingBase target = getTargetEntity(); - if(target != null && target.getHealth() > 0 && !target.isDead && worldObj.loadedEntityList.contains(target)) + if(target != null && target.getHealth() > 0 && !target.isDead && world.loadedEntityList.contains(target)) return true; if(target != null) setTarget(null); double range = 12; - List entities = worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range), Predicates.instanceOf(isEvil() ? EntityPlayer.class : IMob.class)); + List entities = world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(posX - range, posY - range, posZ - range, posX + range, posY + range, posZ + range), Predicates.instanceOf(isEvil() ? EntityPlayer.class : IMob.class)); while(entities.size() > 0) { - Entity e = (Entity) entities.get(worldObj.rand.nextInt(entities.size())); + Entity e = (Entity) entities.get(world.rand.nextInt(entities.size())); if(!(e instanceof EntityLivingBase) || e.isDead) { // Just in case... entities.remove(e); continue; @@ -191,7 +191,7 @@ public class EntityMagicMissile extends EntityThrowable { protected void onImpact(@Nonnull RayTraceResult pos) { switch (pos.typeOfHit) { case BLOCK: { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block block = world.getBlockState(pos.getBlockPos()).getBlock(); if(!(block instanceof BlockBush) && !(block instanceof BlockLeaves)) setDead(); break; diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java index b98227293..feefd0c94 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaBurst.java @@ -90,7 +90,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private static final DataParameter MANA_LOSS_PER_TICK = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.FLOAT); private static final DataParameter GRAVITY = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.FLOAT); private static final DataParameter SOURCE_COORDS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.BLOCK_POS); - private static final DataParameter> SOURCE_LENS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.OPTIONAL_ITEM_STACK); + private static final DataParameter SOURCE_LENS = EntityDataManager.createKey(EntityManaBurst.class, DataSerializers.OPTIONAL_ITEM_STACK); float accumulatedManaLoss = 0; boolean fake = false; @@ -116,7 +116,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { dataManager.register(MANA_LOSS_PER_TICK, 0F); dataManager.register(GRAVITY, 0F); dataManager.register(SOURCE_COORDS, BlockPos.ORIGIN); - dataManager.register(SOURCE_LENS, Optional.absent()); + dataManager.register(SOURCE_LENS, ItemStack.EMPTY); } public EntityManaBurst(IManaSpreader spreader, boolean fake) { @@ -139,7 +139,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public EntityManaBurst(EntityPlayer player) { - this(player.worldObj); + this(player.world); setBurstSourceCoords(new BlockPos(0, -1, 0)); setLocationAndAngles(player.posX, player.posY + player.getEyeHeight(), player.posZ, player.rotationYaw + 180, -player.rotationPitch); @@ -163,7 +163,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { lastTickPosZ = posZ; // super.onUpdate(); Botania - inline supersuperclass's onUpdate { - if (!worldObj.isRemote) + if (!world.isRemote) { setFlag(6, isGlowing()); } @@ -180,7 +180,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { Vec3d vec3d = new Vec3d(posX, posY, posZ); Vec3d vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); - RayTraceResult raytraceresult = worldObj.rayTraceBlocks(vec3d, vec3d1); + RayTraceResult raytraceresult = world.rayTraceBlocks(vec3d, vec3d1); vec3d = new Vec3d(posX, posY, posZ); vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); @@ -189,9 +189,9 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { vec3d1 = new Vec3d(raytraceresult.hitVec.xCoord, raytraceresult.hitVec.yCoord, raytraceresult.hitVec.zCoord); } - if(!worldObj.isRemote) { // Botania - only do entity colliding on server + if(!world.isRemote) { // Botania - only do entity colliding on server Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); + List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); double d0 = 0.0D; for (int i = 0; i < list.size(); ++i) { @@ -245,7 +245,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if (raytraceresult != null) { - if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && world.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) { setPortal(raytraceresult.getBlockPos()); } @@ -258,7 +258,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { posX += motionX; posY += motionY; posZ += motionZ; - float f = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); + float f = MathHelper.sqrt(motionX * motionX + motionZ * motionZ); rotationYaw = (float)(MathHelper.atan2(motionX, motionZ) * (180D / Math.PI)); for (rotationPitch = (float)(MathHelper.atan2(motionY, f) * (180D / Math.PI)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) @@ -290,7 +290,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { for (int j = 0; j < 4; ++j) { float f3 = 0.25F; - worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * f3, posY - motionY * f3, posZ - motionZ * f3, motionX, motionY, motionZ, new int[0]); + world.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * f3, posY - motionY * f3, posZ - motionZ * f3, motionX, motionY, motionZ, new int[0]); } } @@ -383,8 +383,8 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { ItemStack stack = getSourceLens(); NBTTagCompound lensCmp = new NBTTagCompound(); - if(stack != null) - stack.writeToNBT(lensCmp); + if(!stack.isEmpty()) + lensCmp = stack.writeToNBT(lensCmp); par1nbtTagCompound.setTag(TAG_LENS_STACK, lensCmp); BlockPos coords = getBurstSourceBlockPos(); @@ -417,10 +417,10 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { setGravity(par1nbtTagCompound.getFloat(TAG_GRAVITY)); NBTTagCompound lensCmp = par1nbtTagCompound.getCompoundTag(TAG_LENS_STACK); - ItemStack stack = ItemStack.loadItemStackFromNBT(lensCmp); - if(stack != null) + ItemStack stack = new ItemStack(lensCmp); + if(!stack.isEmpty()) setSourceLens(stack); - else setSourceLens(new ItemStack(Blocks.STONE, 0, 0)); + else setSourceLens(ItemStack.EMPTY); int x = par1nbtTagCompound.getInteger(TAG_SPREADER_X); int y = par1nbtTagCompound.getInteger(TAG_SPREADER_Y); @@ -445,7 +445,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } public void particles() { - if(isDead || !worldObj.isRemote) + if(isDead || !world.isRemote) return; ILensEffect lens = getLensInstance(); @@ -532,11 +532,11 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { boolean dead = false; if(rtr.entityHit == null) { - TileEntity tile = worldObj.getTileEntity(rtr.getBlockPos()); - IBlockState state = worldObj.getBlockState(rtr.getBlockPos()); + TileEntity tile = world.getTileEntity(rtr.getBlockPos()); + IBlockState state = world.getBlockState(rtr.getBlockPos()); Block block = state.getBlock(); - if(block instanceof IManaCollisionGhost && ((IManaCollisionGhost) block).isGhost(state, worldObj, rtr.getBlockPos()) && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) + if(block instanceof IManaCollisionGhost && ((IManaCollisionGhost) block).isGhost(state, world, rtr.getBlockPos()) && !(block instanceof IManaTrigger) || block instanceof BlockBush || block instanceof BlockLeaves) return; if(BotaniaAPI.internalHandler.isBuildcraftPipe(tile)) @@ -547,11 +547,11 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { collidedTile = tile; if(tile == null || !tile.getPos().equals(coords)) { - if(!fake && !noParticles && (!worldObj.isRemote || tile instanceof IClientManaHandler) && tile != null && tile instanceof IManaReceiver && ((IManaReceiver) tile).canRecieveManaFromBursts()) + if(!fake && !noParticles && (!world.isRemote || tile instanceof IClientManaHandler) && tile != null && tile instanceof IManaReceiver && ((IManaReceiver) tile).canRecieveManaFromBursts()) onRecieverImpact((IManaReceiver) tile, tile.getPos()); if(block instanceof IManaTrigger) - ((IManaTrigger) block).onBurstCollision(this, worldObj, rtr.getBlockPos()); + ((IManaTrigger) block).onBurstCollision(this, world, rtr.getBlockPos()); boolean ghost = block instanceof IManaCollisionGhost; dead = !ghost; @@ -606,7 +606,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { if(tile instanceof IThrottledPacket) ((IThrottledPacket) tile).markDispatchable(); - else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, pos); + else VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } @Override @@ -621,7 +621,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { } private TileEntity getShooter() { - return worldObj.getTileEntity(getBurstSourceBlockPos()); + return world.getTileEntity(getBurstSourceBlockPos()); } @Override @@ -715,15 +715,12 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { @Override public ItemStack getSourceLens() { - Optional stack = dataManager.get(SOURCE_LENS); - if(!stack.isPresent()) - return new ItemStack(Blocks.STONE, 0, 0); - else return stack.get(); + return dataManager.get(SOURCE_LENS); } @Override public void setSourceLens(ItemStack lens) { - dataManager.set(SOURCE_LENS, lens == null ? Optional.absent() : Optional.of(lens)); + dataManager.set(SOURCE_LENS, lens); } @Override @@ -737,7 +734,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private ILensEffect getLensInstance() { ItemStack lens = getSourceLens(); - if(lens != null && lens.getItem() instanceof ILensEffect) + if(!lens.isEmpty() && lens.getItem() instanceof ILensEffect) return (ILensEffect) lens.getItem(); return null; @@ -801,7 +798,7 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { private void setDeathTicksForFakeParticle() { BlockPos coords = getBurstSourceBlockPos(); - TileEntity tile = worldObj.getTileEntity(coords); + TileEntity tile = world.getTileEntity(coords); if(tile != null && tile instanceof IManaSpreader) ((IManaSpreader) tile).setLastBurstDeathTick(getTicksExisted()); } @@ -814,11 +811,11 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst { public boolean invalid = false; public PositionProperties(Entity entity) { - int x = MathHelper.floor_double(entity.posX); - int y = MathHelper.floor_double(entity.posY); - int z = MathHelper.floor_double(entity.posZ); + int x = MathHelper.floor(entity.posX); + int y = MathHelper.floor(entity.posY); + int z = MathHelper.floor(entity.posZ); coords = new BlockPos(x, y, z); - state = entity.worldObj.getBlockState(coords); + state = entity.world.getBlockState(coords); } public boolean coordsEqual(PositionProperties props) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java index a98efc94a..8f5e829ee 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java +++ b/src/main/java/vazkii/botania/common/entity/EntityManaStorm.java @@ -47,7 +47,7 @@ public class EntityManaStorm extends Entity { int diffTime = Math.max(1, 30 - (int) (liveTime / 45f)); if(burstsFired < TOTAL_BURSTS && liveTime % diffTime == 0) { - if(!worldObj.isRemote) + if(!world.isRemote) spawnBurst(); burstsFired++; } @@ -56,13 +56,13 @@ public class EntityManaStorm extends Entity { deathTime++; if(deathTime >= DEATH_TIME) { setDead(); - worldObj.newExplosion(this, posX, posY, posZ, 8F, true, true); + world.newExplosion(this, posX, posY, posZ, 8F, true, true); } } } private void spawnBurst() { - EntityManaBurst burst = new EntityManaBurst(worldObj); + EntityManaBurst burst = new EntityManaBurst(world); burst.setPosition(posX, posY, posZ); float motionModifier = 0.5F; @@ -78,7 +78,7 @@ public class EntityManaStorm extends Entity { Vector3 motion = new Vector3(Math.random() - 0.5, Math.random() - 0.5, Math.random() - 0.5).normalize().multiply(motionModifier); burst.setMotion(motion.x, motion.y, motion.z); - worldObj.spawnEntityInWorld(burst); + world.spawnEntity(burst); } @Override diff --git a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java index 66b1624d6..846f3f9a7 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPinkWither.java @@ -44,7 +44,7 @@ public class EntityPinkWither extends EntityWither { double d10 = func_82214_u(j); double d2 = func_82208_v(j); double d4 = func_82213_w(j); - worldObj.spawnParticle(EnumParticleTypes.HEART, d10 + rand.nextGaussian() * 0.30000001192092896D, d2 + rand.nextGaussian() * 0.30000001192092896D, d4 + rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D); + world.spawnParticle(EnumParticleTypes.HEART, d10 + rand.nextGaussian() * 0.30000001192092896D, d2 + rand.nextGaussian() * 0.30000001192092896D, d4 + rand.nextGaussian() * 0.30000001192092896D, 0.0D, 0.0D, 0.0D); } } @@ -55,7 +55,7 @@ public class EntityPinkWither extends EntityWither { } @Override - protected boolean processInteract(EntityPlayer player, EnumHand hand, ItemStack stack) { + protected boolean processInteract(EntityPlayer player, EnumHand hand) { if(!player.isSneaking()) { player.startRiding(this); return true; diff --git a/src/main/java/vazkii/botania/common/entity/EntityPixie.java b/src/main/java/vazkii/botania/common/entity/EntityPixie.java index 405c201cf..192636eaa 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPixie.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPixie.java @@ -113,19 +113,19 @@ public class EntityPixie extends EntityFlying { public void onEntityUpdate() { super.onEntityUpdate(); - if(!worldObj.isRemote + if(!world.isRemote && (getAttackTarget() == null || ticksExisted > 200)) setDead(); boolean dark = getType() == 1; - if(worldObj.isRemote) + if(world.isRemote) for(int i = 0; i < 4; i++) Botania.proxy.sparkleFX(posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, dark ? 0.1F : 1F, dark ? 0.025F : 0.25F, dark ? 0.09F : 0.9F, 0.1F + (float) Math.random() * 0.25F, 12); } @Override public void setDead() { - if(worldObj != null && worldObj.isRemote && getType() == 0) + if(world != null && world.isRemote && getType() == 0) for(int i = 0; i < 12; i++) Botania.proxy.sparkleFX(posX + (Math.random() - 0.5) * 0.25, posY + 0.5 + (Math.random() - 0.5) * 0.25, posZ + (Math.random() - 0.5) * 0.25, 1F, 0.25F, 0.9F, 1F + (float) Math.random() * 0.25F, 5); super.setDead(); diff --git a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java index a6e9026c5..19aa383cf 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/entity/EntityPoolMinecart.java @@ -114,12 +114,12 @@ public class EntityPoolMinecart extends EntityMinecart { public void onUpdate() { super.onUpdate(); - if(worldObj.isRemote) { + if(world.isRemote) { double particleChance = 1F - (double) getMana() / (double) TilePool.MAX_MANA * 0.1; Color color = TilePool.PARTICLE_COLOR; - double x = MathHelper.floor_double(posX); - double y = MathHelper.floor_double(posY); - double z = MathHelper.floor_double(posZ); + double x = MathHelper.floor(posX); + double y = MathHelper.floor(posY); + double z = MathHelper.floor(posZ); if(Math.random() > particleChance) Botania.proxy.wispFX(x + 0.3 + Math.random() * 0.5, y + 0.85 + Math.random() * 0.25, z + Math.random(), color.getRed(), color.getGreen() / 255F, color.getBlue() / 255F, (float) Math.random() / 3F, (float) -Math.random() / 25F, 2F); } @@ -131,16 +131,16 @@ public class EntityPoolMinecart extends EntityMinecart { for(EnumFacing dir : EnumFacing.HORIZONTALS) { BlockPos posP = pos.offset(dir); - Block block = worldObj.getBlockState(posP).getBlock(); + Block block = world.getBlockState(posP).getBlock(); if(block == ModBlocks.pump) { BlockPos posP_ = posP.offset(dir); - TileEntity tile = worldObj.getTileEntity(posP_); - TileEntity tile_ = worldObj.getTileEntity(posP); + TileEntity tile = world.getTileEntity(posP_); + TileEntity tile_ = world.getTileEntity(posP); TilePump pump = (TilePump) tile_; if(tile != null && tile instanceof IManaPool) { IManaPool pool = (IManaPool) tile; - EnumFacing pumpDir = worldObj.getBlockState(posP).getValue(BotaniaStateProps.CARDINALS); + EnumFacing pumpDir = world.getBlockState(posP).getValue(BotaniaStateProps.CARDINALS); boolean did = false; boolean can = false; @@ -173,7 +173,7 @@ public class EntityPoolMinecart extends EntityMinecart { } if(did) { - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(worldObj, posP_); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, posP_); pump.hasCart = true; if(!pump.active) pump.setActive(true); diff --git a/src/main/java/vazkii/botania/common/entity/EntitySpark.java b/src/main/java/vazkii/botania/common/entity/EntitySpark.java index b46a0bf01..8a0aab892 100644 --- a/src/main/java/vazkii/botania/common/entity/EntitySpark.java +++ b/src/main/java/vazkii/botania/common/entity/EntitySpark.java @@ -40,6 +40,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -55,7 +56,6 @@ public class EntitySpark extends Entity implements ISparkEntity { private static final int TRANSFER_RATE = 1000; private static final String TAG_UPGRADE = "upgrade"; private static final String TAG_INVIS = "invis"; - public static final DataParameter INVISIBILITY = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private static final DataParameter UPGRADE = EntityDataManager.createKey(EntitySpark.class, DataSerializers.VARINT); private final Set transfers = Collections.newSetFromMap(new WeakHashMap<>()); @@ -70,7 +70,6 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void entityInit() { setSize(0.1F, 0.5F); - dataManager.register(INVISIBILITY, 0); dataManager.register(UPGRADE, 0); } @@ -84,7 +83,7 @@ public class EntitySpark extends Entity implements ISparkEntity { public void onUpdate() { super.onUpdate(); - if(worldObj.isRemote) + if(world.isRemote) return; ISparkAttachable tile = getAttachedTile(); @@ -96,30 +95,28 @@ public class EntitySpark extends Entity implements ISparkEntity { SparkUpgradeType upgrade = getUpgrade(); List allSparks = null; if(upgrade == SparkUpgradeType.DOMINANT || upgrade == SparkUpgradeType.RECESSIVE) - allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); + allSparks = SparkHelper.getSparksAround(world, posX, posY, posZ); Collection transfers = getTransfers(); switch(upgrade) { case DISPERSIVE : { - List players = SparkHelper.getEntitiesAround(EntityPlayer.class, worldObj, posX, posY, posZ); + List players = SparkHelper.getEntitiesAround(EntityPlayer.class, world, posX, posY, posZ); Map> receivingPlayers = new HashMap<>(); ItemStack input = new ItemStack(ModItems.spark); for(EntityPlayer player : players) { List stacks = new ArrayList<>(); - stacks.addAll(Arrays.asList(player.inventory.mainInventory)); - stacks.addAll(Arrays.asList(player.inventory.armorInventory)); + stacks.addAll(player.inventory.mainInventory); + stacks.addAll(player.inventory.armorInventory); - IInventory baubles = BaublesApi.getBaubles(player); - ItemStack[] baubleStacks = new ItemStack[baubles.getSizeInventory()]; - for(int i = 0; i < baubleStacks.length; i++) - baubleStacks[i] = baubles.getStackInSlot(i); - stacks.addAll(Arrays.asList(baubleStacks)); + IItemHandler baubles = BaublesApi.getBaublesHandler(player); + for (int i = 0; i < baubles.getSlots(); i++) + stacks.add(baubles.getStackInSlot(i)); for(ItemStack stack : stacks) { - if(stack == null || !(stack.getItem() instanceof IManaItem)) + if(stack.isEmpty() || !(stack.getItem() instanceof IManaItem)) continue; IManaItem manaItem = (IManaItem) stack.getItem(); @@ -168,7 +165,7 @@ public class EntitySpark extends Entity implements ISparkEntity { validSparks.add(spark); } if(validSparks.size() > 0) - validSparks.get(worldObj.rand.nextInt(validSparks.size())).registerTransfer(this); + validSparks.get(world.rand.nextInt(validSparks.size())).registerTransfer(this); break; } @@ -216,13 +213,13 @@ public class EntitySpark extends Entity implements ISparkEntity { } private void particlesTowards(Entity e) { - PacketHandler.sendToNearby(worldObj, this, + PacketHandler.sendToNearby(world, this, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_MANA_FLOW, posX, posY, posZ, getEntityId(), e.getEntityId())); } public static void particleBeam(EntityPlayer player, Entity e1, Entity e2) { - if(e1 != null && e2 != null && !e1.worldObj.isRemote) { + if(e1 != null && e2 != null && !e1.world.isRemote) { PacketHandler.sendTo((EntityPlayerMP) player, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.SPARK_NET_INDICATOR, e1.posX, e1.posY, e1.posZ, e1.getEntityId(), e2.getEntityId())); @@ -243,11 +240,16 @@ public class EntitySpark extends Entity implements ISparkEntity { } @Override - public boolean processInitialInteract(EntityPlayer player, ItemStack stack, EnumHand hand) { - if(stack != null) { - if(worldObj.isRemote) - return stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade - || stack.getItem() == ModItems.phantomInk; + public boolean processInitialInteract(EntityPlayer player, EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + if(!stack.isEmpty()) { + if(world.isRemote) { + boolean valid = stack.getItem() == ModItems.twigWand || stack.getItem() == ModItems.sparkUpgrade + || stack.getItem() == ModItems.phantomInk; + if(valid) + player.swingArm(hand); + return valid; + } SparkUpgradeType upgrade = getUpgrade(); if(stack.getItem() == ModItems.twigWand) { @@ -259,23 +261,19 @@ public class EntitySpark extends Entity implements ISparkEntity { transfers.clear(); removeTransferants = 2; } else dropAndKill(); - player.swingArm(hand); return true; } else { - List allSparks = SparkHelper.getSparksAround(worldObj, posX, posY, posZ); - for(ISparkEntity spark : allSparks) + for(ISparkEntity spark : SparkHelper.getSparksAround(world, posX, posY, posZ)) particleBeam(player, this, (Entity) spark); return true; } } else if(stack.getItem() == ModItems.sparkUpgrade && upgrade == SparkUpgradeType.NONE) { int newUpgrade = stack.getItemDamage() + 1; setUpgrade(SparkUpgradeType.values()[newUpgrade]); - stack.stackSize--; - player.swingArm(hand); + stack.shrink(1); return true; } else if (stack.getItem() == ModItems.phantomInk) { - int invis = dataManager.get(INVISIBILITY); - dataManager.set(INVISIBILITY, ~invis & 1); + setInvisible(true); return true; } } @@ -286,21 +284,21 @@ public class EntitySpark extends Entity implements ISparkEntity { @Override protected void readEntityFromNBT(@Nonnull NBTTagCompound cmp) { setUpgrade(SparkUpgradeType.values()[cmp.getInteger(TAG_UPGRADE)]); - dataManager.set(INVISIBILITY, cmp.getInteger(TAG_INVIS)); + setInvisible(cmp.getInteger(TAG_INVIS) == 1); } @Override protected void writeEntityToNBT(@Nonnull NBTTagCompound cmp) { cmp.setInteger(TAG_UPGRADE, getUpgrade().ordinal()); - cmp.setInteger(TAG_INVIS, dataManager.get(INVISIBILITY)); + cmp.setInteger(TAG_INVIS, isInvisible() ? 1 : 0); } @Override public ISparkAttachable getAttachedTile() { - int x = MathHelper.floor_double(posX); - int y = MathHelper.floor_double(posY) - 1; - int z = MathHelper.floor_double(posZ); - TileEntity tile = worldObj.getTileEntity(new BlockPos(x, y, z)); + int x = MathHelper.floor(posX); + int y = MathHelper.floor(posY) - 1; + int z = MathHelper.floor(posZ); + TileEntity tile = world.getTileEntity(new BlockPos(x, y, z)); if(tile != null && tile instanceof ISparkAttachable) return (ISparkAttachable) tile; diff --git a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java index bd1c0fbf0..31f750b10 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThornChakram.java @@ -42,7 +42,7 @@ public class EntityThornChakram extends EntityThrowable { private static final DataParameter RETURN_TO = EntityDataManager.createKey(EntityThornChakram.class, DataSerializers.VARINT); private static final int MAX_BOUNCES = 16; private boolean bounced = false; - private ItemStack stack; + private ItemStack stack = ItemStack.EMPTY; public EntityThornChakram(World world) { super(world); @@ -91,15 +91,15 @@ public class EntityThornChakram extends EntityThrowable { } // Client FX - if(worldObj.isRemote && isFire()) { + if(world.isRemote && isFire()) { double r = 0.1; double m = 0.1; for(int i = 0; i < 3; i++) - worldObj.spawnParticle(EnumParticleTypes.FLAME, posX + r * (Math.random() - 0.5), posY + r * (Math.random() - 0.5), posZ + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); + world.spawnParticle(EnumParticleTypes.FLAME, posX + r * (Math.random() - 0.5), posY + r * (Math.random() - 0.5), posZ + r * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5), m * (Math.random() - 0.5)); } // Server state control - if(!worldObj.isRemote && (getTimesBounced() >= MAX_BOUNCES || ticksExisted > 60)) { + if(!world.isRemote && (getTimesBounced() >= MAX_BOUNCES || ticksExisted > 60)) { EntityLivingBase thrower = getThrower(); if(thrower == null) { dropAndKill(); @@ -113,13 +113,13 @@ public class EntityThornChakram extends EntityThrowable { private void dropAndKill() { ItemStack stack = getItemStack(); - EntityItem item = new EntityItem(worldObj, posX, posY, posZ, stack); - worldObj.spawnEntityInWorld(item); + EntityItem item = new EntityItem(world, posX, posY, posZ, stack); + world.spawnEntity(item); setDead(); } private ItemStack getItemStack() { - return stack != null ? stack.copy() : new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0); + return !stack.isEmpty() ? stack.copy() : new ItemStack(ModItems.thornChakram, 1, isFire() ? 1 : 0); } @Override @@ -129,7 +129,7 @@ public class EntityThornChakram extends EntityThrowable { switch (pos.typeOfHit) { case BLOCK: { - Block block = worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block block = world.getBlockState(pos.getBlockPos()).getBlock(); if(block instanceof BlockBush || block instanceof BlockLeaves) return; @@ -145,19 +145,19 @@ public class EntityThornChakram extends EntityThrowable { motionZ = movementVec.z; bounced = true; - if(!worldObj.isRemote) + if(!world.isRemote) setTimesBounced(getTimesBounced() + 1); } break; } case ENTITY: { - if(!worldObj.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != getThrower()) { + if(!world.isRemote && pos.entityHit != null && pos.entityHit instanceof EntityLivingBase && pos.entityHit != getThrower()) { EntityLivingBase thrower = getThrower(); - pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causeThrownDamage(this, thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.generic, 12); + pos.entityHit.attackEntityFrom(thrower != null ? thrower instanceof EntityPlayer ? DamageSource.causeThrownDamage(this, thrower) : DamageSource.causeMobDamage(thrower) : DamageSource.GENERIC, 12); if(isFire()) pos.entityHit.setFire(5); - else if(worldObj.rand.nextInt(3) == 0) + else if(world.rand.nextInt(3) == 0) ((EntityLivingBase) pos.entityHit).addPotionEffect(new PotionEffect(MobEffects.POISON, 60, 0)); } @@ -203,7 +203,7 @@ public class EntityThornChakram extends EntityThrowable { @Override public void writeEntityToNBT(NBTTagCompound compound) { super.writeEntityToNBT(compound); - if(stack != null) { + if(!stack.isEmpty()) { compound.setTag("fly_stack", stack.writeToNBT(new NBTTagCompound())); } compound.setBoolean("flare", isFire()); @@ -213,7 +213,7 @@ public class EntityThornChakram extends EntityThrowable { public void readEntityFromNBT(NBTTagCompound compound) { super.readEntityFromNBT(compound); if(compound.hasKey("fly_stack")) { - stack = ItemStack.loadItemStackFromNBT(compound.getCompoundTag("fly_stack")); + stack = new ItemStack(compound.getCompoundTag("fly_stack")); } setFire(compound.getBoolean("flare")); } diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java index fc6b9a174..47e07edd0 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrowableCopy.java @@ -118,7 +118,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile @Override public void setThrowableHeading(double x, double y, double z, float velocity, float inaccuracy) { - float f = MathHelper.sqrt_double(x * x + y * y + z * z); + float f = MathHelper.sqrt(x * x + y * y + z * z); x = x / f; y = y / f; z = z / f; @@ -131,7 +131,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile motionX = x; motionY = y; motionZ = z; - float f1 = MathHelper.sqrt_double(x * x + z * z); + float f1 = MathHelper.sqrt(x * x + z * z); prevRotationYaw = rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); prevRotationPitch = rotationPitch = (float)(MathHelper.atan2(y, f1) * (180D / Math.PI)); ticksInGround = 0; @@ -150,7 +150,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) { - float f = MathHelper.sqrt_double(x * x + z * z); + float f = MathHelper.sqrt(x * x + z * z); prevRotationYaw = rotationYaw = (float)(MathHelper.atan2(x, z) * (180D / Math.PI)); prevRotationPitch = rotationPitch = (float)(MathHelper.atan2(y, f) * (180D / Math.PI)); } @@ -174,7 +174,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (inGround) { - if (worldObj.getBlockState(new BlockPos(xTile, yTile, zTile)).getBlock() == inTile) + if (world.getBlockState(new BlockPos(xTile, yTile, zTile)).getBlock() == inTile) { ++ticksInGround; @@ -198,7 +198,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile Vec3d vec3d = new Vec3d(posX, posY, posZ); Vec3d vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); - RayTraceResult raytraceresult = worldObj.rayTraceBlocks(vec3d, vec3d1); + RayTraceResult raytraceresult = world.rayTraceBlocks(vec3d, vec3d1); vec3d = new Vec3d(posX, posY, posZ); vec3d1 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); @@ -208,7 +208,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile } Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); + List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX, motionY, motionZ).expandXyz(1.0D)); double d0 = 0.0D; boolean flag = false; @@ -266,7 +266,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile if (raytraceresult != null) { - if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && worldObj.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) + if (raytraceresult.typeOfHit == RayTraceResult.Type.BLOCK && world.getBlockState(raytraceresult.getBlockPos()).getBlock() == Blocks.PORTAL) { setPortal(raytraceresult.getBlockPos()); } @@ -279,7 +279,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile posX += motionX; posY += motionY; posZ += motionZ; - float f = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); + float f = MathHelper.sqrt(motionX * motionX + motionZ * motionZ); rotationYaw = (float)(MathHelper.atan2(motionX, motionZ) * (180D / Math.PI)); for (rotationPitch = (float)(MathHelper.atan2(motionY, f) * (180D / Math.PI)); rotationPitch - prevRotationPitch < -180.0F; prevRotationPitch -= 360.0F) @@ -312,7 +312,7 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile for (int j = 0; j < 4; ++j) { float f3 = 0.25F; - worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * f3, posY - motionY * f3, posZ - motionZ * f3, motionX, motionY, motionZ); + world.spawnParticle(EnumParticleTypes.WATER_BUBBLE, posX - motionX * f3, posY - motionY * f3, posZ - motionZ * f3, motionX, motionY, motionZ); } f1 = 0.8F; @@ -396,13 +396,13 @@ public abstract class EntityThrowableCopy extends Entity implements IProjectile { if (thrower == null && throwerName != null && !throwerName.isEmpty()) { - thrower = worldObj.getPlayerEntityByName(throwerName); + thrower = world.getPlayerEntityByName(throwerName); - if (thrower == null && worldObj instanceof WorldServer) + if (thrower == null && world instanceof WorldServer) { try { - Entity entity = ((WorldServer)worldObj).getEntityFromUuid(UUID.fromString(throwerName)); + Entity entity = ((WorldServer)world).getEntityFromUuid(UUID.fromString(throwerName)); if (entity instanceof EntityLivingBase) { diff --git a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java index 7247d112e..25d9a3a68 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java +++ b/src/main/java/vazkii/botania/common/entity/EntityThrownItem.java @@ -58,13 +58,13 @@ public class EntityThrownItem extends EntityItem { Vec3d vec3 = new Vec3d(posX, posY, posZ); Vec3d vec31 = new Vec3d(posX + motionX, posY + motionY, posZ + motionZ); - RayTraceResult RayTraceResult = worldObj.rayTraceBlocks(vec3, vec31); + RayTraceResult RayTraceResult = world.rayTraceBlocks(vec3, vec31); - if (!worldObj.isRemote) + if (!world.isRemote) { Entity entity = null; - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); + List list = world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().addCoord(motionX*2, motionY*2, motionZ*2).expand(2.0D, 2.0D, 2.0D)); double d0 = 0.0D; for (Entity entity1 : list) { @@ -99,19 +99,19 @@ public class EntityThrownItem extends EntityItem { if (RayTraceResult != null) { - if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK && worldObj.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.PORTAL) + if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK && world.getBlockState(RayTraceResult.getBlockPos()).getBlock() == Blocks.PORTAL) { setPortal(RayTraceResult.getBlockPos()); } else { if (RayTraceResult.entityHit != null) { - RayTraceResult.entityHit.attackEntityFrom(DamageSource.magic, 2.0F); - if (!worldObj.isRemote) { - Entity item = getEntityItem().getItem().createEntity(worldObj, this, getEntityItem()); + RayTraceResult.entityHit.attackEntityFrom(DamageSource.MAGIC, 2.0F); + if (!world.isRemote) { + Entity item = getEntityItem().getItem().createEntity(world, this, getEntityItem()); if (item == null) { - item = new EntityItem(worldObj, posX, posY, posZ, getEntityItem()); - worldObj.spawnEntityInWorld(item); + item = new EntityItem(world, posX, posY, posZ, getEntityItem()); + world.spawnEntity(item); item.motionX = motionX*0.25F; item.motionY = motionY*0.25F; item.motionZ = motionZ*0.25F; @@ -132,11 +132,11 @@ public class EntityThrownItem extends EntityItem { Vector3 vec3m = new Vector3(motionX, motionY, motionZ); if (vec3m.mag() < 1.0F) { - if (!worldObj.isRemote) { - Entity item = getEntityItem().getItem().createEntity(worldObj, this, getEntityItem()); + if (!world.isRemote) { + Entity item = getEntityItem().getItem().createEntity(world, this, getEntityItem()); if (item == null) { - item = new EntityItem(worldObj, posX, posY, posZ, getEntityItem()); - worldObj.spawnEntityInWorld(item); + item = new EntityItem(world, posX, posY, posZ, getEntityItem()); + world.spawnEntity(item); item.motionX = motionX; item.motionY = motionY; item.motionZ = motionZ; diff --git a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java index a2360ee14..5056e75b5 100644 --- a/src/main/java/vazkii/botania/common/entity/EntityVineBall.java +++ b/src/main/java/vazkii/botania/common/entity/EntityVineBall.java @@ -31,6 +31,8 @@ import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; @@ -45,7 +47,7 @@ public class EntityVineBall extends EntityThrowable { } public EntityVineBall(EntityLivingBase thrower, boolean gravity) { - super(thrower.worldObj, thrower); + super(thrower.world, thrower); dataManager.set(GRAVITY, gravity ? 0.03F : 0F); } @@ -55,26 +57,31 @@ public class EntityVineBall extends EntityThrowable { dataManager.register(GRAVITY, 0F); } + @SideOnly(Side.CLIENT) + @Override + public void handleStatusUpdate(byte id) { + if(id == 3) { + for(int j = 0; j < 16; j++) { + world.spawnParticle(EnumParticleTypes.ITEM_CRACK, posX, posY, posZ, Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1, Item.getIdFromItem(ModItems.vineBall)); + } + } + } + @Override protected void onImpact(@Nonnull RayTraceResult var1) { - - if(worldObj.isRemote) { - for(int j = 0; j < 16; j++) { - worldObj.spawnParticle(EnumParticleTypes.ITEM_CRACK, posX, posY, posZ, Math.random() * 0.2 - 0.1, Math.random() * 0.25, Math.random() * 0.2 - 0.1, Item.getIdFromItem(ModItems.vineBall)); - } - } else { + if(!world.isRemote) { if(var1 != null) { EnumFacing dir = var1.sideHit; if(dir != null && dir.getAxis() != EnumFacing.Axis.Y) { BlockPos pos = var1.getBlockPos().offset(dir); while(pos.getY() > 0) { - IBlockState state = worldObj.getBlockState(pos); + IBlockState state = world.getBlockState(pos); Block block = state.getBlock(); - if(block.isAir(state, worldObj, pos)) { + if(block.isAir(state, world, pos)) { IBlockState stateSet = ModBlocks.solidVines.getDefaultState().withProperty(propMap.get(dir.getOpposite()), true); - worldObj.setBlockState(pos, stateSet, 1 | 2); - worldObj.playEvent(2001, pos, Block.getStateId(stateSet)); + world.setBlockState(pos, stateSet, 1 | 2); + world.playEvent(2001, pos, Block.getStateId(stateSet)); pos = pos.down(); } else break; } @@ -82,6 +89,7 @@ public class EntityVineBall extends EntityThrowable { } + this.world.setEntityState(this, (byte)3); setDead(); } } diff --git a/src/main/java/vazkii/botania/common/entity/ModEntities.java b/src/main/java/vazkii/botania/common/entity/ModEntities.java index a053389b8..1415147aa 100644 --- a/src/main/java/vazkii/botania/common/entity/ModEntities.java +++ b/src/main/java/vazkii/botania/common/entity/ModEntities.java @@ -20,25 +20,25 @@ public final class ModEntities { public static void init() { int id = 0; - EntityRegistry.registerModEntity(EntityManaBurst.class, LibEntityNames.MANA_BURST, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(EntitySignalFlare.class, LibEntityNames.SIGNAL_FLARE, id++, Botania.instance, 2048, 10, false); - EntityRegistry.registerModEntity(EntityPixie.class, LibEntityNames.PIXIE, id++, Botania.instance, 16, 3, true); - EntityRegistry.registerModEntity(EntityFlameRing.class, LibEntityNames.FLAME_RING, id++, Botania.instance, 32, 40, false); - EntityRegistry.registerModEntity(EntityVineBall.class, LibEntityNames.VINE_BALL, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(EntityDoppleganger.class, LibEntityNames.DOPPLEGANGER, id++, Botania.instance, 128, 3, true); - EntityRegistry.registerModEntity(EntityMagicLandmine.class, LibEntityNames.MAGIC_LANDMINE, id++, Botania.instance, 128, 40, false); - EntityRegistry.registerModEntity(EntitySpark.class, LibEntityNames.SPARK, id++, Botania.instance, 64, 10, false); - EntityRegistry.registerModEntity(EntityThrownItem.class, LibEntityNames.THROWN_ITEM, id++, Botania.instance, 64, 20, true); - EntityRegistry.registerModEntity(EntityMagicMissile.class, LibEntityNames.MAGIC_MISSILE, id++, Botania.instance, 64, 2, true); - EntityRegistry.registerModEntity(EntityThornChakram.class, LibEntityNames.THORN_CHAKRAM, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(EntityCorporeaSpark.class, LibEntityNames.CORPOREA_SPARK, id++, Botania.instance, 64, 10, false); - EntityRegistry.registerModEntity(EntityEnderAirBottle.class, LibEntityNames.ENDER_AIR_BOTTLE, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(EntityPoolMinecart.class, LibEntityNames.POOL_MINECART, id++, Botania.instance, 80, 3, true); - EntityRegistry.registerModEntity(EntityPinkWither.class, LibEntityNames.PINK_WITHER, id++, Botania.instance, 80, 3, false); - EntityRegistry.registerModEntity(EntityPlayerMover.class, LibEntityNames.PLAYER_MOVER, id++, Botania.instance, 40, 3, true); - EntityRegistry.registerModEntity(EntityManaStorm.class, LibEntityNames.MANA_STORM, id++, Botania.instance, 64, 10, false); - EntityRegistry.registerModEntity(EntityBabylonWeapon.class, LibEntityNames.BABYLON_WEAPON, id++, Botania.instance, 64, 10, true); - EntityRegistry.registerModEntity(EntityFallingStar.class, LibEntityNames.FALLING_STAR, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(LibEntityNames.MANA_BURST_REGISTRY, EntityManaBurst.class, LibEntityNames.MANA_BURST, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(LibEntityNames.SIGNAL_FLARE_REGISTRY, EntitySignalFlare.class, LibEntityNames.SIGNAL_FLARE, id++, Botania.instance, 2048, 10, false); + EntityRegistry.registerModEntity(LibEntityNames.PIXIE_REGISTRY, EntityPixie.class, LibEntityNames.PIXIE, id++, Botania.instance, 16, 3, true); + EntityRegistry.registerModEntity(LibEntityNames.FLAME_RING_REGISTRY, EntityFlameRing.class, LibEntityNames.FLAME_RING, id++, Botania.instance, 32, 40, false); + EntityRegistry.registerModEntity(LibEntityNames.VINE_BALL_REGISTRY, EntityVineBall.class, LibEntityNames.VINE_BALL, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(LibEntityNames.DOPPLEGANGER_REGISTRY, EntityDoppleganger.class, LibEntityNames.DOPPLEGANGER, id++, Botania.instance, 128, 3, true); + EntityRegistry.registerModEntity(LibEntityNames.MAGIC_LANDMINE_REGISTRY, EntityMagicLandmine.class, LibEntityNames.MAGIC_LANDMINE, id++, Botania.instance, 128, 40, false); + EntityRegistry.registerModEntity(LibEntityNames.SPARK_REGISTRY, EntitySpark.class, LibEntityNames.SPARK, id++, Botania.instance, 64, 10, false); + EntityRegistry.registerModEntity(LibEntityNames.THROWN_ITEM_REGISTRY, EntityThrownItem.class, LibEntityNames.THROWN_ITEM, id++, Botania.instance, 64, 20, true); + EntityRegistry.registerModEntity(LibEntityNames.MAGIC_MISSILE_REGISTRY, EntityMagicMissile.class, LibEntityNames.MAGIC_MISSILE, id++, Botania.instance, 64, 2, true); + EntityRegistry.registerModEntity(LibEntityNames.THORN_CHAKRAM_REGISTRY, EntityThornChakram.class, LibEntityNames.THORN_CHAKRAM, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(LibEntityNames.CORPOREA_SPARK_REGISTRY, EntityCorporeaSpark.class, LibEntityNames.CORPOREA_SPARK, id++, Botania.instance, 64, 10, false); + EntityRegistry.registerModEntity(LibEntityNames.ENDER_AIR_BOTTLE_REGISTRY, EntityEnderAirBottle.class, LibEntityNames.ENDER_AIR_BOTTLE, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(LibEntityNames.POOL_MINECART_REGISTRY, EntityPoolMinecart.class, LibEntityNames.POOL_MINECART, id++, Botania.instance, 80, 3, true); + EntityRegistry.registerModEntity(LibEntityNames.PINK_WITHER_REGISTRY, EntityPinkWither.class, LibEntityNames.PINK_WITHER, id++, Botania.instance, 80, 3, false); + EntityRegistry.registerModEntity(LibEntityNames.PLAYER_MOVER_REGISTRY, EntityPlayerMover.class, LibEntityNames.PLAYER_MOVER, id++, Botania.instance, 40, 3, true); + EntityRegistry.registerModEntity(LibEntityNames.MANA_STORM_REGISTRY, EntityManaStorm.class, LibEntityNames.MANA_STORM, id++, Botania.instance, 64, 10, false); + EntityRegistry.registerModEntity(LibEntityNames.BABYLON_WEAPON_REGISTRY, EntityBabylonWeapon.class, LibEntityNames.BABYLON_WEAPON, id++, Botania.instance, 64, 10, true); + EntityRegistry.registerModEntity(LibEntityNames.FALLING_STAR_REGISTRY, EntityFallingStar.class, LibEntityNames.FALLING_STAR, id++, Botania.instance, 64, 10, true); } } diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java index f7cd8b9f6..04229e00f 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementAPIPlugin.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.common.integration.buildcraft; import java.util.ArrayList; @@ -61,3 +62,4 @@ public class StatementAPIPlugin implements ITriggerProvider { return list; } } +*/ diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java index 461410606..d717f1e35 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/StatementBase.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.common.integration.buildcraft; import buildcraft.api.statements.IStatement; @@ -32,3 +33,4 @@ public abstract class StatementBase implements IStatement { return this; } } +*/ diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java index 04a7a351f..b6c66e78b 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaDetector.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.common.integration.buildcraft; import com.google.common.base.Predicates; @@ -49,3 +50,4 @@ public class TriggerManaDetector extends StatementBase implements ITriggerIntern } } +*/ diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java index 2a265dfb3..f69fe37fb 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerManaLevel.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.common.integration.buildcraft; import org.apache.commons.lang3.text.WordUtils; @@ -60,3 +61,4 @@ public class TriggerManaLevel extends StatementBase implements ITriggerExternal return false; } } +*/ diff --git a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java index c61ffa787..444cce619 100644 --- a/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java +++ b/src/main/java/vazkii/botania/common/integration/buildcraft/TriggerRuneAltarCanCraft.java @@ -1,3 +1,4 @@ +/* package vazkii.botania.common.integration.buildcraft; import buildcraft.api.statements.IStatementContainer; @@ -38,3 +39,4 @@ public class TriggerRuneAltarCanCraft extends StatementBase implements ITriggerE } } +*/ diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java index 8b83b57ed..8a7441ff0 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedDeepStorage.java @@ -62,7 +62,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { // for the case of barrel without contents set return stacks; } - int storedCount = prototype.stackSize; + int storedCount = prototype.getCount(); // WARNING: this code is very similar in all implementations of // IWrappedInventory - keep it synch @@ -73,7 +73,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { if(rem > 0) { ItemStack copy = prototype.copy(); - copy.stackSize = rem; + copy.setCount(rem); if(doit) { stacks.addAll(breakDownBigStack(copy)); } else { @@ -101,7 +101,7 @@ public class WrappedDeepStorage extends WrappedInventoryBase { } private void decreaseStoredCount(IDeepStorageUnit inventory, int rem) { - inventory.setStoredItemCount(inventory.getStoredItemType().stackSize - rem); + inventory.setStoredItemCount(inventory.getStoredItemType().getCount() - rem); } /** diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java index 8cb6d4011..551ac9477 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedIInventory.java @@ -50,7 +50,7 @@ public class WrappedIInventory extends WrappedInventoryBase{ // WARNING: this code is very similar in all implementations of // IWrappedInventory - keep it synch if(isMatchingItemStack(request.matcher, request.checkNBT, stackAt)) { - int rem = Math.min(stackAt.stackSize, request.count == -1 ? stackAt.stackSize : request.count); + int rem = Math.min(stackAt.getCount(), request.count == -1 ? stackAt.getCount() : request.count); if(rem > 0) { stacks.add(inv.handler.extractItem(i, rem, !doit)); @@ -58,7 +58,7 @@ public class WrappedIInventory extends WrappedInventoryBase{ spark.onItemExtracted(stackAt); } - request.foundItems += stackAt.stackSize; + request.foundItems += stackAt.getCount(); request.extractedItems += rem; if(request.count != -1) diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java index de8b91f30..b976f2b4f 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedInventoryBase.java @@ -34,17 +34,17 @@ public abstract class WrappedInventoryBase implements IWrappedInventory { protected Collection breakDownBigStack(ItemStack stack) { List stacks = new ArrayList(); - int additionalStacks = stack.stackSize / stack.getMaxStackSize(); - int lastStackSize = stack.stackSize % stack.getMaxStackSize(); + int additionalStacks = stack.getCount() / stack.getMaxStackSize(); + int lastStackSize = stack.getCount() % stack.getMaxStackSize(); if(additionalStacks > 0) { ItemStack fullStack = stack.copy(); - fullStack.stackSize = stack.getMaxStackSize(); + fullStack.setCount(stack.getMaxStackSize()); for (int i = 0; i < additionalStacks; i++) { stacks.add(fullStack.copy()); } } ItemStack lastStack = stack.copy(); - lastStack.stackSize = lastStackSize; + lastStack.setCount(lastStackSize); stacks.add(lastStack); return stacks; diff --git a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java index 3920ee3b4..81f53f2ed 100644 --- a/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java +++ b/src/main/java/vazkii/botania/common/integration/corporea/WrappedStorageDrawers.java @@ -72,7 +72,7 @@ public class WrappedStorageDrawers extends WrappedInventoryBase { if(rem > 0) { ItemStack copy = prototype.copy(); - copy.stackSize = rem; + copy.setCount(rem); if(doit) { stacks.addAll(breakDownBigStack(copy)); } else { diff --git a/src/main/java/vazkii/botania/common/item/Item16Colors.java b/src/main/java/vazkii/botania/common/item/Item16Colors.java index e732b06cd..335b01a79 100644 --- a/src/main/java/vazkii/botania/common/item/Item16Colors.java +++ b/src/main/java/vazkii/botania/common/item/Item16Colors.java @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; @@ -31,7 +32,7 @@ public class Item16Colors extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java index 676c6c003..aff49f054 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAncientWill.java +++ b/src/main/java/vazkii/botania/common/item/ItemAncientWill.java @@ -19,6 +19,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -43,7 +44,7 @@ public class ItemAncientWill extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java index 72cac5d51..37fec6084 100644 --- a/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java +++ b/src/main/java/vazkii/botania/common/item/ItemAstrolabe.java @@ -18,6 +18,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -41,6 +42,8 @@ import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.rod.ItemExchangeRod; import vazkii.botania.common.lib.LibItemNames; +import javax.annotation.Nonnull; + public class ItemAstrolabe extends ItemMod { private static final String TAG_BLOCK_NAME = "blockName"; @@ -52,8 +55,10 @@ public class ItemAstrolabe extends ItemMod { setMaxStackSize(1); } + @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + ItemStack stack = playerIn.getHeldItem(hand); IBlockState state = worldIn.getBlockState(pos); Block block = state.getBlock(); int meta = block.getMetaFromState(state); @@ -77,19 +82,21 @@ public class ItemAstrolabe extends ItemMod { return EnumActionResult.PASS; } + @Nonnull @Override - public ActionResult onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand) { + public ActionResult onItemRightClick(World worldIn, EntityPlayer playerIn, @Nonnull EnumHand hand) { + ItemStack stack = playerIn.getHeldItem(hand); if(playerIn.isSneaking()) { - int size = getSize(itemStackIn); + int size = getSize(stack); int newSize = size == 11 ? 3 : size + 2; - setSize(itemStackIn, newSize); - ItemsRemainingRenderHandler.set(itemStackIn, newSize + "x" + newSize); + setSize(stack, newSize); + ItemsRemainingRenderHandler.set(stack, newSize + "x" + newSize); worldIn.playSound(playerIn, playerIn.getPosition(), SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F); - return new ActionResult(EnumActionResult.SUCCESS, itemStackIn); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return new ActionResult(EnumActionResult.PASS, itemStackIn); + return ActionResult.newResult(EnumActionResult.PASS, stack); } public boolean placeAllBlocks(ItemStack stack, EntityPlayer player) { @@ -117,24 +124,21 @@ public class ItemAstrolabe extends ItemMod { Block block = Block.getBlockFromItem(blockToPlace.getItem()); int meta = blockToPlace.getItemDamage(); IBlockState state = block.getStateFromMeta(meta); - player.worldObj.setBlockState(coords, state, 1 | 2); - player.worldObj.playEvent(2001, coords, Block.getStateId(state)); + player.world.setBlockState(coords, state, 1 | 2); + player.world.playEvent(2001, coords, Block.getStateId(state)); if(player.capabilities.isCreativeMode) return; - List stacksToCheck = new ArrayList(); + List stacksToCheck = new ArrayList<>(); for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); - if(stackInSlot != null && stackInSlot.getItem() == blockToPlace.getItem() && stackInSlot.getItemDamage() == blockToPlace.getItemDamage()) { - stackInSlot.stackSize--; - if(stackInSlot.stackSize == 0) - player.inventory.setInventorySlotContents(i, null); - + if(!stackInSlot.isEmpty() && stackInSlot.getItem() == blockToPlace.getItem() && stackInSlot.getItemDamage() == blockToPlace.getItemDamage()) { + stackInSlot.shrink(1); return; } - if (stackInSlot != null && stackInSlot.getItem() instanceof IBlockProvider) + if (!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IBlockProvider) stacksToCheck.add(stackInSlot); } @@ -158,15 +162,15 @@ public class ItemAstrolabe extends ItemMod { int required = blocks.length; int current = 0; - List stacksToCheck = new ArrayList(); + List stacksToCheck = new ArrayList<>(); for (int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); - if (stackInSlot != null && stackInSlot.getItem() == reqStack.getItem() && stackInSlot.getItemDamage() == reqStack.getItemDamage()) { - current += stackInSlot.stackSize; + if (!stackInSlot.isEmpty() && stackInSlot.getItem() == reqStack.getItem() && stackInSlot.getItemDamage() == reqStack.getItemDamage()) { + current += stackInSlot.getCount(); if (current >= required) return true; } - if(stackInSlot != null && stackInSlot.getItem() instanceof IBlockProvider) + if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IBlockProvider) stacksToCheck.add(stackInSlot); } @@ -186,16 +190,16 @@ public class ItemAstrolabe extends ItemMod { } public static BlockPos[] getBlocksToPlace(ItemStack stack, EntityPlayer player) { - List coords = new ArrayList(); - RayTraceResult pos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 5); + List coords = new ArrayList<>(); + RayTraceResult pos = ToolCommons.raytraceFromEntity(player.world, player, true, 5); if(pos != null) { BlockPos bpos = pos.getBlockPos(); - IBlockState state = player.worldObj.getBlockState(bpos); + IBlockState state = player.world.getBlockState(bpos); Block block = state.getBlock(); - if(block != null && block.isReplaceable(player.worldObj, bpos)) + if(block != null && block.isReplaceable(player.world, bpos)) bpos = bpos.down();; - int rotation = MathHelper.floor_double(player.rotationYaw * 4F / 360F + 0.5D) & 3; + int rotation = MathHelper.floor(player.rotationYaw * 4F / 360F + 0.5D) & 3; int range = (getSize(stack) ^ 1) / 2; EnumFacing dir = pos.sideHit; @@ -220,9 +224,9 @@ public class ItemAstrolabe extends ItemMod { int zp = bpos.getZ() + z + dir.getFrontOffsetZ(); BlockPos newPos = new BlockPos(xp, yp, zp); - IBlockState state1 = player.worldObj.getBlockState(newPos); + IBlockState state1 = player.world.getBlockState(newPos); Block block1 = state1.getBlock(); - if(block1 == null || block1.isAir(state1, player.worldObj, newPos) || block1.isReplaceable(player.worldObj, newPos)) + if(block1 == null || block1.isAir(state1, player.world, newPos) || block1.isReplaceable(player.world, newPos)) coords.add(new BlockPos(xp, yp, zp)); } } @@ -237,12 +241,12 @@ public class ItemAstrolabe extends ItemMod { Block block = getBlock(stack); int meta = getBlockMeta(stack); int count = ItemExchangeRod.getInventoryItemCount(player, stack, block, meta); - if(!player.worldObj.isRemote) + if(!player.world.isRemote) ItemsRemainingRenderHandler.set(new ItemStack(block, 1, meta), count); } private boolean setBlock(ItemStack stack, Block block, int meta) { - if(Item.getItemFromBlock(block) != null) { + if(Item.getItemFromBlock(block) != Items.AIR) { ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; diff --git a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java index 76c5cdb07..19467a1f6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java +++ b/src/main/java/vazkii/botania/common/item/ItemBaubleBox.java @@ -55,9 +55,10 @@ public class ItemBaubleBox extends ItemMod { private static class InvProvider implements ICapabilitySerializable { private final IItemHandler inv = new ItemStackHandler(24) { + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { - if(toInsert != null && + public ItemStack insertItem(int slot, @Nonnull ItemStack toInsert, boolean simulate) { + if(!toInsert.isEmpty() && (toInsert.getItem() instanceof IManaItem || toInsert.getItem() instanceof IBauble)) return super.insertItem(slot, toInsert, simulate); @@ -66,12 +67,12 @@ public class ItemBaubleBox extends ItemMod { }; @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(inv); else return null; @@ -105,9 +106,9 @@ public class ItemBaubleBox extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.BAUBLE_BOX, world, hand == EnumHand.OFF_HAND ? 1 : 0, 0, 0); - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java index 97fa94aa0..514784ceb 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java @@ -13,6 +13,7 @@ package vazkii.botania.common.item; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; @@ -20,6 +21,7 @@ import net.minecraft.client.resources.I18n; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -63,8 +65,9 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - if(getBlock(stack) != Blocks.AIR && player.isSneaking()) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + if(getBlock(stack) != null && player.isSneaking()) { int dmg = stack.getItemDamage(); stack.setItemDamage(~dmg & 1); player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, 0.3F, 0.1F); @@ -76,10 +79,11 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { IBlockState state = world.getBlockState(pos); + ItemStack stack = player.getHeldItem(hand); - if (Item.getItemFromBlock(state.getBlock()) != null + if (Item.getItemFromBlock(state.getBlock()) != Items.AIR && setBlock(stack, state.getBlock(), state.getBlock().getMetaFromState(state))) { return EnumActionResult.SUCCESS; } else { @@ -95,17 +99,22 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { IItemHandler inv = tile.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, side); ItemStack toAdd = new ItemStack(bBlock, 1, bmeta); int maxSize = toAdd.getMaxStackSize(); - toAdd.stackSize = remove(stack, maxSize); + toAdd.setCount(remove(stack, maxSize)); ItemStack remainder = ItemHandlerHelper.insertItemStacked(inv, toAdd, false); - if(remainder != null) - add(stack, remainder.stackSize); + if(!remainder.isEmpty()) + add(stack, remainder.getCount()); } return EnumActionResult.SUCCESS; } else { if(player.capabilities.isCreativeMode || getBlockCount(stack) > 0) { ItemStack toUse = new ItemStack(bBlock, 1, bmeta); - if (Item.getItemFromBlock(bBlock).onItemUse(toUse, player, world, pos, hand, side, hitX, hitY, hitZ) == EnumActionResult.SUCCESS) { + ItemStack saveHeldItem = player.getHeldItem(hand); + player.setHeldItem(hand, toUse); + EnumActionResult result = Item.getItemFromBlock(bBlock).onItemUse(player, world, pos, hand, side, hitX, hitY, hitZ); + player.setHeldItem(hand, saveHeldItem); + + if (result == EnumActionResult.SUCCESS) { remove(stack, 1); ItemsRemainingRenderHandler.set(toUse, getBlockCount(stack)); return EnumActionResult.SUCCESS; @@ -120,21 +129,21 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override public void onUpdate(ItemStack itemstack, World world, Entity entity, int slot, boolean selected) { Block block = getBlock(itemstack); - if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.AIR && entity instanceof EntityPlayer) { + if(!entity.world.isRemote && itemstack.getItemDamage() == 1 && block != null && entity instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) entity; int meta = getBlockMeta(itemstack); int highest = -1; - int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length]; + int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.size()]; for(int i = 0; i < counts.length; i++) { ItemStack stack = player.inventory.getStackInSlot(i); - if(stack == null) { + if(stack.isEmpty()) { continue; } if(Item.getItemFromBlock(block) == stack.getItem() && stack.getItemDamage() == meta) { - counts[i] = stack.stackSize; + counts[i] = stack.getCount(); if(highest == -1) highest = i; else highest = counts[i] > counts[highest] && highest > 8 ? i : highest; @@ -158,7 +167,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { continue; add(itemstack, count); - player.inventory.setInventorySlotContents(i, null); + player.inventory.setInventorySlotContents(i, ItemStack.EMPTY); } /*int countInHighest = counts[highest]; @@ -180,7 +189,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { int meta = getBlockMeta(par1ItemStack); ItemStack stack = new ItemStack(block, 1, meta); - return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + TextFormatting.GREEN + stack.getDisplayName() + TextFormatting.RESET + ")"); + return super.getItemStackDisplayName(par1ItemStack) + (stack.isEmpty() ? "" : " (" + TextFormatting.GREEN + stack.getDisplayName() + TextFormatting.RESET + ")"); } @Nonnull @@ -188,7 +197,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { int count = getBlockCount(itemStack); if(count == 0) - return null; + return ItemStack.EMPTY; int extract = Math.min(64, count); ItemStack copy = itemStack.copy(); @@ -203,12 +212,12 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @Override public boolean hasContainerItem(ItemStack stack) { - return getContainerItem(stack) != null; + return !getContainerItem(stack).isEmpty(); } private boolean setBlock(ItemStack stack, Block block, int meta) { - if(Item.getItemFromBlock(block) != null && (getBlock(stack) == Blocks.AIR || getBlockCount(stack) == 0)) { - ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, Block.REGISTRY.getNameForObject(block).toString()); + if(Item.getItemFromBlock(block) != Items.AIR && (getBlock(stack) == null || getBlockCount(stack) == 0)) { + ItemNBTHelper.setString(stack, TAG_BLOCK_NAME, block.getRegistryName().toString()); ItemNBTHelper.setInt(stack, TAG_BLOCK_META, meta); return true; } @@ -224,7 +233,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { @SideOnly(Side.CLIENT) public void addInformation(ItemStack par1ItemStack, EntityPlayer player, List stacks, boolean par4) { Block block = getBlock(par1ItemStack); - if(block != null && block != Blocks.AIR) { + if(block != null) { int count = getBlockCount(par1ItemStack); stacks.add(count + " " + I18n.format(new ItemStack(block, 1, getBlockMeta(par1ItemStack)).getUnlocalizedName() + ".name")); } @@ -253,6 +262,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider { return ItemNBTHelper.getString(stack, TAG_BLOCK_NAME, ""); } + @Nullable public static Block getBlock(ItemStack stack) { return Block.getBlockFromName(getBlockName(stack)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 0dd1c5352..f7845d372 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -21,6 +21,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; @@ -44,7 +45,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -68,13 +69,13 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { TileEntity tile = (TileEntity) pool; boolean t2 = stack.getItemDamage() > 0; - if(!item.worldObj.isRemote) { + if(!item.world.isRemote) { pool.recieveMana(t2 ? MANA_PER_T2 : MANA_PER); - stack.stackSize--; - VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.worldObj, tile.getPos()); + stack.shrink(1); + VanillaPacketDispatcher.dispatchTEToNearbyPlayers(item.world, tile.getPos()); } - PacketHandler.sendToNearby(item.worldObj, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.posX, tile.getPos().getY() + 0.5, item.posZ)); + PacketHandler.sendToNearby(item.world, item, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.BLACK_LOTUS_DISSOLVE, item.posX, tile.getPos().getY() + 0.5, item.posZ)); item.playSound(BotaniaSoundEvents.blackLotus, 0.5F, t2 ? 0.1F : 1F); } diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index d13bb9bd1..46cb0ba41 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -63,23 +63,23 @@ public class ItemBottledMana extends ItemMod { break; } case 1 : { // Water - if(!living.worldObj.isRemote && !living.worldObj.provider.doesWaterVaporize()) - living.worldObj.setBlockState(new BlockPos(living), Blocks.FLOWING_WATER.getDefaultState()); + if(!living.world.isRemote && !living.world.provider.doesWaterVaporize()) + living.world.setBlockState(new BlockPos(living), Blocks.FLOWING_WATER.getDefaultState()); break; } case 2 : { // Set on Fire - if(!living.worldObj.isRemote) + if(!living.world.isRemote) living.setFire(4); break; } case 3 : { // Mini Explosion - if(!living.worldObj.isRemote) - living.worldObj.createExplosion(null, living.posX, living.posY, living.posZ, 0.25F, false); + if(!living.world.isRemote) + living.world.createExplosion(null, living.posX, living.posY, living.posZ, 0.25F, false); break; } case 4 : { // Mega Jump - if(!living.worldObj.provider.doesWaterVaporize()) { - if(!living.worldObj.isRemote) + if(!living.world.provider.doesWaterVaporize()) { + if(!living.world.isRemote) living.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 5)); living.motionY = 6; } @@ -87,24 +87,24 @@ public class ItemBottledMana extends ItemMod { break; } case 5 : { // Randomly set HP - if(!living.worldObj.isRemote) - living.setHealth(living.worldObj.rand.nextInt(19) + 1); + if(!living.world.isRemote) + living.setHealth(living.world.rand.nextInt(19) + 1); break; } case 6 : { // Lots O' Hearts - if(!living.worldObj.isRemote) + if(!living.world.isRemote) living.addPotionEffect(new PotionEffect(MobEffects.ABSORPTION, 20 * 60 * 2, 9)); break; } case 7 : { // All your inventory is belong to us - if(!living.worldObj.isRemote && living instanceof EntityPlayer) { + if(!living.world.isRemote && living instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) living; for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); if(stackAt != stack) { - if(stackAt != null) + if(!stackAt.isEmpty()) player.entityDropItem(stackAt, 0); - player.inventory.setInventorySlotContents(i, null); + player.inventory.setInventorySlotContents(i, ItemStack.EMPTY); } } } @@ -118,12 +118,12 @@ public class ItemBottledMana extends ItemMod { break; } case 9 : { // Highest Possible - int x = MathHelper.floor_double(living.posX); - MathHelper.floor_double(living.posY); - int z = MathHelper.floor_double(living.posZ); + int x = MathHelper.floor(living.posX); + MathHelper.floor(living.posY); + int z = MathHelper.floor(living.posZ); for(int i = 256; i > 0; i--) { - Block block = living.worldObj.getBlockState(new BlockPos(x, i, z)).getBlock(); - if(!block.isAir(living.worldObj.getBlockState(new BlockPos(x, i, z)), living.worldObj, new BlockPos(x, i, z))) { + Block block = living.world.getBlockState(new BlockPos(x, i, z)).getBlock(); + if(!block.isAir(living.world.getBlockState(new BlockPos(x, i, z)), living.world, new BlockPos(x, i, z))) { if(living instanceof EntityPlayerMP) { EntityPlayerMP mp = (EntityPlayerMP) living; mp.connection.setPlayerLocation(living.posX, i + 1.6, living.posZ, living.rotationYaw, living.rotationPitch); @@ -135,26 +135,26 @@ public class ItemBottledMana extends ItemMod { break; } case 10 : { // HYPERSPEEEEEED - if(!living.worldObj.isRemote) + if(!living.world.isRemote) living.addPotionEffect(new PotionEffect(MobEffects.SPEED, 60, 200)); break; } case 11 : { // Night Vision - if(!living.worldObj.isRemote) + if(!living.world.isRemote) living.addPotionEffect(new PotionEffect(MobEffects.NIGHT_VISION, 6000, 0)); break; } case 12 : { // Flare - if(!living.worldObj.isRemote) { - EntitySignalFlare flare = new EntitySignalFlare(living.worldObj); + if(!living.world.isRemote) { + EntitySignalFlare flare = new EntitySignalFlare(living.world); flare.setPosition(living.posX, living.posY, living.posZ); - flare.setColor(living.worldObj.rand.nextInt(16)); - flare.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 40F, (1.0F + (living.worldObj.rand.nextFloat() - living.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); + flare.setColor(living.world.rand.nextInt(16)); + flare.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 40F, (1.0F + (living.world.rand.nextFloat() - living.world.rand.nextFloat()) * 0.2F) * 0.7F); - living.worldObj.spawnEntityInWorld(flare); + living.world.spawnEntity(flare); int range = 5; - List entities = living.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range)); + List entities = living.world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range)); for(EntityLivingBase entity : entities) if(entity != living && (!(entity instanceof EntityPlayer) || FMLCommonHandler.instance().getMinecraftServerInstance() == null || FMLCommonHandler.instance().getMinecraftServerInstance().isPVPEnabled())) entity.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 50, 5)); @@ -163,15 +163,15 @@ public class ItemBottledMana extends ItemMod { break; } case 13 : { // Pixie Friend - if(!living.worldObj.isRemote) { - EntityPixie pixie = new EntityPixie(living.worldObj); + if(!living.world.isRemote) { + EntityPixie pixie = new EntityPixie(living.world); pixie.setPosition(living.posX, living.posY + 1.5, living.posZ); - living.worldObj.spawnEntityInWorld(pixie); + living.world.spawnEntity(pixie); } break; } case 14 : { // Nausea + Blindness :3 - if(!living.worldObj.isRemote) { + if(!living.world.isRemote) { living.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 160, 3)); living.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 160, 0)); } @@ -179,8 +179,8 @@ public class ItemBottledMana extends ItemMod { break; } case 15 : { // Drop own Head - if(!living.worldObj.isRemote && living instanceof EntityPlayer) { - living.attackEntityFrom(DamageSource.magic, living.getHealth() - 1); + if(!living.world.isRemote && living instanceof EntityPlayer) { + living.attackEntityFrom(DamageSource.MAGIC, living.getHealth() - 1); ItemStack skull = new ItemStack(Items.SKULL, 1, 3); ItemNBTHelper.setString(skull, "SkullOwner", living.getName()); living.entityDropItem(skull, 0); @@ -218,11 +218,12 @@ public class ItemBottledMana extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } + @Nonnull @Override public ItemStack onItemUseFinish(@Nonnull ItemStack par1ItemStack, World world, EntityLivingBase living) { randomEffect(living, par1ItemStack); diff --git a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java index 72799dc9e..d180f0e48 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCacophonium.java +++ b/src/main/java/vazkii/botania/common/item/ItemCacophonium.java @@ -89,7 +89,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { ItemNBTHelper.setString(stack, TAG_SOUND_NAME, "entity." + s + ".name"); player.setHeldItem(hand, stack); - if(player.worldObj.isRemote) + if(player.world.isRemote) player.swingArm(hand); return true; @@ -101,13 +101,14 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + ItemStack stack = player.getHeldItem(hand); if(getSound(stack) != null) { Block block = world.getBlockState(pos).getBlock(); if(block == Blocks.NOTEBLOCK) { world.setBlockState(pos, ModBlocks.cacophonium.getDefaultState()); ((TileCacophonium) world.getTileEntity(pos)).stack = stack.copy(); - stack.stackSize--; + stack.shrink(1); return EnumActionResult.SUCCESS; } } @@ -137,7 +138,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(getSound(stack) != null) player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); @@ -146,11 +148,11 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { @Override public void onUsingTick(ItemStack stack, EntityLivingBase player, int count) { if(count % (isDOIT(stack) ? 20 : 6) == 0) - playSound(player.worldObj, stack, player.posX, player.posY, player.posZ, SoundCategory.PLAYERS, 0.9F); + playSound(player.world, stack, player.posX, player.posY, player.posZ, SoundCategory.PLAYERS, 0.9F); } public static void playSound(World world, ItemStack stack, double x, double y, double z, SoundCategory category, float volume) { - if(stack == null) + if(stack.isEmpty()) return; SoundEvent sound = getSound(stack); @@ -167,7 +169,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement { } private static boolean isDOIT(ItemStack stack) { - return stack != null && stack.getDisplayName().equalsIgnoreCase("shia labeouf"); + return !stack.isEmpty() && stack.getDisplayName().equalsIgnoreCase("shia labeouf"); } @Override diff --git a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java index ddff74014..51f9633ab 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -41,24 +42,25 @@ public class ItemCorporeaSpark extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); if(tile != null && (tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP) || tile.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) && !CorporeaHelper.doesBlockHaveSpark(world, pos)) { - stack.stackSize--; + ItemStack stack = player.getHeldItem(hand); + stack.shrink(1); if(!world.isRemote) { EntityCorporeaSpark spark = new EntityCorporeaSpark(world); if(stack.getItemDamage() == 1) spark.setMaster(true); spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); - world.spawnEntityInWorld(spark); + world.spawnEntity(spark); world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 0); } return EnumActionResult.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java index 194c3ddb6..118a364b9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftPattern.java @@ -22,6 +22,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -40,11 +41,11 @@ public class ItemCraftPattern extends ItemMod { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer p, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(EntityPlayer p, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof TileCraftCrate) { TileCraftCrate crate = (TileCraftCrate) tile; - crate.pattern = stack.getItemDamage(); + crate.pattern = p.getHeldItem(hand).getItemDamage(); world.notifyBlockUpdate(pos, world.getBlockState(pos), world.getBlockState(pos), 8); return EnumActionResult.SUCCESS; } @@ -53,7 +54,7 @@ public class ItemCraftPattern extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < TileCraftCrate.PATTERNS.length; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java index 8591cd451..7f50757a4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java +++ b/src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java @@ -68,6 +68,8 @@ import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.lib.LibGuiIDs; import vazkii.botania.common.lib.LibItemNames; +import java.util.Arrays; + public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static final ResourceLocation glowTexture = new ResourceLocation(LibResources.MISC_GLOW_GREEN); @@ -93,14 +95,15 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); int segment = getSegmentLookedAt(stack, player); ItemStack itemForPos = getItemForSlot(stack, segment); if(segment == 0) player.openGui(Botania.instance, LibGuiIDs.CRAFTING_HALO, world, hand == EnumHand.OFF_HAND ? 1 : 0, 0, 0); else { - if(itemForPos == null) + if(itemForPos.isEmpty()) assignRecipe(stack, itemForPos, segment); else tryCraft(player, stack, segment, true, getFakeInv(player), true); } @@ -109,11 +112,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } public static IItemHandler getFakeInv(EntityPlayer player) { - ItemStackHandler ret = new ItemStackHandler(player.inventory.mainInventory.length); - for(int i = 0; i < player.inventory.mainInventory.length; i++) { - ItemStack stack = player.inventory.mainInventory[i]; - if(stack != null) - ret.setStackInSlot(i, player.inventory.mainInventory[i].copy()); + ItemStackHandler ret = new ItemStackHandler(player.inventory.mainInventory.size()); + for(int i = 0; i < player.inventory.mainInventory.size(); i++) { + ret.setStackInSlot(i, player.inventory.mainInventory.get(i).copy()); } return ret; @@ -143,7 +144,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { void tryCraft(EntityPlayer player, ItemStack stack, int slot, boolean particles, IItemHandler inv, boolean validate) { ItemStack itemForPos = getItemForSlot(stack, slot); - if(itemForPos == null) + if(itemForPos.isEmpty()) return; ItemStack[] recipe = getCraftingItems(stack, slot); @@ -155,17 +156,17 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { } private static ItemStack[] validateRecipe(EntityPlayer player, ItemStack stack, ItemStack[] recipe, int slot) { - InventoryCrafting fakeInv = new InventoryCrafting(new ContainerWorkbench(player.inventory, player.worldObj, BlockPos.ORIGIN), 3, 3); + InventoryCrafting fakeInv = new InventoryCrafting(new ContainerWorkbench(player.inventory, player.world, BlockPos.ORIGIN), 3, 3); for(int i = 0; i < 9; i++) fakeInv.setInventorySlotContents(i, recipe[i]); - ItemStack result = CraftingManager.getInstance().findMatchingRecipe(fakeInv, player.worldObj); - if(result == null) { + ItemStack result = CraftingManager.getInstance().findMatchingRecipe(fakeInv, player.world); + if(result.isEmpty()) { assignRecipe(stack, recipe[9], slot); return null; } - if(!result.isItemEqual(recipe[9]) || result.stackSize != recipe[9].stackSize || !ItemStack.areItemStackTagsEqual(recipe[9], result)) { + if(!result.isItemEqual(recipe[9]) || result.getCount() != recipe[9].getCount() || !ItemStack.areItemStackTagsEqual(recipe[9], result)) { assignRecipe(stack, recipe[9], slot); return null; } @@ -177,7 +178,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(recipe == null) return false; - if(ItemHandlerHelper.insertItemStacked(inv, recipe[9], true) != null) + if(!ItemHandlerHelper.insertItemStacked(inv, recipe[9], true).isEmpty()) return false; return consumeRecipeIngredients(recipe, inv, null); @@ -185,8 +186,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static void doCraft(EntityPlayer player, ItemStack[] recipe, boolean particles) { consumeRecipeIngredients(recipe, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, EnumFacing.UP), player); - if(!player.inventory.addItemStackToInventory(recipe[9])) - player.dropItem(recipe[9], false); + ItemHandlerHelper.giveItemToPlayer(player, recipe[9]); if(!particles) return; @@ -201,7 +201,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static boolean consumeRecipeIngredients(ItemStack[] recipe, IItemHandler inv, EntityPlayer player) { for(int i = 0; i < 9; i++) { ItemStack ingredient = recipe[i]; - if(ingredient != null && !consumeFromInventory(ingredient, inv, player)) + if(!ingredient.isEmpty() && !consumeFromInventory(ingredient, inv, player)) return false; } @@ -211,11 +211,11 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { private static boolean consumeFromInventory(ItemStack stack, IItemHandler inv, EntityPlayer player) { for(int i = 0; i < inv.getSlots(); i++) { ItemStack stackAt = inv.getStackInSlot(i); - if(stackAt != null && stack.isItemEqual(stackAt) && ItemStack.areItemStackTagsEqual(stack, stackAt)) { + if(!stackAt.isEmpty() && stack.isItemEqual(stackAt) && ItemStack.areItemStackTagsEqual(stack, stackAt)) { boolean consume = true; ItemStack container = stackAt.getItem().getContainerItem(stackAt); - if(container != null) { + if(!container.isEmpty()) { if(container == stackAt) consume = false; else { @@ -244,7 +244,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { ItemStack itemForPos = getItemForSlot(stack, segment); - if(itemForPos != null && player.isSneaking()) { + if(!itemForPos.isEmpty() && player.isSneaking()) { assignRecipe(stack, itemForPos, segment); return true; } @@ -293,19 +293,19 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { if(slot == 0) return craftingTable; else if(slot >= SEGMENTS) - return null; + return ItemStack.EMPTY; else { NBTTagCompound cmp = getStoredRecipeCompound(stack, slot); if(cmp != null) { ItemStack cmpStack = getLastCraftingItem(cmp, 9); return cmpStack; - } else return null; + } else return ItemStack.EMPTY; } } public static void assignRecipe(ItemStack stack, ItemStack itemForPos, int pos) { - if(itemForPos != null) + if(!itemForPos.isEmpty()) ItemNBTHelper.setCompound(stack, TAG_STORED_RECIPE_PREFIX + pos, new NBTTagCompound()); else ItemNBTHelper.setCompound(stack, TAG_STORED_RECIPE_PREFIX + pos, getLastCraftingCompound(stack, false)); @@ -318,7 +318,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { for(int i = 0; i < event.player.inventory.getSizeInventory(); i++) { ItemStack stack = event.player.inventory.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemCraftingHalo) + if(!stack.isEmpty() && stack.getItem() instanceof ItemCraftingHalo) saveRecipeToStack(event, stack); } } @@ -327,19 +327,19 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { NBTTagCompound cmp = new NBTTagCompound(); NBTTagCompound cmp1 = new NBTTagCompound(); - ItemStack result = CraftingManager.getInstance().findMatchingRecipe((InventoryCrafting) event.craftMatrix, event.player.worldObj); - if(result != null) { - result.writeToNBT(cmp1); + ItemStack result = CraftingManager.getInstance().findMatchingRecipe((InventoryCrafting) event.craftMatrix, event.player.world); + if(!result.isEmpty()) { + cmp1 = result.writeToNBT(cmp1); cmp.setTag(TAG_ITEM_PREFIX + 9, cmp1); for(int i = 0; i < 9; i++) { cmp1 = new NBTTagCompound(); ItemStack stackSlot = event.craftMatrix.getStackInSlot(i); - if(stackSlot != null) { + if(!stackSlot.isEmpty()) { ItemStack writeStack = stackSlot.copy(); - writeStack.stackSize = 1; - writeStack.writeToNBT(cmp1); + writeStack.setCount(1); + cmp1 = writeStack.writeToNBT(cmp1); } cmp.setTag(TAG_ITEM_PREFIX + i, cmp1); } @@ -354,6 +354,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public static ItemStack[] getCraftingItems(ItemStack stack, int slot) { ItemStack[] stackArray = new ItemStack[10]; + Arrays.fill(stackArray, ItemStack.EMPTY); NBTTagCompound cmp = getStoredRecipeCompound(stack, slot); if(cmp != null) @@ -377,13 +378,13 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public static ItemStack getLastCraftingItem(NBTTagCompound cmp, int pos) { if(cmp == null) - return null; + return ItemStack.EMPTY; NBTTagCompound cmp1 = cmp.getCompoundTag(TAG_ITEM_PREFIX + pos); if(cmp1 == null) - return null; + return ItemStack.EMPTY; - return ItemStack.loadItemStackFromNBT(cmp1); + return new ItemStack(cmp1); } public static boolean wasEquipped(ItemStack stack) { @@ -405,9 +406,9 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { @SideOnly(Side.CLIENT) @SubscribeEvent public void onRenderWorldLast(RenderWorldLastEvent event) { - EntityPlayer player = Minecraft.getMinecraft().thePlayer; + EntityPlayer player = Minecraft.getMinecraft().player; ItemStack stack = PlayerHelper.getFirstHeldItemClass(player, ItemCraftingHalo.class); - if(stack != null) + if(!stack.isEmpty()) render(stack, player, event.getPartialTicks()); } @@ -465,7 +466,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { inside = true; ItemStack slotStack = getItemForSlot(stack, seg); - if(slotStack != null) { + if(!slotStack.isEmpty()) { mc.renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); RenderHelper.enableStandardItemLighting(); float scale = seg == 0 ? 0.9F : 0.8F; @@ -551,7 +552,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { String label = I18n.format("botaniamisc.unsetRecipe"); boolean setRecipe = false; - if(recipe[9] == null) + if(recipe[9].isEmpty()) recipe = getCraftingItems(stack, SEGMENTS); else { label = recipe[9].getDisplayName(); @@ -566,7 +567,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { public static void renderRecipe(ScaledResolution resolution, String label, ItemStack[] recipe, EntityPlayer player, boolean setRecipe) { Minecraft mc = Minecraft.getMinecraft(); - if(recipe[9] != null) { + if(!recipe[9].isEmpty()) { int x = resolution.getScaledWidth() / 2 - 45; int y = resolution.getScaledHeight() / 2 - 90; @@ -580,7 +581,7 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement { GlStateManager.enableRescaleNormal(); for(int i = 0; i < 9; i++) { ItemStack stack = recipe[i]; - if(stack != null) { + if(!stack.isEmpty()) { int xpos = x + i % 3 * 18; int ypos = y + i / 3 * 18; Gui.drawRect(xpos, ypos, xpos + 16, ypos + 16, 0x22000000); diff --git a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java index 38b7e8572..3b415d140 100644 --- a/src/main/java/vazkii/botania/common/item/ItemEnderHand.java +++ b/src/main/java/vazkii/botania/common/item/ItemEnderHand.java @@ -21,6 +21,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import net.minecraftforge.items.wrapper.InvWrapper; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -41,9 +42,10 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(ManaItemHandler.requestManaExact(stack, player, COST_SELF, false)) { - if(!player.worldObj.isRemote) + if(!player.world.isRemote) player.displayGUIChest(player.getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_SELF, true); player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); @@ -55,7 +57,7 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv @Override public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { if(ConfigHandler.enderPickpocketEnabled && entity instanceof EntityPlayer && ManaItemHandler.requestManaExact(stack, player, COST_OTHER, false)) { - if(!player.worldObj.isRemote) + if(!player.world.isRemote) player.displayGUIChest(((EntityPlayer) entity).getInventoryEnderChest()); ManaItemHandler.requestManaExact(stack, player, COST_OTHER, true); player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1F, 1F); @@ -75,13 +77,13 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv if(requestor != null && requestor.getItem() == this) return false; - ItemStack istack = ItemExchangeRod.removeFromInventory(player, player.getInventoryEnderChest(), stack, block, meta, false); - if(istack != null) { + ItemStack istack = ItemExchangeRod.removeFromInventory(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, meta, false); + if(!istack.isEmpty()) { boolean mana = ManaItemHandler.requestManaExact(stack, player, COST_PROVIDE, false); if(mana) { if(doit) { ManaItemHandler.requestManaExact(stack, player, COST_PROVIDE, true); - ItemExchangeRod.removeFromInventory(player, player.getInventoryEnderChest(), stack, block, meta, true); + ItemExchangeRod.removeFromInventory(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, meta, true); } return true; @@ -96,7 +98,7 @@ public class ItemEnderHand extends ItemMod implements IManaUsingItem, IBlockProv if(requestor != null && requestor.getItem() == this) return 0; - return ItemExchangeRod.getInventoryItemCount(player, player.getInventoryEnderChest(), stack, block, meta); + return ItemExchangeRod.getInventoryItemCount(player, new InvWrapper(player.getInventoryEnderChest()), stack, block, meta); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java index cb116fcd6..9065b5746 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFertilizer.java +++ b/src/main/java/vazkii/botania/common/item/ItemFertilizer.java @@ -36,7 +36,7 @@ public class ItemFertilizer extends ItemMod { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { final int range = 3; if(!world.isRemote) { List validCoords = new ArrayList<>(); @@ -45,7 +45,7 @@ public class ItemFertilizer extends ItemMod { for(int j = -range - 1; j < range; j++) { for(int k = 2; k >= -2; k--) { BlockPos pos_ = pos.add(i + 1, k + 1, j + 1); - if(world.isAirBlock(pos_) && (!world.provider.getHasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canPlaceBlockAt(world, pos_)) + if(world.isAirBlock(pos_) && (!world.provider.hasNoSky() || pos_.getY() < 255) && ModBlocks.flower.canPlaceBlockAt(world, pos_)) validCoords.add(pos_); } } @@ -56,7 +56,7 @@ public class ItemFertilizer extends ItemMod { validCoords.remove(coords); world.setBlockState(coords, ModBlocks.flower.getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(world.rand.nextInt(16))), 1 | 2); } - par1ItemStack.stackSize--; + player.getHeldItem(hand).shrink(1); } else { for(int i = 0; i < 15; i++) { double x = pos.getX() - range + world.rand.nextInt(range * 2 + 1) + Math.random(); diff --git a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java index 9413fdb9c..0083a1d71 100644 --- a/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java +++ b/src/main/java/vazkii/botania/common/item/ItemFlowerBag.java @@ -69,9 +69,10 @@ public class ItemFlowerBag extends ItemMod { private static class InvProvider implements ICapabilitySerializable { private final IItemHandler inv = new ItemStackHandler(16) { + @Nonnull @Override - public ItemStack insertItem(int slot, ItemStack toInsert, boolean simulate) { - if(toInsert != null + public ItemStack insertItem(int slot, @Nonnull ItemStack toInsert, boolean simulate) { + if(!toInsert.isEmpty() && toInsert.getItem() == Item.getItemFromBlock(ModBlocks.flower) && toInsert.getItemDamage() == slot) return super.insertItem(slot, toInsert, simulate); @@ -80,12 +81,12 @@ public class ItemFlowerBag extends ItemMod { }; @Override - public boolean hasCapability(Capability capability, @Nullable EnumFacing facing) { + public boolean hasCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { return capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY; } @Override - public T getCapability(Capability capability, @Nullable EnumFacing facing) { + public T getCapability(@Nonnull Capability capability, @Nullable EnumFacing facing) { if(capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY) return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.cast(inv); else return null; @@ -120,7 +121,7 @@ public class ItemFlowerBag extends ItemMod { @SubscribeEvent public void onPickupItem(EntityItemPickupEvent event) { ItemStack entityStack = event.getItem().getEntityItem(); - if(entityStack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && entityStack.stackSize > 0) { + if(entityStack.getItem() == Item.getItemFromBlock(ModBlocks.flower) && entityStack.getCount() > 0) { int color = entityStack.getItemDamage(); if(color > 15) return; @@ -130,24 +131,22 @@ public class ItemFlowerBag extends ItemMod { continue; // prevent item deletion ItemStack bag = event.getEntityPlayer().inventory.getStackInSlot(i); - if(bag != null && bag.getItem() == this) { + if(!bag.isEmpty() && bag.getItem() == this) { IItemHandler bagInv = bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); ItemStack result = bagInv.insertItem(color, entityStack, false); + int numPickedUp = entityStack.getCount() - result.getCount(); - if(result == null) - event.getItem().setDead(); - else - event.getItem().setEntityItemStack(result); + event.getItem().setEntityItemStack(result); - if(result != entityStack) { + if(numPickedUp > 0) { event.setCanceled(true); if (!event.getItem().isSilent()) { - event.getItem().worldObj.playSound(null, event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, + event.getItem().world.playSound(null, event.getEntityPlayer().posX, event.getEntityPlayer().posY, event.getEntityPlayer().posZ, SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, - ((event.getItem().worldObj.rand.nextFloat() - event.getItem().worldObj.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + ((event.getItem().world.rand.nextFloat() - event.getItem().world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } - ((EntityPlayerMP) event.getEntityPlayer()).connection.sendPacket(new SPacketCollectItem(event.getItem().getEntityId(), event.getEntityPlayer().getEntityId())); + ((EntityPlayerMP) event.getEntityPlayer()).connection.sendPacket(new SPacketCollectItem(event.getItem().getEntityId(), event.getEntityPlayer().getEntityId(), numPickedUp)); event.getEntityPlayer().openContainer.detectAndSendChanges(); return; @@ -159,14 +158,14 @@ public class ItemFlowerBag extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.openGui(Botania.instance, LibGuiIDs.FLOWER_BAG, world, hand == EnumHand.OFF_HAND ? 1 : 0, 0, 0); - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tile = world.getTileEntity(pos); if(tile != null) { if(!world.isRemote) { @@ -179,7 +178,7 @@ public class ItemFlowerBag extends ItemMod { if(tileInv == null) return EnumActionResult.FAIL; - IItemHandlerModifiable bagInv = (IItemHandlerModifiable) stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); + IItemHandlerModifiable bagInv = (IItemHandlerModifiable) player.getHeldItem(hand).getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); for(int i = 0; i < bagInv.getSlots(); i++) { ItemStack flower = bagInv.getStackInSlot(i); diff --git a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java index 895d69fcd..965f34a22 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java +++ b/src/main/java/vazkii/botania/common/item/ItemGaiaHead.java @@ -66,7 +66,7 @@ public class ItemGaiaHead extends ItemMod { // Copied from vanila skull itemBlock. Relevant edits are indicated. @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { if (facing == EnumFacing.DOWN) { return EnumActionResult.FAIL; } else { @@ -86,7 +86,9 @@ public class ItemGaiaHead extends ItemMod { pos = pos.offset(facing); } - if (playerIn.canPlayerEdit(pos, facing, stack) && Blocks.SKULL.canPlaceBlockAt(worldIn, pos)) { + ItemStack itemstack = playerIn.getHeldItem(hand); + + if (playerIn.canPlayerEdit(pos, facing, itemstack) && Blocks.SKULL.canPlaceBlockAt(worldIn, pos)) { if (worldIn.isRemote) { return EnumActionResult.SUCCESS; } else { @@ -94,7 +96,7 @@ public class ItemGaiaHead extends ItemMod { int i = 0; if (facing == EnumFacing.UP) { - i = MathHelper.floor_double(playerIn.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; + i = MathHelper.floor(playerIn.rotationYaw * 16.0F / 360.0F + 0.5D) & 15; } TileEntity tileentity = worldIn.getTileEntity(pos); @@ -102,7 +104,7 @@ public class ItemGaiaHead extends ItemMod { if (tileentity instanceof TileEntitySkull) { TileEntitySkull tileentityskull = (TileEntitySkull) tileentity; - if (stack.getMetadata() == 3) // Botania - do not retrieve skins + if (itemstack.getMetadata() == 3) // Botania - do not retrieve skins { /*GameProfile gameprofile = null; @@ -129,7 +131,7 @@ public class ItemGaiaHead extends ItemMod { Blocks.SKULL.checkWitherSpawn(worldIn, pos, tileentityskull); } - --stack.stackSize; + itemstack.shrink(1); return EnumActionResult.SUCCESS; } } else { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java index 4d8f062f9..ed35dd8df 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassHorn.java @@ -33,6 +33,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -61,7 +62,7 @@ public class ItemGrassHorn extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -91,17 +92,17 @@ public class ItemGrassHorn extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override public void onUsingTick(ItemStack stack, EntityLivingBase player, int time) { - if(!player.worldObj.isRemote) { + if(!player.world.isRemote) { if(time != getMaxItemUseDuration(stack) && time % 5 == 0) - breakGrass(player.worldObj, stack, stack.getItemDamage(), new BlockPos(player)); - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 0.001F); + breakGrass(player.world, stack, stack.getItemDamage(), new BlockPos(player)); + player.world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_NOTE_BASS, SoundCategory.BLOCKS, 1F, 0.001F); } } @@ -129,14 +130,17 @@ public class ItemGrassHorn extends ItemMod { BlockPos currCoords = coords.get(i); IBlockState state = world.getBlockState(currCoords); Block block = state.getBlock(); + List items = block.getDrops(world, currCoords, state, 0); if(block instanceof IHornHarvestable && ((IHornHarvestable) block).hasSpecialHornHarvest(world, currCoords, stack, type)) ((IHornHarvestable) block).harvestByHorn(world, currCoords, stack, type); else { - block.dropBlockAsItem(world, currCoords, state, 0); world.setBlockToAir(currCoords); if(ConfigHandler.blockBreakParticles) world.playEvent(2001, currCoords, Block.getStateId(state)); + + for(ItemStack stack_ : items) + world.spawnEntity(new EntityItem(world, currCoords.getX() + 0.5, currCoords.getY() + 0.5, currCoords.getZ() + 0.5, stack_)); } } } diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 029f01734..dda6ef86d 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -31,6 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; @@ -71,7 +72,7 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs par2, List par3) { + public void getSubItems(@Nonnull Item item, CreativeTabs par2, NonNullList par3) { for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(item, 1, i)); } @@ -84,79 +85,83 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { IBlockState state = world.getBlockState(pos); + ItemStack stack = player.getHeldItem(hand); - if(state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT || state.getBlock() == Blocks.GRASS && par1ItemStack.getItemDamage() != 0) { - int meta = par1ItemStack.getItemDamage(); + if(state.getBlock() == Blocks.DIRT && state.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT || state.getBlock() == Blocks.GRASS && stack.getItemDamage() != 0) { + int meta = stack.getItemDamage(); - BlockSwapper swapper = addBlockSwapper(world, pos, meta); - world.setBlockState(pos, swapper.stateToSet, 1 | 2); - for(int i = 0; i < 50; i++) { - double x = (Math.random() - 0.5) * 3; - double y = Math.random() - 0.5 + 1; - double z = (Math.random() - 0.5) * 3; + if(!world.isRemote) { + BlockSwapper swapper = addBlockSwapper(world, pos, meta); + world.setBlockState(pos, swapper.stateToSet, 1 | 2); + stack.shrink(1); + } else { + for(int i = 0; i < 50; i++) { + double x = (Math.random() - 0.5) * 3; + double y = Math.random() - 0.5 + 1; + double z = (Math.random() - 0.5) * 3; - float r = 0F; - float g = 0.4F; - float b = 0F; - switch(meta) { - case 1: { - r = 0.5F; - g = 0.37F; - b = 0F; - break; - } - case 2: { - r = 0.27F; - g = 0F; - b = 0.33F; - break; - } - case 3: { - r = 0.4F; - g = 0.5F; - b = 0.05F; - break; - } - case 4: { - r = 0.75F; - g = 0.7F; - b = 0F; - break; - } - case 5: { - r = 0F; - g = 0.5F; - b = 0.1F; - break; - } - case 6: { - r = 0.75F; - g = 0F; - b = 0F; - break; - } - case 7: { - r = 0F; - g = 0.55F; - b = 0.55F; - break; - } - case 8: { - r = 0.4F; - g = 0.1F; - b = 0.4F; - break; - } - } + float r = 0F; + float g = 0.4F; + float b = 0F; + switch(meta) { + case 1: { + r = 0.5F; + g = 0.37F; + b = 0F; + break; + } + case 2: { + r = 0.27F; + g = 0F; + b = 0.33F; + break; + } + case 3: { + r = 0.4F; + g = 0.5F; + b = 0.05F; + break; + } + case 4: { + r = 0.75F; + g = 0.7F; + b = 0F; + break; + } + case 5: { + r = 0F; + g = 0.5F; + b = 0.1F; + break; + } + case 6: { + r = 0.75F; + g = 0F; + b = 0F; + break; + } + case 7: { + r = 0F; + g = 0.55F; + b = 0.55F; + break; + } + case 8: { + r = 0.4F; + g = 0.1F; + b = 0.4F; + break; + } + } - float velMul = 0.025F; + float velMul = 0.025F; - Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + Botania.proxy.wispFX(pos.getX() + 0.5 + x, pos.getY() + 0.5 + y, pos.getZ() + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul); + } } - par1ItemStack.stackSize--; return EnumActionResult.SUCCESS; } @@ -207,10 +212,6 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { private static BlockSwapper addBlockSwapper(World world, BlockPos pos, int meta) { BlockSwapper swapper = swapperFromMeta(world, pos, meta); - // Block swappers are only registered on the server - if(world.isRemote) - return swapper; - // If a set for the dimension doesn't exist, create it. int dim = world.provider.getDimension(); if(!blockSwappers.containsKey(dim)) @@ -313,10 +314,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant { // If we can make changes, and have at least 1 block to swap, // then swap a random block from the valid blocks we could swap. - if(!validCoords.isEmpty() && !world.isRemote) { + if(!validCoords.isEmpty()) { BlockPos toSwap = validCoords.get(rand.nextInt(validCoords.size())); - world.setBlockState(toSwap, stateToSet, 1 | 2); + world.setBlockState(toSwap, stateToSet); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java index 195d0c484..53c80a73c 100644 --- a/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java +++ b/src/main/java/vazkii/botania/common/item/ItemKeepIvy.java @@ -48,7 +48,7 @@ public class ItemKeepIvy extends ItemMod { List keeps = new ArrayList<>(); for(EntityItem item : event.getDrops()) { ItemStack stack = item.getEntityItem(); - if(stack != null && ItemNBTHelper.detectNBT(stack) && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) + if(!stack.isEmpty() && stack.hasTagCompound() && ItemNBTHelper.getBoolean(stack, TAG_KEEP, false)) keeps.add(item); } @@ -61,8 +61,7 @@ public class ItemKeepIvy extends ItemMod { int i = 0; for(EntityItem keep : keeps) { ItemStack stack = keep.getEntityItem(); - NBTTagCompound cmp1 = new NBTTagCompound(); - stack.writeToNBT(cmp1); + NBTTagCompound cmp1 = stack.writeToNBT(new NBTTagCompound()); cmp.setTag(TAG_DROP_PREFIX + i, cmp1); i++; } @@ -86,8 +85,8 @@ public class ItemKeepIvy extends ItemMod { int count = cmp1.getInteger(TAG_DROP_COUNT); for(int i = 0; i < count; i++) { NBTTagCompound cmp2 = cmp1.getCompoundTag(TAG_DROP_PREFIX + i); - ItemStack stack = ItemStack.loadItemStackFromNBT(cmp2); - if(stack != null) { + ItemStack stack = new ItemStack(cmp2); + if(!stack.isEmpty()) { ItemStack copy = stack.copy(); ItemNBTHelper.setBoolean(copy, TAG_KEEP, false); event.player.inventory.addItemStackToInventory(copy); diff --git a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java index 2ded52e7d..fe6cee398 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java +++ b/src/main/java/vazkii/botania/common/item/ItemLaputaShard.java @@ -30,6 +30,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -75,7 +76,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { super.getSubItems(item, tab, list); for(int i = 0; i < 4; i++) list.add(new ItemStack(item, 1, (i + 1) * 5 - 1)); @@ -89,13 +90,14 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(!world.isRemote && pos.getY() < 160 && !world.provider.doesWaterVaporize()) { world.playSound(null, pos, BotaniaSoundEvents.laputaStart, SoundCategory.BLOCKS, 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F); - spawnBurstFirst(world, pos, par1ItemStack); - par1ItemStack.stackSize--; - if(par1ItemStack.getItemDamage() == 19) + ItemStack stack = player.getHeldItem(hand); + spawnBurstFirst(world, pos, stack); + if(stack.getItemDamage() == 19) player.addStat(ModAchievements.l20ShardUse, 1); + stack.shrink(1); } return EnumActionResult.SUCCESS; @@ -164,7 +166,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet ItemNBTHelper.setInt(copyLens, TAG_ITERATION_K, k); EntityManaBurst burst = getBurst(world, pos_, copyLens); - world.spawnEntityInWorld(burst); + world.spawnEntity(burst); return; } } @@ -215,13 +217,13 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet double speed = 0.35; int targetDistance = BASE_OFFSET; EntityThrowable entity = (EntityThrowable) burst; - if(!entity.worldObj.isRemote) { + if(!entity.world.isRemote) { entity.motionX = 0; entity.motionY = speed; entity.motionZ = 0; final int spawnTicks = 2; - final int placeTicks = net.minecraft.util.math.MathHelper.floor_double(targetDistance / speed); + final int placeTicks = net.minecraft.util.math.MathHelper.floor(targetDistance / speed); ItemStack lens = burst.getSourceLens(); @@ -231,14 +233,14 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet int z = ItemNBTHelper.getInt(lens, TAG_Z, 0); if(y != -1) - spawnBurst(entity.worldObj, new BlockPos(x, y, z), lens); + spawnBurst(entity.world, new BlockPos(x, y, z), lens); } else if(burst.getTicksExisted() == placeTicks) { - int x = net.minecraft.util.math.MathHelper.floor_double(entity.posX); + int x = net.minecraft.util.math.MathHelper.floor(entity.posX); int y = ItemNBTHelper.getInt(lens, TAG_Y_START, -1) + targetDistance; - int z = net.minecraft.util.math.MathHelper.floor_double(entity.posZ); + int z = net.minecraft.util.math.MathHelper.floor(entity.posZ); BlockPos pos = new BlockPos(x, y, z); - if(entity.worldObj.isAirBlock(pos)) { + if(entity.world.isAirBlock(pos)) { Block block = Blocks.AIR; if (lens.hasTagCompound()) { if (lens.getTagCompound().hasKey(TAG_BLOCK_NAME)) { @@ -253,13 +255,13 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet TileEntity tile = null; NBTTagCompound tilecmp = ItemNBTHelper.getCompound(lens, TAG_TILE, false); if(tilecmp.hasKey("id")) - tile = TileEntity.func_190200_a(entity.worldObj, tilecmp); + tile = TileEntity.create(entity.world, tilecmp); - entity.worldObj.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); - entity.worldObj.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); + entity.world.setBlockState(pos, block.getStateFromMeta(meta), 1 | 2); + entity.world.playEvent(2001, pos, Block.getStateId(block.getStateFromMeta(meta))); if(tile != null) { tile.setPos(pos); - entity.worldObj.setTileEntity(pos, tile); + entity.world.setTileEntity(pos, tile); } } @@ -275,7 +277,7 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet String id = ItemNBTHelper.getString(lens, TAG_BLOCK_NAME, "minecraft:air"); Block b = Block.getBlockFromName(id); int meta = ItemNBTHelper.getInt(lens, TAG_META, 0); - entity.worldObj.spawnParticle(EnumParticleTypes.BLOCK_CRACK, entity.posX, entity.posY, entity.posZ, entity.motionX, entity.motionY, entity.motionZ, Block.getStateId(b.getStateFromMeta(meta))); + entity.world.spawnParticle(EnumParticleTypes.BLOCK_CRACK, entity.posX, entity.posY, entity.posZ, entity.motionX, entity.motionY, entity.motionZ, Block.getStateId(b.getStateFromMeta(meta))); return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 4e190cbb7..a19032441 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -30,6 +30,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; @@ -72,18 +73,19 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(player.isSneaking()) { Block block = world.getBlockState(pos).getBlock(); if(block != null) { if(block instanceof ILexiconable) { - LexiconEntry entry = ((ILexiconable) block).getEntry(world, pos, player, par1ItemStack); - if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) { + ItemStack stack = player.getHeldItem(hand); + LexiconEntry entry = ((ILexiconable) block).getEntry(world, pos, player, stack); + if(entry != null && isKnowledgeUnlocked(stack, entry.getKnowledgeType())) { Botania.proxy.setEntryToOpen(entry); - Botania.proxy.setLexiconStack(par1ItemStack); + Botania.proxy.setLexiconStack(stack); - openBook(player, par1ItemStack, world, false); + openBook(player, stack, world, false); return EnumActionResult.SUCCESS; } } else if(world.isRemote) { @@ -98,7 +100,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { list.add(new ItemStack(item)); ItemStack creative = new ItemStack(item); for(String s : BotaniaAPI.knowledgeTypes.keySet()) { @@ -145,20 +147,21 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - String force = getForcedPage(par1ItemStack); + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + String force = getForcedPage(stack); if(force != null && !force.isEmpty()) { - LexiconEntry entry = getEntryFromForce(par1ItemStack); + LexiconEntry entry = getEntryFromForce(stack); if(entry != null) Botania.proxy.setEntryToOpen(entry); - else player.addChatMessage(new TextComponentTranslation("botaniamisc.cantOpen").setStyle(new Style().setColor(TextFormatting.RED))); - setForcedPage(par1ItemStack, ""); + else player.sendMessage(new TextComponentTranslation("botaniamisc.cantOpen").setStyle(new Style().setColor(TextFormatting.RED))); + setForcedPage(stack, ""); } - openBook(player, par1ItemStack, world, skipSound); + openBook(player, stack, world, skipSound); skipSound = false; - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } public static void openBook(EntityPlayer player, ItemStack stack, World world, boolean skipSound) { @@ -188,7 +191,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { if(ticks > 0 && entity instanceof EntityPlayer) { skipSound = ticks < 5; if(ticks == 1) - onItemRightClick(stack, world, (EntityPlayer) entity, EnumHand.MAIN_HAND); + onItemRightClick(world, (EntityPlayer) entity, EnumHand.MAIN_HAND); setQueueTicks(stack, ticks - 1); } @@ -238,8 +241,8 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { } public static String getTitle(ItemStack stack) { - String title = ModItems.lexicon.getItemStackDisplayName(null); - if(stack != null) + String title = ModItems.lexicon.getItemStackDisplayName(ItemStack.EMPTY); + if(!stack.isEmpty()) title = stack.getDisplayName(); String akashicTomeNBT = "akashictome:displayName"; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 189cc0429..650bd0a36 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -77,43 +77,44 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); int effCd = COOLDOWN; PotionEffect effect = player.getActivePotionEffect(MobEffects.HASTE); if(effect != null) effCd -= (effect.getAmplifier() + 1) * 8; - if(player.isSneaking() && hasClip(par1ItemStack)) { - rotatePos(par1ItemStack); + if(player.isSneaking() && hasClip(stack)) { + rotatePos(stack); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_STONE_BUTTON_CLICK_ON, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); if(world.isRemote) player.swingArm(hand); - ItemStack lens = getLens(par1ItemStack); + ItemStack lens = getLens(stack); ItemsRemainingRenderHandler.set(lens, -2); - par1ItemStack.setItemDamage(effCd); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); - } else if(par1ItemStack.getItemDamage() == 0) { - EntityManaBurst burst = getBurst(player, par1ItemStack, true); - if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, player, burst.getMana(), true)) { + stack.setItemDamage(effCd); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + } else if(stack.getItemDamage() == 0) { + EntityManaBurst burst = getBurst(player, stack, true); + if(burst != null && ManaItemHandler.requestManaExact(stack, player, burst.getMana(), true)) { if(!world.isRemote) { world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.manaBlaster, SoundCategory.PLAYERS, 0.6F, 1); player.addStat(ModAchievements.manaBlasterShoot, 1); - if(isSugoiKawaiiDesuNe(par1ItemStack)) + if(isSugoiKawaiiDesuNe(stack)) player.addStat(ModAchievements.desuGun, 1); - world.spawnEntityInWorld(burst); + world.spawnEntity(burst); } else { player.swingArm(hand); player.motionX -= burst.motionX * 0.1; player.motionY -= burst.motionY * 0.3; player.motionZ -= burst.motionZ * 0.1; } - par1ItemStack.setItemDamage(effCd); + stack.setItemDamage(effCd); } else if(!world.isRemote) world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.BLOCK_LEVER_CLICK, SoundCategory.PLAYERS, 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } // ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN ASADA-SAN @@ -136,7 +137,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @Override public boolean hasContainerItem(ItemStack stack) { - return getLens(stack) != null; + return !getLens(stack).isEmpty(); } @Nonnull @@ -157,7 +158,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { BurstProperties props = new BurstProperties(maxMana, ticksBeforeManaLoss, manaLossPerTick, gravity, motionModifier, color); ItemStack lens = getLens(stack); - if(lens != null) + if(!lens.isEmpty()) ((ILens) lens.getItem()).apply(lens, props); @@ -186,7 +187,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { } ItemStack lens = getLens(par1ItemStack); - if(lens != null) { + if(!lens.isEmpty()) { List tooltip = lens.getTooltip(player, false); if(tooltip.size() > 1) stacks.addAll(tooltip.subList(1, tooltip.size())); @@ -215,7 +216,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { @Override public String getItemStackDisplayName(@Nonnull ItemStack par1ItemStack) { ItemStack lens = getLens(par1ItemStack); - return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + TextFormatting.GREEN + lens.getDisplayName() + TextFormatting.RESET + ")"); + return super.getItemStackDisplayName(par1ItemStack) + (lens.isEmpty() ? "" : " (" + TextFormatting.GREEN + lens.getDisplayName() + TextFormatting.RESET + ")"); } public static boolean hasClip(ItemStack stack) { @@ -257,15 +258,15 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { public static ItemStack getLensAtPos(ItemStack stack, int pos) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_LENS + pos, true); if(cmp != null) { - return ItemStack.loadItemStackFromNBT(cmp); + return new ItemStack(cmp); } - return null; + return ItemStack.EMPTY; } public static void setLensAtPos(ItemStack stack, ItemStack lens, int pos) { NBTTagCompound cmp = new NBTTagCompound(); if(lens != null) - lens.writeToNBT(cmp); + cmp = lens.writeToNBT(cmp); ItemNBTHelper.setCompound(stack, TAG_LENS + pos, cmp); } @@ -274,8 +275,8 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { setLensAtPos(stack, lens, getClipPos(stack)); NBTTagCompound cmp = new NBTTagCompound(); - if(lens != null) - lens.writeToNBT(cmp); + if(!lens.isEmpty()) + cmp = lens.writeToNBT(cmp); ItemNBTHelper.setCompound(stack, TAG_LENS, cmp); } @@ -285,10 +286,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_LENS, true); if(cmp != null) { - ItemStack lens = ItemStack.loadItemStackFromNBT(cmp); - return lens; + return new ItemStack(cmp); } - return null; + return ItemStack.EMPTY; } public static List getAllLens(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java index b85d630b3..11c70d612 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaMirror.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaMirror.java @@ -78,11 +78,11 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { if(player.isSneaking() && !world.isRemote) { TileEntity tile = world.getTileEntity(pos); if(tile != null && tile instanceof IManaPool) { - bindPool(par1ItemStack, tile); + bindPool(player.getHeldItem(hand), tile); world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 1F, 1F); return EnumActionResult.SUCCESS; } @@ -162,7 +162,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte int dim = getDimension(stack); World world = null; - for(World w : server.worldServers) + for(World w : server.worlds) if(w.provider.getDimension() == dim) { world = w; break; diff --git a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java index ca13b0fab..0a86846ae 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaTablet.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaTablet.java @@ -20,6 +20,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,23 +42,21 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP public ItemManaTablet() { super(LibItemNames.MANA_TABLET); setMaxStackSize(1); - setMaxDamage(1000); - setNoRepair(); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { // Empty tablet - stacks.add(new ItemStack(item, 1)); + stacks.add(new ItemStack(item)); // Full tablet - ItemStack fullPower = new ItemStack(item, 1); + ItemStack fullPower = new ItemStack(item); setMana(fullPower, MAX_MANA); stacks.add(fullPower); // Creative Tablet - ItemStack creative = new ItemStack(item, 1); + ItemStack creative = new ItemStack(item); setMana(creative, MAX_MANA); setStackCreative(creative); stacks.add(creative); @@ -150,14 +150,16 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP @Override public boolean showDurabilityBar(ItemStack stack) { - // If the stack is not creative, show the durability bar. return !isStackCreative(stack); } @Override public double getDurabilityForDisplay(ItemStack stack) { - // I believe Forge has their durability values swapped, hence the (1.0 -). - // This will probably be fixed soon. return 1.0 - getManaFractionForDisplay(stack); } + + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return MathHelper.hsvToRGB(getManaFractionForDisplay(stack) / 3.0F, 1.0F, 1.0F); + } } diff --git a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java index 1a3a543aa..4bc97fce5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java +++ b/src/main/java/vazkii/botania/common/item/ItemObedienceStick.java @@ -38,7 +38,7 @@ public class ItemObedienceStick extends ItemMod { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { TileEntity tileAt = world.getTileEntity(pos); if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) { boolean pool = tileAt instanceof IManaPool; @@ -60,7 +60,7 @@ public class ItemObedienceStick extends ItemMod { } } - if(player.worldObj.isRemote) + if(player.world.isRemote) player.swingArm(hand); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java index ea27ba733..d934efee8 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java +++ b/src/main/java/vazkii/botania/common/item/ItemOpenBucket.java @@ -33,20 +33,21 @@ public class ItemOpenBucket extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - RayTraceResult RayTraceResult = rayTrace(world, player, true); + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + RayTraceResult rtr = rayTrace(world, player, true); + ItemStack stack = player.getHeldItem(hand); - if(RayTraceResult == null) - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + if(rtr == null) + return ActionResult.newResult(EnumActionResult.PASS, stack); else { - if(RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { - BlockPos pos = RayTraceResult.getBlockPos(); + if(rtr.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { + BlockPos pos = rtr.getBlockPos(); if(!world.isBlockModifiable(player, pos)) - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); - if(!player.canPlayerEdit(pos, RayTraceResult.sideHit, par1ItemStack)) - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + if(!player.canPlayerEdit(pos, rtr.sideHit, stack)) + return ActionResult.newResult(EnumActionResult.PASS, stack); Material material = world.getBlockState(pos).getMaterial(); int l = world.getBlockState(pos).getBlock().getMetaFromState(world.getBlockState(pos)); // hack to get meta so we don't have to know the level prop @@ -57,11 +58,11 @@ public class ItemOpenBucket extends ItemMod { for(int x = 0; x < 5; x++) world.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), 0, 0, 0); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java index d6f5446c8..e410a4c59 100644 --- a/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java @@ -15,6 +15,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumActionResult; @@ -34,9 +35,9 @@ public class ItemOvergrowthSeed extends ItemMod { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xs, float ys, float zs) { IBlockState state = world.getBlockState(pos); - if(Item.getItemFromBlock(state.getBlock()) == null) + if(Item.getItemFromBlock(state.getBlock()) == Items.AIR) return EnumActionResult.PASS; ItemStack blockStack = new ItemStack(state.getBlock()); int[] ids = OreDictionary.getOreIDs(blockStack); @@ -45,7 +46,7 @@ public class ItemOvergrowthSeed extends ItemMod { if(name.equals("grass")) { world.playEvent(2001, pos, Block.getStateId(state)); world.setBlockState(pos, ModBlocks.enchantedSoil.getDefaultState()); - stack.stackSize--; + player.getHeldItem(hand).shrink(1); return EnumActionResult.SUCCESS; } diff --git a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java index dc85b0b27..217964137 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPinkinator.java +++ b/src/main/java/vazkii/botania/common/item/ItemPinkinator.java @@ -24,6 +24,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.util.EnumParticleTypes; import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -41,7 +42,8 @@ public class ItemPinkinator extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); int range = 16; List withers = world.getEntitiesWithinAABB(EntityWither.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(EntityWither wither : withers) @@ -50,13 +52,14 @@ public class ItemPinkinator extends ItemMod { wither.setDead(); EntityPinkWither pink = new EntityPinkWither(world); pink.setLocationAndAngles(wither.posX, wither.posY, wither.posZ, wither.rotationYaw, wither.rotationPitch); - world.spawnEntityInWorld(pink); + pink.onInitialSpawn(world.getDifficultyForLocation(new BlockPos(pink)), null); + world.spawnEntity(pink); pink.playSound(SoundEvents.ENTITY_GENERIC_EXPLODE, 4F, (1F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F); } player.addStat(ModAchievements.pinkinator, 1); world.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, wither.posX, wither.posY, wither.posZ, 1D, 0D, 0D); - stack.stackSize--; + stack.shrink(1); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java index e4b27d41d..eec31d846 100644 --- a/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java +++ b/src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java @@ -42,7 +42,9 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); + if(BlockRailBase.isRailBlock(world.getBlockState(pos))) { if(!world.isRemote) { EntityMinecart entityminecart = new EntityPoolMinecart(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); @@ -50,10 +52,10 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin if(stack.hasDisplayName()) entityminecart.setCustomNameTag(stack.getDisplayName()); - world.spawnEntityInWorld(entityminecart); + world.spawnEntity(entityminecart); } - --stack.stackSize; + stack.shrink(1); return EnumActionResult.SUCCESS; } @@ -79,7 +81,7 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin if(cart.hasDisplayName()) entityminecart.setCustomNameTag(cart.getDisplayName()); - if(world.spawnEntityInWorld(entityminecart)) + if(world.spawnEntity(entityminecart)) return entityminecart; } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSextant.java b/src/main/java/vazkii/botania/common/item/ItemSextant.java index 42af3f78b..435316365 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSextant.java +++ b/src/main/java/vazkii/botania/common/item/ItemSextant.java @@ -104,23 +104,24 @@ public class ItemSextant extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { Botania.proxy.removeSextantMultiblock(); + ItemStack stack = player.getHeldItem(hand); if(!player.isSneaking()) { RayTraceResult pos = ToolCommons.raytraceFromEntity(world, player, false, 128); if(pos != null && pos.entityHit == null && pos.getBlockPos() != null) { if(!world.isRemote) { - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.getBlockPos().getX()); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.getBlockPos().getY()); - ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.getBlockPos().getZ()); + ItemNBTHelper.setInt(stack, TAG_SOURCE_X, pos.getBlockPos().getX()); + ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.getBlockPos().getY()); + ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.getBlockPos().getZ()); } - } else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1); + } else ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, -1); player.setActiveHand(hand); } - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } public static double calculateRadius(ItemStack stack, EntityPlayer player) { @@ -136,9 +137,9 @@ public class ItemSextant extends ItemMod { double mul = diffVec.y / lookVec.y; lookVec = lookVec.multiply(mul).add(centerVec); - lookVec = new Vector3(net.minecraft.util.math.MathHelper.floor_double(lookVec.x), + lookVec = new Vector3(net.minecraft.util.math.MathHelper.floor(lookVec.x), lookVec.y, - net.minecraft.util.math.MathHelper.floor_double(lookVec.z)); + net.minecraft.util.math.MathHelper.floor(lookVec.z)); return MathHelper.pointDistancePlane(source.x, source.z, lookVec.x, lookVec.z); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java index 8ca0f9411..9ba239b15 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java @@ -31,8 +31,8 @@ public class ItemSlimeBottle extends ItemMod { @Override public void onUpdate(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) { if(!world.isRemote) { - int x = MathHelper.floor_double(entity.posX); - int z = MathHelper.floor_double(entity.posZ); + int x = MathHelper.floor(entity.posX); + int z = MathHelper.floor(entity.posZ); boolean slime = SubTileNarslimmus.SpawnIntercepter.isSlimeChunk(world, x, z); int meta = stack.getItemDamage(); int newMeta = slime ? 1 : 0; diff --git a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java index 483be2007..b1ad6ede9 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSlingshot.java +++ b/src/main/java/vazkii/botania/common/item/ItemSlingshot.java @@ -56,7 +56,7 @@ public class ItemSlingshot extends ItemMod { ball.motionX *= 1.6; ball.motionY *= 1.6; ball.motionZ *= 1.6; - world.spawnEntityInWorld(ball); + world.spawnEntity(ball); world.playSound(null, living.posX, living.posY, living.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); } } @@ -74,13 +74,14 @@ public class ItemSlingshot extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(player.capabilities.isCreativeMode || PlayerHelper.hasAmmo(player, AMMO_FUNC)) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpark.java b/src/main/java/vazkii/botania/common/item/ItemSpark.java index 813d593e5..79dbe2b55 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpark.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpark.java @@ -38,16 +38,17 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xv, float yv, float zv) { TileEntity tile = world.getTileEntity(pos); if(tile instanceof ISparkAttachable) { ISparkAttachable attach = (ISparkAttachable) tile; + ItemStack stack = player.getHeldItem(hand); if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) { - stack.stackSize--; if(!world.isRemote) { + stack.shrink(1); EntitySpark spark = new EntitySpark(world); spark.setPosition(pos.getX() + 0.5, pos.getY() + 1.5, pos.getZ() + 0.5); - world.spawnEntityInWorld(spark); + world.spawnEntity(spark); attach.attachSpark(spark); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, pos); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java index e53ce853b..a013c0610 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java +++ b/src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.client.core.handler.ModelHandler; @@ -33,7 +34,7 @@ public class ItemSparkUpgrade extends ItemMod { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < VARIANTS; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java index 760d9e089..3da3876e4 100644 --- a/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java +++ b/src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java @@ -97,7 +97,8 @@ public class ItemSpawnerMover extends ItemMod { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack itemstack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xOffset, float yOffset, float zOffset) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float xOffset, float yOffset, float zOffset) { + ItemStack itemstack = player.getHeldItem(hand); if(getEntityId(itemstack) == null) { if(world.getBlockState(pos).getBlock().equals(Blocks.MOB_SPAWNER)) { TileEntity te = world.getTileEntity(pos); @@ -130,18 +131,18 @@ public class ItemSpawnerMover extends ItemMod { pos = pos.offset(side); } - if(itemstack.stackSize == 0) { + if(itemstack.isEmpty()) { return false; } else if(!player.canPlayerEdit(pos, side, itemstack)) { return false; - } else if(world.canBlockBePlaced(Blocks.MOB_SPAWNER, pos, false, side, null, itemstack)) { + } else if(world.mayPlace(Blocks.MOB_SPAWNER, pos, false, side, null)) { int meta = this.getMetadata(itemstack.getMetadata()); - IBlockState iblockstate1 = Blocks.MOB_SPAWNER.onBlockPlaced(world, pos, side, xOffset, yOffset, zOffset, meta, player); + IBlockState iblockstate1 = Blocks.MOB_SPAWNER.getStateForPlacement(world, pos, side, xOffset, yOffset, zOffset, meta, player); if (placeBlockAt(itemstack, player, world, pos, side, xOffset, yOffset, zOffset, iblockstate1)) { world.playSound(null, pos, Blocks.MOB_SPAWNER.getSoundType().getPlaceSound(), SoundCategory.BLOCKS, (Blocks.MOB_SPAWNER.getSoundType().getVolume() + 1.0F) / 2.0F, Blocks.MOB_SPAWNER.getSoundType().getPitch() * 0.8F); - --itemstack.stackSize; player.renderBrokenItemStack(itemstack); + itemstack.shrink(1); player.addStat(ModAchievements.spawnerMoverUse, 1); for(int i = 0; i < 100; i++) Botania.proxy.sparkleFX(pos.getX() + Math.random(), pos.getY() + Math.random(), pos.getZ() + Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.45F + 0.2F * (float) Math.random(), 6); diff --git a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java index a5a26e728..56b082e19 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java +++ b/src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java @@ -39,7 +39,8 @@ public class ItemTemperanceStone extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); int dmg = stack.getItemDamage(); stack.setItemDamage(~dmg & 1); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.NEUTRAL, 0.3F, 0.1F); @@ -68,7 +69,7 @@ public class ItemTemperanceStone extends ItemMod { IInventory inv = player.inventory; for(int i = 0; i < inv.getSizeInventory(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack != null && stack.getItem() == ModItems.temperanceStone && stack.getItemDamage() == 1) + if(!stack.isEmpty() && stack.getItem() == ModItems.temperanceStone && stack.getItemDamage() == 1) return true; } diff --git a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java index f5a4dd9bd..082edfdcf 100644 --- a/src/main/java/vazkii/botania/common/item/ItemThornChakram.java +++ b/src/main/java/vazkii/botania/common/item/ItemThornChakram.java @@ -24,6 +24,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; @@ -44,7 +45,7 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { @SideOnly(Side.CLIENT) @Override - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } @@ -57,16 +58,18 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + if(!world.isRemote) { ItemStack copy = stack.copy(); - copy.stackSize = 1; + copy.setCount(1); EntityThornChakram c = new EntityThornChakram(world, player, copy); c.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); c.setFire(stack.getItemDamage() != 0); - world.spawnEntityInWorld(c); + world.spawnEntity(c); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - --stack.stackSize; + stack.shrink(1); } return ActionResult.newResult(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java index db9863ebb..6bb385825 100644 --- a/src/main/java/vazkii/botania/common/item/ItemTwigWand.java +++ b/src/main/java/vazkii/botania/common/item/ItemTwigWand.java @@ -31,6 +31,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; @@ -74,24 +75,25 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + ItemStack stack = player.getHeldItem(hand); Block block = world.getBlockState(pos).getBlock(); - BlockPos boundTile = getBoundTile(par1ItemStack); + BlockPos boundTile = getBoundTile(stack); if(boundTile.getY() != -1 && player.isSneaking() && !pos.equals(boundTile)) { TileEntity tile = world.getTileEntity(boundTile); if(tile instanceof IWandBindable) { - if(((IWandBindable) tile).bindTo(player, par1ItemStack, pos, side)) { + if(((IWandBindable) tile).bindTo(player, stack, pos, side)) { Vector3 orig = new Vector3(boundTile.getX() + 0.5, boundTile.getY() + 0.5, boundTile.getZ() + 0.5); Vector3 end = new Vector3(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5); doParticleBeam(world, orig, end); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, boundTile); - setBoundTile(par1ItemStack, UNBOUND_POS); + setBoundTile(stack, UNBOUND_POS); } return EnumActionResult.SUCCESS; - } else setBoundTile(par1ItemStack, UNBOUND_POS); + } else setBoundTile(stack, UNBOUND_POS); } else if(player.isSneaking()) { block.rotateBlock(world, pos, side); if(world.isRemote) @@ -128,10 +130,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { boolean bindable = tile instanceof IWandBindable; boolean wanded; - if(getBindMode(par1ItemStack) && bindable && player.isSneaking() && ((IWandBindable) tile).canSelect(player, par1ItemStack, pos, side)) { + if(getBindMode(stack) && bindable && player.isSneaking() && ((IWandBindable) tile).canSelect(player, stack, pos, side)) { if(boundTile.equals(pos)) - setBoundTile(par1ItemStack, UNBOUND_POS); - else setBoundTile(par1ItemStack, pos); + setBoundTile(stack, UNBOUND_POS); + else setBoundTile(stack, pos); if(world.isRemote) player.swingArm(hand); @@ -139,7 +141,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { wanded = true; } else { - wanded = ((IWandable) block).onUsedByWand(player, par1ItemStack, world, pos, side); + wanded = ((IWandable) block).onUsedByWand(player, stack, world, pos, side); if(wanded && world.isRemote) player.swingArm(hand); } @@ -195,7 +197,8 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote && player.isSneaking()) { setBindMode(stack, !getBindMode(stack)); world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.ding, SoundCategory.PLAYERS, 0.1F, 1F); @@ -205,7 +208,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { } @Override - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(forColors(i, i)); } @@ -277,7 +280,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem { RayTraceResult pos = Minecraft.getMinecraft().objectMouseOver; if(pos != null && pos.typeOfHit == RayTraceResult.Type.BLOCK) { - TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.getBlockPos()); + TileEntity tile = Minecraft.getMinecraft().world.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof ITileBound) { BlockPos coords = ((ITileBound) tile).getBinding(); return coords; diff --git a/src/main/java/vazkii/botania/common/item/ItemVineBall.java b/src/main/java/vazkii/botania/common/item/ItemVineBall.java index 25fe6518a..7504f2127 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVineBall.java +++ b/src/main/java/vazkii/botania/common/item/ItemVineBall.java @@ -31,19 +31,19 @@ public class ItemVineBall extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { if(!player.capabilities.isCreativeMode) - --par1ItemStack.stackSize; + player.getHeldItem(hand).shrink(1); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.NEUTRAL, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if(!world.isRemote) { EntityVineBall ball = new EntityVineBall(player, true); ball.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0.0F, 1.5F, 1.0F); - world.spawnEntityInWorld(ball); + world.spawnEntity(ball); } - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } } diff --git a/src/main/java/vazkii/botania/common/item/ItemVirus.java b/src/main/java/vazkii/botania/common/item/ItemVirus.java index 2f61f7cc8..cb87f384a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemVirus.java +++ b/src/main/java/vazkii/botania/common/item/ItemVirus.java @@ -10,10 +10,6 @@ */ package vazkii.botania.common.item; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; - import javax.annotation.Nonnull; import net.minecraft.creativetab.CreativeTabs; @@ -22,15 +18,22 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AbstractAttributeMap; import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.ai.attributes.IAttributeInstance; +import net.minecraft.entity.passive.AbstractChestHorse; +import net.minecraft.entity.passive.AbstractHorse; import net.minecraft.entity.passive.EntityHorse; -import net.minecraft.entity.passive.HorseType; +import net.minecraft.entity.passive.EntityLlama; +import net.minecraft.entity.passive.EntitySkeletonHorse; +import net.minecraft.entity.passive.EntityZombieHorse; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; @@ -54,43 +57,55 @@ public class ItemVirus extends ItemMod { } @Override - public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer player, EntityLivingBase par3EntityLivingBase, EnumHand hand) { - if(par3EntityLivingBase instanceof EntityHorse) { - if(player.worldObj.isRemote) + public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase living, EnumHand hand) { + if(living instanceof AbstractHorse && !(living instanceof EntityLlama)) { + if(player.world.isRemote) return true; - EntityHorse horse = (EntityHorse) par3EntityLivingBase; - if(horse.getType() != HorseType.ZOMBIE && horse.getType() != HorseType.SKELETON && horse.isTame()) { + AbstractHorse horse = (AbstractHorse) living; + if(horse.isTame()) { IItemHandler inv = horse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); ItemStack saddle = inv.getStackInSlot(0); + // Not all AbstractHorse's have saddles in slot 0 + if(!saddle.isEmpty() && saddle.getItem() != Items.SADDLE) { + horse.entityDropItem(saddle, 0); + saddle = ItemStack.EMPTY; + } + for (int i = 1; i < inv.getSlots(); i++) - if(inv.getStackInSlot(i) != null) + if(!inv.getStackInSlot(i).isEmpty()) horse.entityDropItem(inv.getStackInSlot(i), 0); - if (horse.isChested()) + + if (horse instanceof AbstractChestHorse && ((AbstractChestHorse) horse).hasChest()) horse.entityDropItem(new ItemStack(Blocks.CHEST), 0); - horse.setType(par1ItemStack.getItemDamage() == 0 ? HorseType.ZOMBIE : HorseType.SKELETON); + horse.setDead(); - // Reinit the horse chest to the right new size - Method m = ReflectionHelper.findMethod(EntityHorse.class, horse, LibObfuscation.INIT_HORSE_CHEST); - try { - m.invoke(horse); - } catch (IllegalAccessException | InvocationTargetException ignored) {} + AbstractHorse newHorse = stack.getItemDamage() == 0 ? new EntityZombieHorse(player.world) : new EntitySkeletonHorse(player.world); + newHorse.setTamedBy(player); + newHorse.setPositionAndRotation(horse.posX, horse.posY, horse.posZ, horse.rotationYaw, horse.rotationPitch); // Put the saddle back - horse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).insertItem(0, saddle, false); + if(!saddle.isEmpty()) + newHorse.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).insertItem(0, saddle, false); + + AbstractAttributeMap attributes = newHorse.getAttributeMap(); - AbstractAttributeMap attributes = horse.getAttributeMap(); IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.MOVEMENT_SPEED); + movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), 0)); + IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.MAX_HEALTH); health.applyModifier(new AttributeModifier("Ermergerd Virus D:", health.getBaseValue(), 0)); - movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), 0)); - IAttributeInstance jumpHeight = attributes.getAttributeInstance(ReflectionHelper.getPrivateValue(EntityHorse.class, null, LibObfuscation.HORSE_JUMP_STRENGTH)); - jumpHeight.applyModifier(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, 0)); - horse.playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F); - horse.spawnExplosionParticle(); - par1ItemStack.stackSize--; + IAttributeInstance jumpHeight = attributes.getAttributeInstance(ReflectionHelper.getPrivateValue(AbstractHorse.class, null, LibObfuscation.HORSE_JUMP_STRENGTH)); + jumpHeight.applyModifier(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, 0)); + + newHorse.playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 1.0F + living.world.rand.nextFloat(), living.world.rand.nextFloat() * 0.7F + 1.3F); + newHorse.onInitialSpawn(player.world.getDifficultyForLocation(new BlockPos(newHorse)), null); + player.world.spawnEntity(newHorse); + newHorse.spawnExplosionParticle(); + + stack.shrink(1); return true; } } @@ -103,16 +118,16 @@ public class ItemVirus extends ItemMod { if(entity.isRiding() && entity.getRidingEntity() instanceof EntityLivingBase) entity = (EntityLivingBase) entity.getRidingEntity(); - if(entity instanceof EntityHorse && event.getSource() == DamageSource.fall) { - EntityHorse horse = (EntityHorse) entity; - if((horse.getType() == HorseType.ZOMBIE || horse.getType() == HorseType.SKELETON) && horse.isTame()) - event.setCanceled(true); + if((entity instanceof EntityZombieHorse || entity instanceof EntitySkeletonHorse) + && event.getSource() == DamageSource.FALL + && ((AbstractHorse) entity).isTame()) { + event.setCanceled(true); } } @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java index 7451ff169..5983f6ad6 100644 --- a/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java +++ b/src/main/java/vazkii/botania/common/item/ItemWorldSeed.java @@ -33,7 +33,8 @@ public class ItemWorldSeed extends ItemMod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); BlockPos coords = world.getSpawnPoint(); if(MathHelper.pointDistanceSpace(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5, player.posX, player.posY, player.posZ) > 24) { @@ -48,7 +49,7 @@ public class ItemWorldSeed extends ItemMod { for(int i = 0; i < 50; i++) Botania.proxy.sparkleFX(player.posX + Math.random() * player.width, player.posY - 1.6 + Math.random() * player.height, player.posZ + Math.random() * player.width, 0.25F, 1F, 0.25F, 1F, 10); - stack.stackSize--; + stack.shrink(1); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 07bc4b1db..afbb24c7c 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -44,7 +44,6 @@ import vazkii.botania.common.item.equipment.bauble.ItemDivaCharm; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara; import vazkii.botania.common.item.equipment.bauble.ItemGoddessCharm; -import vazkii.botania.common.item.equipment.bauble.ItemGoldenLaurel; import vazkii.botania.common.item.equipment.bauble.ItemGreaterAuraRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterMagnetRing; import vazkii.botania.common.item.equipment.bauble.ItemGreaterManaRing; @@ -169,7 +168,6 @@ public final class ModItems { public static Item knockbackBelt; public static Item icePendant; public static Item lavaPendant; - public static Item goldLaurel; public static Item magnetRing; public static Item waterRing; public static Item miningRing; @@ -324,7 +322,6 @@ public final class ModItems { knockbackBelt = new ItemKnockbackBelt(); icePendant = new ItemIcePendant(); lavaPendant = new ItemLavaPendant(); - goldLaurel = new ItemGoldenLaurel(); magnetRing = new ItemMagnetRing(); waterRing = new ItemWaterRing(); miningRing = new ItemMiningRing(); diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java index 97c97b459..42dd745d9 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java @@ -101,7 +101,7 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr } public static String getType(ItemStack stack) { - return ItemNBTHelper.detectNBT(stack) ? ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, "") : ""; + return stack.hasTagCompound() ? ItemNBTHelper.getString(stack, SubTileEntity.TAG_TYPE, "") : ""; } public static ItemStack ofType(String type) { diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java index 49129a268..c56bf9a79 100644 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java +++ b/src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java @@ -58,7 +58,7 @@ public class ItemBlockTinyPotato extends ItemBlockMod { EntityPlayer player = (EntityPlayer) e; int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0); if(ticks < NOT_MY_NAME.length) { - player.addChatMessage(new TextComponentString(TextFormatting.RED + NOT_MY_NAME[ticks])); + player.sendMessage(new TextComponentString(TextFormatting.RED + NOT_MY_NAME[ticks])); ItemNBTHelper.setInt(stack, TAG_TICKS, ticks + 1); } } diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java index a1e3ad971..99b0fa69f 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java @@ -29,6 +29,7 @@ import net.minecraft.stats.Achievement; import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.text.TextFormatting; @@ -75,11 +76,12 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, stack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } + @Nonnull @Override public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { if(!world.isRemote) { @@ -99,9 +101,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup if(!((EntityPlayer) living).inventory.addItemStackToInventory(baseItem.copy())) return baseItem.copy(); else { - ItemStack copy = stack.copy(); - copy.stackSize = 0; - return copy; + return ItemStack.EMPTY; } } @@ -115,7 +115,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack stack = new ItemStack(item); setBrew(stack, s); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java index db7d9c0c7..36c7456a1 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java @@ -21,6 +21,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -44,11 +45,11 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); - if(brewStack != null) + if(!brewStack.isEmpty()) list.add(brewStack); } } @@ -91,7 +92,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { if(!brew.canInfuseIncense() || brew.getPotionEffects(stack).size() != 1 || brew.getPotionEffects(stack).get(0).getPotion().isInstant()) - return null; + return ItemStack.EMPTY; ItemStack brewStack = new ItemStack(this); setBrew(brewStack, brew); diff --git a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java index 05d510304..1347811fd 100644 --- a/src/main/java/vazkii/botania/common/item/brew/ItemVial.java +++ b/src/main/java/vazkii/botania/common/item/brew/ItemVial.java @@ -18,6 +18,7 @@ import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -40,7 +41,7 @@ public class ItemVial extends ItemMod implements IBrewContainer { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < 2; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java index 5e215895f..00d89ce8f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java @@ -17,6 +17,8 @@ import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; +import javax.annotation.Nonnull; + public abstract class ItemElementiumArmor extends ItemManasteelArmor implements IPixieSpawner { public ItemElementiumArmor(EntityEquipmentSlot type, String name) { @@ -36,7 +38,7 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 7 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } @@ -57,8 +59,8 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements @Override public boolean hasArmorSetItem(EntityPlayer player, int i) { - ItemStack stack = player.inventory.armorInventory[3 - i]; - if(stack == null) + ItemStack stack = player.inventory.armorInventory.get(3 - i); + if(stack.isEmpty()) return false; switch(i) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java index cf9e27efa..a7d56b4d7 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java @@ -80,14 +80,14 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { + public ArmorProperties getProperties(EntityLivingBase player, @Nonnull ItemStack armor, DamageSource source, double damage, int slot) { if(source.isUnblockable()) return new ArmorProperties(0, 0, 0); return new ArmorProperties(0, damageReduceAmount / 25D, armor.getMaxDamage() + 1 - armor.getItemDamage()); } @Override - public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { + public int getArmorDisplay(EntityPlayer player, @Nonnull ItemStack armor, int slot) { return damageReduceAmount; } @@ -104,7 +104,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + public void damageArmor(EntityLivingBase entity, @Nonnull ItemStack stack, DamageSource source, int damage, int slot) { ToolCommons.damageItem(stack, damage, entity, MANA_PER_DAMAGE); } @@ -118,7 +118,6 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan return ConfigHandler.enableArmorModels ? LibResources.MODEL_MANASTEEL_NEW : slot == EntityEquipmentSlot.LEGS ? LibResources.MODEL_MANASTEEL_1 : LibResources.MODEL_MANASTEEL_0; } - @Nonnull @Override @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, EntityEquipmentSlot armorSlot, ModelBiped original) { @@ -151,7 +150,7 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } @@ -202,8 +201,8 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan } public boolean hasArmorSetItem(EntityPlayer player, int i) { - ItemStack stack = player.inventory.armorInventory[3 - i]; - if(stack == null) + ItemStack stack = player.inventory.armorInventory.get(3 - i); + if(stack.isEmpty()) return false; switch(i) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java index 43a3e92b2..05fa886e1 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java @@ -64,7 +64,7 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack); } @@ -85,8 +85,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi @Override public boolean hasArmorSetItem(EntityPlayer player, int i) { - ItemStack stack = player.inventory.armorInventory[3 - i]; - if(stack == null) + ItemStack stack = player.inventory.armorInventory.get(3 - i); + if(stack.isEmpty()) return false; switch(i) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java index 7ef3242cc..fdd0daac6 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveHelm.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.armor.manaweave; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import net.minecraft.entity.EntityLivingBase; @@ -49,7 +50,7 @@ public class ItemManaweaveHelm extends ItemManaweaveArmor implements IManaDiscou } @Override - public void damageArmor(EntityLivingBase entity, ItemStack stack, DamageSource source, int damage, int slot) { + public void damageArmor(EntityLivingBase entity, @Nonnull ItemStack stack, DamageSource source, int damage, int slot) { ToolCommons.damageItem(stack, damage, entity, MANA_PER_DAMAGE); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java index 3533c636e..e573dc373 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java @@ -52,7 +52,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { } @Override - public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { + public boolean getIsRepairable(ItemStack par1ItemStack, @Nonnull ItemStack par2ItemStack) { return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 || super.getIsRepairable(par1ItemStack, par2ItemStack); } @@ -62,7 +62,7 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { Multimap multimap = super.getAttributeModifiers(slot, stack); UUID uuid = new UUID((getUnlocalizedName() + slot.toString()).hashCode(), 0); if (slot == armorType) { - multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); + multimap.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(uuid, "Terrasteel modifier " + type, (double) getArmorDisplay(null, new ItemStack(this), type.getIndex()) / 20, 0)); } return multimap; } @@ -84,8 +84,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor { @Override public boolean hasArmorSetItem(EntityPlayer player, int i) { - ItemStack stack = player.inventory.armorInventory[3 - i]; - if(stack == null) + ItemStack stack = player.inventory.armorInventory.get(3 - i); + if(stack.isEmpty()) return false; switch(i) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java index ad711c04b..6341a6e56 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java @@ -128,7 +128,7 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc if(hasArmorSet(player)) { boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(MobEffects.BLINDNESS) && !player.isRiding(); ItemStack stack = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD); - if(crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) { + if(crit && !stack.isEmpty() && stack.getItem() instanceof ItemTerrasteelHelm) { boolean ahrim = hasAncientWill(stack, 0); boolean dharok = hasAncientWill(stack, 1); boolean guthan = hasAncientWill(stack, 2); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java index f3fe57271..34977c97e 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBalanceCloak.java @@ -42,7 +42,7 @@ public class ItemBalanceCloak extends ItemHolyCloak { if(event.getAmount() > player.getHealth()) event.setAmount(player.getHealth() - 1); - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 30; i++) { double x = player.posX + Math.random() * player.width * 2 - player.width; double y = player.posY + Math.random() * player.height; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java index ae63c76bf..d7dacc927 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java @@ -33,6 +33,8 @@ import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.IItemHandler; +import net.minecraftforge.items.IItemHandlerModifiable; import thaumcraft.api.items.IRunicArmor; import vazkii.botania.api.item.ICosmeticAttachable; import vazkii.botania.api.item.IPhantomInkable; @@ -58,25 +60,25 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(!EntityDoppleganger.isTruePlayer(player)) return ActionResult.newResult(EnumActionResult.FAIL, stack); - ItemStack toEquip = stack.copy(); - toEquip.stackSize = 1; + ItemStack toEquip = stack.splitStack(1); if(canEquip(toEquip, player)) { - IInventory baubles = BaublesApi.getBaubles(player); - for(int i = 0; i < baubles.getSizeInventory(); i++) { - if(baubles.isItemValidForSlot(i, toEquip)) { + IItemHandlerModifiable baubles = BaublesApi.getBaublesHandler(player); + for(int i = 0; i < baubles.getSlots(); i++) { + ItemStack simulate = baubles.insertItem(i, toEquip, true); + if(simulate.isEmpty()) { ItemStack stackInSlot = baubles.getStackInSlot(i); - if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { + if(stackInSlot.isEmpty() || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) { if(!world.isRemote) { - baubles.setInventorySlotContents(i, toEquip); - stack.stackSize--; + baubles.setStackInSlot(i, toEquip); } - if(stackInSlot != null) { + if(!stackInSlot.isEmpty()) { ((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player); return ActionResult.newResult(EnumActionResult.SUCCESS, stackInSlot.copy()); } @@ -105,7 +107,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt addStringToTooltip(I18n.format("botania.baubletooltip", key), stacks); ItemStack cosmetic = getCosmeticItem(par1ItemStack); - if(cosmetic != null) + if(!cosmetic.isEmpty()) addStringToTooltip(I18n.format("botaniamisc.hasCosmetic", cosmetic.getDisplayName()), stacks); if(hasPhantomInk(par1ItemStack)) @@ -137,8 +139,8 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt @Override public void onEquipped(ItemStack stack, EntityLivingBase player) { if(player != null) { - if(!player.worldObj.isRemote) - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.equipBauble, SoundCategory.PLAYERS, 0.1F, 1.3F); + if(!player.world.isRemote) + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.equipBauble, SoundCategory.PLAYERS, 0.1F, 1.3F); if(player instanceof EntityPlayer) ((EntityPlayer) player).addStat(ModAchievements.baubleWear, 1); @@ -157,21 +159,21 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt public ItemStack getCosmeticItem(ItemStack stack) { NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_COSMETIC_ITEM, true); if(cmp == null) - return null; - return ItemStack.loadItemStackFromNBT(cmp); + return ItemStack.EMPTY; + return new ItemStack(cmp); } @Override public void setCosmeticItem(ItemStack stack, ItemStack cosmetic) { NBTTagCompound cmp = new NBTTagCompound(); - if(cosmetic != null) - cosmetic.writeToNBT(cmp); + if(!cosmetic.isEmpty()) + cmp = cosmetic.writeToNBT(cmp); ItemNBTHelper.setCompound(stack, TAG_COSMETIC_ITEM, cmp); } @Override public boolean hasContainerItem(ItemStack stack) { - return getContainerItem(stack) != null; + return !getContainerItem(stack).isEmpty(); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java index 3d5a581f0..d5a80fde2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java @@ -14,6 +14,7 @@ import java.util.List; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; @@ -74,7 +75,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } @@ -360,7 +361,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble { // Copy of RenderItem.renderQuads private void renderQuads(VertexBuffer renderer, List quads, int color, ItemStack stack) { - boolean flag = color == -1 && stack != null; + boolean flag = color == -1 && !stack.isEmpty(); int i = 0; for (int j = quads.size(); i < j; ++i) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 0fca2e921..707de4276 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -15,6 +15,7 @@ import java.util.List; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; @@ -59,11 +60,11 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { super.getSubItems(item, tab, list); for(String s : BotaniaAPI.brewMap.keySet()) { ItemStack brewStack = getItemForBrew(BotaniaAPI.brewMap.get(s), new ItemStack(this)); - if(brewStack != null) + if(!brewStack.isEmpty()) list.add(brewStack); } } @@ -94,7 +95,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { Brew brew = getBrew(stack); - if(brew != BotaniaAPI.fallbackBrew && player instanceof EntityPlayer && !player.worldObj.isRemote) { + if(brew != BotaniaAPI.fallbackBrew && player instanceof EntityPlayer && !player.world.isRemote) { EntityPlayer eplayer = (EntityPlayer) player; PotionEffect effect = brew.getPotionEffects(stack).get(0); float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F; @@ -130,7 +131,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre @Override public ItemStack getItemForBrew(Brew brew, ItemStack stack) { if(!brew.canInfuseBloodPendant() || brew.getPotionEffects(stack).size() != 1 || brew.getPotionEffects(stack).get(0).getPotion().isInstant()) - return null; + return ItemStack.EMPTY; ItemStack brewStack = new ItemStack(this); setBrew(brewStack, brew); @@ -153,7 +154,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.26F, -0.4F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java index a3f45c31a..0b6d388b4 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemCloudPendant.java @@ -63,7 +63,7 @@ public class ItemCloudPendant extends CloudPendantShim implements IBaubleRender @Override @SideOnly(Side.CLIENT) public void clientWornTick(ItemStack stack, EntityLivingBase player) { - if(player instanceof EntityPlayerSP && player == Minecraft.getMinecraft().thePlayer) { + if(player instanceof EntityPlayerSP && player == Minecraft.getMinecraft().player) { EntityPlayerSP playerSp = (EntityPlayerSP) player; UUID uuid = playerSp.getUniqueID(); @@ -88,7 +88,7 @@ public class ItemCloudPendant extends CloudPendantShim implements IBaubleRender if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.2F, -0.3F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java index c5401aa5a..ad6c8f682 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java @@ -52,15 +52,15 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble @SubscribeEvent public void onEntityDamaged(LivingHurtEvent event) { - if(event.getSource().getEntity() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().worldObj.isRemote && Math.random() < 0.6F) { + if(event.getSource().getEntity() instanceof EntityPlayer && event.getEntityLiving() instanceof EntityLiving && !event.getEntityLiving().world.isRemote && Math.random() < 0.6F) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); - ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(6); - if(amulet != null && amulet.getItem() == this) { + ItemStack amulet = BaublesApi.getBaublesHandler(player).getStackInSlot(6); + if(!amulet.isEmpty() && amulet.getItem() == this) { final int cost = 250; if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) { final int range = 20; - List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.getEntityLiving().posX - range, event.getEntityLiving().posY - range, event.getEntityLiving().posZ - range, event.getEntityLiving().posX + range, event.getEntityLiving().posY + range, event.getEntityLiving().posZ + range), Predicates.instanceOf(IMob.class)); + List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(event.getEntityLiving().posX - range, event.getEntityLiving().posY - range, event.getEntityLiving().posZ - range, event.getEntityLiving().posX + range, event.getEntityLiving().posY + range, event.getEntityLiving().posZ + range), Predicates.instanceOf(IMob.class)); if(mobs.size() > 1) { if(SubTileHeiseiDream.brainwashEntity((EntityLiving) event.getEntityLiving(), (List) mobs)) { if(event.getEntityLiving() instanceof EntityCreeper) @@ -70,7 +70,7 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble event.getEntityLiving().isDead = false; ManaItemHandler.requestManaExact(amulet, player, cost, true); - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.divaCharm, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.divaCharm, SoundCategory.PLAYERS, 1F, 1F); double x = event.getEntityLiving().posX; double y = event.getEntityLiving().posY; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java index c65af8fa3..1761f5ba8 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDodgeRing.java @@ -27,6 +27,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.core.helper.Vector3; @@ -53,11 +54,11 @@ public class ItemDodgeRing extends ItemBauble { public void onKeyDown(KeyInputEvent event) { Minecraft mc = Minecraft.getMinecraft(); - IInventory baublesInv = BaublesApi.getBaubles(mc.thePlayer); + IItemHandler baublesInv = BaublesApi.getBaublesHandler(mc.player); ItemStack ringStack = baublesInv.getStackInSlot(1); - if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) { + if(ringStack.isEmpty() || !(ringStack.getItem() instanceof ItemDodgeRing)) { ringStack = baublesInv.getStackInSlot(2); - if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) + if(ringStack.isEmpty() || !(ringStack.getItem() instanceof ItemDodgeRing)) return; } @@ -70,13 +71,13 @@ public class ItemDodgeRing extends ItemBauble { leftDown = ClientTickHandler.ticksInGame; if(leftDown - oldLeft < threshold) - dodge(mc.thePlayer, true); + dodge(mc.player, true); } else if(mc.gameSettings.keyBindRight.isKeyDown()) { int oldRight = rightDown; rightDown = ClientTickHandler.ticksInGame; if(rightDown - oldRight < threshold) - dodge(mc.thePlayer, false); + dodge(mc.player, false); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 43c101001..7e3799908 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -15,6 +15,7 @@ import java.util.List; import javax.annotation.Nonnull; +import net.minecraft.util.NonNullList; import org.lwjgl.opengl.GL11; import baubles.api.BaubleType; @@ -100,7 +101,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = 0; i < SUBTYPES + 1; i++) list.add(new ItemStack(item, 1, i)); } @@ -147,7 +148,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub if(!wasSprting && isSprinting && cooldown == 0) { p.motionX += look.x; p.motionZ += look.z; - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); } else if(cooldown > 0) { if(maxCd - cooldown < 2) @@ -182,14 +183,14 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub public void updatePlayerFlyStatus(LivingUpdateEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack tiara = BaublesApi.getBaubles(player).getStackInSlot(4); + ItemStack tiara = BaublesApi.getBaublesHandler(player).getStackInSlot(4); int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME); if(playersWithFlight.contains(playerStr(player))) { if(shouldPlayerHaveFlight(player)) { player.capabilities.allowFlying = true; if(player.capabilities.isFlying) { - if(!player.worldObj.isRemote) + if(!player.world.isRemote) ManaItemHandler.requestManaExact(tiara, player, getCost(tiara, left), true); else if(Math.abs(player.motionX) > 0.1 || Math.abs(player.motionZ) > 0.1) { double x = event.getEntityLiving().posX - 0.5; @@ -276,12 +277,12 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub } public static String playerStr(EntityPlayer player) { - return player.getGameProfile().getName() + ":" + player.worldObj.isRemote; + return player.getGameProfile().getName() + ":" + player.world.isRemote; } private boolean shouldPlayerHaveFlight(EntityPlayer player) { - ItemStack armor = BaublesApi.getBaubles(player).getStackInSlot(4); - if(armor != null && armor.getItem() == this) { + ItemStack armor = BaublesApi.getBaublesHandler(player).getStackInSlot(4); + if(!armor.isEmpty() && armor.getItem() == this) { int left = ItemNBTHelper.getInt(armor, TAG_TIME_LEFT, MAX_FLY_TIME); boolean flying = ItemNBTHelper.getBoolean(armor, TAG_FLYING, false); return (left > (flying ? 0 : MAX_FLY_TIME / 10) || player.inventory.hasItemStack(new ItemStack(ModItems.flugelEye))) && ManaItemHandler.requestManaExact(armor, player, getCost(armor, left), false); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java index 54a5d72ee..19d89208d 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoddessCharm.java @@ -28,6 +28,7 @@ import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; @@ -49,9 +50,8 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem, IBau List players = event.getWorld().getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(vec.xCoord, vec.yCoord, vec.zCoord, vec.xCoord, vec.yCoord, vec.zCoord).expand(8, 8, 8)); for(EntityPlayer player : players) { - IInventory inv = BaublesApi.getBaubles(player); - ItemStack charm = inv.getStackInSlot(6); - if(charm != null && charm.getItem() instanceof ItemGoddessCharm && ManaItemHandler.requestManaExact(charm, player, COST, true)) { + ItemStack charm = BaublesApi.getBaublesHandler(player).getStackInSlot(6); + if(!charm.isEmpty() && charm.getItem() instanceof ItemGoddessCharm && ManaItemHandler.requestManaExact(charm, player, COST, true)) { event.getAffectedBlocks().clear(); return; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java deleted file mode 100644 index d9be43c42..000000000 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * This class was created by . It's distributed as - * part of the Botania Mod. Get the Source Code in github: - * https://github.com/Vazkii/Botania - * - * Botania is Open Source and distributed under the - * Botania License: http://botaniamod.net/license.php - * - * File Created @ [Apr 27, 2014, 8:49:01 PM (GMT)] - */ -package vazkii.botania.common.item.equipment.bauble; - -import baubles.api.BaubleType; -import baubles.api.BaublesApi; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.block.model.ItemCameraTransforms; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.MobEffects; -import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemStack; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.text.TextComponentTranslation; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.event.entity.living.LivingDeathEvent; -import net.minecraftforge.fml.common.eventhandler.EventPriority; -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import vazkii.botania.api.item.IBaubleRender; -import vazkii.botania.api.sound.BotaniaSoundEvents; -import vazkii.botania.common.lib.LibItemNames; - -public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender { - - public ItemGoldenLaurel() { - super(LibItemNames.GOLDEN_LAUREL); - MinecraftForge.EVENT_BUS.register(this); - } - - @SubscribeEvent(priority = EventPriority.HIGHEST) - public void onPlayerDeath(LivingDeathEvent event) { - if(event.getEntityLiving() instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack headgear = BaublesApi.getBaubles(player).getStackInSlot(4); - - if(headgear != null && headgear.getItem() == this) { - event.setCanceled(true); - player.setHealth(player.getMaxHealth()); - player.addPotionEffect(new PotionEffect(MobEffects.RESISTANCE, 300, 6)); - player.addChatMessage(new TextComponentTranslation("botaniamisc.savedByLaurel")); - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.goldenLaurel, SoundCategory.PLAYERS, 1F, 0.3F); - BaublesApi.getBaubles(player).setInventorySlotContents(4, null); - } - } - } - - @Override - public BaubleType getBaubleType(ItemStack itemstack) { - return BaubleType.HEAD; - } - - @Override - @SideOnly(Side.CLIENT) - public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { - if(type == RenderType.HEAD) { - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; - Helper.translateToHeadLevel(player); - Helper.defaultTransforms(); - Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); - GlStateManager.translate(0F, -3.2F, -1.825F); - GlStateManager.rotate(-90F, 0F, 1F, 0F); - GlStateManager.scale(1.625F, 1.625F, 1.625F); - GlStateManager.rotate(-80F, 1F, 0F, 0F); - if(armor) { - GlStateManager.scale(1.1F, 1.1F, 1.1F); - } - Minecraft.getMinecraft().getRenderItem().renderItem(stack, ItemCameraTransforms.TransformType.NONE); - } - } -} diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 9b3301891..710ecfa79 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -27,6 +27,7 @@ import net.minecraftforge.event.entity.living.LivingHurtEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.item.IBaubleRender; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.client.lib.LibResources; @@ -59,9 +60,8 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public void onPlayerDamage(LivingHurtEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - IInventory baubles = BaublesApi.getBaubles(player); - ItemStack belt = baubles.getStackInSlot(5); - if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { + ItemStack belt = BaublesApi.getBaublesHandler(player).getStackInSlot(5); + if(!belt.isEmpty() && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) { ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem(); int cooldown = getCooldown(belt); @@ -84,7 +84,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.getSource().isMagicDamage()) { event.setCanceled(true); - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.holyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 30; i++) { double x = player.posX + Math.random() * player.width * 2 - player.width; double y = player.posY + Math.random() * player.height; @@ -138,7 +138,7 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender { public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.BODY) { Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.translate(0F, armor ? -0.07F : -0.01F, 0F); float s = 1F / 16F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java index dbd99ea7c..e82a67b9f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java @@ -43,10 +43,10 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { @Override public void onWornTick(ItemStack stack, EntityLivingBase entity) { super.onWornTick(stack, entity); - if(!entity.worldObj.isRemote) { + if(!entity.world.isRemote) { boolean lastOnGround = entity.onGround; entity.onGround = true; - EnchantmentFrostWalker.freezeNearby(entity, entity.worldObj, new BlockPos(entity), 8); + EnchantmentFrostWalker.freezeNearby(entity, entity.world, new BlockPos(entity), 8); entity.onGround = lastOnGround; } } @@ -57,7 +57,7 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F); GlStateManager.rotate(-45F, 0F, 0F, 1F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java index a5ac69b93..216fc5959 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemInvisibilityCloak.java @@ -42,7 +42,7 @@ public class ItemInvisibilityCloak extends ItemBauble implements IManaUsingItem public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); - if(player instanceof EntityPlayer && !player.worldObj.isRemote) { + if(player instanceof EntityPlayer && !player.world.isRemote) { int manaCost = 2; boolean hasMana = ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, manaCost, false); if(!hasMana) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java index 8cd11088e..250824431 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java @@ -67,7 +67,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { if(!(player instanceof EntityPlayer)) return; - if(player.worldObj.isRemote) + if(player.world.isRemote) tickClient(stack, (EntityPlayer) player); else tickServer(stack, (EntityPlayer) player); } @@ -87,7 +87,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { int[] entities = ItemNBTHelper.getIntArray(stack, TAG_ENTITY_POSITIONS); for(int i : entities) { - Entity e = player.worldObj.getEntityByID(i); + Entity e = player.world.getEntityByID(i); if(e != null && Math.random() < 0.6) { Botania.proxy.setWispFXDepthTest(Math.random() < 0.6); Botania.proxy.wispFX(e.posX + (float) (Math.random() * 0.5 - 0.25) * 0.45F, e.posY + e.height, e.posZ + (float) (Math.random() * 0.5 - 0.25) * 0.45F, (float) Math.random(), (float) Math.random(), (float) Math.random(), 0.15F + 0.05F * (float) Math.random(), -0.05F - 0.03F * (float) Math.random()); @@ -118,10 +118,10 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } private void scanForStack(ItemStack pstack, EntityPlayer player, TIntArrayList entIdBuilder, NBTTagList blockPosBuilder) { - if(pstack != null || player.isSneaking()) { + if(!pstack.isEmpty() || player.isSneaking()) { int range = 24; - List entities = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); + List entities = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range)); for(Entity e : entities) { if(e == player) continue; @@ -143,14 +143,14 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } else if(e instanceof EntityPlayer) { EntityPlayer player_ = (EntityPlayer) e; IItemHandler playerInv = player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null); - IItemHandler binv = new InvWrapper(BaublesApi.getBaubles(player_)); + IItemHandler binv = BaublesApi.getBaublesHandler(player); if(scanInventory(binv, pstack) || scanInventory(playerInv, pstack)) entIdBuilder.add(player_.getEntityId()); } else if(e instanceof EntityVillager) { EntityVillager villager = (EntityVillager) e; ArrayList recipes = villager.getRecipes(player); - if(pstack != null && recipes != null) + if(!pstack.isEmpty() && recipes != null) for(MerchantRecipe recipe : recipes) if(recipe != null && !recipe.isRecipeDisabled() && (equalStacks(pstack, recipe.getItemToBuy()) || equalStacks(pstack, recipe.getItemToSell()))) { entIdBuilder.add(villager.getEntityId()); @@ -160,11 +160,11 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } } - if(pstack != null) { + if(!pstack.isEmpty()) { range = 12; BlockPos pos = new BlockPos(player); for(BlockPos pos_ : BlockPos.getAllInBoxMutable(pos.add(-range, -range, -range), pos.add(range + 1, range + 1, range + 1))) { - TileEntity tile = player.worldObj.getTileEntity(pos_); + TileEntity tile = player.world.getTileEntity(pos_); if(tile != null) { boolean foundCap = false; for(EnumFacing e : EnumFacing.VALUES) { @@ -191,12 +191,12 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { } private boolean scanInventory(IItemHandler inv, ItemStack pstack) { - if(pstack == null) + if(pstack.isEmpty()) return false; for(int l = 0; l < inv.getSlots(); l++) { ItemStack istack = inv.getStackInSlot(l); - if(istack != null && equalStacks(istack, pstack)) + if(!istack.isEmpty() && equalStacks(istack, pstack)) return true; } @@ -217,7 +217,7 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender { float f1 = gemIcon.getMaxU(); float f2 = gemIcon.getMinV(); float f3 = gemIcon.getMaxV(); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty(); Helper.translateToHeadLevel(player); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); GlStateManager.rotate(90F, 0F, 1F, 0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index 3f7aec44c..bde39e9d9 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -43,10 +43,10 @@ public class ItemKnockbackBelt extends ItemBaubleModifier implements IBaubleRend @Override void fillModifiers(Multimap attributes, ItemStack stack) { - if(stack == null) // workaround for Azanor/Baubles#156 + if(stack.isEmpty()) // workaround for Azanor/Baubles#156 return; - attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); + attributes.put(SharedMonsterAttributes.KNOCKBACK_RESISTANCE.getName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 1, 0)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java index 707713dfc..319cde724 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java @@ -50,7 +50,7 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.scale(0.5, 0.5, 0.5); GlStateManager.rotate(180, 0, 0, 1); GlStateManager.translate(-0.5, -0.90, armor ? -0.4 : -0.25); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java index f65600b92..2cabfdf3c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java @@ -27,6 +27,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.item.ItemTossEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IRelic; import vazkii.botania.api.mana.IManaItem; @@ -59,10 +60,10 @@ public class ItemMagnetRing extends ItemBauble { @SubscribeEvent public void onTossItem(ItemTossEvent event) { - IInventory inv = BaublesApi.getBaubles(event.getPlayer()); - for(int i = 0; i < inv.getSizeInventory(); i++) { + IItemHandler inv = BaublesApi.getBaublesHandler(event.getPlayer()); + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); - if(stack != null && stack.getItem() instanceof ItemMagnetRing) { + if(!stack.isEmpty() && stack.getItem() instanceof ItemMagnetRing) { setCooldown(stack, 100); BotaniaAPI.internalHandler.sendBaubleUpdatePacket(event.getPlayer(), i); } @@ -87,7 +88,7 @@ public class ItemMagnetRing extends ItemBauble { double y = player.posY + 0.75; double z = player.posZ; - List items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); + List items = player.world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(x - range, y - range, z - range, x + range, y + range, z + range)); int pulled = 0; for(EntityItem item : items) if(canPullItem(item)) { @@ -95,8 +96,8 @@ public class ItemMagnetRing extends ItemBauble { break; MathHelper.setEntityMotionFromVector(item, new Vector3(x, y, z), 0.45F); - if(player.worldObj.isRemote) { - boolean red = player.worldObj.rand.nextBoolean(); + if(player.world.isRemote) { + boolean red = player.world.rand.nextBoolean(); Botania.proxy.sparkleFX(item.posX, item.posY, item.posZ, red ? 1F : 0F, 0F, red ? 0F : 1F, 1F, 3); } pulled++; @@ -110,15 +111,15 @@ public class ItemMagnetRing extends ItemBauble { return false; ItemStack stack = item.getEntityItem(); - if(stack == null || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || BLACKLIST.contains(Item.REGISTRY.getNameForObject(stack.getItem())) || BotaniaAPI.isItemBlacklistedFromMagnet(stack)) + if(stack.isEmpty() || stack.getItem() instanceof IManaItem || stack.getItem() instanceof IRelic || BLACKLIST.contains(Item.REGISTRY.getNameForObject(stack.getItem())) || BotaniaAPI.isItemBlacklistedFromMagnet(stack)) return false; BlockPos pos = new BlockPos(item); - if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.worldObj.getBlockState(pos))) + if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.world.getBlockState(pos))) return false; - if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.worldObj.getBlockState(pos.down()))) + if(BotaniaAPI.isBlockBlacklistedFromMagnet(item.world.getBlockState(pos.down()))) return false; return true; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java index dc50cd456..7d52159b3 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemManaRing.java @@ -19,6 +19,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -35,13 +37,10 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD public ItemManaRing() { this(LibItemNames.MANA_RING); - setMaxDamage(1000); - setNoRepair(); } public ItemManaRing(String name) { super(name); - setMaxDamage(1000); } @Override @@ -51,8 +50,12 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { - stacks.add(new ItemStack(item, 1, 10000)); + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { + stacks.add(new ItemStack(item)); + + ItemStack full = new ItemStack(item); + setMana(full, getMaxMana(full)); + stacks.add(full); } @Override @@ -111,14 +114,17 @@ public class ItemManaRing extends ItemBauble implements IManaItem, IManaTooltipD @Override public boolean showDurabilityBar(ItemStack stack) { - // For mana rings, always show the durability bar. return true; } @Override public double getDurabilityForDisplay(ItemStack stack) { - // As in ItemManaTablet, forge seems to have their durability swapped, hence the 1.0 - return 1.0 - getManaFractionForDisplay(stack); } + @Override + public int getRGBDurabilityForDisplay(ItemStack stack) { + return MathHelper.hsvToRGB(getManaFractionForDisplay(stack) / 3.0F, 1.0F, 1.0F); + } + } diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java index 58092da8a..f2a07953c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMiningRing.java @@ -30,7 +30,7 @@ public class ItemMiningRing extends ItemBauble implements IManaUsingItem { public void onWornTick(ItemStack stack, EntityLivingBase player) { super.onWornTick(stack, player); - if(player instanceof EntityPlayer && !player.worldObj.isRemote) { + if(player instanceof EntityPlayer && !player.world.isRemote) { int manaCost = 5; boolean hasMana = ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, manaCost, false); if(!hasMana) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java index fa54a1478..f61cd8afa 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java @@ -52,7 +52,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm @SideOnly(Side.CLIENT) public void onPlayerBaubleRender(ItemStack stack, EntityPlayer player, RenderType type, float partialTicks) { if(type == RenderType.HEAD) { - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.HEAD) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.HEAD).isEmpty(); Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.translateToHeadLevel(player); @@ -71,11 +71,11 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm RayTraceResult pos = mc.objectMouseOver; if(pos == null || pos.getBlockPos() == null) return; - IBlockState state = player.worldObj.getBlockState(pos.getBlockPos()); + IBlockState state = player.world.getBlockState(pos.getBlockPos()); Block block = state.getBlock(); - player.worldObj.getTileEntity(pos.getBlockPos()); + player.world.getTileEntity(pos.getBlockPos()); - ItemStack dispStack = null; + ItemStack dispStack = ItemStack.EMPTY; String text = ""; if(block == Blocks.REDSTONE_WIRE) { @@ -89,7 +89,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm text = state.getValue(BlockRedstoneComparator.MODE) == BlockRedstoneComparator.Mode.SUBTRACT ? "-" : "+"; } - if(dispStack == null) + if(dispStack.isEmpty()) return; int x = resolution.getScaledWidth() / 2 + 15; @@ -104,8 +104,8 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm public static boolean hasMonocle(EntityPlayer player) { for(int i = 0; i < 7; i++) { - ItemStack stack = BaublesApi.getBaubles(player).getStackInSlot(i); - if(stack != null) { + ItemStack stack = BaublesApi.getBaublesHandler(player).getStackInSlot(i); + if(!stack.isEmpty()) { Item item = stack.getItem(); if(item instanceof IBurstViewerBauble) return true; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java index 0b83c310b..630ff2969 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperCloudPendant.java @@ -43,7 +43,7 @@ public class ItemSuperCloudPendant extends ItemCloudPendant { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.rotate(180F, 1F, 0F, 0F); GlStateManager.translate(-0.2F, -0.45F, armor ? 0.2F : 0.15F); GlStateManager.scale(0.5F, 0.5F, 0.5F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java index c4335ef15..56977b350 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java @@ -61,7 +61,7 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender { if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); GlStateManager.scale(0.5, 0.5, 0.5); GlStateManager.rotate(180, 0, 0, 1); GlStateManager.translate(-0.5, -0.90, armor ? -0.4 : -0.25); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java index dc3491647..6a8949814 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java @@ -36,23 +36,23 @@ public class ItemSwapRing extends ItemBauble { EntityPlayer player = (EntityPlayer) entity; ItemStack currentStack = player.getHeldItemMainhand(); - if(currentStack == null || !(currentStack.getItem() instanceof ISortableTool)) + if(currentStack.isEmpty() || !(currentStack.getItem() instanceof ISortableTool)) return; ISortableTool tool = (ISortableTool) currentStack.getItem(); - RayTraceResult pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F); + RayTraceResult pos = ToolCommons.raytraceFromEntity(entity.world, entity, true, 4.5F); ToolType typeToFind = null; if(player.isSwingInProgress && pos != null && pos.getBlockPos() != null) { - IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); + IBlockState state = entity.world.getBlockState(pos.getBlockPos()); Material mat = state.getMaterial(); - if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsPick)) + if(ToolCommons.materialsPick.contains(mat)) typeToFind = ToolType.PICK; - else if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsShovel)) + else if(ToolCommons.materialsShovel.contains(mat)) typeToFind = ToolType.SHOVEL; - else if(ToolCommons.isRightMaterial(mat, ToolCommons.materialsAxe)) + else if(ToolCommons.materialsAxe.contains(mat)) typeToFind = ToolType.AXE; } @@ -65,7 +65,7 @@ public class ItemSwapRing extends ItemBauble { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackInSlot = player.inventory.getStackInSlot(i); - if (stackInSlot != null && stackInSlot.getItem() instanceof ISortableTool && stackInSlot != currentStack) { + if (!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof ISortableTool && stackInSlot != currentStack) { ISortableTool toolInSlot = (ISortableTool) stackInSlot.getItem(); if(toolInSlot.getSortingType(stackInSlot).equals(typeToFind)) { int priority = toolInSlot.getSortingPriority(stackInSlot); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java index e8f211caf..a7ea23275 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemThirdEye.java @@ -55,7 +55,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem, IBaubleR double range = 24; AxisAlignedBB aabb = new AxisAlignedBB(player.posX, player.posY, player.posZ, player.posX, player.posY, player.posZ).expand(range, range, range); - List mobs = player.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, aabb, (Entity e) -> e instanceof IMob); + List mobs = player.world.getEntitiesWithinAABB(EntityLivingBase.class, aabb, (Entity e) -> e instanceof IMob); if(!mobs.isEmpty()) for(EntityLivingBase e : mobs) { @@ -81,7 +81,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem, IBaubleR if(type == RenderType.BODY) { Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE); Helper.rotateIfSneaking(player); - boolean armor = player.getItemStackFromSlot(EntityEquipmentSlot.CHEST) != null; + boolean armor = !player.getItemStackFromSlot(EntityEquipmentSlot.CHEST).isEmpty(); double scale = 0.6; GlStateManager.rotate(180, 0, 0, 1); GlStateManager.translate(-0.3, -0.6, armor ? -0.18 : -0.12); diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java index 22897f38d..0e545021b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTinyPlanet.java @@ -54,10 +54,10 @@ public class ItemTinyPlanet extends ItemBauble implements IBaubleRender { double x = player.posX; double y = player.posY + 1.2F; double z = player.posZ; - if(player.worldObj.isRemote) + if(player.world.isRemote) y -= 1.62F; - applyEffect(player.worldObj, x, y, z); + applyEffect(player.world, x, y, z); } public static void applyEffect(World world, double x, double y, double z) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 554f67fea..b9852ad3a 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -73,12 +73,12 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs EntityPlayer player = (EntityPlayer) event.getEntityLiving(); String s = playerStr(player); - ItemStack belt = BaublesApi.getBaubles(player).getStackInSlot(3); + ItemStack belt = BaublesApi.getBaublesHandler(player).getStackInSlot(3); if(playersWithStepup.contains(s)) { if(shouldPlayerHaveStepup(player)) { ItemTravelBelt beltItem = (ItemTravelBelt) belt.getItem(); - if(player.worldObj.isRemote) { + if(player.world.isRemote) { if((player.onGround || player.capabilities.isFlying) && player.moveForward > 0F && !player.isInsideOfMaterial(Material.WATER)) { float speed = beltItem.getSpeed(belt); player.moveRelative(0F, 1F, player.capabilities.isFlying ? speed : speed); @@ -116,9 +116,9 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs public void onPlayerJump(LivingJumpEvent event) { if(event.getEntityLiving() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); - ItemStack belt = BaublesApi.getBaubles(player).getStackInSlot(3); + ItemStack belt = BaublesApi.getBaublesHandler(player).getStackInSlot(3); - if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { + if(!belt.isEmpty() && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) { player.motionY += ((ItemTravelBelt) belt.getItem()).jump; player.fallDistance = -((ItemTravelBelt) belt.getItem()).fallBuffer; } @@ -126,8 +126,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } private boolean shouldPlayerHaveStepup(EntityPlayer player) { - ItemStack armor = BaublesApi.getBaubles(player).getStackInSlot(3); - return armor != null && armor.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(armor, player, COST, false); + ItemStack armor = BaublesApi.getBaublesHandler(player).getStackInSlot(3); + return !armor.isEmpty() && armor.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(armor, player, COST, false); } @SubscribeEvent @@ -138,7 +138,7 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs } public static String playerStr(EntityPlayer player) { - return player.getGameProfile().getName() + ":" + player.worldObj.isRemote; + return player.getGameProfile().getName() + ":" + player.world.isRemote; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java index bf0214279..516d59f7b 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java @@ -44,14 +44,14 @@ public class ItemUnholyCloak extends ItemHolyCloak { public boolean effectOnDamage(LivingHurtEvent event, EntityPlayer player, ItemStack stack) { if(!event.getSource().isUnblockable()) { int range = 6; - List mobs = player.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IMob.class)); + List mobs = player.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range), Predicates.instanceOf(IMob.class)); for(IMob mob : (List) mobs) if(mob instanceof EntityLivingBase) { EntityLivingBase entity = (EntityLivingBase) mob; entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.getAmount()); } - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.unholyCloak, SoundCategory.PLAYERS, 1F, 1F); for(int i = 0; i < 90; i++) { float rad = i * 4F * (float) Math.PI / 180F; float xMotion = (float) Math.cos(rad) * 0.2F; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java index ed7330796..44d0d883c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java @@ -37,8 +37,8 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { if(player.isInsideOfMaterial(Material.WATER)) { if(player instanceof EntityPlayer) { - ItemStack firstRing = BaublesApi.getBaubles((EntityPlayer) player).getStackInSlot(1); - if(firstRing != null && firstRing.getItem() instanceof ItemWaterRing && firstRing != stack) { + ItemStack firstRing = BaublesApi.getBaublesHandler((EntityPlayer) player).getStackInSlot(1); + if(!firstRing.isEmpty() && firstRing.getItem() instanceof ItemWaterRing && firstRing != stack) { return; } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java index f4d329c24..4736f5afe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java @@ -38,7 +38,7 @@ public class ItemEnderDagger extends ItemManasteelSword { @Override public boolean hitEntity(ItemStack stack, EntityLivingBase target, @Nonnull EntityLivingBase attacker) { - if(!target.worldObj.isRemote + if(!target.world.isRemote && target instanceof EntityEnderman && attacker instanceof EntityPlayer) { target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 20); @@ -62,7 +62,7 @@ public class ItemEnderDagger extends ItemManasteelSword { Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.25, 0)); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.25, 0)); } return multimap; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java index a795d3d8e..dc746a77c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java @@ -36,7 +36,7 @@ public class ItemGlassPick extends ItemManasteelPick { @SubscribeEvent public void onBlockDrops(HarvestDropsEvent event) { - if(event.getHarvester() != null && event.getState() != null && event.getDrops() != null && event.getDrops().isEmpty() && event.getHarvester().getHeldItemMainhand() != null && event.getHarvester().getHeldItemMainhand().getItem() == this && event.getState().getMaterial() == Material.GLASS && event.getState().getBlock().canSilkHarvest(event.getWorld(), event.getPos(), event.getState(), event.getHarvester())) + if(event.getHarvester() != null && event.getState() != null && event.getDrops() != null && event.getDrops().isEmpty() && !event.getHarvester().getHeldItemMainhand().isEmpty() && event.getHarvester().getHeldItemMainhand().getItem() == this && event.getState().getMaterial() == Material.GLASS && event.getState().getBlock().canSilkHarvest(event.getWorld(), event.getPos(), event.getState(), event.getHarvester())) event.getDrops().add(new ItemStack(event.getState().getBlock(), 1, event.getState().getBlock().getMetaFromState(event.getState()))); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java index b05c4d283..a4e446377 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java @@ -61,7 +61,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme star.motionX = motVec.x; star.motionY = motVec.y; star.motionZ = motVec.z; - world.spawnEntityInWorld(star); + world.spawnEntity(star); if (!world.isRaining() && Math.abs(world.getWorldTime() - 18000) < 1800 @@ -71,7 +71,7 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme bonusStar.motionX = motVec.x + Math.random() - 0.5; bonusStar.motionY = motVec.y + Math.random() - 0.5; bonusStar.motionZ = motVec.z + Math.random() - 0.5; - world.spawnEntityInWorld(bonusStar); + world.spawnEntity(bonusStar); } ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java index b77cb2c8d..bb17bbc06 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java @@ -60,9 +60,9 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev Random rand = new Random(lightningSeed); EntityLivingBase lightningSource = entity; - int hops = entity.worldObj.isThundering() ? 10 : 4; + int hops = entity.world.isThundering() ? 10 : 4; for(int i = 0; i < hops; i++) { - List entities = entity.worldObj.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector::test); + List entities = entity.world.getEntitiesInAABBexcluding(lightningSource, new AxisAlignedBB(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector::test); if(entities.isEmpty()) break; @@ -78,8 +78,8 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev dmg--; } - if(!entity.worldObj.isRemote) - ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, entity.worldObj.rand.nextLong()); + if(!entity.world.isRemote) + ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, entity.world.rand.nextLong()); } @@ -97,8 +97,8 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev Multimap multimap = super.getItemAttributeModifiers(equipmentSlot); if (equipmentSlot == EntityEquipmentSlot.MAINHAND) { - multimap.removeAll(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName()); - multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getAttributeUnlocalizedName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.5, 0)); + multimap.removeAll(SharedMonsterAttributes.ATTACK_SPEED.getName()); + multimap.put(SharedMonsterAttributes.ATTACK_SPEED.getName(), new AttributeModifier(ATTACK_SPEED_MODIFIER, "Weapon modifier", -1.5, 0)); } return multimap; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java index c021bd6b5..ce77b8388 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java @@ -28,6 +28,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.Vec3d; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import vazkii.botania.api.BotaniaAPI; @@ -37,11 +38,14 @@ import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.elementium.ItemElementiumPick; import vazkii.botania.common.item.equipment.tool.terrasteel.ItemTerraPick; +import java.util.Arrays; +import java.util.List; + public final class ToolCommons { - public static final Material[] materialsPick = new Material[]{ Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL }; - public static final Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; - public static final Material[] materialsAxe = new Material[]{ Material.CORAL, Material.LEAVES, Material.PLANTS, Material.WOOD, Material.GOURD }; + public static final List materialsPick = Arrays.asList(Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL); + public static final List materialsShovel = Arrays.asList(Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY); + public static final List materialsAxe = Arrays.asList(Material.CORAL, Material.LEAVES, Material.PLANTS, Material.WOOD, Material.GOURD); public static void damageItem(ItemStack stack, int dmg, EntityLivingBase entity, int manaPerDamage) { int manaToRequest = dmg * manaPerDamage; @@ -51,44 +55,37 @@ public final class ToolCommons { stack.damageItem(dmg, entity); } - /** - * Pos is the actual block coordinate, posStart and posEnd are deltas from pos - */ - public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos posStart, BlockPos posEnd, Block block, Material[] materialsListing, boolean silk, int fortune, boolean dispose) { - float blockHardness = block == null ? 1F : block.getBlockHardness(world.getBlockState(pos), world, pos); - - for (BlockPos iterPos : BlockPos.getAllInBox(pos.add(posStart), pos.add(posEnd))) { - if (iterPos.equals(pos)) // skip original block space to avoid crash, vanilla code in the tool class will handle it + public static void removeBlocksInIteration(EntityPlayer player, ItemStack stack, World world, BlockPos centerPos, + Vec3i startDelta, Vec3i endDelta, Block filterBlock, List materialsListing, + boolean silk, int fortune, boolean dispose) { + for (BlockPos iterPos : BlockPos.getAllInBox(centerPos.add(startDelta), centerPos.add(endDelta))) { + if (iterPos.equals(centerPos)) // skip original block space to avoid crash, vanilla code in the tool class will handle it continue; - removeBlockWithDrops(player, stack, world, iterPos, pos, block, materialsListing, silk, fortune, blockHardness, dispose); + removeBlockWithDrops(player, stack, world, iterPos, centerPos, filterBlock, materialsListing, silk, fortune, dispose); } } - public static boolean isRightMaterial(Material material, Material[] materialsListing) { - for(Material mat : materialsListing) - if(material == mat) - return true; - - return false; + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, + Block filterBlock, List materialsListing, + boolean silk, int fortune, boolean dispose) { + removeBlockWithDrops(player, stack, world, pos, bPos, filterBlock, materialsListing, silk, fortune, dispose, true); } - public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose) { - removeBlockWithDrops(player, stack, world, pos, bPos, block, materialsListing, silk, fortune, blockHardness, dispose, true); - } - - public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, Block block, Material[] materialsListing, boolean silk, int fortune, float blockHardness, boolean dispose, boolean particles) { + public static void removeBlockWithDrops(EntityPlayer player, ItemStack stack, World world, BlockPos pos, BlockPos bPos, + Block filterBlock, List materialsListing, + boolean silk, int fortune, boolean dispose, boolean particles) { if(!world.isBlockLoaded(pos)) return; IBlockState state = world.getBlockState(pos); - Block blk = state.getBlock(); + Block block = state.getBlock(); - if(block != null && blk != block) + if(filterBlock != null && block != filterBlock) return; Material mat = world.getBlockState(pos).getMaterial(); - if(!world.isRemote && blk != null && !blk.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0) { - if(!blk.canHarvestBlock(player.worldObj, pos, player) || !isRightMaterial(mat, materialsListing)) { + if(!world.isRemote && !block.isAir(state, world, pos) && state.getPlayerRelativeBlockHardness(player, world, pos) > 0) { + if(!block.canHarvestBlock(player.world, pos, player) || !materialsListing.contains(mat)) { return; } @@ -101,13 +98,12 @@ public final class ToolCommons { if(!player.capabilities.isCreativeMode) { TileEntity tile = world.getTileEntity(pos); IBlockState localState = world.getBlockState(pos); - blk.onBlockHarvested(world, pos, localState, player); - if(blk.removedByPlayer(state, world, pos, player, true)) { - blk.onBlockDestroyedByPlayer(world, pos, state); + if(block.removedByPlayer(state, world, pos, player, true)) { + block.onBlockDestroyedByPlayer(world, pos, state); - if(!dispose || !ItemElementiumPick.isDisposable(blk)) { - blk.harvestBlock(world, player, pos, state, tile, stack); + if(!dispose || !ItemElementiumPick.isDisposable(block)) { + block.harvestBlock(world, player, pos, state, tile, stack); spawnedDrops = true; } } @@ -119,12 +115,12 @@ public final class ToolCommons { world.playEvent(2001, pos, Block.getStateId(state)); if(spawnedDrops) - blk.dropXpOnBlockBreak(world, pos, exp); + block.dropXpOnBlockBreak(world, pos, exp); } } public static int getToolPriority(ItemStack stack) { - if(stack == null) + if(stack.isEmpty()) return 0; Item item = stack.getItem(); @@ -149,28 +145,27 @@ public final class ToolCommons { return materialLevel * 100 + modifier * 10 + efficiency; } - /** - * @author mDiyo - */ - public static RayTraceResult raytraceFromEntity(World world, Entity player, boolean par3, double range) { - float f = 1.0F; - float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f; - float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f; - double d0 = player.prevPosX + (player.posX - player.prevPosX) * f; - double d1 = player.prevPosY + (player.posY - player.prevPosY) * f; - if (player instanceof EntityPlayer) - d1 += ((EntityPlayer) player).eyeHeight; - double d2 = player.prevPosZ + (player.posZ - player.prevPosZ) * f; - Vec3d vec3 = new Vec3d(d0, d1, d2); - float f3 = MathHelper.cos(-f2 * 0.017453292F - (float) Math.PI); - float f4 = MathHelper.sin(-f2 * 0.017453292F - (float) Math.PI); - float f5 = -MathHelper.cos(-f1 * 0.017453292F); - float f6 = MathHelper.sin(-f1 * 0.017453292F); - float f7 = f4 * f5; - float f8 = f3 * f5; - double d3 = range; - Vec3d vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3); - return world.rayTraceBlocks(vec3, vec31, par3); + // [VanillaCopy] of Item.rayTrace, edits noted + public static RayTraceResult raytraceFromEntity(World worldIn, Entity playerIn, boolean useLiquids, double range) { + float f = playerIn.rotationPitch; + float f1 = playerIn.rotationYaw; + double d0 = playerIn.posX; + double d1 = playerIn.posY + (double)playerIn.getEyeHeight(); + double d2 = playerIn.posZ; + Vec3d vec3d = new Vec3d(d0, d1, d2); + float f2 = MathHelper.cos(-f1 * 0.017453292F - (float)Math.PI); + float f3 = MathHelper.sin(-f1 * 0.017453292F - (float)Math.PI); + float f4 = -MathHelper.cos(-f * 0.017453292F); + float f5 = MathHelper.sin(-f * 0.017453292F); + float f6 = f3 * f4; + float f7 = f2 * f4; + double d3 = range; // Botania - use custom range param, don't limit to reach distance + /*if (playerIn instanceof net.minecraft.entity.player.EntityPlayerMP) + { + d3 = ((net.minecraft.entity.player.EntityPlayerMP)playerIn).interactionManager.getBlockReachDistance(); + }*/ + Vec3d vec3d1 = vec3d.addVector((double)f6 * d3, (double)f5 * d3, (double)f7 * d3); + return worldIn.rayTraceBlocks(vec3d, vec3d1, useLiquids, !useLiquids, false); } } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java index 967e05202..588faf50f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java @@ -72,7 +72,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel else { ItemStack itemstack = entityIn.getActiveItemStack(); - return itemstack != null && itemstack.getItem() instanceof ItemLivingwoodBow ? (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; + return !itemstack.isEmpty() && itemstack.getItem() instanceof ItemLivingwoodBow ? (stack.getMaxItemUseDuration() - entityIn.getItemInUseCount()) * chargeVelocityMultiplier() / 20.0F : 0.0F; } }); } @@ -85,7 +85,8 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, @Nonnull World world, EntityPlayer player, @Nonnull EnumHand hand) { + public ActionResult onItemRightClick(@Nonnull World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); // Copy from superclass with our own check boolean flag = canFire(stack, player); ActionResult ret = ForgeEventFactory.onArrowNock(stack, world, player, hand, flag); @@ -111,12 +112,12 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel ItemStack itemstack = getAmmo(player); int i = (int) ((getMaxItemUseDuration(stack) - useTicks) * chargeVelocityMultiplier()); // Botania - velocity multiplier - i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, player, i, itemstack != null || flag); + i = net.minecraftforge.event.ForgeEventFactory.onArrowLoose(stack, world, player, i, !itemstack.isEmpty() || flag); if (i < 0) return; - if (itemstack != null || flag) + if (!itemstack.isEmpty() || flag) { - if (itemstack == null) + if (itemstack.isEmpty()) { itemstack = new ItemStack(Items.ARROW); } @@ -164,7 +165,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel entityarrow.pickupStatus = EntityArrow.PickupStatus.CREATIVE_ONLY; } - world.spawnEntityInWorld(entityarrow); + world.spawnEntity(entityarrow); onFire(stack, shooter, infinite, entityarrow); } @@ -222,7 +223,7 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem, IModel return itemstack; } - return null; + return ItemStack.EMPTY; } @SideOnly(Side.CLIENT) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java index 92ec8d4b1..250206279 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumAxe.java @@ -4,9 +4,11 @@ import java.util.Random; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.monster.AbstractSkeleton; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.monster.EntitySkeleton; +import net.minecraft.entity.monster.EntityWitherSkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Enchantments; @@ -36,12 +38,12 @@ public class ItemElementiumAxe extends ItemManasteelAxe { public void onEntityDrops(LivingDropsEvent event) { if(event.isRecentlyHit() && event.getSource().getEntity() != null && event.getSource().getEntity() instanceof EntityPlayer) { ItemStack weapon = ((EntityPlayer) event.getSource().getEntity()).getHeldItemMainhand(); - if(weapon != null && weapon.getItem() == this) { - Random rand = event.getEntityLiving().worldObj.rand; + if(!weapon.isEmpty() && weapon.getItem() == this) { + Random rand = event.getEntityLiving().world.rand; int looting = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, weapon); - if(event.getEntityLiving() instanceof EntitySkeleton && rand.nextInt(26) <= 3 + looting) - addDrop(event, new ItemStack(Items.SKULL, 1, ((EntitySkeleton) event.getEntityLiving()).func_189771_df().ordinal())); + if(event.getEntityLiving() instanceof AbstractSkeleton && rand.nextInt(26) <= 3 + looting) + addDrop(event, new ItemStack(Items.SKULL, 1, event.getEntityLiving() instanceof EntityWitherSkeleton ? 1 : 0)); else if(event.getEntityLiving() instanceof EntityZombie && !(event.getEntityLiving() instanceof EntityPigZombie) && rand.nextInt(26) <= 2 + 2 * looting) addDrop(event, new ItemStack(Items.SKULL, 1, 2)); else if(event.getEntityLiving() instanceof EntityCreeper && rand.nextInt(26) <= 2 + 2 * looting) @@ -57,7 +59,7 @@ public class ItemElementiumAxe extends ItemManasteelAxe { } private void addDrop(LivingDropsEvent event, ItemStack drop) { - EntityItem entityitem = new EntityItem(event.getEntityLiving().worldObj, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, drop); + EntityItem entityitem = new EntityItem(event.getEntityLiving().world, event.getEntityLiving().posX, event.getEntityLiving().posY, event.getEntityLiving().posZ, drop); entityitem.setPickupDelay(10); event.getDrops().add(entityitem); } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java index ad31db14b..2fa8abd38 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumPick.java @@ -23,14 +23,9 @@ public class ItemElementiumPick extends ItemManasteelPick { public void onHarvestDrops(HarvestDropsEvent event) { if(event.getHarvester() != null) { ItemStack stack = event.getHarvester().getHeldItemMainhand(); - if(stack != null && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { - for(int i = 0; i < event.getDrops().size(); i++) { - ItemStack drop = event.getDrops().get(i); - if(drop != null) { - if(isDisposable(drop) || isSemiDisposable(drop) && !event.getHarvester().isSneaking()) - event.getDrops().remove(i); - } - } + if(!stack.isEmpty() && (stack.getItem() == this || stack.getItem() == ModItems.terraPick && ItemTerraPick.isTipped(stack))) { + event.getDrops().removeIf(s -> !s.isEmpty() && (isDisposable(s) + || isSemiDisposable(s) && !event.getHarvester().isSneaking())); } } } @@ -40,7 +35,7 @@ public class ItemElementiumPick extends ItemManasteelPick { } private static boolean isDisposable(ItemStack stack) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return false; for(int id : OreDictionary.getOreIDs(stack)) { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java index 5e6d71f1a..f47466630 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java @@ -49,24 +49,24 @@ public class ItemElementiumShears extends ItemManasteelShears { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { - if(living.worldObj.isRemote) + if(living.world.isRemote) return; if(count != getMaxItemUseDuration(stack) && count % 5 == 0) { int range = 12; - List sheep = living.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range), Predicates.instanceOf(IShearable.class)); + List sheep = living.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(living.posX - range, living.posY - range, living.posZ - range, living.posX + range, living.posY + range, living.posZ + range), Predicates.instanceOf(IShearable.class)); if(sheep.size() > 0) { for(IShearable target : (List) sheep) { Entity entity = (Entity) target; - if(target.isShearable(stack, entity.worldObj, new BlockPos(entity))) { - List drops = target.onSheared(stack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack)); + if(target.isShearable(stack, entity.world, new BlockPos(entity))) { + List drops = target.onSheared(stack, entity.world, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack)); for(ItemStack drop : drops) { entity.entityDropItem(drop, 1.0F); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java index 2f41b7764..bf81148c0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShovel.java @@ -9,15 +9,19 @@ import net.minecraft.init.Enchantments; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.item.equipment.tool.manasteel.ItemManasteelShovel; import vazkii.botania.common.lib.LibItemNames; +import java.util.Arrays; +import java.util.List; + public class ItemElementiumShovel extends ItemManasteelShovel { - public static final Material[] materialsShovel = new Material[]{ Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; + public static final List materialsShovel = Arrays.asList(Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY); public ItemElementiumShovel() { super(BotaniaAPI.elementiumToolMaterial, LibItemNames.ELEMENTIUM_SHOVEL); @@ -25,21 +29,21 @@ public class ItemElementiumShovel extends ItemManasteelShovel { @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { - World world = player.worldObj; + World world = player.world; Material mat = world.getBlockState(pos).getMaterial(); - if (!ToolCommons.isRightMaterial(mat, materialsShovel)) + if (!ToolCommons.materialsShovel.contains(mat)) return false; RayTraceResult block = ToolCommons.raytraceFromEntity(world, player, true, 10); if (block == null) return false; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand()); - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand()) > 0; + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; Block blk = world.getBlockState(pos).getBlock(); if(blk instanceof BlockFalling) - ToolCommons.removeBlocksInIteration(player, stack, world, pos, new BlockPos(0, -12, 0), new BlockPos(1, 12, 1), blk, materialsShovel, silk, fortune, false); + ToolCommons.removeBlocksInIteration(player, stack, world, pos, new Vec3i(0, -12, 0), new Vec3i(1, 12, 1), blk, materialsShovel, silk, fortune, false); return false; } diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java index 48b3c3711..b8e15a98c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java @@ -75,7 +75,7 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab } @Override - public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDamage()); @@ -88,13 +88,14 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); - if(stackAt != null && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - EnumActionResult did = stackAt.getItem().onItemUse(stackAt, player, world, pos, hand, side, sx, sy, sz); - if(stackAt.stackSize == 0) - player.inventory.setInventorySlotContents(i, null); + if(!stackAt.isEmpty() && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { + ItemStack saveHeldStack = player.getHeldItem(hand); + player.setHeldItem(hand, stackAt); + EnumActionResult did = stackAt.getItem().onItemUse(player, world, pos, hand, side, sx, sy, sz); + player.setHeldItem(hand, saveHeldStack); ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.SAPLING), SAPLING_PATTERN); return did; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java index fce599e17..c7c8fe154 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java @@ -75,7 +75,7 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS } @Override - public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if(state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, getManaPerDmg()); @@ -84,13 +84,14 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { for(int i = 0; i < player.inventory.getSizeInventory(); i++) { ItemStack stackAt = player.inventory.getStackInSlot(i); - if(stackAt != null && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { - EnumActionResult did = stackAt.getItem().onItemUse(stackAt, player, world, pos, hand, side, sx, sy, sz); - if(stackAt.stackSize == 0) - player.inventory.setInventorySlotContents(i, null); + if(!stackAt.isEmpty() && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) { + ItemStack saveHeldStack = player.getHeldItem(hand); + player.setHeldItem(hand, stackAt); + EnumActionResult did = stackAt.getItem().onItemUse(player, world, pos, hand, side, sx, sy, sz); + player.setHeldItem(hand, saveHeldStack); ItemsRemainingRenderHandler.set(player, new ItemStack(Blocks.TORCH), TORCH_PATTERN); return did; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java index 3d6c7ebf7..15da73dbe 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java @@ -67,13 +67,13 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I @Override public boolean itemInteractionForEntity(@Nonnull ItemStack itemstack, EntityPlayer player, EntityLivingBase entity, EnumHand hand) { - if(entity.worldObj.isRemote) + if(entity.world.isRemote) return false; if(entity instanceof IShearable) { IShearable target = (IShearable)entity; - if(target.isShearable(itemstack, entity.worldObj, new BlockPos(entity))) { - List drops = target.onSheared(itemstack, entity.worldObj, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); + if(target.isShearable(itemstack, entity.world, new BlockPos(entity))) { + List drops = target.onSheared(itemstack, entity.world, new BlockPos(entity), EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); for(ItemStack stack : drops) { entity.entityDropItem(stack, 1.0F); @@ -90,14 +90,14 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I @Override public boolean onBlockStartBreak(@Nonnull ItemStack itemstack, @Nonnull BlockPos pos, EntityPlayer player) { - if (player.worldObj.isRemote) + if (player.world.isRemote) return false; - Block block = player.worldObj.getBlockState(pos).getBlock(); + Block block = player.world.getBlockState(pos).getBlock(); if(block instanceof IShearable) { IShearable target = (IShearable)block; - if(target.isShearable(itemstack, player.worldObj, pos)) { - List drops = target.onSheared(itemstack, player.worldObj, pos, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); + if(target.isShearable(itemstack, player.world, pos)) { + List drops = target.onSheared(itemstack, player.world, pos, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, itemstack)); Random rand = new Random(); for(ItemStack stack : drops) { @@ -106,9 +106,9 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem, I double d1 = rand.nextFloat() * f + (1D - f) * 0.5; double d2 = rand.nextFloat() * f + (1D - f) * 0.5; - EntityItem entityitem = new EntityItem(player.worldObj, pos.getX() + d, pos.getY() + d1, pos.getZ() + d2, stack); + EntityItem entityitem = new EntityItem(player.world, pos.getX() + d, pos.getY() + d1, pos.getZ() + d2, stack); entityitem.setPickupDelay(10); - player.worldObj.spawnEntityInWorld(entityitem); + player.world.spawnEntity(entityitem); } ToolCommons.damageItem(itemstack, 1, player, MANA_PER_DAMAGE); diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java index 567db4d1b..b91698a6f 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java @@ -75,7 +75,7 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS } @Override - public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { + public boolean onBlockDestroyed(@Nonnull ItemStack stack, @Nonnull World world, @Nonnull IBlockState state, @Nonnull BlockPos pos, @Nonnull EntityLivingBase entity) { if (state.getBlockHardness(world, pos) != 0F) ToolCommons.damageItem(stack, 1, entity, MANA_PER_DAMAGE); @@ -84,7 +84,9 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS @Nonnull @Override - public EnumActionResult onItemUse(@Nonnull ItemStack stack, EntityPlayer player, @Nonnull World world, BlockPos pos, EnumHand hand, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, @Nonnull World world, BlockPos pos, @Nonnull EnumHand hand, @Nonnull EnumFacing side, float hitX, float hitY, float hitZ) { + ItemStack stack = player.getHeldItem(hand); + if(!player.canPlayerEdit(pos, side, stack)) return EnumActionResult.PASS; else { diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java index d5e67baac..b73861882 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java @@ -93,7 +93,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { - RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); + RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, true, 10); if(raycast != null) { breakOtherBlock(player, stack, pos, pos, raycast.sideHit); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); @@ -110,7 +110,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker @Override public void breakOtherBlock(EntityPlayer player, ItemStack stack, BlockPos pos, BlockPos originPos, EnumFacing side) { if(shouldBreak(player)) { - addBlockSwapper(player.worldObj, player, stack, pos, 32, true); + addBlockSwapper(player.world, player, stack, pos, 32, true); } } @@ -297,7 +297,7 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker null, ToolCommons.materialsAxe, EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, truncator) > 0, EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, truncator), - 0F, false, treatLeavesSpecial); + false, treatLeavesSpecial); remainingSwaps--; diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java index eb5a8366a..f4d7bd216 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.item.equipment.tool.terrasteel; +import java.util.Arrays; import java.util.List; import javax.annotation.Nonnull; @@ -28,10 +29,12 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3i; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.fml.common.registry.GameRegistry; @@ -64,7 +67,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ private static final int MAX_MANA = Integer.MAX_VALUE; private static final int MANA_PER_DAMAGE = 100; - private static final Material[] MATERIALS = new Material[] { Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL, Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY }; + private static final List MATERIALS = Arrays.asList(Material.ROCK, Material.IRON, Material.ICE, Material.GLASS, Material.PISTON, Material.ANVIL, Material.GRASS, Material.GROUND, Material.SAND, Material.SNOW, Material.CRAFTED_SNOW, Material.CLAY); public static final int[] LEVELS = new int[] { 0, 10000, 1000000, 10000000, 100000000, 1000000000 @@ -84,7 +87,7 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int mana : CREATIVE_MANA) { ItemStack stack = new ItemStack(item); setMana(stack, mana); @@ -104,23 +107,25 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - getMana(par1ItemStack); - int level = getLevel(par1ItemStack); + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + + getMana(stack); + int level = getLevel(stack); if(level != 0) { - setEnabled(par1ItemStack, !isEnabled(par1ItemStack)); + setEnabled(stack, !isEnabled(stack)); if(!world.isRemote) world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraPickMode, SoundCategory.PLAYERS, 0.5F, 0.4F); } - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { - return player.isSneaking() ? super.onItemUse(stack, player, world, pos, hand, side, sx, sy, sz) + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float sx, float sy, float sz) { + return player.isSneaking() ? super.onItemUse(player, world, pos, hand, side, sx, sy, sz) : EnumActionResult.PASS; } @@ -139,8 +144,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ @Override public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, EntityPlayer player) { - RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10); - if(!player.worldObj.isRemote && raycast != null) { + RayTraceResult raycast = ToolCommons.raytraceFromEntity(player.world, player, true, 10); + if(!player.world.isRemote && raycast != null) { breakOtherBlock(player, stack, pos, pos, raycast.sideHit); ItemLokiRing.breakOnAllCursors(player, this, stack, pos, raycast.sideHit); // ^ Doable with API access through the IInternalMethodHandler. @@ -159,16 +164,16 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(!isEnabled(stack)) return; - World world = player.worldObj; + World world = player.world; Material mat = world.getBlockState(pos).getMaterial(); - if(!ToolCommons.isRightMaterial(mat, MATERIALS)) + if(!MATERIALS.contains(mat)) return; if(world.isAirBlock(pos)) return; - int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand()); - boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand()) > 0; + int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); + boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; boolean thor = ItemThorRing.getThorRing(player) != null; boolean doX = thor || side.getFrontOffsetX() == 0; boolean doY = thor || side.getFrontOffsetY() == 0; @@ -185,8 +190,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ if(range == 0 && level != 1) return; - BlockPos beginDiff = new BlockPos(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0); - BlockPos endDiff = new BlockPos(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); + Vec3i beginDiff = new Vec3i(doX ? -range : 0, doY ? -1 : 0, doZ ? -range : 0); + Vec3i endDiff = new Vec3i(doX ? range : 0, doY ? rangeY * 2 - 1 : 0, doZ ? range : 0); ToolCommons.removeBlocksInIteration(player, stack, world, pos, beginDiff, endDiff, null, MATERIALS, silk, fortune, isTipped(stack)); if(origLevel == 5) diff --git a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java index 4d969be0d..25b3c046c 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java +++ b/src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java @@ -58,7 +58,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I @SubscribeEvent public void leftClick(PlayerInteractEvent.LeftClickEmpty evt) { - if (evt.getItemStack() != null + if (!evt.getItemStack().isEmpty() && evt.getItemStack().getItem() == this) { PacketHandler.sendToServer(new PacketLeftClick()); } @@ -66,19 +66,19 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I @SubscribeEvent public void attackEntity(AttackEntityEvent evt) { - if (!evt.getEntityPlayer().worldObj.isRemote) { + if (!evt.getEntityPlayer().world.isRemote) { trySpawnBurst(evt.getEntityPlayer()); } } public void trySpawnBurst(EntityPlayer player) { - if (player.getHeldItemMainhand() != null + if (!player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() == this && player.getCooledAttackStrength(0) == 1) { EntityManaBurst burst = getBurst(player, player.getHeldItemMainhand()); - player.worldObj.spawnEntityInWorld(burst); + player.world.spawnEntity(burst); ToolCommons.damageItem(player.getHeldItemMainhand(), 1, player, MANA_PER_DAMAGE); - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.terraBlade, SoundCategory.PLAYERS, 0.4F, 1.4F); } } @@ -118,7 +118,7 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I public void updateBurst(IManaBurst burst, ItemStack stack) { EntityThrowable entity = (EntityThrowable) burst; AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); + List entities = entity.world.getEntitiesWithinAABB(EntityLivingBase.class, axis); String attacker = ItemNBTHelper.getString(burst.getSourceLens(), TAG_ATTACKER_USERNAME, ""); for(EntityLivingBase living : entities) { @@ -131,9 +131,9 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I if(mana >= cost) { burst.setMana(mana - cost); float damage = 4F + BotaniaAPI.terrasteelToolMaterial.getDamageVsEntity(); - if(!burst.isFake() && !entity.worldObj.isRemote) { - EntityPlayer player = living.worldObj.getPlayerEntityByName(attacker); - living.attackEntityFrom(player == null ? DamageSource.magic : DamageSource.causePlayerDamage(player), damage); + if(!burst.isFake() && !entity.world.isRemote) { + EntityPlayer player = living.world.getPlayerEntityByName(attacker); + living.attackEntityFrom(player == null ? DamageSource.MAGIC : DamageSource.causePlayerDamage(player), damage); entity.setDead(); break; } diff --git a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java index dfc502eba..378e00fcf 100644 --- a/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java +++ b/src/main/java/vazkii/botania/common/item/interaction/thaumcraft/ItemManaInkwell.java @@ -18,6 +18,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.NonNullList; import net.minecraft.world.World; import net.minecraftforge.fml.common.Optional; import net.minecraftforge.fml.relauncher.Side; @@ -46,7 +47,7 @@ public class ItemManaInkwell extends ItemMod implements IManaItem, IScribeTools @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { list.add(new ItemStack(item, 1, USES)); list.add(new ItemStack(item)); } diff --git a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java index 564379ad9..78187bd43 100644 --- a/src/main/java/vazkii/botania/common/item/lens/ItemLens.java +++ b/src/main/java/vazkii/botania/common/item/lens/ItemLens.java @@ -23,6 +23,7 @@ import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.NonNullList; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -157,7 +158,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < SUBTYPES; i++) stacks.add(new ItemStack(item, 1, i)); } @@ -185,7 +186,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override public String getItemStackDisplayName(@Nonnull ItemStack stack) { ItemStack compositeLens = getCompositeLens(stack); - if(compositeLens == null) + if(compositeLens.isEmpty()) return super.getItemStackDisplayName(stack); return String.format(net.minecraft.util.text.translation.I18n.translateToLocal("item.botania:compositeLens.name"), getItemShortTermName(stack), getItemShortTermName(compositeLens)); } @@ -199,7 +200,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens getLens(stack.getItemDamage()).apply(stack, props); ItemStack compositeLens = getCompositeLens(stack); - if(compositeLens != null && compositeLens.getItem() instanceof ILens) + if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens) ((ILens) compositeLens.getItem()).apply(compositeLens, props); } @@ -210,7 +211,7 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens dead = getLens(stack.getItemDamage()).collideBurst(burst, entity, pos, isManaBlock, dead, stack); ItemStack compositeLens = getCompositeLens(stack); - if(compositeLens != null && compositeLens.getItem() instanceof ILens) + if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens) dead = ((ILens) compositeLens.getItem()).collideBurst(burst, pos, isManaBlock, dead, compositeLens); return dead; @@ -221,13 +222,13 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens EntityThrowable entity = (EntityThrowable) burst; int storedColor = getStoredColor(stack); - if(storedColor == 16 && entity.worldObj.isRemote) + if(storedColor == 16 && entity.world.isRemote) burst.setColor(getLensColor(stack)); getLens(stack.getItemDamage()).updateBurst(burst, entity, stack); ItemStack compositeLens = getCompositeLens(stack); - if(compositeLens != null && compositeLens.getItem() instanceof ILens) + if(!compositeLens.isEmpty() && compositeLens.getItem() instanceof ILens) ((ILens) compositeLens.getItem()).updateBurst(burst, compositeLens); } @@ -297,18 +298,18 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens @Override public ItemStack getCompositeLens(ItemStack stack) { - NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_COMPOSITE_LENS, true); + NBTTagCompound cmp = ItemNBTHelper.getCompound(stack, TAG_COMPOSITE_LENS, false); if(cmp == null) - return null; - return ItemStack.loadItemStackFromNBT(cmp); + return ItemStack.EMPTY; + else return new ItemStack(cmp); } @Override public ItemStack setCompositeLens(ItemStack sourceLens, ItemStack compositeLens) { - NBTTagCompound cmp = new NBTTagCompound(); - compositeLens.writeToNBT(cmp); - ItemNBTHelper.setCompound(sourceLens, TAG_COMPOSITE_LENS, cmp); - + if(!compositeLens.isEmpty()) { + NBTTagCompound cmp = compositeLens.writeToNBT(new NBTTagCompound()); + ItemNBTHelper.setCompound(sourceLens, TAG_COMPOSITE_LENS, cmp); + } return sourceLens; } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java index fae8270d7..0c082a5c6 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensDamage.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensDamage.java @@ -24,10 +24,10 @@ public class LensDamage extends Lens { @Override public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { - if (entity.worldObj.isRemote) + if (entity.world.isRemote) return; AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(1, 1, 1); - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); + List entities = entity.world.getEntitiesWithinAABB(EntityLivingBase.class, axis); for(EntityLivingBase living : entities) { if(living instanceof EntityPlayer) continue; @@ -37,7 +37,7 @@ public class LensDamage extends Lens { if(mana >= 16) { burst.setMana(mana - 16); if(!burst.isFake()) - living.attackEntityFrom(DamageSource.magic, 8); + living.attackEntityFrom(DamageSource.MAGIC, 8); break; } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java index 2da82df1d..73140e58e 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensExplosive.java @@ -21,10 +21,10 @@ public class LensExplosive extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!entity.worldObj.isRemote && !burst.isFake()) { + if(!entity.world.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) - entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, burst.getMana() / 50F, true); + entity.world.createExplosion(entity, entity.posX, entity.posY, entity.posZ, burst.getMana() / 50F, true); } else dead = false; return dead; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFire.java b/src/main/java/vazkii/botania/common/item/lens/LensFire.java index 74c006369..9b678c2ee 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFire.java @@ -28,24 +28,24 @@ public class LensFire extends Lens { public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult rtr, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); BlockPos pos = rtr.getBlockPos(); - if(!entity.worldObj.isRemote && pos != null && !coords.equals(pos) && !burst.isFake() && !isManaBlock) { + if(!entity.world.isRemote && pos != null && !coords.equals(pos) && !burst.isFake() && !isManaBlock) { EnumFacing dir = rtr.sideHit; BlockPos offPos = pos.offset(dir); - Block blockAt = entity.worldObj.getBlockState(pos).getBlock(); - Block blockAtOffset = entity.worldObj.getBlockState(offPos).getBlock(); + Block blockAt = entity.world.getBlockState(pos).getBlock(); + Block blockAtOffset = entity.world.getBlockState(offPos).getBlock(); if(blockAt == Blocks.PORTAL) - entity.worldObj.setBlockState(pos, Blocks.AIR.getDefaultState()); + entity.world.setBlockState(pos, Blocks.AIR.getDefaultState()); if(blockAtOffset == Blocks.PORTAL) - entity.worldObj.setBlockState(offPos, Blocks.AIR.getDefaultState()); + entity.world.setBlockState(offPos, Blocks.AIR.getDefaultState()); else if(blockAt == ModBlocks.incensePlate) { - TileIncensePlate plate = (TileIncensePlate) entity.worldObj.getTileEntity(pos); + TileIncensePlate plate = (TileIncensePlate) entity.world.getTileEntity(pos); plate.ignite(); VanillaPacketDispatcher.dispatchTEToNearbyPlayers(plate); - } else if(blockAtOffset.isAir(entity.worldObj.getBlockState(offPos), entity.worldObj, offPos)) - entity.worldObj.setBlockState(offPos, Blocks.FIRE.getDefaultState()); + } else if(blockAtOffset.isAir(entity.world.getBlockState(offPos), entity.world, offPos)) + entity.world.setBlockState(offPos, Blocks.FIRE.getDefaultState()); } return dead; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java index 17d3c2521..206e0e66f 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensFirework.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensFirework.java @@ -25,13 +25,13 @@ public class LensFirework extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!entity.worldObj.isRemote && !burst.isFake()) { + if(!entity.world.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { ItemStack fireworkStack = generateFirework(burst.getColor()); - EntityFireworkRocket rocket = new EntityFireworkRocket(entity.worldObj, entity.posX, entity.posY, entity.posZ, fireworkStack); - entity.worldObj.spawnEntityInWorld(rocket); + EntityFireworkRocket rocket = new EntityFireworkRocket(entity.world, entity.posX, entity.posY, entity.posZ, fireworkStack); + entity.world.spawnEntity(rocket); } } else dead = false; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java index 2ec4f198b..19ed4199a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensInfluence.java @@ -31,11 +31,11 @@ public class LensInfluence extends Lens { public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(!burst.isFake()) { double range = 3.5; - List movables = entity.worldObj.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(EntityFallingBlock.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); - movables.addAll(entity.worldObj.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range), Predicates.instanceOf(IManaBurst.class))); + List movables = entity.world.getEntitiesWithinAABB(EntityItem.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range)); + movables.addAll(entity.world.getEntitiesWithinAABB(EntityXPOrb.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.world.getEntitiesWithinAABB(EntityArrow.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.world.getEntitiesWithinAABB(EntityFallingBlock.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range))); + movables.addAll(entity.world.getEntitiesWithinAABB(Entity.class, new AxisAlignedBB(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range), Predicates.instanceOf(IManaBurst.class))); for(Entity movable : movables) { if(movable == burst) diff --git a/src/main/java/vazkii/botania/common/item/lens/LensLight.java b/src/main/java/vazkii/botania/common/item/lens/LensLight.java index 2fbcf62b2..df2e61f28 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensLight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensLight.java @@ -26,17 +26,17 @@ public class LensLight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { + if(!entity.world.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit); - Block blockAt = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); - Block blockAt_ = entity.worldObj.getBlockState(pos_).getBlock(); + Block blockAt = entity.world.getBlockState(pos.getBlockPos()).getBlock(); + Block blockAt_ = entity.world.getBlockState(pos_).getBlock(); if(blockAt == ModBlocks.manaFlame) - entity.worldObj.setBlockState(pos.getBlockPos(), Blocks.AIR.getDefaultState()); - else if(blockAt_.isAir(entity.worldObj.getBlockState(pos_), entity.worldObj, pos_) || blockAt_.isReplaceable(entity.worldObj, pos_)) { - entity.worldObj.setBlockState(pos_, ModBlocks.manaFlame.getDefaultState()); - TileEntity tile = entity.worldObj.getTileEntity(pos_); + entity.world.setBlockState(pos.getBlockPos(), Blocks.AIR.getDefaultState()); + else if(blockAt_.isAir(entity.world.getBlockState(pos_), entity.world, pos_) || blockAt_.isReplaceable(entity.world, pos_)) { + entity.world.setBlockState(pos_, ModBlocks.manaFlame.getDefaultState()); + TileEntity tile = entity.world.getTileEntity(pos_); if(tile instanceof TileManaFlame) ((TileManaFlame) tile).setColor(burst.getColor()); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java index ee221b819..50d2df626 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMagnet.java @@ -33,8 +33,8 @@ public class LensMagnet extends Lens { magnetize : { for (BlockPos pos : BlockPos.getAllInBox(basePos.add(-range, -range, -range), basePos.add(range, range, range))) { - if(entity.worldObj.getTileEntity(pos) instanceof IManaReceiver) { - TileEntity tile = entity.worldObj.getTileEntity(pos); + if(entity.world.getTileEntity(pos) instanceof IManaReceiver) { + TileEntity tile = entity.world.getTileEntity(pos); if(magnetized) { int magX = entity.getEntityData().getInteger(TAG_MAGNETIZED_X); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensMine.java b/src/main/java/vazkii/botania/common/item/lens/LensMine.java index 1a35de0d2..13fa60a9a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensMine.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensMine.java @@ -33,7 +33,7 @@ public class LensMine extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - World world = entity.worldObj; + World world = entity.world; BlockPos pos_ = pos.getBlockPos(); if (world.isRemote || pos_ == null) @@ -58,17 +58,24 @@ public class LensMine extends Lens { BlockPos coords = burst.getBurstSourceBlockPos(); if(!coords.equals(pos.getBlockPos()) && !(tile instanceof IManaBlock) && neededHarvestLevel <= harvestLevel && hardness != -1 && hardness < 50F && (burst.isFake() || mana >= 24)) { + List items = new ArrayList<>(); + + items.addAll(block.getDrops(world, pos_, world.getBlockState(pos_), 0)); + if(!burst.hasAlreadyCollidedAt(pos_)) { - if(!burst.isFake()) { - boolean offBounds = coords.getY() < 0; - boolean doWarp = warp && !offBounds; - - for(ItemStack drop : block.getDrops(world, pos_, state, 0)) - Block.spawnAsEntity(world, doWarp ? coords : pos_, drop); - + if(!burst.isFake() && !entity.world.isRemote) { world.setBlockToAir(pos_); if(ConfigHandler.blockBreakParticles) - entity.worldObj.playEvent(2001, pos_, Block.getStateId(state)); + entity.world.playEvent(2001, pos_, Block.getStateId(state)); + + boolean offBounds = coords.getY() < 0; + boolean doWarp = warp && !offBounds; + int dropX = doWarp ? coords.getX() : pos_.getX(); + int dropY = doWarp ? coords.getY() : pos_.getY(); + int dropZ = doWarp ? coords.getZ() : pos_.getZ(); + + for(ItemStack stack_ : items) + world.spawnEntity(new EntityItem(world, dropX + 0.5, dropY + 0.5, dropZ + 0.5, stack_)); burst.setMana(mana - 24); } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java index 232460a73..1b8566792 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPaint.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPaint.java @@ -33,20 +33,20 @@ public class LensPaint extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { int storedColor = ItemLens.getStoredColor(stack); - if(!entity.worldObj.isRemote && !burst.isFake() && storedColor > -1 && storedColor < 17) { + if(!entity.world.isRemote && !burst.isFake() && storedColor > -1 && storedColor < 17) { if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) { int r = 20; EnumDyeColor sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor(); - List sheepList = entity.worldObj.getEntitiesWithinAABB(EntitySheep.class, new AxisAlignedBB(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r)); + List sheepList = entity.world.getEntitiesWithinAABB(EntitySheep.class, new AxisAlignedBB(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r)); for(EntitySheep sheep : sheepList) { if(sheep.getFleeceColor() == sheepColor) - sheep.setFleeceColor(EnumDyeColor.byMetadata(storedColor == 16 ? sheep.worldObj.rand.nextInt(16) : storedColor)); + sheep.setFleeceColor(EnumDyeColor.byMetadata(storedColor == 16 ? sheep.world.rand.nextInt(16) : storedColor)); } dead = true; } else if (pos.getBlockPos() != null) { - Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block block = entity.world.getBlockState(pos.getBlockPos()).getBlock(); if(BotaniaAPI.paintableBlocks.containsKey(block)) { - IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); + IBlockState state = entity.world.getBlockState(pos.getBlockPos()); List coordsToPaint = new ArrayList<>(); List coordsFound = new ArrayList<>(); @@ -60,7 +60,7 @@ public class LensPaint extends Lens { coordsToPaint.add(coords); for(EnumFacing dir : EnumFacing.VALUES) { - IBlockState state_ = entity.worldObj.getBlockState(coords.offset(dir)); + IBlockState state_ = entity.world.getBlockState(coords.offset(dir)); BlockPos coords_ = new BlockPos(coords.offset(dir)); if(state_ == state && !coordsFound.contains(coords_) && !coordsToPaint.contains(coords_)) coordsFound.add(coords_); @@ -69,13 +69,13 @@ public class LensPaint extends Lens { } while(!coordsFound.isEmpty() && coordsToPaint.size() < 1000); for(BlockPos coords : coordsToPaint) { - EnumDyeColor placeColor = EnumDyeColor.byMetadata(storedColor == 16 ? entity.worldObj.rand.nextInt(16) : storedColor); - IBlockState stateThere = entity.worldObj.getBlockState(coords); + EnumDyeColor placeColor = EnumDyeColor.byMetadata(storedColor == 16 ? entity.world.rand.nextInt(16) : storedColor); + IBlockState stateThere = entity.world.getBlockState(coords); if(stateThere.getValue(BotaniaAPI.paintableBlocks.get(block)) != placeColor && BotaniaAPI.paintableBlocks.get(block).getAllowedValues().contains(placeColor)) { - entity.worldObj.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); - PacketHandler.sendToNearby(entity.worldObj, coords, + entity.world.setBlockState(coords, stateThere.withProperty(BotaniaAPI.paintableBlocks.get(block), placeColor), 2); + PacketHandler.sendToNearby(entity.world, coords, new PacketBotaniaEffect(PacketBotaniaEffect.EffectType.PAINT_LENS, coords.getX(), coords.getY(), coords.getZ(), placeColor.getMetadata())); } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java index a4d4b7965..dd5f7f1b7 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensPiston.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensPiston.java @@ -25,16 +25,16 @@ public class LensPiston extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { + if(!entity.world.isRemote && pos.getBlockPos() != null && !coords.equals(pos.getBlockPos()) && !burst.isFake() && !isManaBlock) { BlockPos pos_ = pos.getBlockPos().offset(pos.sideHit.getOpposite()); - if(entity.worldObj.isAirBlock(pos_) || entity.worldObj.getBlockState(pos_).getBlock().isReplaceable(entity.worldObj, pos_)) { - IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); - TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); + if(entity.world.isAirBlock(pos_) || entity.world.getBlockState(pos_).getBlock().isReplaceable(entity.world, pos_)) { + IBlockState state = entity.world.getBlockState(pos.getBlockPos()); + TileEntity tile = entity.world.getTileEntity(pos.getBlockPos()); - if(state.getMobilityFlag() == EnumPushReaction.NORMAL && state.getBlock() != Blocks.OBSIDIAN && state.getBlockHardness(entity.worldObj, pos_) >= 0 && tile == null) { - entity.worldObj.destroyBlock(pos.getBlockPos(), false); - entity.worldObj.setBlockState(pos_, state, 1 | 2); + if(state.getMobilityFlag() == EnumPushReaction.NORMAL && state.getBlock() != Blocks.OBSIDIAN && state.getBlockHardness(entity.world, pos_) >= 0 && tile == null) { + entity.world.destroyBlock(pos.getBlockPos(), false); + entity.world.setBlockState(pos_, state, 1 | 2); } } } diff --git a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java index 0eb9c91af..6c4bff116 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensRedirect.java @@ -26,15 +26,15 @@ public class LensRedirect extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { BlockPos coords = burst.getBurstSourceBlockPos(); - if(!entity.worldObj.isRemote && pos.entityHit == null && coords.getY() != -1 && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { - TileEntity tile = entity.worldObj.getTileEntity(pos.getBlockPos()); + if(!entity.world.isRemote && pos.entityHit == null && coords.getY() != -1 && (pos.getBlockPos() == null || !pos.getBlockPos().equals(coords))) { + TileEntity tile = entity.world.getTileEntity(pos.getBlockPos()); if(tile != null && tile instanceof IDirectioned) { if(!burst.isFake()) { IDirectioned redir = (IDirectioned) tile; Vector3 tileVec = Vector3.fromTileEntityCenter(tile); Vector3 sourceVec = new Vector3(coords.getX() + 0.5, coords.getY() + 0.5, coords.getZ() + 0.5); - AxisAlignedBB axis = entity.worldObj.getBlockState(coords).getCollisionBoundingBox(entity.worldObj, coords).offset(coords); + AxisAlignedBB axis = entity.world.getBlockState(coords).getCollisionBoundingBox(entity.world, coords).offset(coords); if(axis == null) axis = new AxisAlignedBB(coords, coords.add(1, 1, 1)); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java index 60502b23a..f7bcb512a 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensStorm.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensStorm.java @@ -20,10 +20,10 @@ public class LensStorm extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!entity.worldObj.isRemote && !burst.isFake()) { + if(!entity.world.isRemote && !burst.isFake()) { BlockPos coords = burst.getBurstSourceBlockPos(); if(pos.entityHit == null && !isManaBlock && (pos.getBlockPos() == null || !coords.equals(pos.getBlockPos()))) - entity.worldObj.createExplosion(entity, entity.posX, entity.posY, entity.posZ, 5F, true); + entity.world.createExplosion(entity, entity.posX, entity.posY, entity.posZ, 5F, true); } else dead = false; return dead; diff --git a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java index 08ccda287..4dd893ced 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensTripwire.java @@ -34,11 +34,11 @@ public class LensTripwire extends Lens { @Override public void updateBurst(IManaBurst burst, EntityThrowable entity, ItemStack stack) { if(burst.isFake()) { - if(entity.worldObj.isRemote) + if(entity.world.isRemote) return; AxisAlignedBB axis = new AxisAlignedBB(entity.posX, entity.posY, entity.posZ, entity.lastTickPosX, entity.lastTickPosY, entity.lastTickPosZ).expand(0.25, 0.25, 0.25); - List entities = entity.worldObj.getEntitiesWithinAABB(EntityLivingBase.class, axis); + List entities = entity.world.getEntitiesWithinAABB(EntityLivingBase.class, axis); if(!entities.isEmpty()) { Entity e = (Entity) burst; e.getEntityData().setBoolean(TAG_TRIPPED, true); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java index c3b0a9594..9a5e98e46 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWarp.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWarp.java @@ -28,11 +28,11 @@ public class LensWarp extends Lens { if(burst.isFake() || pos.getBlockPos() == null) return dead; - Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); + Block block = entity.world.getBlockState(pos.getBlockPos()).getBlock(); if(block == ModBlocks.pistonRelay) { - BlockPistonRelay.DimWithPos key = ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.worldObj.provider.getDimension(), pos.getBlockPos())); + BlockPistonRelay.DimWithPos key = ((BlockPistonRelay) ModBlocks.pistonRelay).mappedPositions.get(new BlockPistonRelay.DimWithPos(entity.world.provider.getDimension(), pos.getBlockPos())); if(key != null) { - if(key.dim == entity.worldObj.provider.getDimension()) { + if(key.dim == entity.world.provider.getDimension()) { entity.setPosition(key.blockPos.getX() + 0.5, key.blockPos.getY() + 0.5, key.blockPos.getZ() + 0.5); burst.setCollidedAt(key.blockPos); diff --git a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java index eb728040e..e53b8ad86 100644 --- a/src/main/java/vazkii/botania/common/item/lens/LensWeight.java +++ b/src/main/java/vazkii/botania/common/item/lens/LensWeight.java @@ -14,13 +14,17 @@ import java.util.Map; import com.google.common.collect.ImmutableMap; +import mezz.jei.util.FakeClientWorld; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.WorldServer; import vazkii.botania.api.internal.IManaBurst; import vazkii.botania.common.core.handler.ConfigHandler; @@ -33,19 +37,21 @@ public class LensWeight extends Lens { @Override public boolean collideBurst(IManaBurst burst, EntityThrowable entity, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack) { - if(!entity.worldObj.isRemote && !burst.isFake() && pos.getBlockPos() != null) { + if(!entity.world.isRemote && !burst.isFake() && pos.getBlockPos() != null) { int harvestLevel = ConfigHandler.harvestLevelWeight; - Block block = entity.worldObj.getBlockState(pos.getBlockPos()).getBlock(); - IBlockState state = entity.worldObj.getBlockState(pos.getBlockPos()); + BlockPos bPos = pos.getBlockPos(); + Block block = entity.world.getBlockState(bPos).getBlock(); + IBlockState state = entity.world.getBlockState(bPos); int neededHarvestLevel = block.getHarvestLevel(state); - if(entity.worldObj.isAirBlock(pos.getBlockPos().down()) && state.getBlockHardness(entity.worldObj, pos.getBlockPos()) != -1 && neededHarvestLevel <= harvestLevel && entity.worldObj.getTileEntity(pos.getBlockPos()) == null && block.canSilkHarvest(entity.worldObj, pos.getBlockPos(), state, null)) { + if(entity.world.isAirBlock(bPos.down()) && state.getBlockHardness(entity.world, bPos) != -1 && neededHarvestLevel <= harvestLevel && entity.world.getTileEntity(bPos) == null && block.canSilkHarvest(entity.world, bPos, state, null)) { state = TECHNICAL_BLOCK_REMAP.getOrDefault(state, state); - EntityFallingBlock falling = new EntityFallingBlock(entity.worldObj, pos.getBlockPos().getX() + 0.5, pos.getBlockPos().getY() + 0.5, pos.getBlockPos().getZ() + 0.5, state); + EntityFallingBlock falling = new EntityFallingBlock(entity.world, bPos.getX() + 0.5, bPos.getY(), bPos.getZ() + 0.5, state); falling.fallTime = 1; - entity.worldObj.setBlockToAir(pos.getBlockPos()); - entity.worldObj.spawnEntityInWorld(falling); + entity.world.setBlockToAir(bPos); + ((WorldServer) entity.world).spawnParticle(EnumParticleTypes.FALLING_DUST, bPos.getX() + 0.5, bPos.getY() + 0.5, bPos.getZ() + 0.5, 10, 0.45, 0.45, 0.45, 5, new int[] {Block.getStateId(state)}); + entity.world.spawnEntity(falling); } } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemDye.java b/src/main/java/vazkii/botania/common/item/material/ItemDye.java index 7248a4f5c..ad05d6eff 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemDye.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemDye.java @@ -39,13 +39,14 @@ public class ItemDye extends Item16Colors { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + ItemStack stack = player.getHeldItem(hand); Block block = world.getBlockState(pos).getBlock(); - EnumDyeColor color = EnumDyeColor.byMetadata(par1ItemStack.getItemDamage()); + EnumDyeColor color = EnumDyeColor.byMetadata(stack.getItemDamage()); if(block == Blocks.WOOL && color != world.getBlockState(pos).getValue(BlockColored.COLOR) || block == Blocks.CARPET && color != world.getBlockState(pos).getValue(BlockCarpet.COLOR)) { world.setBlockState(pos, world.getBlockState(pos).withProperty(block == Blocks.WOOL ? BlockColored.COLOR : BlockCarpet.COLOR, color), 1 | 2); - par1ItemStack.stackSize--; + stack.shrink(1); return EnumActionResult.SUCCESS; } @@ -54,7 +55,7 @@ public class ItemDye extends Item16Colors { IManaPool pool = (IManaPool) tile; if(color != pool.getColor()) { pool.setColor(color); - par1ItemStack.stackSize--; + stack.shrink(1); return EnumActionResult.SUCCESS; } } @@ -70,7 +71,7 @@ public class ItemDye extends Item16Colors { if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) { entitysheep.setFleeceColor(i); - --stack.stackSize; + stack.shrink(1); } return true; diff --git a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java index 54aa9ae42..6212976d9 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemManaResource.java @@ -26,6 +26,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.NonNullList; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -34,6 +35,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.recipe.IElvenItem; import vazkii.botania.api.recipe.IFlowerComponent; @@ -59,7 +61,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @SubscribeEvent public void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { ItemStack stack = event.getItemStack(); - boolean correctStack = stack != null && stack.getItem() == Items.GLASS_BOTTLE; + boolean correctStack = !stack.isEmpty() && stack.getItem() == Items.GLASS_BOTTLE; boolean ender = event.getWorld().provider.getDimension() == 1; if(correctStack && ender) { @@ -69,15 +71,9 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve ItemStack stack1 = new ItemStack(this, 1, 15); event.getEntityPlayer().addStat(ModAchievements.enderAirMake, 1); - if(!event.getEntityPlayer().inventory.addItemStackToInventory(stack1)) { - event.getEntityPlayer().dropItem(stack1, true); - } else { - event.getEntityPlayer().openContainer.detectAndSendChanges(); - } + ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), stack1); - stack.stackSize--; - if(stack.stackSize == 0) - event.getEntityPlayer().setHeldItem(event.getHand(), null); + stack.shrink(1); event.getWorld().playSound(null, event.getPos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.5F, 1F); event.setCanceled(true); @@ -87,43 +83,46 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14) - return EntityDoppleganger.spawn(player, par1ItemStack, world, pos, par1ItemStack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; - else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, world, pos, player)) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + ItemStack stack = player.getHeldItem(hand); + + if(stack.getItemDamage() == 4 || stack.getItemDamage() == 14) + return EntityDoppleganger.spawn(player, stack, world, pos, stack.getItemDamage() == 14) ? EnumActionResult.SUCCESS : EnumActionResult.FAIL; + else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, pos, player)) { if(!world.isRemote) world.playEvent(2005, pos, 0); return EnumActionResult.SUCCESS; } - return super.onItemUse(par1ItemStack, player, world, pos, hand, side, par8, par9, par10); + return super.onItemUse(player, world, pos, hand, side, par8, par9, par10); } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(par1ItemStack.getItemDamage() == 15) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + if(stack.getItemDamage() == 15) { if(!player.capabilities.isCreativeMode) - --par1ItemStack.stackSize; + stack.shrink(1); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); if(!world.isRemote) { EntityEnderAirBottle b = new EntityEnderAirBottle(world, player); b.setHeadingFromThrower(player, player.rotationPitch, player.rotationYaw, 0F, 1.5F, 1F); - world.spawnEntityInWorld(b); + world.spawnEntity(b); } else player.swingArm(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < types; i++) if(Botania.gardenOfGlassLoaded || i != 20 && i != 21) stacks.add(new ItemStack(item, 1, i)); @@ -155,7 +154,7 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve @Nonnull @Override public ItemStack getContainerItem(@Nonnull ItemStack itemStack) { - return itemStack.getItemDamage() == 11 ? itemStack.copy() : null; + return itemStack.getItemDamage() == 11 ? itemStack.copy() : ItemStack.EMPTY; } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java index 1dfb2fab7..1f8815735 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemPetal.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemPetal.java @@ -39,7 +39,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) { // Copy of ItemBlock.onItemUse IBlockState iblockstate = world.getBlockState(pos); Block block = iblockstate.getBlock(); @@ -49,16 +49,17 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { pos = pos.offset(facing); } - if (stack.stackSize != 0 && player.canPlayerEdit(pos, facing, stack) && world.canBlockBePlaced(ModBlocks.buriedPetals, pos, false, facing, null, stack)) + ItemStack stack = player.getHeldItem(hand); + if (!stack.isEmpty() && player.canPlayerEdit(pos, facing, stack) && world.mayPlace(ModBlocks.buriedPetals, pos, false, facing, null)) { int i = this.getMetadata(stack.getMetadata()); - IBlockState iblockstate1 = ModBlocks.buriedPetals.onBlockPlaced(world, pos, facing, hitX, hitY, hitZ, i, player); + IBlockState iblockstate1 = ModBlocks.buriedPetals.getStateForPlacement(world, pos, facing, hitX, hitY, hitZ, i, player); if (placeBlockAt(stack, player, world, pos, facing, hitX, hitY, hitZ, iblockstate1)) { SoundType soundtype = ModBlocks.buriedPetals.getSoundType(); world.playSound(player, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); - --stack.stackSize; + stack.shrink(1); } return EnumActionResult.SUCCESS; @@ -85,7 +86,7 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent { @Override public int getMetadata(int stackMeta) { - return MathHelper.clamp_int(stackMeta, 0, 15); + return MathHelper.clamp(stackMeta, 0, 15); } @Override diff --git a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java index 7e18fa428..c400709e5 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemQuartz.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.recipe.IElvenItem; @@ -36,7 +37,7 @@ public class ItemQuartz extends ItemMod implements IElvenItem { @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List list) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList list) { for(int i = ConfigHandler.darkQuartzEnabled ? 0 : 1; i < SUBTYPES; i++) list.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/material/ItemRune.java b/src/main/java/vazkii/botania/common/item/material/ItemRune.java index 17bab8aae..b11eed09a 100644 --- a/src/main/java/vazkii/botania/common/item/material/ItemRune.java +++ b/src/main/java/vazkii/botania/common/item/material/ItemRune.java @@ -20,6 +20,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.stats.Achievement; +import net.minecraft.util.NonNullList; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.item.IPetalApothecary; @@ -39,7 +40,7 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev @Override @SideOnly(Side.CLIENT) - public void getSubItems(@Nonnull Item item, CreativeTabs tab, List stacks) { + public void getSubItems(@Nonnull Item item, CreativeTabs tab, NonNullList stacks) { for(int i = 0; i < 16; i++) stacks.add(new ItemStack(item, 1, i)); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java index 7cd9f8734..e3a0c2d9d 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemAesirRing.java @@ -54,16 +54,16 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina @SubscribeEvent public void onDropped(ItemTossEvent event) { - if(event.getEntityItem() != null && event.getEntityItem().getEntityItem() != null && !event.getEntityItem().worldObj.isRemote) { + if(event.getEntityItem() != null && !event.getEntityItem().getEntityItem().isEmpty() && !event.getEntityItem().world.isRemote) { ItemStack stack = event.getEntityItem().getEntityItem(); - if(stack.getItem() != null && stack.getItem() == this) { + if(stack.getItem() == this) { event.getEntityItem().setDead(); UUID user = getSoulbindUUID(stack); for(Item item : new Item[] { ModItems.thorRing, ModItems.lokiRing, ModItems.odinRing }) { ItemStack stack1 = new ItemStack(item); bindToUUID(user, stack1); - EntityItem entity = new EntityItem(event.getEntityItem().worldObj, event.getEntityItem().posX, event.getEntityItem().posY, event.getEntityItem().posZ, stack1); + EntityItem entity = new EntityItem(event.getEntityItem().world, event.getEntityItem().posX, event.getEntityItem().posY, event.getEntityItem().posZ, stack1); entity.motionX = event.getEntityItem().motionX; entity.motionY = event.getEntityItem().motionY; entity.motionZ = event.getEntityItem().motionZ; @@ -78,7 +78,7 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina } catch (Throwable ignored) {} entity.setPickupDelay(pickupDelay); - entity.worldObj.spawnEntityInWorld(entity); + entity.world.spawnEntity(entity); } } } @@ -120,10 +120,10 @@ public class ItemAesirRing extends ItemRelicBauble implements IWireframeCoordina private void fillModifiers(Multimap attributes, ItemStack stack) { - if(stack == null) // workaround for Azanor/Baubles#156 + if(stack.isEmpty()) // workaround for Azanor/Baubles#156 return; - attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java index a702e2ea1..3e22afd84 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemDice.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemDice.java @@ -52,8 +52,10 @@ public class ItemDice extends ItemRelic { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { - if(isRightPlayer(player, stack) && !player.worldObj.isRemote) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + + if(isRightPlayer(player, stack) && !player.world.isRemote) { int moonPhase = world.provider.getMoonPhase(world.getWorldTime()); int relic = SIDES_FOR_MOON_PHASES[moonPhase]; if(hasRelicAlready(player, relic)) { @@ -72,12 +74,12 @@ public class ItemDice extends ItemRelic { world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_ARROW_SHOOT, SoundCategory.PLAYERS, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F)); if(hasRelicAlready(player, relic)) { - player.addChatMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); - stack.stackSize--; + player.sendMessage(new TextComponentTranslation("botaniamisc.dudDiceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + stack.shrink(1); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - player.addChatMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); + player.sendMessage(new TextComponentTranslation("botaniamisc.diceRoll", relic + 1).setStyle(new Style().setColor(TextFormatting.DARK_GREEN))); return ActionResult.newResult(EnumActionResult.SUCCESS, relicStacks[relic].copy()); } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java index 4a7c67caa..5fbc4de70 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemFlugelEye.java @@ -47,7 +47,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @Nonnull @Override - public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if(player.isSneaking()) { if(world.isRemote) { player.swingArm(hand); @@ -58,6 +58,7 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs Botania.proxy.wispFX(x1, y1, z1, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random() * 0.5F, -0.05F + (float) Math.random() * 0.05F); } } else { + ItemStack stack = player.getHeldItem(hand); ItemNBTHelper.setInt(stack, TAG_X, pos.getX()); ItemNBTHelper.setInt(stack, TAG_Y, pos.getY()); ItemNBTHelper.setInt(stack, TAG_Z, pos.getZ()); @@ -79,11 +80,12 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } + @Nonnull @Override public ItemStack onItemUseFinish(@Nonnull ItemStack stack, World world, EntityLivingBase living) { if(!(living instanceof EntityPlayer)) @@ -114,8 +116,8 @@ public class ItemFlugelEye extends ItemRelic implements ICoordBoundItem, IManaUs float z = (float) (entity.posZ + Math.random()); Botania.proxy.wispFX(x, y, z, (float) Math.random(), (float) Math.random(), (float) Math.random(), (float) Math.random(), -0.3F + (float) Math.random() * 0.2F); } - if(!entity.worldObj.isRemote) - entity.worldObj.playSound(null, entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); + if(!entity.world.isRemote) + entity.world.playSound(null, entity.posX, entity.posY, entity.posZ, SoundEvents.ENTITY_ENDERMEN_TELEPORT, SoundCategory.PLAYERS, 1F, 1F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java index e5cc381b2..28beffb84 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemInfiniteFruit.java @@ -50,7 +50,8 @@ public class ItemInfiniteFruit extends ItemRelic implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(player.canEat(false) && isRightPlayer(player, stack)) { player.setActiveHand(hand); return ActionResult.newResult(EnumActionResult.SUCCESS, stack); diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java index 114cedb74..ec5850086 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemKingKey.java @@ -44,10 +44,11 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - setCharging(par1ItemStack, true); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + ItemStack stack = player.getHeldItem(hand); + setCharging(stack, true); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Override @@ -63,7 +64,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { int spawned = getWeaponsSpawned(stack); - if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.worldObj.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, (EntityPlayer) living, 150, true))) { + if(count != getMaxItemUseDuration(stack) && spawned < 20 && !living.world.isRemote && (!(living instanceof EntityPlayer) || ManaItemHandler.requestManaExact(stack, (EntityPlayer) living, 150, true))) { Vector3 look = new Vector3(living.getLookVec()).multiply(1, 0, 1); double playerRot = Math.toRadians(living.rotationYaw + 90); @@ -71,13 +72,13 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { look = new Vector3(Math.cos(playerRot), 0, Math.sin(playerRot)); look = look.normalize().multiply(-2); - + int div = spawned / 5; int mod = spawned % 5; Vector3 pl = look.add(Vector3.fromEntityCenter(living)).add(0, 1.6, div * 0.1); - Random rand = living.worldObj.rand; + Random rand = living.world.rand; Vector3 axis = look.normalize().crossProduct(new Vector3(-1, 0, -1)).normalize(); double rot = mod * Math.PI / 4 - Math.PI / 2; @@ -88,7 +89,7 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { Vector3 end = pl.add(axis1); - EntityBabylonWeapon weapon = new EntityBabylonWeapon(living.worldObj, living); + EntityBabylonWeapon weapon = new EntityBabylonWeapon(living.world, living); weapon.posX = end.x; weapon.posY = end.y; weapon.posZ = end.z; @@ -97,8 +98,8 @@ public class ItemKingKey extends ItemRelic implements IManaUsingItem { weapon.setDelay(spawned); weapon.setRotation(MathHelper.wrapDegrees(-living.rotationYaw + 180)); - living.worldObj.spawnEntityInWorld(weapon); - weapon.playSound(BotaniaSoundEvents.babylonSpawn, 1F, 1F + living.worldObj.rand.nextFloat() * 3F); + living.world.spawnEntity(weapon); + weapon.playSound(BotaniaSoundEvents.babylonSpawn, 1F, 1F + living.world.rand.nextFloat() * 3F); setWeaponsSpawned(stack, spawned + 1); } } 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 3673c3401..3cac0a8ee 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -11,6 +11,7 @@ package vazkii.botania.common.item.relic; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import com.google.common.collect.ImmutableList; @@ -38,6 +39,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.ISequentialBreaker; import vazkii.botania.api.item.IWireframeCoordinateListProvider; @@ -69,12 +71,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { EntityPlayer player = event.getEntityPlayer(); ItemStack lokiRing = getLokiRing(player); - if(lokiRing == null || player.worldObj.isRemote || event.getHand() == EnumHand.OFF_HAND) + if(lokiRing.isEmpty() || player.world.isRemote || event.getHand() == EnumHand.OFF_HAND) return; int slot = -1; - IInventory inv = BaublesApi.getBaubles(player); - for(int i = 0; i < inv.getSizeInventory(); i++) { + IItemHandler inv = BaublesApi.getBaublesHandler(player); + for(int i = 0; i < inv.getSlots(); i++) { ItemStack stack = inv.getStackInSlot(i); if(stack == lokiRing) { slot = i; @@ -84,13 +86,13 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat ItemStack heldItemStack = event.getItemStack(); BlockPos originCoords = getOriginPos(lokiRing); - RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.worldObj, player, true, 10F); + RayTraceResult lookPos = ToolCommons.raytraceFromEntity(player.world, player, true, 10F); List cursors = getCursorList(lokiRing); int cursorCount = cursors.size(); int cost = Math.min(cursorCount, (int) Math.pow(Math.E, cursorCount * 0.25)); - if(heldItemStack == null && player.isSneaking()) { + if(heldItemStack.isEmpty() && player.isSneaking()) { if(originCoords.getY() == -1 && lookPos != null && lookPos.getBlockPos() != null) { setOriginPos(lokiRing, lookPos.getBlockPos()); setCursorList(lokiRing, null); @@ -116,13 +118,16 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } } } - } else if(heldItemStack != null && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { + } else if(!heldItemStack.isEmpty() && lookPos != null && lookPos.getBlockPos() != null && player.isSneaking()) { for(BlockPos cursor : cursors) { BlockPos pos = lookPos.getBlockPos().add(cursor); Item item = heldItemStack.getItem(); - if(!player.worldObj.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { - item.onItemUse(player.capabilities.isCreativeMode ? heldItemStack.copy() : heldItemStack, player, player.worldObj, pos, event.getHand(), lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); - if(heldItemStack.stackSize == 0) { + if(!player.world.isAirBlock(pos) && ManaItemHandler.requestManaExact(lokiRing, player, cost, true)) { + ItemStack saveHeld = heldItemStack.copy(); + item.onItemUse(player, player.world, pos, event.getHand(), lookPos.sideHit, (float) lookPos.hitVec.xCoord - pos.getX(), (float) lookPos.hitVec.yCoord - pos.getY(), (float) lookPos.hitVec.zCoord - pos.getZ()); + if (player.isCreative()) + player.setHeldItem(event.getHand(), saveHeld); + if(heldItemStack.isEmpty()) { event.setCanceled(true); return; } @@ -133,12 +138,12 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat public static void breakOnAllCursors(EntityPlayer player, Item item, ItemStack stack, BlockPos pos, EnumFacing side) { ItemStack lokiRing = getLokiRing(player); - if(lokiRing == null || player.worldObj.isRemote || !(item instanceof ISequentialBreaker)) + if(lokiRing.isEmpty() || player.world.isRemote || !(item instanceof ISequentialBreaker)) return; List cursors = getCursorList(lokiRing); ISequentialBreaker breaker = (ISequentialBreaker) item; - World world = player.worldObj; + World world = player.world; boolean silk = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, stack) > 0; int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, stack); boolean dispose = breaker.disposeOfTrashBlocks(stack); @@ -146,7 +151,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat for (BlockPos coords : cursors) { IBlockState state = world.getBlockState(coords); breaker.breakOtherBlock(player, stack, coords, coords, side); - ToolCommons.removeBlockWithDrops(player, stack, player.worldObj, coords, pos, state.getBlock(), new Material[]{state.getMaterial()}, silk, fortune, state.getBlockHardness(world, coords), dispose); + ToolCommons.removeBlockWithDrops(player, stack, player.world, coords, pos, state.getBlock(), Collections.singletonList(state.getMaterial()), silk, fortune, dispose); } } @@ -168,7 +173,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat RayTraceResult lookPos = Minecraft.getMinecraft().objectMouseOver; - if(lookPos != null && lookPos.getBlockPos() != null && !player.worldObj.isAirBlock(lookPos.getBlockPos()) && lookPos.entityHit == null) { + if(lookPos != null && lookPos.getBlockPos() != null && !player.world.isAirBlock(lookPos.getBlockPos()) && lookPos.entityHit == null) { List list = getCursorList(stack); BlockPos origin = getOriginPos(stack); @@ -192,14 +197,14 @@ public class ItemLokiRing extends ItemRelicBauble implements IWireframeCoordinat } private static ItemStack getLokiRing(EntityPlayer player) { - IInventory baubles = BaublesApi.getBaubles(player); + IItemHandler baubles = BaublesApi.getBaublesHandler(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); - return isLokiRing(stack1) ? stack1 : isLokiRing(stack2) ? stack2 : null; + return isLokiRing(stack1) ? stack1 : isLokiRing(stack2) ? stack2 : ItemStack.EMPTY; } private static boolean isLokiRing(ItemStack stack) { - return stack != null && (stack.getItem() == ModItems.lokiRing || stack.getItem() == ModItems.aesirRing); + return !stack.isEmpty() && (stack.getItem() == ModItems.lokiRing || stack.getItem() == ModItems.aesirRing); } private static BlockPos getOriginPos(ItemStack stack) { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java index 95aef14c4..890f3a86e 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemOdinRing.java @@ -28,6 +28,7 @@ import net.minecraft.util.DamageSource; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingAttackEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.core.handler.ConfigHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -42,16 +43,16 @@ public class ItemOdinRing extends ItemRelicBauble { super(LibItemNames.ODIN_RING); MinecraftForge.EVENT_BUS.register(ItemOdinRing.class); - damageNegations.add(DamageSource.drown.damageType); - damageNegations.add(DamageSource.fall.damageType); - damageNegations.add(DamageSource.lava.damageType); + damageNegations.add(DamageSource.DROWN.damageType); + damageNegations.add(DamageSource.FALL.damageType); + damageNegations.add(DamageSource.LAVA.damageType); if(ConfigHandler.ringOfOdinFireResist) { - damageNegations.add(DamageSource.inFire.damageType); - damageNegations.add(DamageSource.onFire.damageType); + damageNegations.add(DamageSource.IN_FIRE.damageType); + damageNegations.add(DamageSource.ON_FIRE.damageType); } - damageNegations.add(DamageSource.inWall.damageType); - damageNegations.add(DamageSource.starve.damageType); + damageNegations.add(DamageSource.IN_WALL.damageType); + damageNegations.add(DamageSource.STARVE.damageType); } @Override @@ -75,14 +76,14 @@ public class ItemOdinRing extends ItemRelicBauble { } public static ItemStack getOdinRing(EntityPlayer player) { - IInventory baubles = BaublesApi.getBaubles(player); + IItemHandler baubles = BaublesApi.getBaublesHandler(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isOdinRing(stack1) ? stack1 : isOdinRing(stack2) ? stack2 : null; } private static boolean isOdinRing(ItemStack stack) { - return stack != null && (stack.getItem() == ModItems.odinRing || stack.getItem() == ModItems.aesirRing); + return !stack.isEmpty() && (stack.getItem() == ModItems.odinRing || stack.getItem() == ModItems.aesirRing); } @Override @@ -100,10 +101,10 @@ public class ItemOdinRing extends ItemRelicBauble { } void fillModifiers(Multimap attributes, ItemStack stack) { - if(stack == null) // workaround for Azanor/Baubles#156 + if(stack.isEmpty()) // workaround for Azanor/Baubles#156 return; - attributes.put(SharedMonsterAttributes.MAX_HEALTH.getAttributeUnlocalizedName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); + attributes.put(SharedMonsterAttributes.MAX_HEALTH.getName(), new AttributeModifier(getBaubleUUID(stack), "Bauble modifier", 20, 0)); } } diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java index b3d1a51eb..02566e443 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemRelic.java @@ -95,7 +95,7 @@ public class ItemRelic extends ItemMod implements IRelic { } public void updateRelic(ItemStack stack, EntityPlayer player) { - if(stack == null || !(stack.getItem() instanceof IRelic)) + if(stack.isEmpty() || !(stack.getItem() instanceof IRelic)) return; boolean rightPlayer = true; diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java index a110a23f9..428fa7088 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemThorRing.java @@ -15,6 +15,7 @@ import baubles.api.BaublesApi; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibItemNames; @@ -30,14 +31,14 @@ public class ItemThorRing extends ItemRelicBauble { } public static ItemStack getThorRing(EntityPlayer player) { - IInventory baubles = BaublesApi.getBaubles(player); + IItemHandler baubles = BaublesApi.getBaublesHandler(player); ItemStack stack1 = baubles.getStackInSlot(1); ItemStack stack2 = baubles.getStackInSlot(2); return isThorRing(stack1) ? stack1 : isThorRing(stack2) ? stack2 : null; } private static boolean isThorRing(ItemStack stack) { - return stack != null && (stack.getItem() == ModItems.thorRing || stack.getItem() == ModItems.aesirRing); + return !stack.isEmpty() && (stack.getItem() == ModItems.thorRing || stack.getItem() == ModItems.aesirRing); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java index 2bd98c659..82cd9b281 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -38,8 +38,8 @@ public class ItemCobbleRod extends ItemMod implements IManaUsingItem, IBlockProv @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - return ItemDirtRod.place(par1ItemStack, player, world, pos, hand, side, par8, par9, par10, Blocks.COBBLESTONE, COST, 0.3F, 0.3F, 0.3F); + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + return ItemDirtRod.place(player, world, pos, hand, side, par8, par9, par10, Blocks.COBBLESTONE, COST, 0.3F, 0.3F, 0.3F); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index d9d8e84e2..d5b949cb6 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -57,20 +57,24 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem, ICraftAchiev @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - return place(par1ItemStack, player, world, pos, hand, side, par8, par9, par10, Blocks.DIRT, COST, 0.35F, 0.2F, 0.05F); + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + return place(player, world, pos, hand, side, par8, par9, par10, Blocks.DIRT, COST, 0.35F, 0.2F, 0.05F); } - public static EnumActionResult place(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { - if(ManaItemHandler.requestManaExactForTool(par1ItemStack, player, cost, false)) { + public static EnumActionResult place(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ, Block block, int cost, float r, float g, float b) { + ItemStack stack = player.getHeldItem(hand); + if(ManaItemHandler.requestManaExactForTool(stack, player, cost, false)) { int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(pos.offset(side), pos.offset(side).add(1, 1, 1))).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(block); - stackToPlace.onItemUse(player, world, pos, hand, side, par8, par9, par10); - if(stackToPlace.stackSize == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, player, cost, true); + player.setHeldItem(hand, stackToPlace); + stackToPlace.onItemUse(player, world, pos, hand, side, hitX, hitY, hitZ); + player.setHeldItem(hand, stack); + + if(stackToPlace.isEmpty()) { + ManaItemHandler.requestManaExactForTool(stack, player, cost, true); for(int i = 0; i < 6; i++) Botania.proxy.sparkleFX(pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), r, g, b, 1F, 5); return EnumActionResult.SUCCESS; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java index f72a9bc79..19ffc4689 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDiviningRod.java @@ -16,6 +16,7 @@ import javax.annotation.Nonnull; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -51,7 +52,8 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer p, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer p, @Nonnull EnumHand hand) { + ItemStack stack = p.getHeldItem(hand); if(ManaItemHandler.requestManaExactForTool(stack, p, COST, true)) { if(world.isRemote) { int range = IManaProficiencyArmor.Helper.hasProficiency(p, stack) ? 20 : 15; @@ -69,7 +71,7 @@ public class ItemDiviningRod extends ItemMod implements IManaUsingItem, IAvatarW Botania.proxy.setWispFXDepthTest(false); for(BlockPos pos_ : BlockPos.getAllInBox(pos.add(-range, -range, -range), pos.add(range, range, range))) { IBlockState state = world.getBlockState(pos_); - if(Item.getItemFromBlock(state.getBlock()) == null) + if(Item.getItemFromBlock(state.getBlock()) == Items.AIR) continue; ItemStack orestack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); for(int id : OreDictionary.getOreIDs(orestack)) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java index 3e2ac9c65..bb72a27eb 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemExchangeRod.java @@ -41,6 +41,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraftforge.items.CapabilityItemHandler; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.api.item.IManaProficiencyArmor; @@ -76,7 +78,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + ItemStack stack = player.getHeldItem(hand); IBlockState wstate = world.getBlockState(pos); if(player.isSneaking()) { @@ -85,23 +88,23 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(BlockCamo.isValidBlock(wstate)) { Item item = Item.getItemFromBlock(wstate.getBlock()); - setBlock(par1ItemStack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); - player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, par1ItemStack); + setBlock(stack, wstate.getBlock(), !item.getHasSubtypes() ? 0 : wstate.getBlock().getMetaFromState(wstate)); + player.setItemStackToSlot(hand == EnumHand.MAIN_HAND ? EntityEquipmentSlot.MAINHAND : EntityEquipmentSlot.OFFHAND, stack); - displayRemainderCounter(player, par1ItemStack); + displayRemainderCounter(player, stack); return EnumActionResult.SUCCESS; } } - } else if(canExchange(par1ItemStack) && !ItemNBTHelper.getBoolean(par1ItemStack, TAG_SWAPPING, false)) { - Block block = getBlock(par1ItemStack); - int meta = getBlockMeta(par1ItemStack); - List swap = getBlocksToSwap(world, par1ItemStack, block.getStateFromMeta(meta), pos, null); + } else if(canExchange(stack) && !ItemNBTHelper.getBoolean(stack, TAG_SWAPPING, false)) { + Block block = getBlock(stack); + int meta = getBlockMeta(stack); + List swap = getBlocksToSwap(world, stack, block.getStateFromMeta(meta), pos, null); if(swap.size() > 0) { - ItemNBTHelper.setBoolean(par1ItemStack, TAG_SWAPPING, true); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_X, pos.getX()); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Y, pos.getY()); - ItemNBTHelper.setInt(par1ItemStack, TAG_SELECT_Z, pos.getZ()); - setTargetBlock(par1ItemStack, wstate.getBlock(), wstate.getBlock().getMetaFromState(wstate)); + ItemNBTHelper.setBoolean(stack, TAG_SWAPPING, true); + ItemNBTHelper.setInt(stack, TAG_SELECT_X, pos.getX()); + ItemNBTHelper.setInt(stack, TAG_SELECT_Y, pos.getY()); + ItemNBTHelper.setInt(stack, TAG_SELECT_Z, pos.getZ()); + setTargetBlock(stack, wstate.getBlock(), wstate.getBlock().getMetaFromState(wstate)); if(world.isRemote) player.swingArm(hand); } @@ -113,7 +116,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra @SubscribeEvent public void onLeftClick(PlayerInteractEvent.LeftClickBlock event) { ItemStack stack = event.getItemStack(); - if(stack != null && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { + if(!stack.isEmpty() && stack.getItem() == this && canExchange(stack) && ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, false)) { if(exchange(event.getWorld(), event.getEntityPlayer(), event.getPos(), stack, getBlock(stack).getStateFromMeta(getBlockMeta(stack)))) ManaItemHandler.requestManaExactForTool(stack, event.getEntityPlayer(), COST, true); } @@ -218,13 +221,15 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return false; ItemStack placeStack = removeFromInventory(player, stack, state.getBlock(), state.getBlock().getMetaFromState(state), false); - if(placeStack != null) { + if(!placeStack.isEmpty()) { IBlockState stateAt = world.getBlockState(pos); Block blockAt = stateAt.getBlock(); if(!blockAt.isAir(world.getBlockState(pos), world, pos) && stateAt.getPlayerRelativeBlockHardness(player, world, pos) > 0 && stateAt != state) { if(!world.isRemote) { if(!player.capabilities.isCreativeMode) { - blockAt.dropBlockAsItem(world, pos, stateAt, 0); + List drops = blockAt.getDrops(world, pos, stateAt, 0); + for(ItemStack drop : drops) + world.spawnEntity(new EntityItem(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, drop)); removeFromInventory(player, stack, state.getBlock(), state.getBlock().getMetaFromState(state), true); } world.playEvent(2001, pos, Block.getStateId(state)); @@ -244,22 +249,16 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return block != null && block != Blocks.AIR; } - public static ItemStack removeFromInventory(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta, boolean doit) { + public static ItemStack removeFromInventory(EntityPlayer player, IItemHandler inv, ItemStack stack, Block block, int meta, boolean doit) { List providers = new ArrayList<>(); - for(int i = inv.getSizeInventory() - 1; i >= 0; i--) { + for(int i = inv.getSlots() - 1; i >= 0; i--) { ItemStack invStack = inv.getStackInSlot(i); - if(invStack == null) + if(invStack.isEmpty()) continue; Item item = invStack.getItem(); if(item == Item.getItemFromBlock(block) && invStack.getItemDamage() == meta) { - ItemStack retStack = invStack.copy(); - if(doit) { - invStack.stackSize--; - if(invStack.stackSize == 0) - inv.setInventorySlotContents(i, null); - } - return retStack; + return inv.extractItem(i, 1, !doit); } if(item instanceof IBlockProvider) @@ -272,16 +271,16 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra return new ItemStack(block, 1, meta); } - return null; + return ItemStack.EMPTY; } public static ItemStack removeFromInventory(EntityPlayer player, ItemStack stack, Block block, int meta, boolean doit) { if(player.capabilities.isCreativeMode) return new ItemStack(block, 1, meta); - ItemStack outStack = removeFromInventory(player, BotaniaAPI.internalHandler.getBaublesInventory(player), stack, block, meta, doit); - if (outStack == null) - outStack = removeFromInventory(player, player.inventory, stack, block, meta, doit); + ItemStack outStack = removeFromInventory(player, BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player), stack, block, meta, doit); + if (outStack.isEmpty()) + outStack = removeFromInventory(player, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), stack, block, meta, doit); return outStack; } @@ -289,28 +288,28 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra if(player.capabilities.isCreativeMode) return -1; - int baubleCount = getInventoryItemCount(player, BotaniaAPI.internalHandler.getBaublesInventory(player), stack, block, meta); + int baubleCount = getInventoryItemCount(player, BotaniaAPI.internalHandler.getBaublesInventoryWrapped(player), stack, block, meta); if (baubleCount == -1) return -1; - int count = getInventoryItemCount(player, player.inventory, stack, block, meta); + int count = getInventoryItemCount(player, player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null), stack, block, meta); if (count == -1) return -1; return count+baubleCount; } - public static int getInventoryItemCount(EntityPlayer player, IInventory inv, ItemStack stack, Block block, int meta) { + public static int getInventoryItemCount(EntityPlayer player, IItemHandler inv, ItemStack stack, Block block, int meta) { if(player.capabilities.isCreativeMode) return -1; int count = 0; - for(int i = 0; i < inv.getSizeInventory(); i++) { + for(int i = 0; i < inv.getSlots(); i++) { ItemStack invStack = inv.getStackInSlot(i); - if(invStack == null) + if(invStack.isEmpty()) continue; Item item = invStack.getItem(); if(item == Item.getItemFromBlock(block) && invStack.getItemDamage() == meta) - count += invStack.stackSize; + count += invStack.getCount(); if(item instanceof IBlockProvider) { IBlockProvider prov = (IBlockProvider) item; @@ -328,7 +327,7 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra Block block = getBlock(stack); int meta = getBlockMeta(stack); int count = getInventoryItemCount(player, stack, block, meta); - if(!player.worldObj.isRemote) + if(!player.world.isRemote) ItemsRemainingRenderHandler.set(new ItemStack(block, 1, meta), count); } @@ -407,8 +406,8 @@ public class ItemExchangeRod extends ItemMod implements IManaUsingItem, IWirefra targetMeta = getTargetBlockMeta(stack); } - if(!player.worldObj.isAirBlock(bPos)) { - List coordsList = getBlocksToSwap(player.worldObj, stack, block.getStateFromMeta(meta), bPos, targetBlock == null ? null : targetBlock.getStateFromMeta(targetMeta)); + if(!player.world.isAirBlock(bPos)) { + List coordsList = getBlocksToSwap(player.world, stack, block.getStateFromMeta(meta), bPos, targetBlock == null ? null : targetBlock.getStateFromMeta(targetMeta)); for(BlockPos coords : coordsList) if(coords.equals(bPos)) { coordsList.remove(coords); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java index b92323c01..b302549be 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemFireRod.java @@ -48,28 +48,26 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(!world.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { - EntityFlameRing entity = new EntityFlameRing(player.worldObj); + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + ItemStack stack = player.getHeldItem(hand); + if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { + EntityFlameRing entity = new EntityFlameRing(player.world); entity.setPosition(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5); - player.worldObj.spawnEntityInWorld(entity); + player.world.spawnEntity(entity); - player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack) ? COOLDOWN / 2 : COOLDOWN); + player.getCooldownTracker().setCooldown(this, IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? COOLDOWN / 2 : COOLDOWN); - ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); + ManaItemHandler.requestManaExactForTool(stack, player, COST, true); world.playSound(null, player.posX, player.posY, player.posZ, SoundEvents.ENTITY_BLAZE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); + + // Fix up rods from old versions which used meta instead of cooldown tracker + if (stack.getItemDamage() > 0) + stack.setItemDamage(0); } return EnumActionResult.SUCCESS; } - @Override - public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { - // Keep for backward compat - if(par1ItemStack.getItemDamage() > 0) - par1ItemStack.setItemDamage(0); - } - @Override public boolean usesMana(ItemStack stack) { return true; @@ -83,7 +81,7 @@ public class ItemFireRod extends ItemMod implements IManaUsingItem, IAvatarWield if(!world.isRemote && tile.getCurrentMana() >= COST && tile.getElapsedFunctionalTicks() % 300 == 0 && tile.isEnabled()) { EntityFlameRing entity = new EntityFlameRing(world); entity.setPosition(te.getPos().getX() + 0.5, te.getPos().getY(), te.getPos().getZ() + 0.5); - world.spawnEntityInWorld(entity); + world.spawnEntity(entity); tile.recieveMana(-COST); } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java index 9ab688c56..fe91bc4b9 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemGravityRod.java @@ -89,15 +89,16 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); int ticksCooldown = ItemNBTHelper.getInt(stack, TAG_TICKS_COOLDOWN, 0); double length = ItemNBTHelper.getDouble(stack, TAG_DIST, -1); if(ticksCooldown == 0) { Entity item = null; - if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { - Entity taritem = player.worldObj.getEntityByID(targetID); + if(targetID != -1 && player.world.getEntityByID(targetID) != null) { + Entity taritem = player.world.getEntityByID(targetID); boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); @@ -105,14 +106,14 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int distance = 1; while(entities.size() == 0 && distance < 25) { target = target.add(new Vector3(player.getLookVec()).multiply(distance)).add(0, 0.5, 0); - entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); + entities = player.world.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; if(entities.contains(taritem)) found = true; } if(found) - item = player.worldObj.getEntityByID(targetID); + item = player.world.getEntityByID(targetID); } if(item == null) { @@ -121,7 +122,7 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int distance = 1; while(entities.size() == 0 && distance < 25) { target = target.add(new Vector3(player.getLookVec()).multiply(distance)).add(0, 0.5, 0); - entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); + entities = player.world.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; } @@ -184,13 +185,13 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { public static void leftClick(EntityPlayer player) { ItemStack stack = player.getHeldItemMainhand(); - if(stack != null && stack.getItem() == ModItems.gravityRod) { + if(!stack.isEmpty() && stack.getItem() == ModItems.gravityRod) { int targetID = ItemNBTHelper.getInt(stack, TAG_TARGET, -1); ItemNBTHelper.getDouble(stack, TAG_DIST, -1); Entity item; - if(targetID != -1 && player.worldObj.getEntityByID(targetID) != null) { - Entity taritem = player.worldObj.getEntityByID(targetID); + if(targetID != -1 && player.world.getEntityByID(targetID) != null) { + Entity taritem = player.world.getEntityByID(targetID); boolean found = false; Vector3 target = Vector3.fromEntityCenter(player); @@ -198,14 +199,14 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { int distance = 1; while(entities.size() == 0 && distance < 25) { target = target.add(new Vector3(player.getLookVec()).multiply(distance)).add(0, 0.5, 0); - entities = player.worldObj.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); + entities = player.world.getEntitiesWithinAABBExcludingEntity(player, new AxisAlignedBB(target.x - RANGE, target.y - RANGE, target.z - RANGE, target.x + RANGE, target.y + RANGE, target.z + RANGE)); distance++; if(entities.contains(taritem)) found = true; } if(found) { - item = player.worldObj.getEntityByID(targetID); + item = player.world.getEntityByID(targetID); ItemNBTHelper.setInt(stack, TAG_TARGET, -1); ItemNBTHelper.setDouble(stack, TAG_DIST, -1); Vector3 moveVector = new Vector3(player.getLookVec().normalize()); @@ -215,9 +216,9 @@ public class ItemGravityRod extends ItemMod implements IManaUsingItem { item.motionX = moveVector.x * mot; item.motionY = moveVector.y; item.motionZ = moveVector.z * mot; - if(!player.worldObj.isRemote) { - EntityThrownItem thrown = new EntityThrownItem(item.worldObj, item.posX, item.posY, item.posZ, (EntityItem) item); - item.worldObj.spawnEntityInWorld(thrown); + if(!player.world.isRemote) { + EntityThrownItem thrown = new EntityThrownItem(item.world, item.posX, item.posY, item.posZ, (EntityItem) item); + item.world.spawnEntity(thrown); } item.setDead(); } else { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java index 04b2eef02..e2e8d8416 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemMissileRod.java @@ -62,8 +62,8 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi if(!(living instanceof EntityPlayer)) return; EntityPlayer player = (EntityPlayer) living; - if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 1 : 2) == 0 && !player.worldObj.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { - if(spawnMissile(player.worldObj, player, player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1))) + if(count != getMaxItemUseDuration(stack) && count % (IManaProficiencyArmor.Helper.hasProficiency(player, stack) ? 1 : 2) == 0 && !player.world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, false)) { + if(spawnMissile(player.world, player, player.posX + (Math.random() - 0.5 * 0.1), player.posY + 2.4 + (Math.random() - 0.5 * 0.1), player.posZ + (Math.random() - 0.5 * 0.1))) ManaItemHandler.requestManaExactForTool(stack, player, COST_PER, true); Botania.proxy.sparkleFX(player.posX, player.posY + 2.4, player.posZ, 1F, 0.4F, 1F, 6F, 6); @@ -80,7 +80,7 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi if(missile.getTarget()) { if(!world.isRemote) { missile.playSound(BotaniaSoundEvents.missile, 0.6F, 0.8F + (float) Math.random() * 0.2F); - world.spawnEntityInWorld(missile); + world.spawnEntity(missile); } return true; @@ -90,9 +90,9 @@ public class ItemMissileRod extends ItemMod implements IManaUsingItem, IAvatarWi @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java index d94b19bf3..5e87aa9dc 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemRainbowRod.java @@ -58,8 +58,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - if(!world.isRemote && ManaItemHandler.requestManaExactForTool(par1ItemStack, player, MANA_COST, false)) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false)) { Block place = ModBlocks.bifrost; Vector3 vector = new Vector3(player.getLookVec()).normalize(); @@ -74,7 +75,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi BlockPos.MutableBlockPos lastChecker = new BlockPos.MutableBlockPos(); int count = 0; - boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack); + boolean prof = IManaProficiencyArmor.Helper.hasProficiency(player, stack); int maxlen = prof ? 160 : 100; int time = prof ? (int) (TIME * 1.6) : TIME; @@ -92,7 +93,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi placePos.setPos(pos.getX() + i, pos.getY(), pos.getZ() + j); if(world.isAirBlock(placePos) || world.getBlockState(placePos).getBlock() == place) { - world.setBlockState(placePos, place.getDefaultState()); + world.setBlockState(placePos, place.getDefaultState(), 2); TileBifrost tile = (TileBifrost) world.getTileEntity(placePos); if(tile != null) { tile.ticks = time; @@ -116,12 +117,16 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi if(count > 0) { world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.bifrostRod, SoundCategory.PLAYERS, 0.5F, 0.25F); - ManaItemHandler.requestManaExactForTool(par1ItemStack, player, MANA_COST, false); + ManaItemHandler.requestManaExactForTool(stack, player, MANA_COST, false); player.getCooldownTracker().setCooldown(this, TIME); + + // Fix up rods from old versions which used meta instead of cooldown tracker + if (stack.getItemDamage() > 0) + stack.setItemDamage(0); } } - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } @Nonnull @@ -132,14 +137,7 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi @Override public boolean hasContainerItem(ItemStack stack) { - return getContainerItem(stack) != null; - } - - @Override - public void onUpdate(ItemStack par1ItemStack, World world, Entity par3Entity, int par4, boolean par5) { - // Kept for backward compat - if (par1ItemStack.getItemDamage() > 0) - par1ItemStack.setItemDamage(0); + return !getContainerItem(stack).isEmpty(); } @Override @@ -178,9 +176,9 @@ public class ItemRainbowRod extends ItemMod implements IManaUsingItem, IAvatarWi List players = world.getEntitiesWithinAABB(EntityPlayer.class, axis); for(EntityPlayer p : players) { - int px = MathHelper.floor_double(p.posX); - int py = MathHelper.floor_double(p.posY) - 1; - int pz = MathHelper.floor_double(p.posZ); + int px = MathHelper.floor(p.posX); + int py = MathHelper.floor(p.posY) - 1; + int pz = MathHelper.floor(p.posZ); int dist = 5; int diff = dist / 2; diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java index 0aa0a7359..172d86357 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSkyDirtRod.java @@ -37,23 +37,26 @@ public class ItemSkyDirtRod extends ItemDirtRod { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack stack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); if(!world.isRemote && ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, false)) { Vector3 playerVec = Vector3.fromEntityCenter(player); Vector3 lookVec = new Vector3(player.getLookVec()).multiply(3); Vector3 placeVec = playerVec.add(lookVec); - int x = MathHelper.floor_double(placeVec.x); - int y = MathHelper.floor_double(placeVec.y) + 1; - int z = MathHelper.floor_double(placeVec.z); + int x = MathHelper.floor(placeVec.x); + int y = MathHelper.floor(placeVec.y) + 1; + int z = MathHelper.floor(placeVec.z); int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, new AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1)).size(); if(entities == 0) { ItemStack stackToPlace = new ItemStack(Blocks.DIRT); + player.setHeldItem(hand, stackToPlace); stackToPlace.onItemUse(player, world, new BlockPos(x, y, z), hand, EnumFacing.DOWN, 0F, 0F, 0F); + player.setHeldItem(hand, stack); - if(stackToPlace.stackSize == 0) { + if(stackToPlace.isEmpty()) { ManaItemHandler.requestManaExactForTool(stack, player, COST * 2, true); for(int i = 0; i < 6; i++) Botania.proxy.sparkleFX(x + Math.random(), y + Math.random(), z + Math.random(), 0.35F, 0.2F, 0.05F, 1F, 5); diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java index 03594bcda..895bb7cc2 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemSmeltRod.java @@ -64,9 +64,9 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } @Override @@ -77,15 +77,15 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { if(!ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, false)) return; - RayTraceResult pos = ToolCommons.raytraceFromEntity(p.worldObj, p, false, 32); + RayTraceResult pos = ToolCommons.raytraceFromEntity(p.world, p, false, 32); if(pos != null && pos.getBlockPos() != null) { - IBlockState state = p.worldObj.getBlockState(pos.getBlockPos()); + IBlockState state = p.world.getBlockState(pos.getBlockPos()); ItemStack blockStack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state)); ItemStack result = FurnaceRecipes.instance().getSmeltingResult(blockStack); - if(result != null && result.getItem() instanceof ItemBlock) { + if(!result.isEmpty() && result.getItem() instanceof ItemBlock) { boolean decremented = false; if(playerData.containsKey(p)) { @@ -95,10 +95,10 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { data.progress--; decremented = true; if(data.progress <= 0) { - if(!p.worldObj.isRemote) { - p.worldObj.setBlockState(pos.getBlockPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 1 | 2); - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 0.6F, 1F); - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); + if(!p.world.isRemote) { + p.world.setBlockState(pos.getBlockPos(), Block.getBlockFromItem(result.getItem()).getStateFromMeta(result.getItemDamage()), 1 | 2); + p.world.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.PLAYERS, 0.6F, 1F); + p.world.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, 1F, 1F); ManaItemHandler.requestManaExactForTool(stack, p, COST_PER_TICK, true); playerData.remove(p); @@ -126,7 +126,7 @@ public class ItemSmeltRod extends ItemMod implements IManaUsingItem { Botania.proxy.wispFX(x, y, z, 1F, 0.2F, 0.2F, 0.5F, (float) -Math.random() / 10F); } if(time % 10 == 0) - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); + p.world.playSound(null, p.posX, p.posY, p.posZ, SoundEvents.BLOCK_FIRE_AMBIENT, SoundCategory.PLAYERS, (float) Math.random() / 2F + 0.5F, 1F); } } } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java index f77f3a9f5..81f43c025 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTerraformRod.java @@ -23,6 +23,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; +import net.minecraft.init.Items; import net.minecraft.init.SoundEvents; import net.minecraft.inventory.IInventory; import net.minecraft.item.EnumAction; @@ -96,14 +97,14 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP @Override public void onUsingTick(ItemStack stack, EntityLivingBase living, int count) { if(count != getMaxItemUseDuration(stack) && count % 10 == 0 && living instanceof EntityPlayer) - terraform(stack, living.worldObj, (EntityPlayer) living); + terraform(stack, living.world, (EntityPlayer) living); } @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { player.setActiveHand(hand); - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } private void terraform(ItemStack par1ItemStack, World world, EntityPlayer player) { @@ -120,7 +121,7 @@ public class ItemTerraformRod extends ItemMod implements IManaUsingItem, IBlockP IBlockState state = world.getBlockState(pos); if(state.getBlock() == Blocks.AIR) continue; - else if(Item.getItemFromBlock(state.getBlock()) == null) + else if(Item.getItemFromBlock(state.getBlock()) == Items.AIR) continue; int[] ids = OreDictionary.getOreIDs(new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state))); for(int id : ids) diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java index eb305e52f..55b36f681 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemTornadoRod.java @@ -76,7 +76,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi player.fallDistance = 0F; player.motionY = IManaProficiencyArmor.Helper.hasProficiency(player, par1ItemStack) ? 1.6 : 1.25; - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.airRod, SoundCategory.PLAYERS, 0.1F, 0.25F); for(int i = 0; i < 5; i++) Botania.proxy.wispFX(player.posX, player.posY, player.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); } @@ -93,18 +93,19 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi @Nonnull @Override - public ActionResult onItemRightClick(@Nonnull ItemStack par1ItemStack, World world, EntityPlayer player, EnumHand hand) { - int meta = par1ItemStack.getItemDamage(); - if(meta != 0 || ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false)) { + public ActionResult onItemRightClick(World world, EntityPlayer player, @Nonnull EnumHand hand) { + ItemStack stack = player.getHeldItem(hand); + int meta = stack.getItemDamage(); + if(meta != 0 || ManaItemHandler.requestManaExactForTool(stack, player, COST, false)) { player.setActiveHand(hand); if(meta == 0) { - ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true); - setFlying(par1ItemStack, true); + ManaItemHandler.requestManaExactForTool(stack, player, COST, true); + setFlying(stack, true); } - return ActionResult.newResult(EnumActionResult.SUCCESS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.SUCCESS, stack); } - return ActionResult.newResult(EnumActionResult.PASS, par1ItemStack); + return ActionResult.newResult(EnumActionResult.PASS, stack); } @Nonnull @@ -148,7 +149,7 @@ public class ItemTornadoRod extends ItemMod implements IManaUsingItem, IAvatarWi Botania.proxy.wispFX(p.posX, p.posY + i, p.posZ, 0.25F, 0.25F, 0.25F, 0.35F + (float) Math.random() * 0.1F, 0.2F * (float) (Math.random() - 0.5), -0.01F * (float) Math.random(), 0.2F * (float) (Math.random() - 0.5)); if(!world.isRemote) { - p.worldObj.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + p.world.playSound(null, p.posX, p.posY, p.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); p.addPotionEffect(new PotionEffect(ModPotions.featherfeet, 100, 0)); tile.recieveMana(-COST); } diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java index 0cbe20e5f..b107232e8 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemWaterRod.java @@ -29,8 +29,9 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { @Nonnull @Override - public EnumActionResult onItemUse(ItemStack par1ItemStack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { - if(ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, false) && !world.provider.doesWaterVaporize()) { + public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float par8, float par9, float par10) { + ItemStack stack = player.getHeldItem(hand); + if(ManaItemHandler.requestManaExactForTool(stack, player, COST, false) && !world.provider.doesWaterVaporize()) { // Adapted from bucket code RayTraceResult mop = rayTrace(world, player, false); @@ -39,8 +40,8 @@ public class ItemWaterRod extends ItemMod implements IManaUsingItem { if(!world.isBlockModifiable(player, hitPos)) return EnumActionResult.FAIL; BlockPos placePos = hitPos.offset(mop.sideHit); - if(player.canPlayerEdit(placePos, mop.sideHit, par1ItemStack)) { - if (ManaItemHandler.requestManaExactForTool(par1ItemStack, player, COST, true) + if(player.canPlayerEdit(placePos, mop.sideHit, stack)) { + if (ManaItemHandler.requestManaExactForTool(stack, player, COST, true) && ((ItemBucket) Items.WATER_BUCKET).tryPlaceContainedLiquid(player, world, placePos)) { for(int i = 0; i < 6; i++) Botania.proxy.sparkleFX(pos.getX() + side.getFrontOffsetX() + Math.random(), pos.getY() + side.getFrontOffsetY() + Math.random(), pos.getZ() + side.getFrontOffsetZ() + Math.random(), 0.2F, 0.2F, 1F, 1F, 5); diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 7824eacf6..300fc057c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -236,7 +236,6 @@ public final class LexiconData { public static LexiconEntry knockbacklBelt; public static LexiconEntry icePendant; public static LexiconEntry lavaPendant; - public static LexiconEntry goldLaurel; public static LexiconEntry waterRing; public static LexiconEntry miningRing; public static LexiconEntry magnetRing; @@ -532,7 +531,7 @@ public final class LexiconData { functionalIntro .setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("2"), new PageText("3"), new PageCraftingRecipe("4", ModCraftingRecipes.recipeRedstoneRoot)) - .setIcon(null); + .setIcon(ItemStack.EMPTY); ; flowerShrinking = new BasicLexiconEntry(LibLexicon.FFLOWER_SHRINKING, categoryFunctionalFlowers); @@ -1177,10 +1176,6 @@ public final class LexiconData { lavaPendant.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeFirePendant)); - goldLaurel = new AlfheimLexiconEntry(LibLexicon.BAUBLE_GOLDEN_LAUREL, categoryBaubles); - goldLaurel.setLexiconPages(new PageText("0"), - new PageCraftingRecipe("1", ModCraftingRecipes.recipeGoldenLaurel)); - waterRing = new BasicLexiconEntry(LibLexicon.BAUBLE_WATER_RING, categoryBaubles); waterRing.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeWaterRing)); diff --git a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java index ce9154af5..d16dd6b4a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java +++ b/src/main/java/vazkii/botania/common/lexicon/RelicLexiconEntry.java @@ -33,7 +33,7 @@ public class RelicLexiconEntry extends BasicLexiconEntry { @Override @SideOnly(Side.CLIENT) public boolean isVisible() { - EntityPlayerSP player = Minecraft.getMinecraft().thePlayer; + EntityPlayerSP player = Minecraft.getMinecraft().player; return a == null || player.capabilities.isCreativeMode || player.getStatFileWriter().hasAchievementUnlocked(a); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java index 9ec80ff32..452df7924 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageBrew.java @@ -58,7 +58,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { renderer.setUnicodeFlag(unicode); PageText.renderText(x, y + 22, width, height, text); - ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, ILexicon.class); + ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().player, ILexicon.class); if(book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) { renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial))); renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.vial, 1, 1))); @@ -82,7 +82,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage { @SideOnly(Side.CLIENT) public void renderItemAtLinePos(IGuiLexiconEntry gui, int offset, int pos, int yPos, ItemStack stack) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return; stack = stack.copy(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java index a3031fdc1..812ddc7d7 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageElvenRecipe.java @@ -83,7 +83,7 @@ public class PageElvenRecipe extends PageRecipe { @SideOnly(Side.CLIENT) public void renderItemAtInputPos(IGuiLexiconEntry gui, int x, ItemStack stack) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return; stack = stack.copy(); @@ -101,7 +101,7 @@ public class PageElvenRecipe extends PageRecipe { @SideOnly(Side.CLIENT) public void renderItemAtOutputPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return; stack = stack.copy(); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java index acca12a8e..824627a66 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageEntity.java @@ -18,8 +18,10 @@ import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import vazkii.botania.api.internal.IGuiLexiconEntry; @@ -35,7 +37,7 @@ public class PageEntity extends LexiconPage{ public PageEntity(String unlocalizedName, String entity, int size) { super(unlocalizedName); - Class EntityClass = EntityList.NAME_TO_CLASS.get(entity); + Class EntityClass = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entity)).getEntityClass(); this.size = size; try { entityConstructor = EntityClass.getConstructor(World.class); @@ -52,7 +54,7 @@ public class PageEntity extends LexiconPage{ int text_y = gui.getTop() + gui.getHeight() - 40; int entity_scale = getEntityScale(size); int entity_x = gui.getLeft() + gui.getWidth() / 2; - int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor_float(dummyEntity.height * entity_scale / 2); + int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor(dummyEntity.height * entity_scale / 2); renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); @@ -66,7 +68,7 @@ public class PageEntity extends LexiconPage{ if(dummyEntity.width < dummyEntity.height) entity_size = dummyEntity.height; - return MathHelper.floor_float(size / entity_size); + return MathHelper.floor(size / entity_size); } @@ -78,7 +80,7 @@ public class PageEntity extends LexiconPage{ @SideOnly(Side.CLIENT) public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) { - dummyEntity.worldObj = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().theWorld : null; + dummyEntity.world = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().world : null; GlStateManager.enableColorMaterial(); GlStateManager.pushMatrix(); @@ -103,7 +105,7 @@ public class PageEntity extends LexiconPage{ public void prepDummy() { if(dummyEntity == null || dummyEntity.isDead) { try { - dummyEntity = (Entity) entityConstructor.newInstance(Minecraft.getMinecraft().theWorld); + dummyEntity = (Entity) entityConstructor.newInstance(Minecraft.getMinecraft().world); } catch (Exception e) { e.printStackTrace(); } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java index c79f88c51..5c09e2c69 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageManaInfusionRecipe.java @@ -15,6 +15,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; +import net.minecraft.init.Items; import org.lwjgl.opengl.GL11; import net.minecraft.block.Block; @@ -88,7 +89,7 @@ public class PageManaInfusionRecipe extends PageRecipe { if(recipe.getCatalyst() != null) { Block block = recipe.getCatalyst().getBlock(); - if (Item.getItemFromBlock(block) != null) { + if (Item.getItemFromBlock(block) != Items.AIR) { renderItemAtGridPos(gui, 1, 2, new ItemStack(block, 1, block.getMetaFromState(recipe.getCatalyst())), false); } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java index 2991eeea3..cbf051d8a 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageMultiblock.java @@ -105,7 +105,7 @@ public class PageMultiblock extends LexiconPage { List mats = new ArrayList<>(); mats.add(I18n.format("botaniamisc.materialsRequired")); for(ItemStack stack : mb.materials) { - String size = "" + stack.stackSize; + String size = "" + stack.getCount(); if(size.length() < 2) size = "0" + size; mats.add(" " + TextFormatting.AQUA + size + " " + TextFormatting.GRAY + stack.getDisplayName()); diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java index b985abac4..b7a09186c 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageRecipe.java @@ -39,7 +39,7 @@ import vazkii.botania.common.core.helper.PlayerHelper; public class PageRecipe extends LexiconPage { int relativeMouseX, relativeMouseY; - ItemStack tooltipStack, tooltipContainerStack; + ItemStack tooltipStack = ItemStack.EMPTY, tooltipContainerStack = ItemStack.EMPTY; boolean tooltipEntry; static boolean mouseDownLastTick = false; @@ -62,8 +62,8 @@ public class PageRecipe extends LexiconPage { int y = gui.getTop() + height - 40; PageText.renderText(x, y, width, height, getUnlocalizedName()); - if(tooltipStack != null) { - List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); + if(!tooltipStack.isEmpty()) { + List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().player, false); List parsedTooltip = new ArrayList<>(); boolean first = true; @@ -84,11 +84,11 @@ public class PageRecipe extends LexiconPage { tooltipY += 18; } - if(tooltipContainerStack != null) + if(!tooltipContainerStack.isEmpty()) vazkii.botania.client.core.helper.RenderHelper.renderTooltipGreen(mx, my + tooltipY, Arrays.asList(TextFormatting.AQUA + I18n.format("botaniamisc.craftingContainer"), tooltipContainerStack.getDisplayName())); } - tooltipStack = tooltipContainerStack = null; + tooltipStack = tooltipContainerStack = ItemStack.EMPTY; tooltipEntry = false; GlStateManager.disableBlend(); mouseDownLastTick = Mouse.isButtonDown(0); @@ -99,7 +99,7 @@ public class PageRecipe extends LexiconPage { @SideOnly(Side.CLIENT) public void renderItemAtAngle(IGuiLexiconEntry gui, float angle, ItemStack stack) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return; ItemStack workStack = stack.copy(); @@ -117,7 +117,7 @@ public class PageRecipe extends LexiconPage { @SideOnly(Side.CLIENT) public void renderItemAtGridPos(IGuiLexiconEntry gui, int x, int y, ItemStack stack, boolean accountForContainer) { - if(stack == null || stack.getItem() == null) + if(stack.isEmpty()) return; stack = stack.copy(); @@ -158,7 +158,7 @@ public class PageRecipe extends LexiconPage { tooltipStack = stack; EntryData data = LexiconRecipeMappings.getDataForStack(tooltipStack); - ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().thePlayer, ILexicon.class); + ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().player, ILexicon.class); if(data != null && (data.entry != gui.getEntry() || data.page != gui.getPageOn()) && book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, data.entry.getKnowledgeType())) { tooltipEntry = true; @@ -172,7 +172,7 @@ public class PageRecipe extends LexiconPage { if(accountForContainer) { ItemStack containerStack = stack.getItem().getContainerItem(stack); - if(containerStack != null && containerStack.getItem() != null) + if(!containerStack.isEmpty()) tooltipContainerStack = containerStack; } } diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java index 2e1c7e609..308d573fd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageShedding.java @@ -62,7 +62,7 @@ public class PageShedding extends PageEntity { int stack_y = gui.getTop() + gui.getHeight() - 40 - 18 - 5; int entity_scale = getEntityScale(size); int entity_x = gui.getLeft() + gui.getWidth() / 2; - int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor_float(dummyEntity.height * entity_scale / 2) - 29; + int entity_y = gui.getTop() + gui.getHeight() / 2 + MathHelper.floor(dummyEntity.height * entity_scale / 2) - 29; renderEntity(gui, dummyEntity, entity_x, entity_y, entity_scale, dummyEntity.ticksExisted * 2); @@ -76,8 +76,8 @@ public class PageShedding extends PageEntity { GlStateManager.color(1F, 1F, 1F, 1F); ((GuiScreen) gui).drawTexturedModalRect(gui.getLeft(), gui.getTop(), 0, 0, gui.getWidth(), gui.getHeight()); - if(tooltipStack != null) { - List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().thePlayer, false); + if(!tooltipStack.isEmpty()) { + List tooltipData = tooltipStack.getTooltip(Minecraft.getMinecraft().player, false); List parsedTooltip = new ArrayList<>(); boolean first = true; diff --git a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java index d8e4f2642..f6e3b1acd 100644 --- a/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java +++ b/src/main/java/vazkii/botania/common/lexicon/page/PageTutorial.java @@ -67,7 +67,7 @@ public class PageTutorial extends PageText { if(button == buttonText) { GuiLexicon.startTutorial(); Minecraft.getMinecraft().displayGuiScreen(new GuiLexicon()); - Minecraft.getMinecraft().thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN))); + Minecraft.getMinecraft().player.sendMessage(new TextComponentTranslation("botaniamisc.tutorialStarted").setStyle(new Style().setColor(TextFormatting.GREEN))); } else if(button == buttonVideo && Desktop.isDesktopSupported()) { try { Desktop.getDesktop().browse(new URI("https://www.youtube.com/watch?v=rx0xyejC6fI")); diff --git a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java index 2bf5eac35..27ee01e0a 100644 --- a/src/main/java/vazkii/botania/common/lib/LibEntityNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibEntityNames.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.lib; +import net.minecraft.util.ResourceLocation; import vazkii.botania.client.lib.LibResources; public final class LibEntityNames { @@ -34,4 +35,28 @@ public final class LibEntityNames { public static final String BABYLON_WEAPON = LibResources.PREFIX_MOD + "babylonWeapon"; public static final String FALLING_STAR = LibResources.PREFIX_MOD + "fallingStar"; + public static final ResourceLocation MANA_BURST_REGISTRY = makeName("mana_burst"); + public static final ResourceLocation SIGNAL_FLARE_REGISTRY = makeName("signal_flare"); + public static final ResourceLocation PIXIE_REGISTRY = makeName("pixie"); + public static final ResourceLocation FLAME_RING_REGISTRY = makeName("flame_ring"); + public static final ResourceLocation VINE_BALL_REGISTRY = makeName("vine_ball"); + public static final ResourceLocation DOPPLEGANGER_REGISTRY = makeName("doppleganger"); + public static final ResourceLocation MAGIC_LANDMINE_REGISTRY = makeName("magic_landmine"); + public static final ResourceLocation SPARK_REGISTRY = makeName("spark"); + public static final ResourceLocation THROWN_ITEM_REGISTRY = makeName("thrown_item"); + public static final ResourceLocation MAGIC_MISSILE_REGISTRY = makeName("magic_missile"); + public static final ResourceLocation THORN_CHAKRAM_REGISTRY = makeName("thorn_chakram"); + public static final ResourceLocation CORPOREA_SPARK_REGISTRY = makeName("corporea_spark"); + public static final ResourceLocation ENDER_AIR_BOTTLE_REGISTRY = makeName("ender_air_bottle"); + public static final ResourceLocation POOL_MINECART_REGISTRY = makeName("pool_minecart"); + public static final ResourceLocation PINK_WITHER_REGISTRY = makeName("pink_wither"); + public static final ResourceLocation PLAYER_MOVER_REGISTRY = makeName("player_mover"); + public static final ResourceLocation MANA_STORM_REGISTRY = makeName("mana_storm"); + public static final ResourceLocation BABYLON_WEAPON_REGISTRY = makeName("babylon_weapon"); + public static final ResourceLocation FALLING_STAR_REGISTRY = makeName("falling_star"); + + private static ResourceLocation makeName(String s) { + return new ResourceLocation(LibMisc.MOD_ID, s); + } + } diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index eb1df29e4..ec0c1431f 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -53,7 +53,6 @@ public final class LibItemNames { public static final String KNOCKBACK_BELT = "knockbackBelt"; public static final String ICE_PENDANT = "icePendant"; public static final String LAVA_PENDANT = "lavaPendant"; - public static final String GOLDEN_LAUREL = "goldenLaurel"; public static final String MAGNET_RING = "magnetRing"; public static final String WATER_RING = "waterRing"; public static final String MINING_RING = "miningRing"; diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 7e4ec643b..31c6ca0b5 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -13,11 +13,11 @@ package vazkii.botania.common.lib; public final class LibMisc { // Mod Constants - public static final String MOD_ID = "Botania"; - public static final String MOD_NAME = MOD_ID; + public static final String MOD_ID = "botania"; + public static final String MOD_NAME = "Botania"; public static final String BUILD = "GRADLE:BUILD"; public static final String VERSION = "GRADLE:VERSION-" + BUILD; - public static final String DEPENDENCIES = "required-after:Forge@[12.18.1.2053,];required-after:Baubles@[1.3.BETA8,];after:Thaumcraft"; + public static final String DEPENDENCIES = "required-after:forge@[13.20.0.2206,];required-after:baubles@[1.4.2,];after:thaumcraft"; // Network Contants public static final String NETWORK_CHANNEL = MOD_ID; diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 84df974e5..2c5ab2754 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -12,9 +12,6 @@ package vazkii.botania.common.lib; public final class LibObfuscation { - // EntityHorse - public static final String[] INIT_HORSE_CHEST = { "initHorseChest", "func_110226_cD", "dJ" }; - // RenderManager public static final String[] RENDERPOSX = { "renderPosX", "field_78725_b", "o" }; public static final String[] RENDERPOSY = { "renderPosY", "field_78726_c", "p" }; @@ -46,8 +43,8 @@ public final class LibObfuscation { // EntityLivingBase public static final String[] ITEM_IN_USE_COUNT = { "activeItemStackUseCount", "field_184628_bn", "bn" }; - // EntityHorse - public static final String[] HORSE_JUMP_STRENGTH = { "JUMP_STRENGTH", "field_110271_bv", "bC" }; + // AbstractHorse + public static final String[] HORSE_JUMP_STRENGTH = { "JUMP_STRENGTH", "field_110271_bv", "bw" }; // PlayerControllerMP public static final String[] NET_CLIENT_HANDLER = { "connection", "field_78774_b", "b" }; @@ -59,7 +56,7 @@ public final class LibObfuscation { public static final String[] MAX_NEARBY_ENTITIES = { "maxNearbyEntities", "field_98292_k", "j" }; public static final String[] MAX_SPAWN_DELAY = { "maxSpawnDelay", "field_98293_h", "g" }; public static final String[] MIN_SPAWN_DELAY = { "minSpawnDelay", "field_98283_g", "f" }; - public static final String[] POTENTIAL_ENTITY_SPAWNS = { "minecartToSpawn", "field_98285_e", "b" }; + public static final String[] POTENTIAL_ENTITY_SPAWNS = { "potentialSpawns", "field_98285_e", "b" }; public static final String[] SPAWN_DELAY = { "spawnDelay", "field_98286_b", "a" }; public static final String[] PREV_MOB_ROTATION = { "prevMobRotation", "field_98284_d", "e" }; public static final String[] MOB_ROTATION = { "mobRotation", "field_98287_c", "d" }; @@ -73,7 +70,7 @@ public final class LibObfuscation { // GuiChat public static final String[] INPUT_FIELD = { "inputField", "field_146415_a", "a" }; - public static final String[] COMPLETE_FLAG = { "waitingOnAutocomplete", "field_146414_r", "r" }; // todo 1.9 + // todo 1.9+ public static final String[] COMPLETE_FLAG = { "waitingOnAutocomplete", "field_146414_r", "r" }; // Entityliving public static final String[] GET_LIVING_SOUND = { "getAmbientSound", "func_184639_G", "G" }; diff --git a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java index 580ceb1cb..6cdb7cf59 100644 --- a/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java +++ b/src/main/java/vazkii/botania/common/network/PacketBotaniaEffect.java @@ -74,7 +74,7 @@ public class PacketBotaniaEffect implements IMessage { @Override public void run() { Minecraft mc = Minecraft.getMinecraft(); - World world = mc.theWorld; + World world = mc.world; switch (message.type) { case POOL_CRAFT: { for(int i = 0; i < 25; i++) { @@ -131,13 +131,13 @@ public class PacketBotaniaEffect implements IMessage { for(int i = 0; i < p; i++) { double m = 0.01; - double d0 = item.worldObj.rand.nextGaussian() * m; - double d1 = item.worldObj.rand.nextGaussian() * m; - double d2 = item.worldObj.rand.nextGaussian() * m; + double d0 = item.world.rand.nextGaussian() * m; + double d1 = item.world.rand.nextGaussian() * m; + double d2 = item.world.rand.nextGaussian() * m; double d3 = 10.0D; - item.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, - message.x + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.worldObj.rand.nextFloat() * item.height - d1 * d3, - message.z + item.worldObj.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); + item.world.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, + message.x + item.world.rand.nextFloat() * item.width * 2.0F - item.width - d0 * d3, message.y + item.world.rand.nextFloat() * item.height - d1 * d3, + message.z + item.world.rand.nextFloat() * item.width * 2.0F - item.width - d2 * d3, d0, d1, d2); } break; } @@ -238,6 +238,17 @@ public class PacketBotaniaEffect implements IMessage { break; } + case BREWERY_FINISH: { + for(int i = 0; i < 25; i++) { + Color c = new Color(message.args[0]); + float r = c.getRed() / 255F; + float g = c.getGreen() / 255F; + float b = c.getBlue() / 255F; + Botania.proxy.sparkleFX(message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, r, g, b, (float) Math.random() * 2F + 0.5F, 10); + for(int j = 0; j < 2; j++) + Botania.proxy.wispFX(message.x + 0.7 - Math.random() * 0.4, message.y + 0.9 - Math.random() * 0.2, message.z + 0.7 - Math.random() * 0.4, 0.2F, 0.2F, 0.2F, 0.1F + (float) Math.random() * 0.2F, 0.05F - (float) Math.random() * 0.1F, 0.05F + (float) Math.random() * 0.03F, 0.05F - (float) Math.random() * 0.1F); + } + } case TERRA_PLATE: { TileEntity te = world.getTileEntity(new BlockPos(message.x, message.y, message.z)); if(te instanceof TileTerraPlate) { @@ -270,6 +281,24 @@ public class PacketBotaniaEffect implements IMessage { } } } + case APOTHECARY_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX(message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + } + + break; + } + case RUNE_CRAFT: { + for(int i = 0; i < 25; i++) { + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.sparkleFX(message.x + 0.5 + Math.random() * 0.4 - 0.2, message.y + 1, message.z + 0.5 + Math.random() * 0.4 - 0.2, red, green, blue, (float) Math.random(), 10); + } + } } } }); @@ -281,7 +310,7 @@ public class PacketBotaniaEffect implements IMessage { public enum EffectType { POOL_CRAFT(0), POOL_CHARGE(1), // Arg: 1 if outputting, 0 if inputting - PAINT_LENS(1), // Arg: colour + PAINT_LENS(1), // Arg: EnumDyeColor ARENA_INDICATOR(0), ITEM_SMOKE(2), // Arg: Entity ID, number of particles SPARK_NET_INDICATOR(2), // Arg: Entity ID from, Entity ID towards @@ -290,7 +319,10 @@ public class PacketBotaniaEffect implements IMessage { ENCHANTER_DESTROY(0), ENTROPINNYUM(0), BLACK_LOTUS_DISSOLVE(0), - TERRA_PLATE(0); + BREWERY_FINISH(1), // Arg: RGB + TERRA_PLATE(0), + APOTHECARY_CRAFT(0), + RUNE_CRAFT(0); private final int argCount; diff --git a/src/main/java/vazkii/botania/common/network/PacketDodge.java b/src/main/java/vazkii/botania/common/network/PacketDodge.java index d20bc30e2..2b1e0eb85 100644 --- a/src/main/java/vazkii/botania/common/network/PacketDodge.java +++ b/src/main/java/vazkii/botania/common/network/PacketDodge.java @@ -19,6 +19,7 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.equipment.bauble.ItemDodgeRing; @@ -37,14 +38,14 @@ public class PacketDodge implements IMessage { public IMessage onMessage(PacketDodge message, MessageContext ctx) { EntityPlayerMP player = ctx.getServerHandler().playerEntity; player.mcServer.addScheduledTask(() -> { - player.worldObj.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); + player.world.playSound(null, player.posX, player.posY, player.posZ, BotaniaSoundEvents.dash, SoundCategory.PLAYERS, 1F, 1F); - IInventory baublesInv = BaublesApi.getBaubles(player); + IItemHandler baublesInv = BaublesApi.getBaublesHandler(player); ItemStack ringStack = baublesInv.getStackInSlot(1); - if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) { + if(ringStack.isEmpty() || !(ringStack.getItem() instanceof ItemDodgeRing)) { ringStack = baublesInv.getStackInSlot(2); - if(ringStack == null || !(ringStack.getItem() instanceof ItemDodgeRing)) - ctx.getServerHandler().kickPlayerFromServer("Invalid Dodge Packet"); + if(ringStack.isEmpty() || !(ringStack.getItem() instanceof ItemDodgeRing)) + ctx.getServerHandler().disconnect("Invalid Dodge Packet"); } player.addExhaustion(0.3F); diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 4ca18a12b..838f50a63 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -20,7 +20,6 @@ public final class PacketHandler { HANDLER.registerMessage(PacketBotaniaEffect.Handler.class, PacketBotaniaEffect.class, id++, Side.CLIENT); HANDLER.registerMessage(PacketLeftClick.Handler.class, PacketLeftClick.class, id++, Side.SERVER); HANDLER.registerMessage(PacketDodge.Handler.class, PacketDodge.class, id++, Side.SERVER); - HANDLER.registerMessage(PacketDodge.Handler.class, PacketDodge.class, id++, Side.SERVER); HANDLER.registerMessage(PacketJump.Handler.class, PacketJump.class, id++, Side.SERVER); } diff --git a/src/main/java/vazkii/botania/common/network/PacketJump.java b/src/main/java/vazkii/botania/common/network/PacketJump.java index e03737c34..d4e40d5d9 100644 --- a/src/main/java/vazkii/botania/common/network/PacketJump.java +++ b/src/main/java/vazkii/botania/common/network/PacketJump.java @@ -19,6 +19,7 @@ import net.minecraft.util.SoundCategory; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; +import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.api.sound.BotaniaSoundEvents; import vazkii.botania.common.core.helper.ItemNBTHelper; @@ -40,16 +41,16 @@ public class PacketJump implements IMessage { public IMessage onMessage(PacketJump message, MessageContext ctx) { EntityPlayerMP player = ctx.getServerHandler().playerEntity; player.mcServer.addScheduledTask(() -> { - IInventory baublesInv = BaublesApi.getBaubles(player); + IItemHandler baublesInv = BaublesApi.getBaublesHandler(player); ItemStack amuletStack = baublesInv.getStackInSlot(0); - if(amuletStack != null && amuletStack.getItem() instanceof CloudPendantShim) { + if(!amuletStack.isEmpty() && amuletStack.getItem() instanceof CloudPendantShim) { player.addExhaustion(0.3F); player.fallDistance = 0; - ItemStack belt = BaublesApi.getBaubles(player).getStackInSlot(3); + ItemStack belt = BaublesApi.getBaublesHandler(player).getStackInSlot(3); - if(belt != null && belt.getItem() instanceof ItemTravelBelt) + if(!belt.isEmpty() && belt.getItem() instanceof ItemTravelBelt) player.fallDistance = -((ItemTravelBelt) belt.getItem()).fallBuffer * ((CloudPendantShim) amuletStack.getItem()).getMaxAllowedJumps(); } }); diff --git a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java index 7264619ce..829617233 100644 --- a/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java +++ b/src/main/java/vazkii/botania/common/world/SkyblockWorldEvents.java @@ -30,6 +30,7 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.items.ItemHandlerHelper; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.tile.TileManaFlame; import vazkii.botania.common.item.ModItems; @@ -47,7 +48,7 @@ public final class SkyblockWorldEvents { @SubscribeEvent public static void onPlayerUpdate(LivingUpdateEvent event) { - if(event.getEntityLiving() instanceof EntityPlayer && !event.getEntityLiving().worldObj.isRemote) { + if(event.getEntityLiving() instanceof EntityPlayer && !event.getEntityLiving().world.isRemote) { EntityPlayer player = (EntityPlayer) event.getEntityLiving(); NBTTagCompound data = player.getEntityData(); if(!data.hasKey(EntityPlayer.PERSISTED_NBT_TAG)) @@ -55,7 +56,7 @@ public final class SkyblockWorldEvents { NBTTagCompound persist = data.getCompoundTag(EntityPlayer.PERSISTED_NBT_TAG); if(player.ticksExisted > 3 && !persist.getBoolean(TAG_MADE_ISLAND)) { - World world = player.worldObj; + World world = player.world; if(WorldTypeSkyblock.isWorldSkyblock(world)) { BlockPos coords = world.getSpawnPoint(); if(world.getBlockState(coords.down(4)).getBlock() != Blocks.BEDROCK && world.provider.getDimension() == 0) @@ -72,7 +73,7 @@ public final class SkyblockWorldEvents { public static void onPlayerInteract(PlayerInteractEvent.RightClickBlock event) { if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld())) { ItemStack equipped = event.getItemStack(); - if(equipped == null && event.getEntityPlayer().isSneaking()) { + if(equipped.isEmpty() && event.getEntityPlayer().isSneaking()) { Block block = event.getWorld().getBlockState(event.getPos()).getBlock(); if(ImmutableSet.of(Blocks.GRASS, Blocks.GRASS_PATH, Blocks.FARMLAND, Blocks.DIRT, ModBlocks.altGrass).contains(block)) { if(event.getWorld().isRemote) @@ -84,16 +85,16 @@ public final class SkyblockWorldEvents { event.getEntityPlayer().dropItem(new ItemStack(ModItems.manaResource, 1, 21), false); } } - } else if(equipped != null && equipped.getItem() == Items.BOWL && !event.getWorld().isRemote) { + } else if(!equipped.isEmpty() && equipped.getItem() == Items.BOWL && !event.getWorld().isRemote) { RayTraceResult RayTraceResult = ToolCommons.raytraceFromEntity(event.getWorld(), event.getEntityPlayer(), true, 4.5F); if(RayTraceResult != null) { if (RayTraceResult.typeOfHit == net.minecraft.util.math.RayTraceResult.Type.BLOCK) { if(event.getWorld().getBlockState(RayTraceResult.getBlockPos()).getMaterial() == Material.WATER) { - --equipped.stackSize; + equipped.shrink(1); - if(equipped.stackSize <= 0) + if(equipped.isEmpty()) event.getEntityPlayer().setHeldItem(event.getHand(), new ItemStack(ModItems.waterBowl)); - else event.getEntityPlayer().dropItem(new ItemStack(ModItems.waterBowl), false); + else ItemHandlerHelper.giveItemToPlayer(event.getEntityPlayer(), new ItemStack(ModItems.waterBowl)); } } } @@ -104,14 +105,14 @@ public final class SkyblockWorldEvents { @SubscribeEvent public static void onDrops(BlockEvent.HarvestDropsEvent event) { if(WorldTypeSkyblock.isWorldSkyblock(event.getWorld()) && event.getState().getBlock() == Blocks.TALLGRASS) { - ItemStack stackToRemove = null; + ItemStack stackToRemove = ItemStack.EMPTY; for(ItemStack stack : event.getDrops()) if(stack.getItem() == Items.WHEAT_SEEDS && event.getWorld().rand.nextInt(4) == 0) { stackToRemove = stack; break; } - if(stackToRemove != null) { + if(!stackToRemove.isEmpty()) { event.getDrops().remove(stackToRemove); event.getDrops().add(new ItemStack(event.getWorld().rand.nextBoolean() ? Items.PUMPKIN_SEEDS : Items.MELON_SEEDS)); } @@ -127,12 +128,12 @@ public final class SkyblockWorldEvents { final boolean test = false; if(test || !persist.getBoolean(TAG_HAS_OWN_ISLAND)) { - createSkyblock(player.worldObj, pos); + createSkyblock(player.world, pos); if(player instanceof EntityPlayerMP) { EntityPlayerMP pmp = (EntityPlayerMP) player; pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5); - pmp.setSpawnChunk(pos, true, player.worldObj.provider.getDimension()); + pmp.setSpawnChunk(pos, true, player.world.provider.getDimension()); player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon)); } diff --git a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java index 722b4ea55..142a0b180 100644 --- a/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java +++ b/src/main/java/vazkii/botania/common/world/WorldTypeSkyblock.java @@ -36,7 +36,7 @@ public class WorldTypeSkyblock extends WorldType { } @Override - public int getMinimumSpawnHeight(World world) { + public int getMinimumSpawnHeight(@Nonnull World world) { return 86; } diff --git a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json b/src/main/resources/assets/botania/blockstates/agricarnationchibi.json similarity index 71% rename from src/main/resources/assets/botania/blockstates/agricarnationChibi.json rename to src/main/resources/assets/botania/blockstates/agricarnationchibi.json index b56f4f80e..4eb04b2b5 100644 --- a/src/main/resources/assets/botania/blockstates/agricarnationChibi.json +++ b/src/main/resources/assets/botania/blockstates/agricarnationchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/agricarnationChibi" + "cross": "botania:blocks/agricarnationchibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/agricarnationChibi" + "layer0": "botania:blocks/agricarnationchibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/alchemyCatalyst.json b/src/main/resources/assets/botania/blockstates/alchemycatalyst.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/alchemyCatalyst.json rename to src/main/resources/assets/botania/blockstates/alchemycatalyst.json diff --git a/src/main/resources/assets/botania/blockstates/alfheimPortal.json b/src/main/resources/assets/botania/blockstates/alfheimportal.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/alfheimPortal.json rename to src/main/resources/assets/botania/blockstates/alfheimportal.json diff --git a/src/main/resources/assets/botania/blockstates/altGrass.json b/src/main/resources/assets/botania/blockstates/altgrass.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/altGrass.json rename to src/main/resources/assets/botania/blockstates/altgrass.json diff --git a/src/main/resources/assets/botania/blockstates/bellethornChibi.json b/src/main/resources/assets/botania/blockstates/bellethornchibi.json similarity index 73% rename from src/main/resources/assets/botania/blockstates/bellethornChibi.json rename to src/main/resources/assets/botania/blockstates/bellethornchibi.json index aed72d21b..52980608a 100644 --- a/src/main/resources/assets/botania/blockstates/bellethornChibi.json +++ b/src/main/resources/assets/botania/blockstates/bellethornchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bellethornChibi" + "cross": "botania:blocks/bellethornchibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bellethornChibi" + "layer0": "botania:blocks/bellethornchibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/bifrostPerm.json b/src/main/resources/assets/botania/blockstates/bifrostperm.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/bifrostPerm.json rename to src/main/resources/assets/botania/blockstates/bifrostperm.json diff --git a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json b/src/main/resources/assets/botania/blockstates/bifrostpermpane.json similarity index 95% rename from src/main/resources/assets/botania/blockstates/bifrostPermPane.json rename to src/main/resources/assets/botania/blockstates/bifrostpermpane.json index f26442e9e..1cd8b15de 100644 --- a/src/main/resources/assets/botania/blockstates/bifrostPermPane.json +++ b/src/main/resources/assets/botania/blockstates/bifrostpermpane.json @@ -3,7 +3,7 @@ "defaults": { "model": "minecraft:pane_post", "textures": { - "edge": "botania:blocks/bifrostPermPane", + "edge": "botania:blocks/bifrostpermpane", "pane": "botania:blocks/bifrost" } }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json deleted file mode 100644 index 9761ac673..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone13", - "top": "botania:blocks/biomeStone13", - "side": "botania:blocks/biomeStone13" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json deleted file mode 100644 index 9ee2e8e62..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA13Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone13", - "top": "botania:blocks/biomeStone13", - "side": "botania:blocks/biomeStone13" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json deleted file mode 100644 index 065079c46..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone14", - "top": "botania:blocks/biomeStone14", - "side": "botania:blocks/biomeStone14" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json deleted file mode 100644 index d5dfc9022..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA14Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone14", - "top": "botania:blocks/biomeStone14", - "side": "botania:blocks/biomeStone14" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json deleted file mode 100644 index cd96ded79..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone15", - "top": "botania:blocks/biomeStone15", - "side": "botania:blocks/biomeStone15" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json deleted file mode 100644 index 4189ab1ee..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA15Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone15", - "top": "botania:blocks/biomeStone15", - "side": "botania:blocks/biomeStone15" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json deleted file mode 100644 index be8a0caa9..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone4", - "top": "botania:blocks/biomeStone4", - "side": "botania:blocks/biomeStone4" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json deleted file mode 100644 index 2d60a490d..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA4Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone4", - "top": "botania:blocks/biomeStone4", - "side": "botania:blocks/biomeStone4" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json deleted file mode 100644 index b4846b648..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone5", - "top": "botania:blocks/biomeStone5", - "side": "botania:blocks/biomeStone5" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json deleted file mode 100644 index c0822d7a1..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA5Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone5", - "top": "botania:blocks/biomeStone5", - "side": "botania:blocks/biomeStone5" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json deleted file mode 100644 index 8bdfb2408..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone6", - "top": "botania:blocks/biomeStone6", - "side": "botania:blocks/biomeStone6" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json deleted file mode 100644 index 4d308e084..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA6Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone6", - "top": "botania:blocks/biomeStone6", - "side": "botania:blocks/biomeStone6" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json deleted file mode 100644 index 3a6dc3729..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone7", - "top": "botania:blocks/biomeStone7", - "side": "botania:blocks/biomeStone7" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json deleted file mode 100644 index 7eba5c4bf..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA7Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone7", - "top": "botania:blocks/biomeStone7", - "side": "botania:blocks/biomeStone7" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json deleted file mode 100644 index 016d8afd0..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone8", - "top": "botania:blocks/biomeStone8", - "side": "botania:blocks/biomeStone8" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json deleted file mode 100644 index c56da5648..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA8Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone8", - "top": "botania:blocks/biomeStone8", - "side": "botania:blocks/biomeStone8" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json deleted file mode 100644 index 4dd5cd8c7..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone9", - "top": "botania:blocks/biomeStone9", - "side": "botania:blocks/biomeStone9" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json deleted file mode 100644 index 1fd93b694..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA9Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone9", - "top": "botania:blocks/biomeStone9", - "side": "botania:blocks/biomeStone9" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json deleted file mode 100644 index 27effcde8..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone16", - "top": "botania:blocks/biomeStone16", - "side": "botania:blocks/biomeStone16" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json deleted file mode 100644 index 9578c7a8c..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone16", - "top": "botania:blocks/biomeStone16", - "side": "botania:blocks/biomeStone16" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json deleted file mode 100644 index b2927f15d..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone17", - "top": "botania:blocks/biomeStone17", - "side": "botania:blocks/biomeStone17" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json deleted file mode 100644 index ae1584afa..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB1Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone17", - "top": "botania:blocks/biomeStone17", - "side": "botania:blocks/biomeStone17" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json deleted file mode 100644 index b5ea1a1ba..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone18", - "top": "botania:blocks/biomeStone18", - "side": "botania:blocks/biomeStone18" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json deleted file mode 100644 index 79b4742c8..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone18", - "top": "botania:blocks/biomeStone18", - "side": "botania:blocks/biomeStone18" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json deleted file mode 100644 index 1309a9e20..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone19", - "top": "botania:blocks/biomeStone19", - "side": "botania:blocks/biomeStone19" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json deleted file mode 100644 index 67e682c24..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB3Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone19", - "top": "botania:blocks/biomeStone19", - "side": "botania:blocks/biomeStone19" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json deleted file mode 100644 index 78e0d7ed4..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone20", - "top": "botania:blocks/biomeStone20", - "side": "botania:blocks/biomeStone20" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json deleted file mode 100644 index a39d7f922..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB4Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone20", - "top": "botania:blocks/biomeStone20", - "side": "botania:blocks/biomeStone20" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json deleted file mode 100644 index 97b237701..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone21", - "top": "botania:blocks/biomeStone21", - "side": "botania:blocks/biomeStone21" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json deleted file mode 100644 index 9b923bb32..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB5Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone21", - "top": "botania:blocks/biomeStone21", - "side": "botania:blocks/biomeStone21" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json deleted file mode 100644 index 62856fcb4..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone22", - "top": "botania:blocks/biomeStone22", - "side": "botania:blocks/biomeStone22" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json deleted file mode 100644 index f56a3e8cd..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB6Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone22", - "top": "botania:blocks/biomeStone22", - "side": "botania:blocks/biomeStone22" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json deleted file mode 100644 index ce02273ba..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/biomeStone23", - "top": "botania:blocks/biomeStone23", - "side": "botania:blocks/biomeStone23" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json b/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json deleted file mode 100644 index 35db19b06..000000000 --- a/src/main/resources/assets/botania/blockstates/biomeStoneB7Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/biomeStone23", - "top": "botania:blocks/biomeStone23", - "side": "botania:blocks/biomeStone23" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA.json b/src/main/resources/assets/botania/blockstates/biomestonea.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA.json rename to src/main/resources/assets/botania/blockstates/biomestonea.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea0slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea0slab.json index 3acad118c..7650aa4b3 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea0slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone1", - "top": "botania:blocks/biomeStone1", - "side": "botania:blocks/biomeStone1" + "bottom": "botania:blocks/biomestone0", + "top": "botania:blocks/biomestone0", + "side": "botania:blocks/biomestone0" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA0SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea0stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea0stairs.json index 9a15160a2..0b628b798 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea0stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone0", - "top": "botania:blocks/biomeStone0", - "side": "botania:blocks/biomeStone0" + "bottom": "botania:blocks/biomestone0", + "top": "botania:blocks/biomestone0", + "side": "botania:blocks/biomestone0" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea10slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea10slab.json index e8cc23536..f64a2c614 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea10slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone11", - "top": "botania:blocks/biomeStone11", - "side": "botania:blocks/biomeStone11" + "bottom": "botania:blocks/biomestone10", + "top": "botania:blocks/biomestone10", + "side": "botania:blocks/biomestone10" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea10slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA10SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea10slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea10stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea10stairs.json index aa00113cd..6017954d2 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea10stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone10", - "top": "botania:blocks/biomeStone10", - "side": "botania:blocks/biomeStone10" + "bottom": "botania:blocks/biomestone10", + "top": "botania:blocks/biomestone10", + "side": "botania:blocks/biomestone10" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea11slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea11slab.json index 4850027be..bf725ea91 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea11slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone12", - "top": "botania:blocks/biomeStone12", - "side": "botania:blocks/biomeStone12" + "bottom": "botania:blocks/biomestone11", + "top": "botania:blocks/biomestone11", + "side": "botania:blocks/biomestone11" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea11slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA11SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea11slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea11stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea11stairs.json index f4117bfd2..8dafa48fe 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA11Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea11stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone11", - "top": "botania:blocks/biomeStone11", - "side": "botania:blocks/biomeStone11" + "bottom": "botania:blocks/biomestone11", + "top": "botania:blocks/biomestone11", + "side": "botania:blocks/biomestone11" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea12slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea12slab.json index dee3eb2cb..a7af06536 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA10Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea12slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone10", - "top": "botania:blocks/biomeStone10", - "side": "botania:blocks/biomeStone10" + "bottom": "botania:blocks/biomestone12", + "top": "botania:blocks/biomestone12", + "side": "botania:blocks/biomestone12" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea12slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA12SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea12slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea12stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea12stairs.json index b22add585..357c6bf9a 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA12Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea12stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone12", - "top": "botania:blocks/biomeStone12", - "side": "botania:blocks/biomeStone12" + "bottom": "botania:blocks/biomestone12", + "top": "botania:blocks/biomestone12", + "side": "botania:blocks/biomestone12" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomestonea13slab.json b/src/main/resources/assets/botania/blockstates/biomestonea13slab.json new file mode 100644 index 000000000..8ebe2d9ee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea13slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone13", + "top": "botania:blocks/biomestone13", + "side": "botania:blocks/biomestone13" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea13slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA13SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea13slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea13stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea13stairs.json new file mode 100644 index 000000000..db2028a56 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea13stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone13", + "top": "botania:blocks/biomestone13", + "side": "botania:blocks/biomestone13" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea14slab.json b/src/main/resources/assets/botania/blockstates/biomestonea14slab.json new file mode 100644 index 000000000..beefc9ed6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea14slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone14", + "top": "botania:blocks/biomestone14", + "side": "botania:blocks/biomestone14" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea14slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA14SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea14slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea14stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea14stairs.json new file mode 100644 index 000000000..99edc8210 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea14stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone14", + "top": "botania:blocks/biomestone14", + "side": "botania:blocks/biomestone14" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea15slab.json b/src/main/resources/assets/botania/blockstates/biomestonea15slab.json new file mode 100644 index 000000000..293ce097f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea15slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone15", + "top": "botania:blocks/biomestone15", + "side": "botania:blocks/biomestone15" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea15slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA15SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea15slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea15stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea15stairs.json new file mode 100644 index 000000000..aab71beee --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea15stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone15", + "top": "botania:blocks/biomestone15", + "side": "botania:blocks/biomestone15" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea1slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea1slab.json index e76d3dd8f..f6ef34bc4 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea1slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone2", - "top": "botania:blocks/biomeStone2", - "side": "botania:blocks/biomeStone2" + "bottom": "botania:blocks/biomestone1", + "top": "botania:blocks/biomestone1", + "side": "botania:blocks/biomestone1" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea1slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA1SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea1slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea1stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea1stairs.json index 37765c64b..f619eef25 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA1Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea1stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone1", - "top": "botania:blocks/biomeStone1", - "side": "botania:blocks/biomeStone1" + "bottom": "botania:blocks/biomestone1", + "top": "botania:blocks/biomestone1", + "side": "botania:blocks/biomestone1" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea2slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea2slab.json index 8ae3b6d68..ea131c12e 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA0Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea2slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone0", - "top": "botania:blocks/biomeStone0", - "side": "botania:blocks/biomeStone0" + "bottom": "botania:blocks/biomestone2", + "top": "botania:blocks/biomestone2", + "side": "botania:blocks/biomestone2" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea2slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA2SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea2slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea2stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea2stairs.json index 81f5f0f57..6a9521a48 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA2Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea2stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone2", - "top": "botania:blocks/biomeStone2", - "side": "botania:blocks/biomeStone2" + "bottom": "botania:blocks/biomestone2", + "top": "botania:blocks/biomestone2", + "side": "botania:blocks/biomestone2" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json b/src/main/resources/assets/botania/blockstates/biomestonea3slab.json similarity index 65% rename from src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json rename to src/main/resources/assets/botania/blockstates/biomestonea3slab.json index f1fe24970..a10e3c3c5 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3Slab.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea3slab.json @@ -3,9 +3,9 @@ "defaults": { "model": "minecraft:half_slab", "textures": { - "bottom": "botania:blocks/biomeStone3", - "top": "botania:blocks/biomeStone3", - "side": "botania:blocks/biomeStone3" + "bottom": "botania:blocks/biomestone3", + "top": "botania:blocks/biomestone3", + "side": "botania:blocks/biomestone3" }, "transform": "forge:default-block" }, diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea3slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA3SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea3slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea3stairs.json similarity index 97% rename from src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json rename to src/main/resources/assets/botania/blockstates/biomestonea3stairs.json index 35f8f419c..357f32350 100644 --- a/src/main/resources/assets/botania/blockstates/biomeStoneA3Stairs.json +++ b/src/main/resources/assets/botania/blockstates/biomestonea3stairs.json @@ -2,9 +2,9 @@ "forge_marker": 1, "defaults": { "textures": { - "bottom": "botania:blocks/biomeStone3", - "top": "botania:blocks/biomeStone3", - "side": "botania:blocks/biomeStone3" + "bottom": "botania:blocks/biomestone3", + "top": "botania:blocks/biomestone3", + "side": "botania:blocks/biomestone3" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/biomestonea4slab.json b/src/main/resources/assets/botania/blockstates/biomestonea4slab.json new file mode 100644 index 000000000..7db47383c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea4slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone4", + "top": "botania:blocks/biomestone4", + "side": "botania:blocks/biomestone4" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea4slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA4SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea4slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea4stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea4stairs.json new file mode 100644 index 000000000..b3f79cc09 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea4stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone4", + "top": "botania:blocks/biomestone4", + "side": "botania:blocks/biomestone4" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea5slab.json b/src/main/resources/assets/botania/blockstates/biomestonea5slab.json new file mode 100644 index 000000000..91b6977ca --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea5slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone5", + "top": "botania:blocks/biomestone5", + "side": "botania:blocks/biomestone5" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea5slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA5SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea5slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea5stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea5stairs.json new file mode 100644 index 000000000..f1b27198e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea5stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone5", + "top": "botania:blocks/biomestone5", + "side": "botania:blocks/biomestone5" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea6slab.json b/src/main/resources/assets/botania/blockstates/biomestonea6slab.json new file mode 100644 index 000000000..7bfd0eca9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea6slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone6", + "top": "botania:blocks/biomestone6", + "side": "botania:blocks/biomestone6" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea6slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA6SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea6slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea6stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea6stairs.json new file mode 100644 index 000000000..33846795e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea6stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone6", + "top": "botania:blocks/biomestone6", + "side": "botania:blocks/biomestone6" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea7slab.json b/src/main/resources/assets/botania/blockstates/biomestonea7slab.json new file mode 100644 index 000000000..baf67f9b8 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea7slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone7", + "top": "botania:blocks/biomestone7", + "side": "botania:blocks/biomestone7" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea7slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA7SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea7slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea7stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea7stairs.json new file mode 100644 index 000000000..53c6235b3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea7stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone7", + "top": "botania:blocks/biomestone7", + "side": "botania:blocks/biomestone7" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea8slab.json b/src/main/resources/assets/botania/blockstates/biomestonea8slab.json new file mode 100644 index 000000000..b193083d7 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea8slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone8", + "top": "botania:blocks/biomestone8", + "side": "botania:blocks/biomestone8" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea8slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA8SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea8slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea8stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea8stairs.json new file mode 100644 index 000000000..604cbd658 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea8stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone8", + "top": "botania:blocks/biomestone8", + "side": "botania:blocks/biomestone8" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestonea9slab.json b/src/main/resources/assets/botania/blockstates/biomestonea9slab.json new file mode 100644 index 000000000..b68970597 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea9slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone9", + "top": "botania:blocks/biomestone9", + "side": "botania:blocks/biomestone9" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestonea9slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneA9SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestonea9slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestonea9stairs.json b/src/main/resources/assets/botania/blockstates/biomestonea9stairs.json new file mode 100644 index 000000000..83faa09e0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestonea9stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone9", + "top": "botania:blocks/biomestone9", + "side": "botania:blocks/biomestone9" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB.json b/src/main/resources/assets/botania/blockstates/biomestoneb.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB.json rename to src/main/resources/assets/botania/blockstates/biomestoneb.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb0slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb0slab.json new file mode 100644 index 000000000..d3b6313df --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb0slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone16", + "top": "botania:blocks/biomestone16", + "side": "botania:blocks/biomestone16" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB0SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb0stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb0stairs.json new file mode 100644 index 000000000..60904ca82 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb0stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone16", + "top": "botania:blocks/biomestone16", + "side": "botania:blocks/biomestone16" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb1slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb1slab.json new file mode 100644 index 000000000..e03d96f87 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb1slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone17", + "top": "botania:blocks/biomestone17", + "side": "botania:blocks/biomestone17" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb1slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB1SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb1slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb1stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb1stairs.json new file mode 100644 index 000000000..e085e3fd4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb1stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone17", + "top": "botania:blocks/biomestone17", + "side": "botania:blocks/biomestone17" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb2slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb2slab.json new file mode 100644 index 000000000..0eaaa9666 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb2slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone18", + "top": "botania:blocks/biomestone18", + "side": "botania:blocks/biomestone18" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb2slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB2SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb2slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb2stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb2stairs.json new file mode 100644 index 000000000..fa53ffe6f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb2stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone18", + "top": "botania:blocks/biomestone18", + "side": "botania:blocks/biomestone18" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb3slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb3slab.json new file mode 100644 index 000000000..8f702b28b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb3slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone19", + "top": "botania:blocks/biomestone19", + "side": "botania:blocks/biomestone19" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb3slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB3SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb3slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb3stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb3stairs.json new file mode 100644 index 000000000..20aa5c55a --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb3stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone19", + "top": "botania:blocks/biomestone19", + "side": "botania:blocks/biomestone19" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb4slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb4slab.json new file mode 100644 index 000000000..fcfc8f402 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb4slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone20", + "top": "botania:blocks/biomestone20", + "side": "botania:blocks/biomestone20" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb4slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB4SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb4slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb4stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb4stairs.json new file mode 100644 index 000000000..fb34b0bb6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb4stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone20", + "top": "botania:blocks/biomestone20", + "side": "botania:blocks/biomestone20" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb5slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb5slab.json new file mode 100644 index 000000000..83049acf2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb5slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone21", + "top": "botania:blocks/biomestone21", + "side": "botania:blocks/biomestone21" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb5slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB5SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb5slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb5stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb5stairs.json new file mode 100644 index 000000000..05b606c8e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb5stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone21", + "top": "botania:blocks/biomestone21", + "side": "botania:blocks/biomestone21" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb6slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb6slab.json new file mode 100644 index 000000000..198cf8fd0 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb6slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone22", + "top": "botania:blocks/biomestone22", + "side": "botania:blocks/biomestone22" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb6slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB6SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb6slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb6stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb6stairs.json new file mode 100644 index 000000000..910184087 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb6stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone22", + "top": "botania:blocks/biomestone22", + "side": "botania:blocks/biomestone22" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb7slab.json b/src/main/resources/assets/botania/blockstates/biomestoneb7slab.json new file mode 100644 index 000000000..675982344 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb7slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/biomestone23", + "top": "botania:blocks/biomestone23", + "side": "botania:blocks/biomestone23" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json b/src/main/resources/assets/botania/blockstates/biomestoneb7slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/biomeStoneB7SlabFull.json rename to src/main/resources/assets/botania/blockstates/biomestoneb7slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/biomestoneb7stairs.json b/src/main/resources/assets/botania/blockstates/biomestoneb7stairs.json new file mode 100644 index 000000000..8b6e88775 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/biomestoneb7stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/biomestone23", + "top": "botania:blocks/biomestone23", + "side": "botania:blocks/biomestone23" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/blazeBlock.json b/src/main/resources/assets/botania/blockstates/blazeblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/blazeBlock.json rename to src/main/resources/assets/botania/blockstates/blazeblock.json diff --git a/src/main/resources/assets/botania/blockstates/orechidIgnem.json b/src/main/resources/assets/botania/blockstates/bubbellchibi.json similarity index 74% rename from src/main/resources/assets/botania/blockstates/orechidIgnem.json rename to src/main/resources/assets/botania/blockstates/bubbellchibi.json index 240726792..cf20e2126 100644 --- a/src/main/resources/assets/botania/blockstates/orechidIgnem.json +++ b/src/main/resources/assets/botania/blockstates/bubbellchibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/orechidIgnem" + "cross": "botania:blocks/bubbellchibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/orechidIgnem" + "layer0": "botania:blocks/bubbellchibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/buriedPetals.json b/src/main/resources/assets/botania/blockstates/buriedpetals.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/buriedPetals.json rename to src/main/resources/assets/botania/blockstates/buriedpetals.json diff --git a/src/main/resources/assets/botania/blockstates/cacophoniumBlock.json b/src/main/resources/assets/botania/blockstates/cacophoniumblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/cacophoniumBlock.json rename to src/main/resources/assets/botania/blockstates/cacophoniumblock.json diff --git a/src/main/resources/assets/botania/blockstates/cellBlock.json b/src/main/resources/assets/botania/blockstates/cellblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/cellBlock.json rename to src/main/resources/assets/botania/blockstates/cellblock.json diff --git a/src/main/resources/assets/botania/blockstates/clayconiaChibi.json b/src/main/resources/assets/botania/blockstates/clayconiachibi.json similarity index 73% rename from src/main/resources/assets/botania/blockstates/clayconiaChibi.json rename to src/main/resources/assets/botania/blockstates/clayconiachibi.json index 534a6fde4..e51b58b18 100644 --- a/src/main/resources/assets/botania/blockstates/clayconiaChibi.json +++ b/src/main/resources/assets/botania/blockstates/clayconiachibi.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/clayconiaChibi" + "cross": "botania:blocks/clayconiachibi" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/clayconiaChibi" + "layer0": "botania:blocks/clayconiachibi" } }] } diff --git a/src/main/resources/assets/botania/blockstates/conjurationCatalyst.json b/src/main/resources/assets/botania/blockstates/conjurationcatalyst.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/conjurationCatalyst.json rename to src/main/resources/assets/botania/blockstates/conjurationcatalyst.json diff --git a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json similarity index 68% rename from src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json rename to src/main/resources/assets/botania/blockstates/corporeacrystalcube.json index 3f84657e0..e338cdf21 100644 --- a/src/main/resources/assets/botania/blockstates/corporeaCrystalCube.json +++ b/src/main/resources/assets/botania/blockstates/corporeacrystalcube.json @@ -2,11 +2,11 @@ "forge_marker": 1, "defaults": { "textures": { - "stand": "botania:model/crystalCube_stand", - "base_sides": "botania:model/crystalCube_base_sides", - "base_top": "botania:model/crystalCube_base_top", - "base_bottom": "botania:model/crystalCube_base_bottom", - "cube": "botania:model/crystalCube_cube", + "stand": "botania:model/crystalcube_stand", + "base_sides": "botania:model/crystalcube_base_sides", + "base_top": "botania:model/crystalcube_base_top", + "base_bottom": "botania:model/crystalcube_base_bottom", + "cube": "botania:model/crystalcube_cube", "particle": "botania:blocks/storage2" } }, diff --git a/src/main/resources/assets/botania/blockstates/corporeaFunnel.json b/src/main/resources/assets/botania/blockstates/corporeafunnel.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeaFunnel.json rename to src/main/resources/assets/botania/blockstates/corporeafunnel.json diff --git a/src/main/resources/assets/botania/blockstates/corporeaIndex.json b/src/main/resources/assets/botania/blockstates/corporeaindex.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeaIndex.json rename to src/main/resources/assets/botania/blockstates/corporeaindex.json diff --git a/src/main/resources/assets/botania/blockstates/corporeaInterceptor.json b/src/main/resources/assets/botania/blockstates/corporeainterceptor.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeaInterceptor.json rename to src/main/resources/assets/botania/blockstates/corporeainterceptor.json diff --git a/src/main/resources/assets/botania/blockstates/corporeaRetainer.json b/src/main/resources/assets/botania/blockstates/corporearetainer.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/corporeaRetainer.json rename to src/main/resources/assets/botania/blockstates/corporearetainer.json diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json b/src/main/resources/assets/botania/blockstates/customBrick0Slab.json deleted file mode 100644 index abdd8bee0..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick0Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/customBrick0", - "top": "botania:blocks/customBrick0", - "side": "botania:blocks/customBrick0" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json deleted file mode 100644 index fafef7906..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/customBrick0", - "top": "botania:blocks/customBrick0", - "side": "botania:blocks/customBrick0" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json b/src/main/resources/assets/botania/blockstates/customBrick1Slab.json deleted file mode 100644 index 49c293195..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick1Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/customBrick1", - "top": "botania:blocks/customBrick1", - "side": "botania:blocks/customBrick1" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json deleted file mode 100644 index 7466a8295..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick1Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/customBrick1", - "top": "botania:blocks/customBrick1", - "side": "botania:blocks/customBrick1" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json b/src/main/resources/assets/botania/blockstates/customBrick2Slab.json deleted file mode 100644 index 4ed57c712..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick2Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/customBrick2", - "top": "botania:blocks/customBrick2", - "side": "botania:blocks/customBrick2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json deleted file mode 100644 index ed0357faf..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick2Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/customBrick2", - "top": "botania:blocks/customBrick2", - "side": "botania:blocks/customBrick2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json b/src/main/resources/assets/botania/blockstates/customBrick3Slab.json deleted file mode 100644 index f4cbb49ce..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick3Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/customBrick3", - "top": "botania:blocks/customBrick3", - "side": "botania:blocks/customBrick3" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json b/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json deleted file mode 100644 index e26504eb7..000000000 --- a/src/main/resources/assets/botania/blockstates/customBrick3Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/customBrick3", - "top": "botania:blocks/customBrick3", - "side": "botania:blocks/customBrick3" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/customBrick.json b/src/main/resources/assets/botania/blockstates/custombrick.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/customBrick.json rename to src/main/resources/assets/botania/blockstates/custombrick.json diff --git a/src/main/resources/assets/botania/blockstates/custombrick0slab.json b/src/main/resources/assets/botania/blockstates/custombrick0slab.json new file mode 100644 index 000000000..7b7730c48 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick0slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/custombrick0", + "top": "botania:blocks/custombrick0", + "side": "botania:blocks/custombrick0" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json b/src/main/resources/assets/botania/blockstates/custombrick0slabfull.json similarity index 64% rename from src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json rename to src/main/resources/assets/botania/blockstates/custombrick0slabfull.json index c7dd413b5..5f7c92cf6 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick0SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/custombrick0slabfull.json @@ -3,7 +3,7 @@ "variants": { "normal": [{ "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/customBrick0" } + "textures": { "all": "botania:blocks/custombrick0" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick0stairs.json b/src/main/resources/assets/botania/blockstates/custombrick0stairs.json new file mode 100644 index 000000000..fb3b27af4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick0stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/custombrick0", + "top": "botania:blocks/custombrick0", + "side": "botania:blocks/custombrick0" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/custombrick1slab.json b/src/main/resources/assets/botania/blockstates/custombrick1slab.json new file mode 100644 index 000000000..a3f7d1216 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick1slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/custombrick1", + "top": "botania:blocks/custombrick1", + "side": "botania:blocks/custombrick1" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json b/src/main/resources/assets/botania/blockstates/custombrick1slabfull.json similarity index 64% rename from src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json rename to src/main/resources/assets/botania/blockstates/custombrick1slabfull.json index e299f14db..695d6dcb9 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick1SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/custombrick1slabfull.json @@ -3,7 +3,7 @@ "variants": { "normal": [{ "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/customBrick1" } + "textures": { "all": "botania:blocks/custombrick1" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick1stairs.json b/src/main/resources/assets/botania/blockstates/custombrick1stairs.json new file mode 100644 index 000000000..a2dc401b3 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick1stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/custombrick1", + "top": "botania:blocks/custombrick1", + "side": "botania:blocks/custombrick1" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/custombrick2slab.json b/src/main/resources/assets/botania/blockstates/custombrick2slab.json new file mode 100644 index 000000000..3177f9257 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick2slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/custombrick2", + "top": "botania:blocks/custombrick2", + "side": "botania:blocks/custombrick2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json b/src/main/resources/assets/botania/blockstates/custombrick2slabfull.json similarity index 64% rename from src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json rename to src/main/resources/assets/botania/blockstates/custombrick2slabfull.json index dd5a23420..1fb0db84e 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick2SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/custombrick2slabfull.json @@ -3,7 +3,7 @@ "variants": { "normal": [{ "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/customBrick2" } + "textures": { "all": "botania:blocks/custombrick2" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick2stairs.json b/src/main/resources/assets/botania/blockstates/custombrick2stairs.json new file mode 100644 index 000000000..808aa0684 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick2stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/custombrick2", + "top": "botania:blocks/custombrick2", + "side": "botania:blocks/custombrick2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/custombrick3slab.json b/src/main/resources/assets/botania/blockstates/custombrick3slab.json new file mode 100644 index 000000000..dfede3541 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick3slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/custombrick3", + "top": "botania:blocks/custombrick3", + "side": "botania:blocks/custombrick3" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json b/src/main/resources/assets/botania/blockstates/custombrick3slabfull.json similarity index 64% rename from src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json rename to src/main/resources/assets/botania/blockstates/custombrick3slabfull.json index cba4e7996..ba3443a9b 100644 --- a/src/main/resources/assets/botania/blockstates/customBrick3SlabFull.json +++ b/src/main/resources/assets/botania/blockstates/custombrick3slabfull.json @@ -3,7 +3,7 @@ "variants": { "normal": [{ "model": "minecraft:cube_all", - "textures": { "all": "botania:blocks/customBrick3" } + "textures": { "all": "botania:blocks/custombrick3" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/custombrick3stairs.json b/src/main/resources/assets/botania/blockstates/custombrick3stairs.json new file mode 100644 index 000000000..de78d0055 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/custombrick3stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/custombrick3", + "top": "botania:blocks/custombrick3", + "side": "botania:blocks/custombrick3" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/daybloomDecor.json b/src/main/resources/assets/botania/blockstates/daybloomdecor.json similarity index 73% rename from src/main/resources/assets/botania/blockstates/daybloomDecor.json rename to src/main/resources/assets/botania/blockstates/daybloomdecor.json index ee92199f2..f015b1f18 100644 --- a/src/main/resources/assets/botania/blockstates/daybloomDecor.json +++ b/src/main/resources/assets/botania/blockstates/daybloomdecor.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/daybloomDecor" + "cross": "botania:blocks/daybloomdecor" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/daybloomDecor" + "layer0": "botania:blocks/daybloomdecor" } }] } diff --git a/src/main/resources/assets/botania/blockstates/daybloomPrime.json b/src/main/resources/assets/botania/blockstates/daybloomprime.json similarity index 73% rename from src/main/resources/assets/botania/blockstates/daybloomPrime.json rename to src/main/resources/assets/botania/blockstates/daybloomprime.json index 3e8aac7c9..dc5887d1b 100644 --- a/src/main/resources/assets/botania/blockstates/daybloomPrime.json +++ b/src/main/resources/assets/botania/blockstates/daybloomprime.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/daybloomPrime" + "cross": "botania:blocks/daybloomprime" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/daybloomPrime" + "layer0": "botania:blocks/daybloomprime" } }] } diff --git a/src/main/resources/assets/botania/blockstates/dirtPath.json b/src/main/resources/assets/botania/blockstates/dirtpath.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dirtPath.json rename to src/main/resources/assets/botania/blockstates/dirtpath.json diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0Slab.json b/src/main/resources/assets/botania/blockstates/dirtpath0slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dirtPath0Slab.json rename to src/main/resources/assets/botania/blockstates/dirtpath0slab.json diff --git a/src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json b/src/main/resources/assets/botania/blockstates/dirtpath0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dirtPath0SlabFull.json rename to src/main/resources/assets/botania/blockstates/dirtpath0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower1.json b/src/main/resources/assets/botania/blockstates/doubleflower1.json similarity index 67% rename from src/main/resources/assets/botania/blockstates/doubleFlower1.json rename to src/main/resources/assets/botania/blockstates/doubleflower1.json index 339214df2..42f5e68ee 100644 --- a/src/main/resources/assets/botania/blockstates/doubleFlower1.json +++ b/src/main/resources/assets/botania/blockstates/doubleflower1.json @@ -4,21 +4,21 @@ "model": "minecraft:cross" }, "variants": { - "df_variant=white,half=lower": [{ "textures": { "cross": "botania:blocks/flower0Tall0" } }], - "df_variant=white,half=upper": [{ "textures": { "cross": "botania:blocks/flower0Tall1" } }], - "df_variant=orange,half=lower": [{ "textures": { "cross": "botania:blocks/flower1Tall0" } }], - "df_variant=orange,half=upper": [{ "textures": { "cross": "botania:blocks/flower1Tall1" } }], - "df_variant=magenta,half=lower": [{ "textures": { "cross": "botania:blocks/flower2Tall0" } }], - "df_variant=magenta,half=upper": [{ "textures": { "cross": "botania:blocks/flower2Tall1" } }], - "df_variant=light_blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower3Tall0" } }], - "df_variant=light_blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower3Tall1" } }], - "df_variant=yellow,half=lower": [{ "textures": { "cross": "botania:blocks/flower4Tall0" } }], - "df_variant=yellow,half=upper": [{ "textures": { "cross": "botania:blocks/flower4Tall1" } }], - "df_variant=lime,half=lower": [{ "textures": { "cross": "botania:blocks/flower5Tall0" } }], - "df_variant=lime,half=upper": [{ "textures": { "cross": "botania:blocks/flower5Tall1" } }], - "df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6Tall0" } }], - "df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6Tall1" } }], - "df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7Tall0" } }], - "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7Tall1" } }] + "df_variant=white,half=lower": [{ "textures": { "cross": "botania:blocks/flower0tall0" } }], + "df_variant=white,half=upper": [{ "textures": { "cross": "botania:blocks/flower0tall1" } }], + "df_variant=orange,half=lower": [{ "textures": { "cross": "botania:blocks/flower1tall0" } }], + "df_variant=orange,half=upper": [{ "textures": { "cross": "botania:blocks/flower1tall1" } }], + "df_variant=magenta,half=lower": [{ "textures": { "cross": "botania:blocks/flower2tall0" } }], + "df_variant=magenta,half=upper": [{ "textures": { "cross": "botania:blocks/flower2tall1" } }], + "df_variant=light_blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower3tall0" } }], + "df_variant=light_blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower3tall1" } }], + "df_variant=yellow,half=lower": [{ "textures": { "cross": "botania:blocks/flower4tall0" } }], + "df_variant=yellow,half=upper": [{ "textures": { "cross": "botania:blocks/flower4tall1" } }], + "df_variant=lime,half=lower": [{ "textures": { "cross": "botania:blocks/flower5tall0" } }], + "df_variant=lime,half=upper": [{ "textures": { "cross": "botania:blocks/flower5tall1" } }], + "df_variant=pink,half=lower": [{ "textures": { "cross": "botania:blocks/flower6tall0" } }], + "df_variant=pink,half=upper": [{ "textures": { "cross": "botania:blocks/flower6tall1" } }], + "df_variant=gray,half=lower": [{ "textures": { "cross": "botania:blocks/flower7tall0" } }], + "df_variant=gray,half=upper": [{ "textures": { "cross": "botania:blocks/flower7tall1" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/doubleFlower2.json b/src/main/resources/assets/botania/blockstates/doubleflower2.json similarity index 67% rename from src/main/resources/assets/botania/blockstates/doubleFlower2.json rename to src/main/resources/assets/botania/blockstates/doubleflower2.json index d74db343c..65ed8f92a 100644 --- a/src/main/resources/assets/botania/blockstates/doubleFlower2.json +++ b/src/main/resources/assets/botania/blockstates/doubleflower2.json @@ -4,21 +4,21 @@ "model": "minecraft:cross" }, "variants": { - "df_variant=silver,half=lower": [{ "textures": { "cross": "botania:blocks/flower8Tall0" } }], - "df_variant=silver,half=upper": [{ "textures": { "cross": "botania:blocks/flower8Tall1" } }], - "df_variant=cyan,half=lower": [{ "textures": { "cross": "botania:blocks/flower9Tall0" } }], - "df_variant=cyan,half=upper": [{ "textures": { "cross": "botania:blocks/flower9Tall1" } }], - "df_variant=purple,half=lower": [{ "textures": { "cross": "botania:blocks/flower10Tall0" } }], - "df_variant=purple,half=upper": [{ "textures": { "cross": "botania:blocks/flower10Tall1" } }], - "df_variant=blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower11Tall0" } }], - "df_variant=blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower11Tall1" } }], - "df_variant=brown,half=lower": [{ "textures": { "cross": "botania:blocks/flower12Tall0" } }], - "df_variant=brown,half=upper": [{ "textures": { "cross": "botania:blocks/flower12Tall1" } }], - "df_variant=green,half=lower": [{ "textures": { "cross": "botania:blocks/flower13Tall0" } }], - "df_variant=green,half=upper": [{ "textures": { "cross": "botania:blocks/flower13Tall1" } }], - "df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14Tall0" } }], - "df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14Tall1" } }], - "df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15Tall0" } }], - "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15Tall1" } }] + "df_variant=silver,half=lower": [{ "textures": { "cross": "botania:blocks/flower8tall0" } }], + "df_variant=silver,half=upper": [{ "textures": { "cross": "botania:blocks/flower8tall1" } }], + "df_variant=cyan,half=lower": [{ "textures": { "cross": "botania:blocks/flower9tall0" } }], + "df_variant=cyan,half=upper": [{ "textures": { "cross": "botania:blocks/flower9tall1" } }], + "df_variant=purple,half=lower": [{ "textures": { "cross": "botania:blocks/flower10tall0" } }], + "df_variant=purple,half=upper": [{ "textures": { "cross": "botania:blocks/flower10tall1" } }], + "df_variant=blue,half=lower": [{ "textures": { "cross": "botania:blocks/flower11tall0" } }], + "df_variant=blue,half=upper": [{ "textures": { "cross": "botania:blocks/flower11tall1" } }], + "df_variant=brown,half=lower": [{ "textures": { "cross": "botania:blocks/flower12tall0" } }], + "df_variant=brown,half=upper": [{ "textures": { "cross": "botania:blocks/flower12tall1" } }], + "df_variant=green,half=lower": [{ "textures": { "cross": "botania:blocks/flower13tall0" } }], + "df_variant=green,half=upper": [{ "textures": { "cross": "botania:blocks/flower13tall1" } }], + "df_variant=red,half=lower": [{ "textures": { "cross": "botania:blocks/flower14tall0" } }], + "df_variant=red,half=upper": [{ "textures": { "cross": "botania:blocks/flower14tall1" } }], + "df_variant=black,half=lower": [{ "textures": { "cross": "botania:blocks/flower15tall0" } }], + "df_variant=black,half=upper": [{ "textures": { "cross": "botania:blocks/flower15tall1" } }] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood0slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood0Slab.json rename to src/main/resources/assets/botania/blockstates/dreamwood0slab.json diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood0SlabFull.json rename to src/main/resources/assets/botania/blockstates/dreamwood0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood0stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood0Stairs.json rename to src/main/resources/assets/botania/blockstates/dreamwood0stairs.json diff --git a/src/main/resources/assets/botania/blockstates/dreamwood0Wall.json b/src/main/resources/assets/botania/blockstates/dreamwood0wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood0Wall.json rename to src/main/resources/assets/botania/blockstates/dreamwood0wall.json diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Slab.json b/src/main/resources/assets/botania/blockstates/dreamwood1slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood1Slab.json rename to src/main/resources/assets/botania/blockstates/dreamwood1slab.json diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/dreamwood1slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood1SlabFull.json rename to src/main/resources/assets/botania/blockstates/dreamwood1slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json b/src/main/resources/assets/botania/blockstates/dreamwood1stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/dreamwood1Stairs.json rename to src/main/resources/assets/botania/blockstates/dreamwood1stairs.json diff --git a/src/main/resources/assets/botania/blockstates/elfGlass.json b/src/main/resources/assets/botania/blockstates/elfGlass.json deleted file mode 100644 index 46e30264a..000000000 --- a/src/main/resources/assets/botania/blockstates/elfGlass.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:cube_all", - "transform": "forge:default-block" - }, - "variants": { - "normal": [ - { "textures": { "all": "botania:blocks/elfGlass0" } }, - { "textures": { "all": "botania:blocks/elfGlass1" } }, - { "textures": { "all": "botania:blocks/elfGlass2" } }, - { "textures": { "all": "botania:blocks/elfGlass3" } } - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elfglass.json b/src/main/resources/assets/botania/blockstates/elfglass.json new file mode 100644 index 000000000..9270f8bf9 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/elfglass.json @@ -0,0 +1,15 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:cube_all", + "transform": "forge:default-block" + }, + "variants": { + "normal": [ + { "textures": { "all": "botania:blocks/elfglass0" } }, + { "textures": { "all": "botania:blocks/elfglass1" } }, + { "textures": { "all": "botania:blocks/elfglass2" } }, + { "textures": { "all": "botania:blocks/elfglass3" } } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/elfGlassPane.json b/src/main/resources/assets/botania/blockstates/elfglasspane.json similarity index 91% rename from src/main/resources/assets/botania/blockstates/elfGlassPane.json rename to src/main/resources/assets/botania/blockstates/elfglasspane.json index 91e8fff09..b2cd97da2 100644 --- a/src/main/resources/assets/botania/blockstates/elfGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/elfglasspane.json @@ -3,8 +3,8 @@ "defaults": { "model": "minecraft:pane_post", "textures": { - "edge": "botania:blocks/elfGlassPane", - "pane": "botania:blocks/elfGlass" + "edge": "botania:blocks/elfglasspane", + "pane": "botania:blocks/elfglass" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/enchantedSoil.json b/src/main/resources/assets/botania/blockstates/enchantedsoil.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/enchantedSoil.json rename to src/main/resources/assets/botania/blockstates/enchantedsoil.json diff --git a/src/main/resources/assets/botania/blockstates/enderEyeBlock.json b/src/main/resources/assets/botania/blockstates/endereyeblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/enderEyeBlock.json rename to src/main/resources/assets/botania/blockstates/endereyeblock.json diff --git a/src/main/resources/assets/botania/blockstates/fakeAir.json b/src/main/resources/assets/botania/blockstates/fakeair.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/fakeAir.json rename to src/main/resources/assets/botania/blockstates/fakeair.json diff --git a/src/main/resources/assets/botania/blockstates/bubbellChibi.json b/src/main/resources/assets/botania/blockstates/fallenkanade.json similarity index 74% rename from src/main/resources/assets/botania/blockstates/bubbellChibi.json rename to src/main/resources/assets/botania/blockstates/fallenkanade.json index 7f73d9733..e2fe2f834 100644 --- a/src/main/resources/assets/botania/blockstates/bubbellChibi.json +++ b/src/main/resources/assets/botania/blockstates/fallenkanade.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/bubbellChibi" + "cross": "botania:blocks/fallenkanade" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/bubbellChibi" + "layer0": "botania:blocks/fallenkanade" } }] } diff --git a/src/main/resources/assets/botania/blockstates/felPumpkin.json b/src/main/resources/assets/botania/blockstates/felpumpkin.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/felPumpkin.json rename to src/main/resources/assets/botania/blockstates/felpumpkin.json diff --git a/src/main/resources/assets/botania/blockstates/forestDrum.json b/src/main/resources/assets/botania/blockstates/forestdrum.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/forestDrum.json rename to src/main/resources/assets/botania/blockstates/forestdrum.json diff --git a/src/main/resources/assets/botania/blockstates/forestEye.json b/src/main/resources/assets/botania/blockstates/foresteye.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/forestEye.json rename to src/main/resources/assets/botania/blockstates/foresteye.json diff --git a/src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json b/src/main/resources/assets/botania/blockstates/gaiaheadblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/gaiaHeadBlock.json rename to src/main/resources/assets/botania/blockstates/gaiaheadblock.json diff --git a/src/main/resources/assets/botania/blockstates/ghostRail.json b/src/main/resources/assets/botania/blockstates/ghostrail.json similarity index 92% rename from src/main/resources/assets/botania/blockstates/ghostRail.json rename to src/main/resources/assets/botania/blockstates/ghostrail.json index d7a6becb1..1104d7d6e 100644 --- a/src/main/resources/assets/botania/blockstates/ghostRail.json +++ b/src/main/resources/assets/botania/blockstates/ghostrail.json @@ -2,7 +2,7 @@ "forge_marker": 1, "defaults": { "textures": { - "rail": "botania:blocks/ghostRail" + "rail": "botania:blocks/ghostrail" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/heiseiDream.json b/src/main/resources/assets/botania/blockstates/heiseidream.json similarity index 74% rename from src/main/resources/assets/botania/blockstates/heiseiDream.json rename to src/main/resources/assets/botania/blockstates/heiseidream.json index 1c547476a..bee395cfe 100644 --- a/src/main/resources/assets/botania/blockstates/heiseiDream.json +++ b/src/main/resources/assets/botania/blockstates/heiseidream.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/heiseiDream" + "cross": "botania:blocks/heiseidream" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/heiseiDream" + "layer0": "botania:blocks/heiseidream" } }] } diff --git a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json b/src/main/resources/assets/botania/blockstates/hopperhockChibi.json deleted file mode 100644 index 0f140cfc2..000000000 --- a/src/main/resources/assets/botania/blockstates/hopperhockChibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/hopperhockChibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/hopperhockChibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hopperhockchibi.json b/src/main/resources/assets/botania/blockstates/hopperhockchibi.json new file mode 100644 index 000000000..e37d213f6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hopperhockchibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/hopperhockchibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hopperhockchibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hourglass.json b/src/main/resources/assets/botania/blockstates/hourglass.json index 4e63db707..a2b5e210f 100644 --- a/src/main/resources/assets/botania/blockstates/hourglass.json +++ b/src/main/resources/assets/botania/blockstates/hourglass.json @@ -3,7 +3,7 @@ "defaults": { "model": "botania:dummy", "textures": { - "particle": "botania:blocks/manaGlass" + "particle": "botania:blocks/managlass" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json deleted file mode 100644 index 61cd3b7d5..000000000 --- a/src/main/resources/assets/botania/blockstates/hydroangeasDecor.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/hydroangeasDecor" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/hydroangeasDecor" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json b/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json new file mode 100644 index 000000000..12f613004 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/hydroangeasdecor.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/hydroangeasdecor" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/hydroangeasdecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/incensePlate.json b/src/main/resources/assets/botania/blockstates/incenseplate.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/incensePlate.json rename to src/main/resources/assets/botania/blockstates/incenseplate.json diff --git a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json b/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json deleted file mode 100644 index 492f3120d..000000000 --- a/src/main/resources/assets/botania/blockstates/jadedAmaranthus.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/jadedAmaranthus" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/jadedAmaranthus" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/jadedamaranthus.json b/src/main/resources/assets/botania/blockstates/jadedamaranthus.json new file mode 100644 index 000000000..472f8eb8d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/jadedamaranthus.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/jadedamaranthus" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/jadedamaranthus" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/lightLauncher.json b/src/main/resources/assets/botania/blockstates/lightlauncher.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/lightLauncher.json rename to src/main/resources/assets/botania/blockstates/lightlauncher.json diff --git a/src/main/resources/assets/botania/blockstates/lightRelay.json b/src/main/resources/assets/botania/blockstates/lightrelay.json similarity index 52% rename from src/main/resources/assets/botania/blockstates/lightRelay.json rename to src/main/resources/assets/botania/blockstates/lightrelay.json index 5ad044ac0..beada7b95 100644 --- a/src/main/resources/assets/botania/blockstates/lightRelay.json +++ b/src/main/resources/assets/botania/blockstates/lightrelay.json @@ -12,26 +12,26 @@ "variant": { "default": { "textures": { - "layer0": "botania:blocks/lightRelay0", - "particle": "botania:blocks/lightRelay1" + "layer0": "botania:blocks/lightrelay0", + "particle": "botania:blocks/lightrelay1" } }, "detector": { "textures": { - "layer0": "botania:blocks/lightRelay2", - "particle": "botania:blocks/lightRelay3" + "layer0": "botania:blocks/lightrelay2", + "particle": "botania:blocks/lightrelay3" } }, "fork": { "textures": { - "layer0": "botania:blocks/lightRelay4", - "particle": "botania:blocks/lightRelay5" + "layer0": "botania:blocks/lightrelay4", + "particle": "botania:blocks/lightrelay5" } }, "toggle": { "textures": { - "layer0": "botania:blocks/lightRelay6", - "particle": "botania:blocks/lightRelay7" + "layer0": "botania:blocks/lightrelay6", + "particle": "botania:blocks/lightrelay7" } } } diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Slab.json b/src/main/resources/assets/botania/blockstates/livingrock0slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock0Slab.json rename to src/main/resources/assets/botania/blockstates/livingrock0slab.json diff --git a/src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock0SlabFull.json rename to src/main/resources/assets/botania/blockstates/livingrock0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock0stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock0Stairs.json rename to src/main/resources/assets/botania/blockstates/livingrock0stairs.json diff --git a/src/main/resources/assets/botania/blockstates/livingrock0Wall.json b/src/main/resources/assets/botania/blockstates/livingrock0wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock0Wall.json rename to src/main/resources/assets/botania/blockstates/livingrock0wall.json diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Slab.json b/src/main/resources/assets/botania/blockstates/livingrock1slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock1Slab.json rename to src/main/resources/assets/botania/blockstates/livingrock1slab.json diff --git a/src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingrock1slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock1SlabFull.json rename to src/main/resources/assets/botania/blockstates/livingrock1slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/livingrock1Stairs.json b/src/main/resources/assets/botania/blockstates/livingrock1stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingrock1Stairs.json rename to src/main/resources/assets/botania/blockstates/livingrock1stairs.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Slab.json b/src/main/resources/assets/botania/blockstates/livingwood0slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood0Slab.json rename to src/main/resources/assets/botania/blockstates/livingwood0slab.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood0SlabFull.json rename to src/main/resources/assets/botania/blockstates/livingwood0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood0stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood0Stairs.json rename to src/main/resources/assets/botania/blockstates/livingwood0stairs.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood0Wall.json b/src/main/resources/assets/botania/blockstates/livingwood0wall.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood0Wall.json rename to src/main/resources/assets/botania/blockstates/livingwood0wall.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Slab.json b/src/main/resources/assets/botania/blockstates/livingwood1slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood1Slab.json rename to src/main/resources/assets/botania/blockstates/livingwood1slab.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json b/src/main/resources/assets/botania/blockstates/livingwood1slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood1SlabFull.json rename to src/main/resources/assets/botania/blockstates/livingwood1slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/livingwood1Stairs.json b/src/main/resources/assets/botania/blockstates/livingwood1stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/livingwood1Stairs.json rename to src/main/resources/assets/botania/blockstates/livingwood1stairs.json diff --git a/src/main/resources/assets/botania/blockstates/manaBeacon.json b/src/main/resources/assets/botania/blockstates/manabeacon.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaBeacon.json rename to src/main/resources/assets/botania/blockstates/manabeacon.json diff --git a/src/main/resources/assets/botania/blockstates/manaBomb.json b/src/main/resources/assets/botania/blockstates/manabomb.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaBomb.json rename to src/main/resources/assets/botania/blockstates/manabomb.json diff --git a/src/main/resources/assets/botania/blockstates/manaDetector.json b/src/main/resources/assets/botania/blockstates/manadetector.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaDetector.json rename to src/main/resources/assets/botania/blockstates/manadetector.json diff --git a/src/main/resources/assets/botania/blockstates/manaFlame.json b/src/main/resources/assets/botania/blockstates/manaflame.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaFlame.json rename to src/main/resources/assets/botania/blockstates/manaflame.json diff --git a/src/main/resources/assets/botania/blockstates/manaGlass.json b/src/main/resources/assets/botania/blockstates/managlass.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaGlass.json rename to src/main/resources/assets/botania/blockstates/managlass.json diff --git a/src/main/resources/assets/botania/blockstates/manaGlassPane.json b/src/main/resources/assets/botania/blockstates/managlasspane.json similarity index 91% rename from src/main/resources/assets/botania/blockstates/manaGlassPane.json rename to src/main/resources/assets/botania/blockstates/managlasspane.json index 4b9443f11..caf8cb10c 100644 --- a/src/main/resources/assets/botania/blockstates/manaGlassPane.json +++ b/src/main/resources/assets/botania/blockstates/managlasspane.json @@ -3,8 +3,8 @@ "defaults": { "model": "minecraft:pane_post", "textures": { - "edge": "botania:blocks/manaGlassPane", - "pane": "botania:blocks/manaGlass" + "edge": "botania:blocks/managlasspane", + "pane": "botania:blocks/managlass" } }, "variants": { diff --git a/src/main/resources/assets/botania/blockstates/manaVoid.json b/src/main/resources/assets/botania/blockstates/manavoid.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/manaVoid.json rename to src/main/resources/assets/botania/blockstates/manavoid.json diff --git a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json b/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json deleted file mode 100644 index b8b180b56..000000000 --- a/src/main/resources/assets/botania/blockstates/marimorphosisChibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/marimorphosisChibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/marimorphosisChibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/marimorphosischibi.json b/src/main/resources/assets/botania/blockstates/marimorphosischibi.json new file mode 100644 index 000000000..0eec589e4 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/marimorphosischibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/marimorphosischibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/marimorphosischibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/miniIsland.json b/src/main/resources/assets/botania/blockstates/miniisland.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/miniIsland.json rename to src/main/resources/assets/botania/blockstates/miniisland.json diff --git a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json b/src/main/resources/assets/botania/blockstates/nightshadeDecor.json deleted file mode 100644 index b4dafe2d2..000000000 --- a/src/main/resources/assets/botania/blockstates/nightshadeDecor.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/nightshadeDecor" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/nightshadeDecor" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadePrime.json b/src/main/resources/assets/botania/blockstates/nightshadePrime.json deleted file mode 100644 index 9b4f450be..000000000 --- a/src/main/resources/assets/botania/blockstates/nightshadePrime.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/nightshadePrime" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/nightshadePrime" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadedecor.json b/src/main/resources/assets/botania/blockstates/nightshadedecor.json new file mode 100644 index 000000000..dd566a012 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadedecor.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadedecor" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/nightshadedecor" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/nightshadeprime.json b/src/main/resources/assets/botania/blockstates/nightshadeprime.json new file mode 100644 index 000000000..e6fc1e356 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/nightshadeprime.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/nightshadeprime" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/nightshadeprime" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/openCrate.json b/src/main/resources/assets/botania/blockstates/openCrate.json deleted file mode 100644 index 9cde21a91..000000000 --- a/src/main/resources/assets/botania/blockstates/openCrate.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:orientable_vertical", - "transform": "forge:default-block" - }, - "variants": { - "pattern": { - "none": {}, - "crafty_1_1": { "textures": { "side": "botania:blocks/ocPattern0" } }, - "crafty_2_2": { "textures": { "side": "botania:blocks/ocPattern1" } }, - "crafty_1_2": { "textures": { "side": "botania:blocks/ocPattern2" } }, - "crafty_2_1": { "textures": { "side": "botania:blocks/ocPattern3" } }, - "crafty_1_3": { "textures": { "side": "botania:blocks/ocPattern4" } }, - "crafty_3_1": { "textures": { "side": "botania:blocks/ocPattern5" } }, - "crafty_2_3": { "textures": { "side": "botania:blocks/ocPattern6" } }, - "crafty_3_2": { "textures": { "side": "botania:blocks/ocPattern7" } }, - "crafty_donut": { "textures": { "side": "botania:blocks/ocPattern8" } } - }, - "variant": { - "open": { "x": 180, "textures": { "front": "botania:blocks/openCrate1", "side": "botania:blocks/openCrate0" } }, - "crafty": { "x": 180, "textures": { "front": "botania:blocks/openCrate3", "side": "botania:blocks/openCrate2" } } - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/opencrate.json b/src/main/resources/assets/botania/blockstates/opencrate.json new file mode 100644 index 000000000..4583f474c --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/opencrate.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:orientable_vertical", + "transform": "forge:default-block" + }, + "variants": { + "pattern": { + "none": {}, + "crafty_1_1": { "textures": { "side": "botania:blocks/ocpattern0" } }, + "crafty_2_2": { "textures": { "side": "botania:blocks/ocpattern1" } }, + "crafty_1_2": { "textures": { "side": "botania:blocks/ocpattern2" } }, + "crafty_2_1": { "textures": { "side": "botania:blocks/ocpattern3" } }, + "crafty_1_3": { "textures": { "side": "botania:blocks/ocpattern4" } }, + "crafty_3_1": { "textures": { "side": "botania:blocks/ocpattern5" } }, + "crafty_2_3": { "textures": { "side": "botania:blocks/ocpattern6" } }, + "crafty_3_2": { "textures": { "side": "botania:blocks/ocpattern7" } }, + "crafty_donut": { "textures": { "side": "botania:blocks/ocpattern8" } } + }, + "variant": { + "open": { "x": 180, "textures": { "front": "botania:blocks/opencrate1", "side": "botania:blocks/opencrate0" } }, + "crafty": { "x": 180, "textures": { "front": "botania:blocks/opencrate3", "side": "botania:blocks/opencrate2" } } + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/fallenKanade.json b/src/main/resources/assets/botania/blockstates/orechidignem.json similarity index 74% rename from src/main/resources/assets/botania/blockstates/fallenKanade.json rename to src/main/resources/assets/botania/blockstates/orechidignem.json index 577aaf195..3cec6df01 100644 --- a/src/main/resources/assets/botania/blockstates/fallenKanade.json +++ b/src/main/resources/assets/botania/blockstates/orechidignem.json @@ -4,14 +4,14 @@ "normal": [{ "model": "botania:shapes/cross_tinted", "textures": { - "cross": "botania:blocks/fallenKanade" + "cross": "botania:blocks/orechidignem" } }], "inventory": [{ "model": "builtin/generated", "transform": "forge:default-item", "textures": { - "layer0": "botania:blocks/fallenKanade" + "layer0": "botania:blocks/orechidignem" } }] } diff --git a/src/main/resources/assets/botania/blockstates/pavement0Slab.json b/src/main/resources/assets/botania/blockstates/pavement0slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement0Slab.json rename to src/main/resources/assets/botania/blockstates/pavement0slab.json diff --git a/src/main/resources/assets/botania/blockstates/pavement0SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement0SlabFull.json rename to src/main/resources/assets/botania/blockstates/pavement0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/pavement0Stairs.json b/src/main/resources/assets/botania/blockstates/pavement0stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement0Stairs.json rename to src/main/resources/assets/botania/blockstates/pavement0stairs.json diff --git a/src/main/resources/assets/botania/blockstates/pavement1Slab.json b/src/main/resources/assets/botania/blockstates/pavement1slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement1Slab.json rename to src/main/resources/assets/botania/blockstates/pavement1slab.json diff --git a/src/main/resources/assets/botania/blockstates/pavement1SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement1slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement1SlabFull.json rename to src/main/resources/assets/botania/blockstates/pavement1slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/pavement1Stairs.json b/src/main/resources/assets/botania/blockstates/pavement1stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement1Stairs.json rename to src/main/resources/assets/botania/blockstates/pavement1stairs.json diff --git a/src/main/resources/assets/botania/blockstates/pavement2Slab.json b/src/main/resources/assets/botania/blockstates/pavement2slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement2Slab.json rename to src/main/resources/assets/botania/blockstates/pavement2slab.json diff --git a/src/main/resources/assets/botania/blockstates/pavement2SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement2slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement2SlabFull.json rename to src/main/resources/assets/botania/blockstates/pavement2slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/pavement2Stairs.json b/src/main/resources/assets/botania/blockstates/pavement2stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement2Stairs.json rename to src/main/resources/assets/botania/blockstates/pavement2stairs.json diff --git a/src/main/resources/assets/botania/blockstates/pavement3Slab.json b/src/main/resources/assets/botania/blockstates/pavement3slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement3Slab.json rename to src/main/resources/assets/botania/blockstates/pavement3slab.json diff --git a/src/main/resources/assets/botania/blockstates/pavement3SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement3slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement3SlabFull.json rename to src/main/resources/assets/botania/blockstates/pavement3slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/pavement3Stairs.json b/src/main/resources/assets/botania/blockstates/pavement3stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement3Stairs.json rename to src/main/resources/assets/botania/blockstates/pavement3stairs.json diff --git a/src/main/resources/assets/botania/blockstates/pavement4Slab.json b/src/main/resources/assets/botania/blockstates/pavement4slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement4Slab.json rename to src/main/resources/assets/botania/blockstates/pavement4slab.json diff --git a/src/main/resources/assets/botania/blockstates/pavement4SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement4slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement4SlabFull.json rename to src/main/resources/assets/botania/blockstates/pavement4slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/pavement4Stairs.json b/src/main/resources/assets/botania/blockstates/pavement4stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement4Stairs.json rename to src/main/resources/assets/botania/blockstates/pavement4stairs.json diff --git a/src/main/resources/assets/botania/blockstates/pavement5Slab.json b/src/main/resources/assets/botania/blockstates/pavement5slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement5Slab.json rename to src/main/resources/assets/botania/blockstates/pavement5slab.json diff --git a/src/main/resources/assets/botania/blockstates/pavement5SlabFull.json b/src/main/resources/assets/botania/blockstates/pavement5slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement5SlabFull.json rename to src/main/resources/assets/botania/blockstates/pavement5slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/pavement5Stairs.json b/src/main/resources/assets/botania/blockstates/pavement5stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pavement5Stairs.json rename to src/main/resources/assets/botania/blockstates/pavement5stairs.json diff --git a/src/main/resources/assets/botania/blockstates/petalBlock.json b/src/main/resources/assets/botania/blockstates/petalblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/petalBlock.json rename to src/main/resources/assets/botania/blockstates/petalblock.json diff --git a/src/main/resources/assets/botania/blockstates/pistonRelay.json b/src/main/resources/assets/botania/blockstates/pistonrelay.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/pistonRelay.json rename to src/main/resources/assets/botania/blockstates/pistonrelay.json diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json deleted file mode 100644 index 5a4d1b316..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockBlazeQuartz0", - "top": "botania:blocks/blockBlazeQuartz1", - "side": "botania:blocks/blockBlazeQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json deleted file mode 100644 index 342294d24..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabDarkHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockDarkQuartz0", - "top": "botania:blocks/blockDarkQuartz1", - "side": "botania:blocks/blockDarkQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json deleted file mode 100644 index d45d69008..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabElfHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockElfQuartz0", - "top": "botania:blocks/blockElfQuartz1", - "side": "botania:blocks/blockElfQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json deleted file mode 100644 index 0eb7e4354..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockLavenderQuartz0", - "top": "botania:blocks/blockLavenderQuartz1", - "side": "botania:blocks/blockLavenderQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json deleted file mode 100644 index 0aee75219..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabManaHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockManaQuartz0", - "top": "botania:blocks/blockManaQuartz1", - "side": "botania:blocks/blockManaQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json deleted file mode 100644 index 1b99d3fbd..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabRedHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockRedQuartz0", - "top": "botania:blocks/blockRedQuartz1", - "side": "botania:blocks/blockRedQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json b/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json deleted file mode 100644 index 87f085275..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyHalf.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/blockSunnyQuartz0", - "top": "botania:blocks/blockSunnyQuartz1", - "side": "botania:blocks/blockSunnyQuartz2" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json b/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json deleted file mode 100644 index b564a6eac..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsBlaze.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockBlazeQuartz0", - "top": "botania:blocks/blockBlazeQuartz1", - "side": "botania:blocks/blockBlazeQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json b/src/main/resources/assets/botania/blockstates/quartzStairsDark.json deleted file mode 100644 index 65e4d1198..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsDark.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockDarkQuartz0", - "top": "botania:blocks/blockDarkQuartz1", - "side": "botania:blocks/blockDarkQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json b/src/main/resources/assets/botania/blockstates/quartzStairsElf.json deleted file mode 100644 index 24392d84a..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsElf.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockElfQuartz0", - "top": "botania:blocks/blockElfQuartz1", - "side": "botania:blocks/blockElfQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json b/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json deleted file mode 100644 index 5667235f1..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsLavender.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockLavenderQuartz0", - "top": "botania:blocks/blockLavenderQuartz1", - "side": "botania:blocks/blockLavenderQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json b/src/main/resources/assets/botania/blockstates/quartzStairsMana.json deleted file mode 100644 index 39e65c11f..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsMana.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockManaQuartz0", - "top": "botania:blocks/blockManaQuartz1", - "side": "botania:blocks/blockManaQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json b/src/main/resources/assets/botania/blockstates/quartzStairsRed.json deleted file mode 100644 index 52ae466ee..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsRed.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockRedQuartz0", - "top": "botania:blocks/blockRedQuartz1", - "side": "botania:blocks/blockRedQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json b/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json deleted file mode 100644 index 78a3f481b..000000000 --- a/src/main/resources/assets/botania/blockstates/quartzStairsSunny.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/blockSunnyQuartz0", - "top": "botania:blocks/blockSunnyQuartz1", - "side": "botania:blocks/blockSunnyQuartz2" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json b/src/main/resources/assets/botania/blockstates/quartzslabblazefull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabBlazeFull.json rename to src/main/resources/assets/botania/blockstates/quartzslabblazefull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslabblazehalf.json b/src/main/resources/assets/botania/blockstates/quartzslabblazehalf.json new file mode 100644 index 000000000..8c63e9e98 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslabblazehalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockblazequartz0", + "top": "botania:blocks/blockblazequartz1", + "side": "botania:blocks/blockblazequartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json b/src/main/resources/assets/botania/blockstates/quartzslabdarkfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabDarkFull.json rename to src/main/resources/assets/botania/blockstates/quartzslabdarkfull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslabdarkhalf.json b/src/main/resources/assets/botania/blockstates/quartzslabdarkhalf.json new file mode 100644 index 000000000..3ed2b3738 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslabdarkhalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockdarkquartz0", + "top": "botania:blocks/blockdarkquartz1", + "side": "botania:blocks/blockdarkquartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json b/src/main/resources/assets/botania/blockstates/quartzslabelffull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabElfFull.json rename to src/main/resources/assets/botania/blockstates/quartzslabelffull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslabelfhalf.json b/src/main/resources/assets/botania/blockstates/quartzslabelfhalf.json new file mode 100644 index 000000000..5aea59902 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslabelfhalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockelfquartz0", + "top": "botania:blocks/blockelfquartz1", + "side": "botania:blocks/blockelfquartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json b/src/main/resources/assets/botania/blockstates/quartzslablavenderfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabLavenderFull.json rename to src/main/resources/assets/botania/blockstates/quartzslablavenderfull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslablavenderhalf.json b/src/main/resources/assets/botania/blockstates/quartzslablavenderhalf.json new file mode 100644 index 000000000..92fba4241 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslablavenderhalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blocklavenderquartz0", + "top": "botania:blocks/blocklavenderquartz1", + "side": "botania:blocks/blocklavenderquartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json b/src/main/resources/assets/botania/blockstates/quartzslabmanafull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabManaFull.json rename to src/main/resources/assets/botania/blockstates/quartzslabmanafull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslabmanahalf.json b/src/main/resources/assets/botania/blockstates/quartzslabmanahalf.json new file mode 100644 index 000000000..6c8f1037e --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslabmanahalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockmanaquartz0", + "top": "botania:blocks/blockmanaquartz1", + "side": "botania:blocks/blockmanaquartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json b/src/main/resources/assets/botania/blockstates/quartzslabredfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabRedFull.json rename to src/main/resources/assets/botania/blockstates/quartzslabredfull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslabredhalf.json b/src/main/resources/assets/botania/blockstates/quartzslabredhalf.json new file mode 100644 index 000000000..69e8d1ff6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslabredhalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blockredquartz0", + "top": "botania:blocks/blockredquartz1", + "side": "botania:blocks/blockredquartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json b/src/main/resources/assets/botania/blockstates/quartzslabsunnyfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzSlabSunnyFull.json rename to src/main/resources/assets/botania/blockstates/quartzslabsunnyfull.json diff --git a/src/main/resources/assets/botania/blockstates/quartzslabsunnyhalf.json b/src/main/resources/assets/botania/blockstates/quartzslabsunnyhalf.json new file mode 100644 index 000000000..8393ea4aa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzslabsunnyhalf.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/blocksunnyquartz0", + "top": "botania:blocks/blocksunnyquartz1", + "side": "botania:blocks/blocksunnyquartz2" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/quartzstairsblaze.json b/src/main/resources/assets/botania/blockstates/quartzstairsblaze.json new file mode 100644 index 000000000..f7001ccfc --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairsblaze.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockblazequartz0", + "top": "botania:blocks/blockblazequartz1", + "side": "botania:blocks/blockblazequartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzstairsdark.json b/src/main/resources/assets/botania/blockstates/quartzstairsdark.json new file mode 100644 index 000000000..24d6d011f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairsdark.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockdarkquartz0", + "top": "botania:blocks/blockdarkquartz1", + "side": "botania:blocks/blockdarkquartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzstairself.json b/src/main/resources/assets/botania/blockstates/quartzstairself.json new file mode 100644 index 000000000..39adbad94 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairself.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockelfquartz0", + "top": "botania:blocks/blockelfquartz1", + "side": "botania:blocks/blockelfquartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzstairslavender.json b/src/main/resources/assets/botania/blockstates/quartzstairslavender.json new file mode 100644 index 000000000..cc1ba8c1f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairslavender.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blocklavenderquartz0", + "top": "botania:blocks/blocklavenderquartz1", + "side": "botania:blocks/blocklavenderquartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzstairsmana.json b/src/main/resources/assets/botania/blockstates/quartzstairsmana.json new file mode 100644 index 000000000..b1b77c39f --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairsmana.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockmanaquartz0", + "top": "botania:blocks/blockmanaquartz1", + "side": "botania:blocks/blockmanaquartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzstairsred.json b/src/main/resources/assets/botania/blockstates/quartzstairsred.json new file mode 100644 index 000000000..f211e2035 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairsred.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blockredquartz0", + "top": "botania:blocks/blockredquartz1", + "side": "botania:blocks/blockredquartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzstairssunny.json b/src/main/resources/assets/botania/blockstates/quartzstairssunny.json new file mode 100644 index 000000000..14432e552 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/quartzstairssunny.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/blocksunnyquartz0", + "top": "botania:blocks/blocksunnyquartz1", + "side": "botania:blocks/blocksunnyquartz2" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json b/src/main/resources/assets/botania/blockstates/quartztypeblaze.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeBlaze.json rename to src/main/resources/assets/botania/blockstates/quartztypeblaze.json diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeDark.json b/src/main/resources/assets/botania/blockstates/quartztypedark.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeDark.json rename to src/main/resources/assets/botania/blockstates/quartztypedark.json diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeElf.json b/src/main/resources/assets/botania/blockstates/quartztypeelf.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeElf.json rename to src/main/resources/assets/botania/blockstates/quartztypeelf.json diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeLavender.json b/src/main/resources/assets/botania/blockstates/quartztypelavender.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeLavender.json rename to src/main/resources/assets/botania/blockstates/quartztypelavender.json diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeMana.json b/src/main/resources/assets/botania/blockstates/quartztypemana.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeMana.json rename to src/main/resources/assets/botania/blockstates/quartztypemana.json diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeRed.json b/src/main/resources/assets/botania/blockstates/quartztypered.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeRed.json rename to src/main/resources/assets/botania/blockstates/quartztypered.json diff --git a/src/main/resources/assets/botania/blockstates/quartzTypeSunny.json b/src/main/resources/assets/botania/blockstates/quartztypesunny.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/quartzTypeSunny.json rename to src/main/resources/assets/botania/blockstates/quartztypesunny.json diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json deleted file mode 100644 index 6fa8e1649..000000000 --- a/src/main/resources/assets/botania/blockstates/rannuncarpusChibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/rannuncarpusChibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/rannuncarpusChibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json b/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json new file mode 100644 index 000000000..9c8c0e3d2 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/rannuncarpuschibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/rannuncarpuschibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/rannuncarpuschibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/redStringComparator.json b/src/main/resources/assets/botania/blockstates/redstringcomparator.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redStringComparator.json rename to src/main/resources/assets/botania/blockstates/redstringcomparator.json diff --git a/src/main/resources/assets/botania/blockstates/redStringContainer.json b/src/main/resources/assets/botania/blockstates/redstringcontainer.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redStringContainer.json rename to src/main/resources/assets/botania/blockstates/redstringcontainer.json diff --git a/src/main/resources/assets/botania/blockstates/redStringDispenser.json b/src/main/resources/assets/botania/blockstates/redstringdispenser.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redStringDispenser.json rename to src/main/resources/assets/botania/blockstates/redstringdispenser.json diff --git a/src/main/resources/assets/botania/blockstates/redStringFertilizer.json b/src/main/resources/assets/botania/blockstates/redstringfertilizer.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redStringFertilizer.json rename to src/main/resources/assets/botania/blockstates/redstringfertilizer.json diff --git a/src/main/resources/assets/botania/blockstates/redStringInterceptor.json b/src/main/resources/assets/botania/blockstates/redstringinterceptor.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redStringInterceptor.json rename to src/main/resources/assets/botania/blockstates/redstringinterceptor.json diff --git a/src/main/resources/assets/botania/blockstates/redStringRelay.json b/src/main/resources/assets/botania/blockstates/redstringrelay.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/redStringRelay.json rename to src/main/resources/assets/botania/blockstates/redstringrelay.json diff --git a/src/main/resources/assets/botania/blockstates/rfGenerator.json b/src/main/resources/assets/botania/blockstates/rfgenerator.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/rfGenerator.json rename to src/main/resources/assets/botania/blockstates/rfgenerator.json diff --git a/src/main/resources/assets/botania/blockstates/runeAltar.json b/src/main/resources/assets/botania/blockstates/runealtar.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/runeAltar.json rename to src/main/resources/assets/botania/blockstates/runealtar.json diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerrock0slab.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/shimmerrock0Slab.json rename to src/main/resources/assets/botania/blockstates/shimmerrock0slab.json diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerrock0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/shimmerrock0SlabFull.json rename to src/main/resources/assets/botania/blockstates/shimmerrock0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerrock0stairs.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/shimmerrock0Stairs.json rename to src/main/resources/assets/botania/blockstates/shimmerrock0stairs.json diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json deleted file mode 100644 index 5bf7d62bc..000000000 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Slab.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "model": "minecraft:half_slab", - "textures": { - "bottom": "botania:blocks/shimmerwoodPlanks", - "top": "botania:blocks/shimmerwoodPlanks", - "side": "botania:blocks/shimmerwoodPlanks" - }, - "transform": "forge:default-block" - }, - "variants": { - "half=top": [{ - "x": 180, - "uvlock": true - }], - "half=bottom": [{}] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json b/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json deleted file mode 100644 index 5094807bc..000000000 --- a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0Stairs.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "forge_marker": 1, - "defaults": { - "textures": { - "bottom": "botania:blocks/shimmerwoodPlanks", - "top": "botania:blocks/shimmerwoodPlanks", - "side": "botania:blocks/shimmerwoodPlanks" - } - }, - "variants": { - "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, - "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, - "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, - "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, - "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, - "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, - "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, - "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, - "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, - "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, - "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, - "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, - "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, - "inventory": [{ "model": "minecraft:stairs" }] - } -} diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json b/src/main/resources/assets/botania/blockstates/shimmerwoodplanks.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/shimmerwoodPlanks.json rename to src/main/resources/assets/botania/blockstates/shimmerwoodplanks.json diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0slab.json b/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0slab.json new file mode 100644 index 000000000..551f158fa --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0slab.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "minecraft:half_slab", + "textures": { + "bottom": "botania:blocks/shimmerwoodplanks", + "top": "botania:blocks/shimmerwoodplanks", + "side": "botania:blocks/shimmerwoodplanks" + }, + "transform": "forge:default-block" + }, + "variants": { + "half=top": [{ + "x": 180, + "uvlock": true + }], + "half=bottom": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json b/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0slabfull.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/shimmerwoodPlanks0SlabFull.json rename to src/main/resources/assets/botania/blockstates/shimmerwoodplanks0slabfull.json diff --git a/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0stairs.json b/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0stairs.json new file mode 100644 index 000000000..6be7b488b --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/shimmerwoodplanks0stairs.json @@ -0,0 +1,53 @@ +{ + "forge_marker": 1, + "defaults": { + "textures": { + "bottom": "botania:blocks/shimmerwoodplanks", + "top": "botania:blocks/shimmerwoodplanks", + "side": "botania:blocks/shimmerwoodplanks" + } + }, + "variants": { + "facing=east,half=bottom,shape=straight": { "model": "minecraft:stairs" }, + "facing=west,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=straight": { "model": "minecraft:stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs" }, + "facing=west,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=outer_right": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs" }, + "facing=north,half=bottom,shape=outer_left": { "model": "minecraft:outer_stairs", "y": 180, "uvlock": true }, + "facing=east,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs" }, + "facing=west,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=south,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=north,half=bottom,shape=inner_right": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=east,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 270, "uvlock": true }, + "facing=west,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 90, "uvlock": true }, + "facing=south,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs" }, + "facing=north,half=bottom,shape=inner_left": { "model": "minecraft:inner_stairs", "y": 180, "uvlock": true }, + "facing=east,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=straight": { "model": "minecraft:stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=outer_right": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=outer_left": { "model": "minecraft:outer_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=east,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=west,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "facing=south,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=north,half=top,shape=inner_right": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=east,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "uvlock": true }, + "facing=west,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 180, "uvlock": true }, + "facing=south,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 90, "uvlock": true }, + "facing=north,half=top,shape=inner_left": { "model": "minecraft:inner_stairs", "x": 180, "y": 270, "uvlock": true }, + "inventory": [{ "model": "minecraft:stairs" }] + } +} diff --git a/src/main/resources/assets/botania/blockstates/shinyFlower.json b/src/main/resources/assets/botania/blockstates/shinyflower.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/shinyFlower.json rename to src/main/resources/assets/botania/blockstates/shinyflower.json diff --git a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json b/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json deleted file mode 100644 index 1f1ff497d..000000000 --- a/src/main/resources/assets/botania/blockstates/solegnoliaChibi.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "forge_marker": 1, - "variants": { - "normal": [{ - "model": "botania:shapes/cross_tinted", - "textures": { - "cross": "botania:blocks/solegnoliaChibi" - } - }], - "inventory": [{ - "model": "builtin/generated", - "transform": "forge:default-item", - "textures": { - "layer0": "botania:blocks/solegnoliaChibi" - } - }] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solegnoliachibi.json b/src/main/resources/assets/botania/blockstates/solegnoliachibi.json new file mode 100644 index 000000000..4cf2f8c64 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/solegnoliachibi.json @@ -0,0 +1,18 @@ +{ + "forge_marker": 1, + "variants": { + "normal": [{ + "model": "botania:shapes/cross_tinted", + "textures": { + "cross": "botania:blocks/solegnoliachibi" + } + }], + "inventory": [{ + "model": "builtin/generated", + "transform": "forge:default-item", + "textures": { + "layer0": "botania:blocks/solegnoliachibi" + } + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/blockstates/solidVine.json b/src/main/resources/assets/botania/blockstates/solidvine.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/solidVine.json rename to src/main/resources/assets/botania/blockstates/solidvine.json diff --git a/src/main/resources/assets/botania/blockstates/sparkChanger.json b/src/main/resources/assets/botania/blockstates/sparkchanger.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/sparkChanger.json rename to src/main/resources/assets/botania/blockstates/sparkchanger.json diff --git a/src/main/resources/assets/botania/blockstates/spawnerClaw.json b/src/main/resources/assets/botania/blockstates/spawnerclaw.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/spawnerClaw.json rename to src/main/resources/assets/botania/blockstates/spawnerclaw.json diff --git a/src/main/resources/assets/botania/blockstates/specialFlower.json b/src/main/resources/assets/botania/blockstates/specialflower.json similarity index 72% rename from src/main/resources/assets/botania/blockstates/specialFlower.json rename to src/main/resources/assets/botania/blockstates/specialflower.json index f50d3aac7..0712053f5 100644 --- a/src/main/resources/assets/botania/blockstates/specialFlower.json +++ b/src/main/resources/assets/botania/blockstates/specialflower.json @@ -6,10 +6,10 @@ }, "variants": { "normal": [{ - "custom": { "base": "botania:specialFlower#basemodel" } + "custom": { "base": "botania:specialflower#basemodel" } }], "inventory": [{ - "custom": { "base": "botania:specialFlower#basemodel" } + "custom": { "base": "botania:specialflower#basemodel" } }], "basemodel": [{ "model": "minecraft:cross", diff --git a/src/main/resources/assets/botania/blockstates/terraPlate.json b/src/main/resources/assets/botania/blockstates/terraplate.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/terraPlate.json rename to src/main/resources/assets/botania/blockstates/terraplate.json diff --git a/src/main/resources/assets/botania/blockstates/teruTeruBozu.json b/src/main/resources/assets/botania/blockstates/teruterubozu.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/teruTeruBozu.json rename to src/main/resources/assets/botania/blockstates/teruterubozu.json diff --git a/src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json b/src/main/resources/assets/botania/blockstates/tinyplanetblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/tinyPlanetBlock.json rename to src/main/resources/assets/botania/blockstates/tinyplanetblock.json diff --git a/src/main/resources/assets/botania/blockstates/tinyPotato.json b/src/main/resources/assets/botania/blockstates/tinypotato.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/tinyPotato.json rename to src/main/resources/assets/botania/blockstates/tinypotato.json diff --git a/src/main/resources/assets/botania/blockstates/unstableBlock.json b/src/main/resources/assets/botania/blockstates/unstableblock.json similarity index 100% rename from src/main/resources/assets/botania/blockstates/unstableBlock.json rename to src/main/resources/assets/botania/blockstates/unstableblock.json diff --git a/src/main/resources/assets/botania/blockstates/waterBowl.json b/src/main/resources/assets/botania/blockstates/waterbowl.json similarity index 64% rename from src/main/resources/assets/botania/blockstates/waterBowl.json rename to src/main/resources/assets/botania/blockstates/waterbowl.json index 40e2821d0..6a3ac8096 100644 --- a/src/main/resources/assets/botania/blockstates/waterBowl.json +++ b/src/main/resources/assets/botania/blockstates/waterbowl.json @@ -7,9 +7,9 @@ "flipGas": false }, "textures": { - "base": "botania:items/waterBowl_base", - "fluid": "botania:items/waterBowl_fluid", - "cover": "botania:items/waterBowl_cover" + "base": "botania:items/waterbowl_base", + "fluid": "botania:items/waterbowl_fluid", + "cover": "botania:items/waterbowl_cover" }, "transform": "forge:default-item" }, diff --git a/src/main/resources/assets/botania/lang/de_DE.lang b/src/main/resources/assets/botania/lang/de_de.lang similarity index 99% rename from src/main/resources/assets/botania/lang/de_DE.lang rename to src/main/resources/assets/botania/lang/de_de.lang index 5a6222540..dadd97b24 100644 --- a/src/main/resources/assets/botania/lang/de_DE.lang +++ b/src/main/resources/assets/botania/lang/de_de.lang @@ -8,7 +8,7 @@ # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania botaniamisc.nextPage=Nächste Seite botaniamisc.prevPage=Vorherige Seite botaniamisc.back=Zurück @@ -32,7 +32,6 @@ botaniamisc.filter1=Nur Items außerhalb von Rahmen aufsammeln botaniamisc.filter2=Alle Items aufsammeln botaniamisc.creativePool0=Kreatives Manabecken, hat unendlich Mana botaniamisc.creativePool1=Eines Egoisten würdig -botaniamisc.savedByLaurel=Dein goldener Lorbeerkranz zersplitterte, als er dich vor dem Tod rettete. botaniamisc.toolRank=%s&7-Rang # COLORS @@ -385,7 +384,6 @@ item.botania:knockbackBelt.name=Tektonikgürtel item.botania:icePendant.name=Schneeflockanhänger item.botania:lavaPendant.name=Pyroklastanhänger item.botania:lifeEssence.name=Essenz des Ewigen Lebens -item.botania:goldenLaurel.name=Goldener Lorbeerkranz item.botania:redstoneRoot.name=Redstone-Wurzel item.botania:magnetRing.name=Ring des Magnetismus item.botania:waterRing.name=Ring der Ozeane @@ -726,9 +724,6 @@ botania.entry.icePendant=Schneeflockanhänger # -- PYROCLAST PENDANT botania.entry.lavaPendant=Pyroklastanhänger -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Goldener Lorbeerkranz - # -- RING OF CHORDATA botania.entry.waterRing=Ring der Ozeane botania.page.waterRing1=Butter bei die Fische diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_us.lang similarity index 99% rename from src/main/resources/assets/botania/lang/en_US.lang rename to src/main/resources/assets/botania/lang/en_us.lang index fc9920098..bd114ad13 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_us.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania generator.botania-skyblock=Garden of Glass generator.botania-skyblock.info=Not recommended for botania newcomers @@ -38,7 +38,6 @@ 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 # ^ Leave this empty for no edition display @@ -446,25 +445,25 @@ item.dice.poem3=The numbers lead a dance. death.attack.botania-relic=%s was punished for using a relic that isn't theirs # ENTITY NAMES -entity.Botania.botania:manaBurst.name=Mana Burst -entity.Botania.botania:signalFlare.name=Signal Flare -entity.Botania.botania:pixie.name=Pixie -entity.Botania.botania:flameRing.name=Flame Ring -entity.Botania.botania:vineBall.name=Vine Ball -entity.Botania.botania:doppleganger.name=Guardian of Gaia -entity.Botania.botania:magicLandmine.name=Gaia Trap -entity.Botania.botania:spark.name=Spark -entity.Botania.botania:thrownItem.name=Thrown Item -entity.Botania.botania:magicMissile.name=Magic Missile -entity.Botania.botania:thornChakram.name=Thorn Chakram -entity.Botania.botania:corporeaSpark.name=Corporea Spark -entity.Botania.botania:enderAirBottle.name=Bottle of Ender Air -entity.Botania.botania:poolMinecart.name=Mana Pool Minecart -entity.Botania.botania:pinkWither.name=Pink Wither -entity.Botania.botania:playerMover.name=Luminizer Beam -entity.Botania.botania:manaStorm.name=Manastorm Epicenter -entity.Botania.botania:babylonWeapon.name=Treasury Weapon -entity.Botania.botania:fallingStar.name=Falling Star +entity.botania:manaBurst.name=Mana Burst +entity.botania:signalFlare.name=Signal Flare +entity.botania:pixie.name=Pixie +entity.botania:flameRing.name=Flame Ring +entity.botania:vineBall.name=Vine Ball +entity.botania:doppleganger.name=Guardian of Gaia +entity.botania:magicLandmine.name=Gaia Trap +entity.botania:spark.name=Spark +entity.botania:thrownItem.name=Thrown Item +entity.botania:magicMissile.name=Magic Missile +entity.botania:thornChakram.name=Thorn Chakram +entity.botania:corporeaSpark.name=Corporea Spark +entity.botania:enderAirBottle.name=Bottle of Ender Air +entity.botania:poolMinecart.name=Mana Pool Minecart +entity.botania:pinkWither.name=Pink Wither +entity.botania:playerMover.name=Luminizer Beam +entity.botania:manaStorm.name=Manastorm Epicenter +entity.botania:babylonWeapon.name=Treasury Weapon +entity.botania:fallingStar.name=Falling Star # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=Sky of Beginning @@ -1416,7 +1415,6 @@ item.botania:knockbackBelt.name=Tectonic Girdle item.botania:icePendant.name=Snowflake Pendant item.botania:lavaPendant.name=Pyroclast Pendant item.botania:lifeEssence.name=Gaia Spirit -item.botania:goldenLaurel.name=Golden Laurel Crown item.botania:redstoneRoot.name=Redstone Root item.botania:magnetRing.name=Ring of Magnetization item.botania:waterRing.name=Ring of Chordata @@ -2136,8 +2134,8 @@ botania.page.manaVoid1=Even Chad from accounting? # -- MANA FLUXFIELD botania.entry.rfGenerator=Mana Fluxfield -botania.tagline.rfGenerator=Converts Mana into Redstone Flux -botania.page.rfGenerator0=By passing &4Mana&0 through a field of redstone energy, its state can change from a natural energy source to &4Redstone Flux&0.
Simply pointing a spreader at this block will have it shoot at it, converting the &4Mana&0 that lands on it into &4RF&0. It can then be pulled out with any &4RF&0 transporter. +botania.tagline.rfGenerator=Converts Mana into Energy +botania.page.rfGenerator0=By passing &4Mana&0 through a field of redstone energy, its state can change from a natural energy source to &4Forge Energy&0.
Simply pointing a spreader at this block will have it shoot at it, converting the &4Mana&0 that lands on it into &4FE&0, and sending it to any nearby &4FE&0 transporters. botania.page.rfGenerator1=Challenging the fabric of magic mod reality # -- MANA LENSES @@ -2781,7 +2779,7 @@ botania.page.canopyDrum1=The Pinking Drum botania.entry.cocoon=Cocoon of Caprice botania.tagline.cocoon=Hatch your own animals botania.page.cocoon0=A cocoon is usually a symbol of change, of evolution.
Creating a &1Cocoon of Caprice&0 and placing it down will slowly evolve the rudimentary contents inside it into a &1Baby Animal&0. More often than not the animal hatched will be a farm animal, but on rare ocasions, different animals such as &1Wolves&0 or &1Horses&0 may be created. -botania.page.cocoon1=Speculation says that giving the cocoon &1Emeralds&0 influences the outcome towards something a bit different.
What could come out of such experiment is anyone's guess, really. +botania.page.cocoon1=Speculation says that giving the cocoon &1Emeralds&0 or &1Chorus Fruit&0 influences the outcome towards something a bit different.
What could come out of such experiment is anyone's guess, really. botania.page.cocoon2=New World, Perfect World # -- MANASTORM CHARGE @@ -3428,12 +3426,6 @@ botania.tagline.lavaPendant=Fire resistance, somewhat botania.page.lavaPendant0=The &1Pyroclast Pendant&0 is a &4Bauble&0 that absorbs low heat, while it's worn, if the wearer is caught on fire and is not directly standing on &1Fire&0, &1Lava&0 or anything else that can induce burning, they'll be extinguished. botania.page.lavaPendant1=Hanako could have used one of these -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Golden Laurel Crown -botania.tagline.goldenLaurel=Immunity to death, once -botania.page.goldenLaurel0=One of the uses for &1Gaia Spririts&0 is to, grant a layer of immortality to one that uses them, while wearing a &1Golden Laurel Crown&0, if the wearer were to die, the crown will shatter, regenerating all of their health and giving them a short period of invincibility. -botania.page.goldenLaurel1=People don't die if they are killed - # -- RING OF CHORDATA botania.entry.waterRing=Ring of Chordata botania.tagline.waterRing=Move super fast underwater @@ -3873,7 +3865,6 @@ botania.subtitle.enchanterEnchant=Mana Enchanter finishes botania.subtitle.endoflame=Endoflame ignites item botania.subtitle.equipBauble=Bauble is equipped botania.subtitle.gaiaTrap=Gaia Guardian's spell swooshes -botania.subtitle.goldenLaurel=Golden Laurel restores your life botania.subtitle.holyCloak=Cloak of Virtue activates botania.subtitle.laputaStart=Laputa Shard triggers botania.subtitle.lexiconOpen=Lexica Botania opens diff --git a/src/main/resources/assets/botania/lang/es_AR.lang b/src/main/resources/assets/botania/lang/es_ar.lang similarity index 99% rename from src/main/resources/assets/botania/lang/es_AR.lang rename to src/main/resources/assets/botania/lang/es_ar.lang index bab3bc81f..d2c235181 100644 --- a/src/main/resources/assets/botania/lang/es_AR.lang +++ b/src/main/resources/assets/botania/lang/es_ar.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania botaniamisc.nextPage=Página Siguiente botaniamisc.prevPage=Página Anterior botaniamisc.back=Atrás @@ -31,7 +31,6 @@ botaniamisc.filter1=Recoge solamente los objetos que no están en los marcos. botaniamisc.filter2=Recoge todos los objetos. botaniamisc.creativePool0=Pileta de Maná de Creativo. Tiene Maná infinito. botaniamisc.creativePool1=Propio de un Egoista -botaniamisc.savedByLaurel=Tu Corona Dorada de Laurel se destruye y te salva de la muerte. botaniamisc.toolRank=%s&7 Rank botaniamisc.edition=%s Edition # ^ Leave this empty for no edition display diff --git a/src/main/resources/assets/botania/lang/es_ES.lang b/src/main/resources/assets/botania/lang/es_es.lang similarity index 99% rename from src/main/resources/assets/botania/lang/es_ES.lang rename to src/main/resources/assets/botania/lang/es_es.lang index e3991ee05..a713a0e99 100644 --- a/src/main/resources/assets/botania/lang/es_ES.lang +++ b/src/main/resources/assets/botania/lang/es_es.lang @@ -8,7 +8,7 @@ # Traducción por mojares / Translated by mojares # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania generator.botania-skyblock=Jardín de cristal generator.botania-skyblock.info=No recomendado para neófitos en Botania @@ -35,8 +35,7 @@ botaniamisc.filter1=Recoge solamente los objetos que no están en los marcos. botaniamisc.filter2=Recoge todos los objetos. botaniamisc.creativePool0=Pila de maná de creativo. Tiene maná infinito. botaniamisc.creativePool1=Digno de un egoísta -botaniamisc.savedByLaurel=Tu corona de laurel dorado se destruye y te salva de la muerte. -botaniamisc.toolRank=Rango %s&7 +botaniamisc.toolRank=Rango %s&7 botaniamisc.edition=Edición %sª # ^ Leave this empty for no edition display botaniamisc.devEdition=Del escritor @@ -340,25 +339,25 @@ item.dice.poem3=los números no dejan de danzar. death.attack.botania-relic=%s ha sido castigado por usar una reliquia que no es suya # ENTITY NAMES -entity.Botania.botania:manaBurst.name=Pulso de maná -entity.Botania.botania:signalFlare.name=Bengala de señales -entity.Botania.botania:pixie.name=Hada -entity.Botania.botania:flameRing.name=Anillo de llama -entity.Botania.botania:vineBall.name=Bola de enredadera -entity.Botania.botania:doppleganger.name=Guardián de Gaia -entity.Botania.botania:magicLandmine.name=Trampa de Gaia -entity.Botania.botania:spark.name=Chispa -entity.Botania.botania:thrownItem.name=Objeto lanzado -entity.Botania.botania:magicMissile.name=Misil mágico -entity.Botania.botania:thornChakram.name=Chakram de púas -entity.Botania.botania:corporeaSpark.name=Chispa de corporea -entity.Botania.botania:enderAirBottle.name=Botella de aire del Fin -entity.Botania.botania:poolMinecart.name=Vagoneta de pila de maná -entity.Botania.botania:pinkWither.name=Wither rosa -entity.Botania.botania:playerMover.name=Rayo de luminizador -entity.Botania.botania:manaStorm.name=Epicentro de tormenta de maná -entity.Botania.botania:babylonWeapon.name=Arma del tesoro -entity.Botania.botania:fallingStar.name=Estrella caída +entity.botania:manaBurst.name=Pulso de maná +entity.botania:signalFlare.name=Bengala de señales +entity.botania:pixie.name=Hada +entity.botania:flameRing.name=Anillo de llama +entity.botania:vineBall.name=Bola de enredadera +entity.botania:doppleganger.name=Guardián de Gaia +entity.botania:magicLandmine.name=Trampa de Gaia +entity.botania:spark.name=Chispa +entity.botania:thrownItem.name=Objeto lanzado +entity.botania:magicMissile.name=Misil mágico +entity.botania:thornChakram.name=Chakram de púas +entity.botania:corporeaSpark.name=Chispa de corporea +entity.botania:enderAirBottle.name=Botella de aire del Fin +entity.botania:poolMinecart.name=Vagoneta de pila de maná +entity.botania:pinkWither.name=Wither rosa +entity.botania:playerMover.name=Rayo de luminizador +entity.botania:manaStorm.name=Epicentro de tormenta de maná +entity.botania:babylonWeapon.name=Arma del tesoro +entity.botania:fallingStar.name=Estrella caída # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=El cielo del inicio @@ -1173,7 +1172,6 @@ item.botania:knockbackBelt.name=Faja tectónica item.botania:icePendant.name=Colgante de copo de nieve item.botania:lavaPendant.name=Colgante piroclástico item.botania:lifeEssence.name=Espíritu de Gaia -item.botania:goldenLaurel.name=Corona de laurel dorado item.botania:redstoneRoot.name=Raiz de redstone item.botania:magnetRing.name=Anillo de magnetización item.botania:waterRing.name=Anillo de cordado @@ -2613,11 +2611,6 @@ botania.entry.lavaPendant=Colgante piroclástico botania.page.lavaPendant0=El &1colgante piroclástico&0 es un &4ornamento&0 que absorbe algo el calor mientras se lleva puesto. Si el portador se prende en llamas y no está sobre un &1fuego&0, &1lava&0 o cualquier cosa incendiaria, las llamas serán apagadas. botania.page.lavaPendant1=Hanako podría haber usado uno -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Corona de laurel dorado -botania.page.goldenLaurel0=Uno de los usos de los &1espíritus de Gaia&0 es conceder una capa de inmortalidad a aquel que los usa, al portar una &1corona de laurel dorado&0. Si el portador fuese a morir, la corona se romperá, regenerando toda la salud y otorgando un breve periodo de invencibilidad. -botania.page.goldenLaurel1=Un tema dado, probablemente Viridi - # -- RING OF CHORDATA botania.entry.waterRing=Anillo de cordado botania.page.waterRing0=El &1anillo de cordado&0 permite al portador nadar como un pez. Cuando está equipado, el portador es investido con la habilidad de acelerar a una velocidad decente bajo el agua. También concede al portador buena visión debajo del agua, y si hay &4maná&0, gastando un poco, concede la habilidad de respirar indefinidamente. diff --git a/src/main/resources/assets/botania/lang/fr_FR.lang b/src/main/resources/assets/botania/lang/fr_fr.lang similarity index 98% rename from src/main/resources/assets/botania/lang/fr_FR.lang rename to src/main/resources/assets/botania/lang/fr_fr.lang index 5062906d1..77c6a3759 100644 --- a/src/main/resources/assets/botania/lang/fr_FR.lang +++ b/src/main/resources/assets/botania/lang/fr_fr.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania generator.botania-skyblock=Jardin de verre generator.botania-skyblock.info=Non recommandé pour les débutants de botania @@ -34,7 +34,6 @@ botaniamisc.filter1=Ramassage seulement des éléments hors cadres botaniamisc.filter2=Ramassage de tous les éléments botaniamisc.creativePool0=Bassin de mana créatif, possède 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 @@ -332,20 +331,20 @@ botania.baubletooltip=Appuyez &b%s&7 pour ouvrir le menu Baubles 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 -entity.Botania.botania:signalFlare.name=Feux de détresse -entity.Botania.botania:pixie.name=Lutin -entity.Botania.botania:flameRing.name=Anneau de flamme -entity.Botania.botania:vineBall.name=Boule de vigne -entity.Botania.botania:doppleganger.name=Gardien de Gaïa -entity.Botania.botania:magicLandmine.name=Piège de Gaïa -entity.Botania.botania:spark.name=Étincelle -entity.Botania.botania:thrownItem.name=Élément jeté -entity.Botania.botania:magicMissile.name=Missile magique -entity.Botania.botania:thornChakram.name=Chakram d'épines -entity.Botania.botania:corporeaSpark.name=Étincelle de Corporea -entity.Botania.botania:enderAirBottle.name=Bouteille d'air du néant -entity.Botania.botania:poolMinecart.name=Wagonnet à bassin de mana +entity.botania:manaBurst.name=Explosion de mana +entity.botania:signalFlare.name=Feux de détresse +entity.botania:pixie.name=Lutin +entity.botania:flameRing.name=Anneau de flamme +entity.botania:vineBall.name=Boule de vigne +entity.botania:doppleganger.name=Gardien de Gaïa +entity.botania:magicLandmine.name=Piège de Gaïa +entity.botania:spark.name=Étincelle +entity.botania:thrownItem.name=Élément jeté +entity.botania:magicMissile.name=Missile magique +entity.botania:thornChakram.name=Chakram d'épines +entity.botania:corporeaSpark.name=Étincelle de Corporea +entity.botania:enderAirBottle.name=Bouteille d'air du néant +entity.botania:poolMinecart.name=Wagonnet à bassin de mana # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=Ciel du Commencement @@ -1033,7 +1032,6 @@ item.botania:knockbackBelt.name=Ceinture tectonique item.botania:icePendant.name=Pendentif du flocon de neige item.botania:lavaPendant.name=Pendentif du pyroclaste item.botania:lifeEssence.name=Esprit de Gaïa -item.botania:goldenLaurel.name=Couronne de laurier dorée item.botania:redstoneRoot.name=Racine de Redstone item.botania:magnetRing.name=Anneau de magnétisation item.botania:waterRing.name=Anneau des chordés diff --git a/src/main/resources/assets/botania/lang/ja_JP.lang b/src/main/resources/assets/botania/lang/ja_jp.lang similarity index 99% rename from src/main/resources/assets/botania/lang/ja_JP.lang rename to src/main/resources/assets/botania/lang/ja_jp.lang index afe831641..e0064db77 100644 --- a/src/main/resources/assets/botania/lang/ja_JP.lang +++ b/src/main/resources/assets/botania/lang/ja_jp.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=ボタニア +itemGroup.botania=ボタニア generator.botania-skyblock=ガーデンオブグラス generator.botania-skyblock.info=初心者には非推奨 @@ -33,8 +33,7 @@ botaniamisc.filter1=フレーム内のアイテム以外を拾う botaniamisc.filter2=すべてのアイテムを拾う botaniamisc.creativePool0=クリエイティブ用マナプール.無限にマナを保持する botaniamisc.creativePool1=エゴイスト向け -botaniamisc.savedByLaurel=金の月桂冠は砕けてしまった。あなたの身代わりとなって… -botaniamisc.toolRank=ランク %s&7 +botaniamisc.toolRank=ランク %s&7 botaniamisc.edition=%s 版 # ^ Leave this empty for no edition display botaniamisc.lexiconcover0=公式ガイドブック @@ -250,20 +249,20 @@ botania.baubletooltip=&b%s&7 キーを押して Baubles メニューを開く death.attack.botania-relic=%s は他人の形見を使ったために処罰された。 # ENTITY NAMES -entity.Botania.botania:manaBurst.name=マナ放射線 -entity.Botania.botania:pixie.name=ピクシィ -entity.Botania.botania:vineBall.name=ツタ玉 -entity.Botania.botania:doppleganger.name=ガイアの守護者 -entity.Botania.botania:spark.name=スパーク -entity.Botania.botania:thrownItem.name=投げ込まれたアイテム -entity.Botania.botania:thornChakram.name=棘のチャクラム -entity.Botania.botania:corporeaSpark.name=コーポリアスパーク -entity.Botania.botania:enderAirBottle.name=エンダー空気瓶 -entity.Botania.botania:poolMinecart.name=マナプールマインカート -entity.Botania.botania:pinkWither.name=桃色ウィザー -entity.Botania.botania:playerMover.name=ルミナイザ光線 -entity.Botania.botania:babylonWeapon.name=宝物庫の武器 -entity.Botania.botania:fallingStar.name=流星 +entity.botania:manaBurst.name=マナ放射線 +entity.botania:pixie.name=ピクシィ +entity.botania:vineBall.name=ツタ玉 +entity.botania:doppleganger.name=ガイアの守護者 +entity.botania:spark.name=スパーク +entity.botania:thrownItem.name=投げ込まれたアイテム +entity.botania:thornChakram.name=棘のチャクラム +entity.botania:corporeaSpark.name=コーポリアスパーク +entity.botania:enderAirBottle.name=エンダー空気瓶 +entity.botania:poolMinecart.name=マナプールマインカート +entity.botania:pinkWither.name=桃色ウィザー +entity.botania:playerMover.name=ルミナイザ光線 +entity.botania:babylonWeapon.name=宝物庫の武器 +entity.botania:fallingStar.name=流星 # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup.desc=神秘的な花を拾う @@ -1198,7 +1197,6 @@ item.botania:knockbackBelt.name=地殻のガードル item.botania:icePendant.name=雪片のペンダント item.botania:lavaPendant.name=火砕物のペンダント item.botania:lifeEssence.name=ガイアの魂 -item.botania:goldenLaurel.name=黄金の月桂冠 item.botania:redstoneRoot.name=レッドストーンの根 item.botania:magnetRing.name=磁力の指輪 item.botania:waterRing.name=脊索動物の指輪 diff --git a/src/main/resources/assets/botania/lang/ko_KR.lang b/src/main/resources/assets/botania/lang/ko_kr.lang similarity index 98% rename from src/main/resources/assets/botania/lang/ko_KR.lang rename to src/main/resources/assets/botania/lang/ko_kr.lang index b668775d6..416107ea7 100644 --- a/src/main/resources/assets/botania/lang/ko_KR.lang +++ b/src/main/resources/assets/botania/lang/ko_kr.lang @@ -8,7 +8,7 @@ #번역시 주의 점: 현재 꽃이름을 제외한 음역은 대부분 패러디로 무리한 한글화를 진행하지 말아주세요(Ex.Tiny Potato) 한글정발을 제외한 모든 패러디는 발음대로 적어주시길 바랍니다. # MISC -itemGroup.Botania=보타니아 [Botania] +itemGroup.botania=보타니아 [Botania] generator.botania-skyblock=잔디의 정원 generator.botania-skyblock.info=보타니아를 처음하는 분에게는 권장하지 않습니다. @@ -35,7 +35,6 @@ botaniamisc.filter1=프레임에 없는 아이템만 가져옵니다 botaniamisc.filter2=아무 아이템이나 가져옵니다 botaniamisc.creativePool0=크리에이티브 모드를 위한 마나 풀로써, 용량이 무한대입니다. botaniamisc.creativePool1=이기주의자에게 잘 어울립니다. -botaniamisc.savedByLaurel=골든 로렐 크라운은 죽음의 위기로부터 당신을 지키면서 동시에 소멸합니다. botaniamisc.toolRank=%s&7 랭크 botaniamisc.edition=%s 제본판 # ^ Leave this empty for no edition display @@ -345,25 +344,25 @@ item.dice.poem3=숫자들은 춤을 추는 군요. death.attack.botania-relic=%s은(는) 타인 소유의 유물에 욕심을 내 천벌이 내려졌습니다. # ENTITY NAMES -entity.보타니아.botania:manaBurst.name=마나 버스터 -entity.보타니아.botania:signalFlare.name=신호탄 -entity.보타니아.botania:pixie.name=픽시 -entity.보타니아.botania:flameRing.name=화염의 고리 -entity.보타니아.botania:vineBall.name=덩굴 공 -entity.보타니아.botania:doppleganger.name=대지의 수호자 -entity.보타니아.botania:magicLandmine.name=대지의 함정 -entity.보타니아.botania:spark.name=스파크 -entity.보타니아.botania:thrownItem.name=던져지는 아이템 -entity.보타니아.botania:magicMissile.name=매직미사일 -entity.보타니아.botania:thornChakram.name=던져지는 챠크람 -entity.보타니아.botania:corporeaSpark.name=Corporea 스파크 -entity.보타니아.botania:enderAirBottle.name=엔더 공기가 담겨 있는 병 -entity.보타니아.botania:poolMinecart.name=마나 웅덩이 마인카트 -entity.보타니아.botania:pinkWither.name=핑크 위더 -entity.보타니아.botania:playerMover.name=루미나이저 빔 -entity.보타니아.botania:manaStorm.name=마나폭탄 진원지 -entity.보타니아.botania:babylonWeapon.name=보구 -entity.보타니아.botania:fallingStar.name=유성 +entity.botania:manaBurst.name=마나 버스터 +entity.botania:signalFlare.name=신호탄 +entity.botania:pixie.name=픽시 +entity.botania:flameRing.name=화염의 고리 +entity.botania:vineBall.name=덩굴 공 +entity.botania:doppleganger.name=대지의 수호자 +entity.botania:magicLandmine.name=대지의 함정 +entity.botania:spark.name=스파크 +entity.botania:thrownItem.name=던져지는 아이템 +entity.botania:magicMissile.name=매직미사일 +entity.botania:thornChakram.name=던져지는 챠크람 +entity.botania:corporeaSpark.name=Corporea 스파크 +entity.botania:enderAirBottle.name=엔더 공기가 담겨 있는 병 +entity.botania:poolMinecart.name=마나 웅덩이 마인카트 +entity.botania:pinkWither.name=핑크 위더 +entity.botania:playerMover.name=루미나이저 빔 +entity.botania:manaStorm.name=마나폭탄 진원지 +entity.botania:babylonWeapon.name=보구 +entity.botania:fallingStar.name=유성 # ACHIEVEMENT NAMES DESC / 업적의 제목들은 모두 보컬로이드(VOCALOID) 노래 제목입니다. 제목은 더 이상 만지지 말아주세요. achievement.botania:flowerPickup.desc=신비로운 꽃을 월드에서 얻어보세요! @@ -1134,7 +1133,6 @@ item.botania:knockbackBelt.name=구조상 벨트 item.botania:icePendant.name=눈송이 펜던트 item.botania:lavaPendant.name=파이로클래스 펜던트 item.botania:lifeEssence.name=영원한 생명의 정수 -item.botania:goldenLaurel.name=골든 로렐 크라운 item.botania:redstoneRoot.name=레드스톤 뿌리 item.botania:magnetRing.name=자기력의 반지 item.botania:waterRing.name=난폭의 반지 diff --git a/src/main/resources/assets/botania/lang/nl_NL.lang b/src/main/resources/assets/botania/lang/nl_nl.lang similarity index 99% rename from src/main/resources/assets/botania/lang/nl_NL.lang rename to src/main/resources/assets/botania/lang/nl_nl.lang index 4b526c527..b7817b9ff 100644 --- a/src/main/resources/assets/botania/lang/nl_NL.lang +++ b/src/main/resources/assets/botania/lang/nl_nl.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania generator.botania-skyblock=Glazen Tuin generator.botania-skyblock.info=Niet aanbevolen voor Botania beginners @@ -34,7 +34,6 @@ botaniamisc.filter1=Alleen items buiten kader verzamelen botaniamisc.filter2=Alle items verzamelen botaniamisc.creativePool0=Creatieve Mana voorraad, heeft oneindig Mana botaniamisc.creativePool1=Waardig voor een egoïst -botaniamisc.savedByLaurel=Uw gouden lauwerkrans verbrijzeld wanneer hij je redt van de dood. botaniamisc.toolRank=%s&7 Rang botaniamisc.edition=%s Editie @@ -308,25 +307,25 @@ item.dice.poem3=De nummers leiden de dans death.attack.botania-relic=%s werd gestraft voor gebruik van een reliek van een ander # ENTITY NAMES -entity.Botania.botania:manaBurst.name=Mana Burst -entity.Botania.botania:signalFlare.name=Signaalpistool -entity.Botania.botania:pixie.name=Elfje -entity.Botania.botania:flameRing.name=Vuur Ring -entity.Botania.botania:vineBall.name=Lianenbol -entity.Botania.botania:doppleganger.name=Beschermer van Gaia -entity.Botania.botania:magicLandmine.name=Gaia val -entity.Botania.botania:spark.name=Vonk -entity.Botania.botania:thrownItem.name=Gegooid object -entity.Botania.botania:magicMissile.name=Magische Raket -entity.Botania.botania:thornChakram.name=Doorn van Chakram -entity.Botania.botania:corporeaSpark.name=Corporea Vonk -entity.Botania.botania:enderAirBottle.name=Flesje Ender Lucht -entity.Botania.botania:poolMinecart.name=Mana Voorraad Mijnkar -entity.Botania.botania:pinkWither.name=Roze Wither -entity.Botania.botania:playerMover.name=Verlichter Straal -entity.Botania.botania:manaStorm.name=Manastorm Epicenter -entity.Botania.botania:babylonWeapon.name=Mythisch Wapen -entity.Botania.botania:fallingStar.name=Vallende Ster +entity.botania:manaBurst.name=Mana Burst +entity.botania:signalFlare.name=Signaalpistool +entity.botania:pixie.name=Elfje +entity.botania:flameRing.name=Vuur Ring +entity.botania:vineBall.name=Lianenbol +entity.botania:doppleganger.name=Beschermer van Gaia +entity.botania:magicLandmine.name=Gaia val +entity.botania:spark.name=Vonk +entity.botania:thrownItem.name=Gegooid object +entity.botania:magicMissile.name=Magische Raket +entity.botania:thornChakram.name=Doorn van Chakram +entity.botania:corporeaSpark.name=Corporea Vonk +entity.botania:enderAirBottle.name=Flesje Ender Lucht +entity.botania:poolMinecart.name=Mana Voorraad Mijnkar +entity.botania:pinkWither.name=Roze Wither +entity.botania:playerMover.name=Verlichter Straal +entity.botania:manaStorm.name=Manastorm Epicenter +entity.botania:babylonWeapon.name=Mythisch Wapen +entity.botania:fallingStar.name=Vallende Ster # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=Hemel van het Begin @@ -1266,7 +1265,6 @@ item.botania:knockbackBelt.name=Tektonische Gordel item.botania:icePendant.name=Sneeuwvlok Hanger item.botania:lavaPendant.name=Pyroclastische Hanger item.botania:lifeEssence.name=Geest van Gaia -item.botania:goldenLaurel.name=Gouden Laurierkroon item.botania:redstoneRoot.name=Redstone Wortel item.botania:magnetRing.name=Ring der Magnetisatie item.botania:waterRing.name=Ring der Oceanen @@ -3239,12 +3237,6 @@ botania.tagline.lavaPendant=Beperkte vuurbestendigheid botania.page.lavaPendant0=De &1Pyroclastische Hanger&0 is een &4Bauble&0 die warmte kan opnemen. Wanneer gedragen, als de drager vlam vat en niet staat op &1Vuur&0, &1Lava&0 of een andere brandstichter, zal hij geblust worden. botania.page.lavaPendant1=Hanako kon er wel eentje gebruiken -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Gouden Laurierkroon -botania.tagline.goldenLaurel=Ontsnap eenmalig aan de dood -botania.page.goldenLaurel0=Een toepassing van de &1Geest van Gaia&0 is het toevoegen van een laag onsterfelijkheid aan de drager. Door het dragen van een &1Gouden Laurierkroon&0, als de drager dood zou gaan, zal de kroon uiteenspatten, waarbij het leven hersteld wordt en de drager korte tijd onsterfelijk wordt. -botania.page.goldenLaurel1=Gouden Laurierkroon - # -- RING OF CHORDATA botania.entry.waterRing=Ring der Oceanen botania.tagline.waterRing=Zwem supersnel onderwater diff --git a/src/main/resources/assets/botania/lang/pt_BR.lang b/src/main/resources/assets/botania/lang/pt_br.lang similarity index 99% rename from src/main/resources/assets/botania/lang/pt_BR.lang rename to src/main/resources/assets/botania/lang/pt_br.lang index 651239af0..7a4cc0b73 100644 --- a/src/main/resources/assets/botania/lang/pt_BR.lang +++ b/src/main/resources/assets/botania/lang/pt_br.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania generator.botania-skyblock=Jardim de Vidro generator.botania-skyblock.info=Não recomendado para iniciantes # @@ -38,7 +38,6 @@ botaniamisc.filter1=Não coletar itens da moldura botaniamisc.filter2=Coletar tudo botaniamisc.creativePool0=Poço de Mana Criativo, possui Mana infinita botaniamisc.creativePool1=Perfeito para egoístas -botaniamisc.savedByLaurel=Sua Coroa Dourada de Laurel estilhaçou, enquanto te salvava da morte. botaniamisc.toolRank=Rank %s&7 botaniamisc.edition=%sª Edição # ^ Leave this empty for no edition display @@ -446,25 +445,25 @@ item.dice.poem3=Os números regem uma dança. death.attack.botania-relic=%s foi punido por usar uma relíquia que não lhe pertencia # ENTITY NAMES -entity.Botania.botania:manaBurst.name=Pulso de Mana -entity.Botania.botania:signalFlare.name=Fagulhas Sinalizadoras -entity.Botania.botania:pixie.name=Fada -entity.Botania.botania:flameRing.name=Anel de Chamas -entity.Botania.botania:vineBall.name=Bola de Vinhas -entity.Botania.botania:doppleganger.name=Guardião de Gaia -entity.Botania.botania:magicLandmine.name=Armadilha de Gaia -entity.Botania.botania:spark.name=Fagulha -entity.Botania.botania:thrownItem.name=Item arremessado -entity.Botania.botania:magicMissile.name=Míssel Mágico -entity.Botania.botania:thornChakram.name=Chakram Espinhento -entity.Botania.botania:corporeaSpark.name=Fagulha Corporea -entity.Botania.botania:enderAirBottle.name=Garrafa de ar do Fim -entity.Botania.botania:poolMinecart.name=Carrinho com Poço de Mana -entity.Botania.botania:pinkWither.name=Wither Rosa -entity.Botania.botania:playerMover.name=Raio de Luminizer -entity.Botania.botania:manaStorm.name=Epicentro de Manastorm -entity.Botania.botania:babylonWeapon.name=Arma da Tesouraria -entity.Botania.botania:fallingStar.name=Estrela Cadente +entity.botania:manaBurst.name=Pulso de Mana +entity.botania:signalFlare.name=Fagulhas Sinalizadoras +entity.botania:pixie.name=Fada +entity.botania:flameRing.name=Anel de Chamas +entity.botania:vineBall.name=Bola de Vinhas +entity.botania:doppleganger.name=Guardião de Gaia +entity.botania:magicLandmine.name=Armadilha de Gaia +entity.botania:spark.name=Fagulha +entity.botania:thrownItem.name=Item arremessado +entity.botania:magicMissile.name=Míssel Mágico +entity.botania:thornChakram.name=Chakram Espinhento +entity.botania:corporeaSpark.name=Fagulha Corporea +entity.botania:enderAirBottle.name=Garrafa de ar do Fim +entity.botania:poolMinecart.name=Carrinho com Poço de Mana +entity.botania:pinkWither.name=Wither Rosa +entity.botania:playerMover.name=Raio de Luminizer +entity.botania:manaStorm.name=Epicentro de Manastorm +entity.botania:babylonWeapon.name=Arma da Tesouraria +entity.botania:fallingStar.name=Estrela Cadente # ACHIEVEMENT NAMES + DESC # @@ -1416,7 +1415,6 @@ item.botania:knockbackBelt.name=Cinturão Tectônico item.botania:icePendant.name=Pingente do Floco de Neve item.botania:lavaPendant.name=Pingente do Piromântico item.botania:lifeEssence.name=Espírito de Gaia -item.botania:goldenLaurel.name=Coroa Dourada de Laurel item.botania:redstoneRoot.name=Raíz de Redstone item.botania:magnetRing.name=Anel Magnético item.botania:waterRing.name=Anel dos Cordados diff --git a/src/main/resources/assets/botania/lang/ru_RU.lang b/src/main/resources/assets/botania/lang/ru_ru.lang similarity index 99% rename from src/main/resources/assets/botania/lang/ru_RU.lang rename to src/main/resources/assets/botania/lang/ru_ru.lang index d4e3ef3dd..0c5085bd4 100644 --- a/src/main/resources/assets/botania/lang/ru_RU.lang +++ b/src/main/resources/assets/botania/lang/ru_ru.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=Botania +itemGroup.botania=Botania generator.botania-skyblock.info=Не рекомендуется для новичков botaniamisc.nextPage=След. страница @@ -33,7 +33,6 @@ botaniamisc.filter1=Собирать только предметы без рам botaniamisc.filter2=Собирать любые предметы botaniamisc.creativePool0=Творческий бассейн маны, бесконечная мана botaniamisc.creativePool1=Достоин эгоиста -botaniamisc.savedByLaurel=Ваш золотой лавровый венец исчезает, спасая Вас от смерти. botaniamisc.toolRank=Ранг: %s&7 botaniamisc.edition=Издание %s # ^ Leave this empty for no edition display @@ -218,23 +217,23 @@ item.dice.poem3=Цифры привести танец. death.attack.botania-relic=%s был наказан за использование чужой реликвии # ENTITY NAMES -entity.Botania.botania:manaBurst.name=Всплеск маны -entity.Botania.botania:signalFlare.name=Сигнальная вспышка -entity.Botania.botania:pixie.name=Пикси -entity.Botania.botania:flameRing.name=Пламенное кольцо -entity.Botania.botania:vineBall.name=Шар лозы -entity.Botania.botania:doppleganger.name=Страж Гайи -entity.Botania.botania:magicLandmine.name=Ловушка Гайи -entity.Botania.botania:spark.name=Искра -entity.Botania.botania:thrownItem.name=Брошенный предмет -entity.Botania.botania:magicMissile.name=Магический снаряд -entity.Botania.botania:thornChakram.name=Шипастая чакра -entity.Botania.botania:enderAirBottle.name=Бутылка воздуха Края -entity.Botania.botania:poolMinecart.name=Вагонетка с бассейном для маны -entity.Botania.botania:pinkWither.name=Розовый иссушитель -entity.Botania.botania:manaStorm.name=Эпицентр манашторма -entity.Botania.botania:babylonWeapon.name=Оружие казначейства -entity.Botania.botania:fallingStar.name=Падающая звезда +entity.botania:manaBurst.name=Всплеск маны +entity.botania:signalFlare.name=Сигнальная вспышка +entity.botania:pixie.name=Пикси +entity.botania:flameRing.name=Пламенное кольцо +entity.botania:vineBall.name=Шар лозы +entity.botania:doppleganger.name=Страж Гайи +entity.botania:magicLandmine.name=Ловушка Гайи +entity.botania:spark.name=Искра +entity.botania:thrownItem.name=Брошенный предмет +entity.botania:magicMissile.name=Магический снаряд +entity.botania:thornChakram.name=Шипастая чакра +entity.botania:enderAirBottle.name=Бутылка воздуха Края +entity.botania:poolMinecart.name=Вагонетка с бассейном для маны +entity.botania:pinkWither.name=Розовый иссушитель +entity.botania:manaStorm.name=Эпицентр манашторма +entity.botania:babylonWeapon.name=Оружие казначейства +entity.botania:fallingStar.name=Падающая звезда # BLOCK NAMES tile.botania:flower0.name=Мистический белый цветок @@ -659,7 +658,6 @@ item.botania:knockbackBelt.name=Тектонический пояс item.botania:icePendant.name=Кулон со снежинкой item.botania:lavaPendant.name=Пирокластический кулон item.botania:lifeEssence.name=Дух Гайи -item.botania:goldenLaurel.name=Золотой лавровый венок item.botania:redstoneRoot.name=Красный корень item.botania:magnetRing.name=Кольцо магнетизма item.botania:waterRing.name=Кольцо хордовых @@ -1483,11 +1481,6 @@ botania.entry.lavaPendant=Пирокластический кулон botania.page.lavaPendant0=&1Пирокластический кулон&0 - это &4фенечка&0, которая при ношении поглощает немного тепла. Если владелец подожжен и не стоит прямо на &1Огне&0, &1Лаве&0 или чем-то другом, поддерживающем горение, он будет потушен. botania.page.lavaPendant1=Ханако мог бы использовать один из них -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=Золотой лавровый венок -botania.page.goldenLaurel0=Одним из применений &1Духа Гайи&0 является предоставление бессмертия носящему его игроку. &1Золотой лавровый венок&0 при смерти игрока развеется, но при этом всстановит всё здоровье и сделает бессмертным на короткий период. -botania.page.goldenLaurel1=С учетом темы, наверное Viridi - # -- RING OF CHORDATA botania.entry.waterRing=Кольцо хордовых botania.page.waterRing0=&1Кольцо хордовых&0 позволяет носителю плавать как рыба. Пока оно экипировано, носящий способен быстро плавать. Оно также даёт хорошее подводное зрение и, при наличии &4маны&0, способность дышать под водой. diff --git a/src/main/resources/assets/botania/lang/zh_CN.lang b/src/main/resources/assets/botania/lang/zh_cn.lang similarity index 99% rename from src/main/resources/assets/botania/lang/zh_CN.lang rename to src/main/resources/assets/botania/lang/zh_cn.lang index ac76edbe0..8f61dc2ec 100644 --- a/src/main/resources/assets/botania/lang/zh_CN.lang +++ b/src/main/resources/assets/botania/lang/zh_cn.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=植物魔法 +itemGroup.botania=植物魔法 generator.botania-skyblock=水晶花园 generator.botania-skyblock.info=不推荐植物魔法新手使用 @@ -38,7 +38,6 @@ botaniamisc.filter1=只拾取物品展示框以外物品 botaniamisc.filter2=拾取所有物品 botaniamisc.creativePool0=创造模式魔力池,拥有无限魔力 botaniamisc.creativePool1=创造模式独享 -botaniamisc.savedByLaurel=你的金冠破碎了,但它救了你的命。 botaniamisc.toolRank=%s&7 级 botaniamisc.edition=第 %s 版 # ^ Leave this empty for no edition display @@ -446,25 +445,25 @@ item.dice.poem3=数字将引领一切起舞. death.attack.botania-relic=%s 因使用不属于他的遗物而被惩罚致死 # ENTITY NAMES -entity.Botania.botania:manaBurst.name=魔力脉冲 -entity.Botania.botania:signalFlare.name=信号弹 -entity.Botania.botania:pixie.name=小精灵 -entity.Botania.botania:flameRing.name=火焰圈 -entity.Botania.botania:vineBall.name=藤蔓球 -entity.Botania.botania:doppleganger.name=盖亚守护者 -entity.Botania.botania:magicLandmine.name=盖亚陷阱 -entity.Botania.botania:spark.name=火花 -entity.Botania.botania:thrownItem.name=投掷物品 -entity.Botania.botania:magicMissile.name=魔法飞弹 -entity.Botania.botania:thornChakram.name=荆棘飞轮 -entity.Botania.botania:corporeaSpark.name=多媒体火花 -entity.Botania.botania:enderAirBottle.name=瓶装末地空气 -entity.Botania.botania:poolMinecart.name=魔力池矿车 -entity.Botania.botania:pinkWither.name=粉色凋零 -entity.Botania.botania:playerMover.name=微光束 -entity.Botania.botania:manaStorm.name=魔力风暴中心 -entity.Botania.botania:babylonWeapon.name=贮藏库武器 -entity.Botania.botania:fallingStar.name=落星 +entity.botania:manaBurst.name=魔力脉冲 +entity.botania:signalFlare.name=信号弹 +entity.botania:pixie.name=小精灵 +entity.botania:flameRing.name=火焰圈 +entity.botania:vineBall.name=藤蔓球 +entity.botania:doppleganger.name=盖亚守护者 +entity.botania:magicLandmine.name=盖亚陷阱 +entity.botania:spark.name=火花 +entity.botania:thrownItem.name=投掷物品 +entity.botania:magicMissile.name=魔法飞弹 +entity.botania:thornChakram.name=荆棘飞轮 +entity.botania:corporeaSpark.name=多媒体火花 +entity.botania:enderAirBottle.name=瓶装末地空气 +entity.botania:poolMinecart.name=魔力池矿车 +entity.botania:pinkWither.name=粉色凋零 +entity.botania:playerMover.name=微光束 +entity.botania:manaStorm.name=魔力风暴中心 +entity.botania:babylonWeapon.name=贮藏库武器 +entity.botania:fallingStar.name=落星 # ACHIEVEMENT NAMES + DESC achievement.botania:flowerPickup=Sky of Beginning @@ -1416,7 +1415,6 @@ item.botania:knockbackBelt.name=抗击腰带 item.botania:icePendant.name=雪花项链 item.botania:lavaPendant.name=火石项链 item.botania:lifeEssence.name=盖亚之魂 -item.botania:goldenLaurel.name=黄金桂冠 item.botania:redstoneRoot.name=红石根 item.botania:magnetRing.name=磁化指环 item.botania:waterRing.name=鱼泳指环 @@ -3416,12 +3414,6 @@ botania.tagline.lavaPendant=抵抗火焰...稍微的 botania.page.lavaPendant0=&1火石项链&0是个吸收少量热量 的&4饰品&0,若穿戴者着火且没有 直接处于&1火&0,&1岩浆&0或其他能引 起燃烧的地方,火就会被扑灭 . botania.page.lavaPendant1=花子本应用到这个 -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=黄金桂冠 -botania.tagline.goldenLaurel=一次性的免死金牌 -botania.page.goldenLaurel0=&1盖亚之魂&0的用途之一就是,赋 予使用者一层不死的保护,穿 戴&1黄金桂冠&0时,如果穿戴者即 将死亡桂冠就会破碎,回复他 们所有的生命值并附加短暂 的无敌效果. -botania.page.goldenLaurel1=考虑到主题,那就是自然女神 - # -- RING OF CHORDATA botania.entry.waterRing=鱼泳指环 botania.tagline.waterRing=水里游得更快! @@ -3831,7 +3823,6 @@ botania.subtitle.enchanterEnchant=魔力附魔结束 botania.subtitle.endoflame=火红莲燃烧物品 botania.subtitle.equipBauble=装备首饰 botania.subtitle.gaiaTrap=盖亚守卫者的符咒 -botania.subtitle.goldenLaurel=黄金桂冠恢复生命 botania.subtitle.holyCloak=神圣斗篷激活 botania.subtitle.laputaStart=拉普达碎片 激活 botania.subtitle.lexiconOpen=植物魔法辞典打开 diff --git a/src/main/resources/assets/botania/lang/zh_TW.lang b/src/main/resources/assets/botania/lang/zh_tw.lang similarity index 99% rename from src/main/resources/assets/botania/lang/zh_TW.lang rename to src/main/resources/assets/botania/lang/zh_tw.lang index c6b684065..a9434c9d2 100644 --- a/src/main/resources/assets/botania/lang/zh_TW.lang +++ b/src/main/resources/assets/botania/lang/zh_tw.lang @@ -7,7 +7,7 @@ # Once again, don't copy from English, and THANK YOU for your hard work! # MISC -itemGroup.Botania=植物魔法 +itemGroup.botania=植物魔法 generator.botania-skyblock=硝子花園 generator.botania-skyblock.info=不建議植物魔法新手使用 @@ -34,7 +34,6 @@ botaniamisc.filter1=只拾取物品展示框以外物品 botaniamisc.filter2=拾取所有物品 botaniamisc.creativePool0=創造模式瑪那池,擁有無限瑪那 botaniamisc.creativePool1=創造模式獨享 -botaniamisc.savedByLaurel=你的金冠破碎了,但它救了你的命。 botaniamisc.toolRank=%s&7 級 botaniamisc.edition=第 %s 版 # ^ Leave this empty for no edition display @@ -409,25 +408,25 @@ item.dice.poem3=數字將引領一切起舞. death.attack.botania-relic=%s 因使用不屬於他的遺物而受天譴致死 # ENTITY NAMES -entity.Botania.botania:manaBurst.name=瑪那脈衝 -entity.Botania.botania:signalFlare.name=信號彈 -entity.Botania.botania:pixie.name=小精靈 -entity.Botania.botania:flameRing.name=火焰圈 -entity.Botania.botania:vineBall.name=籐蔓球 -entity.Botania.botania:doppleganger.name=蓋亞守護者 -entity.Botania.botania:magicLandmine.name=蓋亞陷阱 -entity.Botania.botania:spark.name=火花 -entity.Botania.botania:thrownItem.name=投擲物品 -entity.Botania.botania:magicMissile.name=瑪那飛彈 -entity.Botania.botania:thornChakram.name=荊棘飛輪 -entity.Botania.botania:corporeaSpark.name=多媒體火花 -entity.Botania.botania:enderAirBottle.name=瓶裝終界空氣 -entity.Botania.botania:poolMinecart.name=瑪那池礦車 -entity.Botania.botania:pinkWither.name=粉色凋零 -entity.Botania.botania:playerMover.name=微光束 -entity.Botania.botania:manaStorm.name=瑪那風暴中心 -entity.Botania.botania:babylonWeapon.name=貯藏庫武器 -entity.Botania.botania:fallingStar.name=落星 +entity.botania:manaBurst.name=瑪那脈衝 +entity.botania:signalFlare.name=信號彈 +entity.botania:pixie.name=小精靈 +entity.botania:flameRing.name=火焰圈 +entity.botania:vineBall.name=籐蔓球 +entity.botania:doppleganger.name=蓋亞守護者 +entity.botania:magicLandmine.name=蓋亞陷阱 +entity.botania:spark.name=火花 +entity.botania:thrownItem.name=投擲物品 +entity.botania:magicMissile.name=瑪那飛彈 +entity.botania:thornChakram.name=荊棘飛輪 +entity.botania:corporeaSpark.name=多媒體火花 +entity.botania:enderAirBottle.name=瓶裝終界空氣 +entity.botania:poolMinecart.name=瑪那池礦車 +entity.botania:pinkWither.name=粉色凋零 +entity.botania:playerMover.name=微光束 +entity.botania:manaStorm.name=瑪那風暴中心 +entity.botania:babylonWeapon.name=貯藏庫武器 +entity.botania:fallingStar.name=落星 # ACHIEVEMENT NAMES + DESC (Due to the fact that most achievement names have references to vocaloid song names, please use original name or common name first, thanks.)(以下成就名多為曲名,因此使用原名與慣用名) achievement.botania:flowerPickup=Sky of Beginning @@ -1379,7 +1378,6 @@ item.botania:knockbackBelt.name=抗擊腰帶 item.botania:icePendant.name=雪花項鏈 item.botania:lavaPendant.name=火石項鏈 item.botania:lifeEssence.name=蓋亞之魂 -item.botania:goldenLaurel.name=黃金桂冠 item.botania:redstoneRoot.name=紅石根 item.botania:magnetRing.name=磁化指環 item.botania:waterRing.name=魚泳指環 @@ -3359,12 +3357,6 @@ botania.tagline.lavaPendant=抵抗火焰...稍微的 botania.page.lavaPendant0=&1火石項鏈&0是個吸收少量熱量 的&4飾品&0,若穿戴者著火且沒有 直接處於&1火&0,&1岩漿&0或其他能引 起燃燒的地方,火就會被撲滅 . botania.page.lavaPendant1=花子本應用到這個 -# -- GOLDEN LAUREL CROWN -botania.entry.goldenLaurel=黃金桂冠 -botania.tagline.goldenLaurel=一次性的免死金牌 -botania.page.goldenLaurel0=&1蓋亞之魂&0的用途之一就是,賦 予使用者一層不死的保護,穿 戴&1黃金桂冠&0時,如果穿戴者即 將死亡桂冠就會破碎,回復他 們所有的生命值並附加短暫 的無敵效果. -botania.page.goldenLaurel1=考慮到主題,那就是自然女神 - # -- RING OF CHORDATA botania.entry.waterRing=魚泳指環 botania.tagline.waterRing=水裡游得更快! diff --git a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json index 0fbe6496b..00c05b068 100644 --- a/src/main/resources/assets/botania/models/block/alchemy_catalyst.json +++ b/src/main/resources/assets/botania/models/block/alchemy_catalyst.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/alchemyCatalyst0", - "top": "botania:blocks/alchemyCatalyst1", - "side": "botania:blocks/alchemyCatalyst2" + "bottom": "botania:blocks/alchemycatalyst0", + "top": "botania:blocks/alchemycatalyst1", + "side": "botania:blocks/alchemycatalyst2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal.json b/src/main/resources/assets/botania/models/block/alfheim_portal.json index c89f3e82d..4978ba6b6 100644 --- a/src/main/resources/assets/botania/models/block/alfheim_portal.json +++ b/src/main/resources/assets/botania/models/block/alfheim_portal.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/alfheimPortal0" + "all": "botania:blocks/alfheimportal0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/alfheim_portal_on.json b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json index ed0629071..bd3c16443 100644 --- a/src/main/resources/assets/botania/models/block/alfheim_portal_on.json +++ b/src/main/resources/assets/botania/models/block/alfheim_portal_on.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/alfheimPortal1" + "all": "botania:blocks/alfheimportal1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json index 827f9cf07..b8b2d35ac 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/default_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/default/gobletBase_sides", - "gobletbasetop": "botania:model/altar/default/gobletBase_top", - "gobletbasebottom": "botania:model/altar/default/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/default/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/default/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/default/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/default/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/default/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/default/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/default/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/default/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/default/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/default/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/default/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/default/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/default/kelkBase2_bottom", - "kelkwall": "botania:model/altar/default/kelkWall", + "gobletbaseside": "botania:model/altar/default/gobletbase_sides", + "gobletbasetop": "botania:model/altar/default/gobletbase_top", + "gobletbasebottom": "botania:model/altar/default/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/default/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/default/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/default/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/default/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/default/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/default/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/default/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/default/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/default/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/default/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/default/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/default/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/default/kelkbase2_bottom", + "kelkwall": "botania:model/altar/default/kelkwall", "particle": "minecraft:blocks/cobblestone" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json index 64158af35..75187e5ff 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/desert_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/desert/gobletBase_sides", - "gobletbasetop": "botania:model/altar/desert/gobletBase_top", - "gobletbasebottom": "botania:model/altar/desert/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/desert/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/desert/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/desert/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/desert/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/desert/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/desert/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/desert/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/desert/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/desert/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/desert/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/desert/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/desert/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/desert/kelkBase2_bottom", - "kelkwall": "botania:model/altar/desert/kelkWall", - "particle": "botania:blocks/biomeStone5" + "gobletbaseside": "botania:model/altar/desert/gobletbase_sides", + "gobletbasetop": "botania:model/altar/desert/gobletbase_top", + "gobletbasebottom": "botania:model/altar/desert/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/desert/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/desert/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/desert/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/desert/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/desert/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/desert/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/desert/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/desert/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/desert/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/desert/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/desert/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/desert/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/desert/kelkbase2_bottom", + "kelkwall": "botania:model/altar/desert/kelkwall", + "particle": "botania:blocks/biomestone5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json index a9fe8da9f..2f46c21e1 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/forest_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/forest/gobletBase_sides", - "gobletbasetop": "botania:model/altar/forest/gobletBase_top", - "gobletbasebottom": "botania:model/altar/forest/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/forest/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/forest/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/forest/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/forest/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/forest/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/forest/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/forest/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/forest/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/forest/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/forest/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/forest/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/forest/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/forest/kelkBase2_bottom", - "kelkwall": "botania:model/altar/forest/kelkWall", - "particle": "botania:blocks/biomeStone0" + "gobletbaseside": "botania:model/altar/forest/gobletbase_sides", + "gobletbasetop": "botania:model/altar/forest/gobletbase_top", + "gobletbasebottom": "botania:model/altar/forest/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/forest/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/forest/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/forest/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/forest/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/forest/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/forest/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/forest/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/forest/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/forest/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/forest/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/forest/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/forest/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/forest/kelkbase2_bottom", + "kelkwall": "botania:model/altar/forest/kelkwall", + "particle": "botania:blocks/biomestone0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json index f96590633..93292da90 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/fungal_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/fungal/gobletBase_sides", - "gobletbasetop": "botania:model/altar/fungal/gobletBase_top", - "gobletbasebottom": "botania:model/altar/fungal/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/fungal/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/fungal/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/fungal/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/fungal/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/fungal/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/fungal/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/fungal/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/fungal/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/fungal/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/fungal/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/fungal/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/fungal/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/fungal/kelkBase2_bottom", - "kelkwall": "botania:model/altar/fungal/kelkWall", - "particle": "botania:blocks/biomeStone3" + "gobletbaseside": "botania:model/altar/fungal/gobletbase_sides", + "gobletbasetop": "botania:model/altar/fungal/gobletbase_top", + "gobletbasebottom": "botania:model/altar/fungal/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/fungal/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/fungal/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/fungal/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/fungal/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/fungal/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/fungal/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/fungal/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/fungal/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/fungal/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/fungal/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/fungal/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/fungal/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/fungal/kelkbase2_bottom", + "kelkwall": "botania:model/altar/fungal/kelkwall", + "particle": "botania:blocks/biomestone3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json index 70b8e6265..ad2a8a766 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/mesa_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/mesa/gobletBase_sides", - "gobletbasetop": "botania:model/altar/mesa/gobletBase_top", - "gobletbasebottom": "botania:model/altar/mesa/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/mesa/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/mesa/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/mesa/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/mesa/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/mesa/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/mesa/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/mesa/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/mesa/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/mesa/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/mesa/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/mesa/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/mesa/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/mesa/kelkBase2_bottom", - "kelkwall": "botania:model/altar/mesa/kelkWall", - "particle": "botania:blocks/biomeStone7" + "gobletbaseside": "botania:model/altar/mesa/gobletbase_sides", + "gobletbasetop": "botania:model/altar/mesa/gobletbase_top", + "gobletbasebottom": "botania:model/altar/mesa/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/mesa/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/mesa/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/mesa/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/mesa/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/mesa/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/mesa/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/mesa/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/mesa/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/mesa/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/mesa/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/mesa/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/mesa/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/mesa/kelkbase2_bottom", + "kelkwall": "botania:model/altar/mesa/kelkwall", + "particle": "botania:blocks/biomestone7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json index aec443fe5..58f2149ee 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/mossy_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/mossy/gobletBase_sides", - "gobletbasetop": "botania:model/altar/mossy/gobletBase_top", - "gobletbasebottom": "botania:model/altar/mossy/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/mossy/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/mossy/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/mossy/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/mossy/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/mossy/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/mossy/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/mossy/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/mossy/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/mossy/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/mossy/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/mossy/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/mossy/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/mossy/kelkBase2_bottom", - "kelkwall": "botania:model/altar/mossy/kelkWall", + "gobletbaseside": "botania:model/altar/mossy/gobletbase_sides", + "gobletbasetop": "botania:model/altar/mossy/gobletbase_top", + "gobletbasebottom": "botania:model/altar/mossy/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/mossy/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/mossy/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/mossy/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/mossy/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/mossy/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/mossy/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/mossy/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/mossy/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/mossy/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/mossy/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/mossy/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/mossy/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/mossy/kelkbase2_bottom", + "kelkwall": "botania:model/altar/mossy/kelkwall", "particle": "minecraft:blocks/cobblestone_mossy" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json index c97c84b44..a6067404e 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/mountain_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/mountain/gobletBase_sides", - "gobletbasetop": "botania:model/altar/mountain/gobletBase_top", - "gobletbasebottom": "botania:model/altar/mountain/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/mountain/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/mountain/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/mountain/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/mountain/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/mountain/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/mountain/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/mountain/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/mountain/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/mountain/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/mountain/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/mountain/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/mountain/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/mountain/kelkBase2_bottom", - "kelkwall": "botania:model/altar/mountain/kelkWall", - "particle": "botania:blocks/biomeStone2" + "gobletbaseside": "botania:model/altar/mountain/gobletbase_sides", + "gobletbasetop": "botania:model/altar/mountain/gobletbase_top", + "gobletbasebottom": "botania:model/altar/mountain/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/mountain/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/mountain/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/mountain/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/mountain/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/mountain/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/mountain/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/mountain/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/mountain/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/mountain/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/mountain/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/mountain/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/mountain/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/mountain/kelkbase2_bottom", + "kelkwall": "botania:model/altar/mountain/kelkwall", + "particle": "botania:blocks/biomestone2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json index 6db37a5e9..8186efcb4 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/plains_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/plains/gobletBase_sides", - "gobletbasetop": "botania:model/altar/plains/gobletBase_top", - "gobletbasebottom": "botania:model/altar/plains/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/plains/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/plains/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/plains/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/plains/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/plains/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/plains/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/plains/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/plains/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/plains/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/plains/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/plains/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/plains/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/plains/kelkBase2_bottom", - "kelkwall": "botania:model/altar/plains/kelkWall", - "particle": "botania:blocks/biomeStone1" + "gobletbaseside": "botania:model/altar/plains/gobletbase_sides", + "gobletbasetop": "botania:model/altar/plains/gobletbase_top", + "gobletbasebottom": "botania:model/altar/plains/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/plains/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/plains/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/plains/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/plains/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/plains/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/plains/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/plains/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/plains/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/plains/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/plains/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/plains/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/plains/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/plains/kelkbase2_bottom", + "kelkwall": "botania:model/altar/plains/kelkwall", + "particle": "botania:blocks/biomestone1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json index 17a0846eb..7a3adf989 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/swamp_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/swamp/gobletBase_sides", - "gobletbasetop": "botania:model/altar/swamp/gobletBase_top", - "gobletbasebottom": "botania:model/altar/swamp/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/swamp/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/swamp/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/swamp/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/swamp/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/swamp/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/swamp/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/swamp/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/swamp/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/swamp/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/swamp/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/swamp/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/swamp/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/swamp/kelkBase2_bottom", - "kelkwall": "botania:model/altar/swamp/kelkWall", - "particle": "botania:blocks/biomeStone4" + "gobletbaseside": "botania:model/altar/swamp/gobletbase_sides", + "gobletbasetop": "botania:model/altar/swamp/gobletbase_top", + "gobletbasebottom": "botania:model/altar/swamp/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/swamp/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/swamp/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/swamp/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/swamp/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/swamp/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/swamp/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/swamp/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/swamp/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/swamp/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/swamp/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/swamp/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/swamp/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/swamp/kelkbase2_bottom", + "kelkwall": "botania:model/altar/swamp/kelkwall", + "particle": "botania:blocks/biomestone4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json b/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json index cca3fe4af..249034459 100644 --- a/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json +++ b/src/main/resources/assets/botania/models/block/apothecaries/taiga_apothecary.json @@ -1,23 +1,23 @@ { "parent": "botania:block/shapes/petal_apothecary", "textures": { - "gobletbaseside": "botania:model/altar/taiga/gobletBase_sides", - "gobletbasetop": "botania:model/altar/taiga/gobletBase_top", - "gobletbasebottom": "botania:model/altar/taiga/gobletBase_bottom", - "gobletbase2side": "botania:model/altar/taiga/gobletBase2_sides", - "gobletbase2top": "botania:model/altar/taiga/gobletBase2_top", - "gobletbase2bottom": "botania:model/altar/taiga/gobletBase2_bottom", - "gobletbase3side": "botania:model/altar/taiga/gobletBase3_sides", - "gobletbase3top": "botania:model/altar/taiga/gobletBase3_top", - "gobletbase3bottom": "botania:model/altar/taiga/gobletBase3_bottom", - "gobletstandside": "botania:model/altar/taiga/gobletStand_sides", - "gobletstandtopbottom": "botania:model/altar/taiga/gobletStand_top_bottom", - "kelkbaseside": "botania:model/altar/taiga/kelkBase_sides", - "kelkbasetopbottom": "botania:model/altar/taiga/kelkBase_top_bottom", - "kelkbase2side": "botania:model/altar/taiga/kelkBase2_sides", - "kelkbase2top": "botania:model/altar/taiga/kelkBase2_top", - "kelkbase2bottom": "botania:model/altar/taiga/kelkBase2_bottom", - "kelkwall": "botania:model/altar/taiga/kelkWall", - "particle": "botania:blocks/biomeStone6" + "gobletbaseside": "botania:model/altar/taiga/gobletbase_sides", + "gobletbasetop": "botania:model/altar/taiga/gobletbase_top", + "gobletbasebottom": "botania:model/altar/taiga/gobletbase_bottom", + "gobletbase2side": "botania:model/altar/taiga/gobletbase2_sides", + "gobletbase2top": "botania:model/altar/taiga/gobletbase2_top", + "gobletbase2bottom": "botania:model/altar/taiga/gobletbase2_bottom", + "gobletbase3side": "botania:model/altar/taiga/gobletbase3_sides", + "gobletbase3top": "botania:model/altar/taiga/gobletbase3_top", + "gobletbase3bottom": "botania:model/altar/taiga/gobletbase3_bottom", + "gobletstandside": "botania:model/altar/taiga/gobletstand_sides", + "gobletstandtopbottom": "botania:model/altar/taiga/gobletstand_top_bottom", + "kelkbaseside": "botania:model/altar/taiga/kelkbase_sides", + "kelkbasetopbottom": "botania:model/altar/taiga/kelkbase_top_bottom", + "kelkbase2side": "botania:model/altar/taiga/kelkbase2_sides", + "kelkbase2top": "botania:model/altar/taiga/kelkbase2_top", + "kelkbase2bottom": "botania:model/altar/taiga/kelkbase2_bottom", + "kelkwall": "botania:model/altar/taiga/kelkwall", + "particle": "botania:blocks/biomestone6" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/blaze_block.json b/src/main/resources/assets/botania/models/block/blaze_block.json index 876160d68..2291d6fc2 100644 --- a/src/main/resources/assets/botania/models/block/blaze_block.json +++ b/src/main/resources/assets/botania/models/block/blaze_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/blazeBlock" + "all": "botania:blocks/blazeblock" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json index 511d0e425..eb6363d25 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick4" + "all": "botania:blocks/custombrick4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json index 439ea85f9..6da7b45cf 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_10.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick13" + "all": "botania:blocks/custombrick13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json index f18481bf4..13b95d5d2 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_11.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick14" + "all": "botania:blocks/custombrick14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json index 2273b3f22..75237d056 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_12.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick15" + "all": "botania:blocks/custombrick15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json index fe49ac629..e9472b5e1 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick5" + "all": "botania:blocks/custombrick5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json index 5a6c70382..039b64868 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick6" + "all": "botania:blocks/custombrick6" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json index 1edd62f2b..06acbaead 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_4.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick7" + "all": "botania:blocks/custombrick7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json index 6895e3bf1..27b6dc439 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_5.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick8" + "all": "botania:blocks/custombrick8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json index fc3546919..512ed80fb 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_6.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick9" + "all": "botania:blocks/custombrick9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json index ab8f0d42f..1a34b8c8d 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_7.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick10" + "all": "botania:blocks/custombrick10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json index 361e8f412..c64221182 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_8.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick11" + "all": "botania:blocks/custombrick11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json index bfd2a0fa0..6c7ca586d 100644 --- a/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json +++ b/src/main/resources/assets/botania/models/block/bricks/azulejo_9.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick12" + "all": "botania:blocks/custombrick12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json b/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json index 077d9da0b..2d3c7dd45 100644 --- a/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json +++ b/src/main/resources/assets/botania/models/block/bricks/frosty_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick2" + "all": "botania:blocks/custombrick2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json b/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json index ed252dee1..af25af092 100644 --- a/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json +++ b/src/main/resources/assets/botania/models/block/bricks/hellish_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick0" + "all": "botania:blocks/custombrick0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/roof_tile.json b/src/main/resources/assets/botania/models/block/bricks/roof_tile.json index 4c6cc77d2..8e75aaa2a 100644 --- a/src/main/resources/assets/botania/models/block/bricks/roof_tile.json +++ b/src/main/resources/assets/botania/models/block/bricks/roof_tile.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick3" + "all": "botania:blocks/custombrick3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/bricks/soul_brick.json b/src/main/resources/assets/botania/models/block/bricks/soul_brick.json index 84795a8d0..c01eb8b76 100644 --- a/src/main/resources/assets/botania/models/block/bricks/soul_brick.json +++ b/src/main/resources/assets/botania/models/block/bricks/soul_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/customBrick1" + "all": "botania:blocks/custombrick1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cacophonium_block.json b/src/main/resources/assets/botania/models/block/cacophonium_block.json index ff56dd5a1..3e069e0b0 100644 --- a/src/main/resources/assets/botania/models/block/cacophonium_block.json +++ b/src/main/resources/assets/botania/models/block/cacophonium_block.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/cacophoniumBlock1", - "top": "botania:blocks/cacophoniumBlock0", - "side": "botania:blocks/cacophoniumBlock1" + "bottom": "botania:blocks/cacophoniumblock1", + "top": "botania:blocks/cacophoniumblock0", + "side": "botania:blocks/cacophoniumblock1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/cell_block.json b/src/main/resources/assets/botania/models/block/cell_block.json index 622338265..8f55f8f8e 100644 --- a/src/main/resources/assets/botania/models/block/cell_block.json +++ b/src/main/resources/assets/botania/models/block/cell_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/cellBlock" + "all": "botania:blocks/cellblock" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json index 9d25fb9aa..47448031d 100644 --- a/src/main/resources/assets/botania/models/block/conjuration_catalyst.json +++ b/src/main/resources/assets/botania/models/block/conjuration_catalyst.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/conjurationCatalyst0", - "top": "botania:blocks/conjurationCatalyst1", - "side": "botania:blocks/conjurationCatalyst2" + "bottom": "botania:blocks/conjurationcatalyst0", + "top": "botania:blocks/conjurationcatalyst1", + "side": "botania:blocks/conjurationcatalyst2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_funnel.json b/src/main/resources/assets/botania/models/block/corporea_funnel.json index c9d477349..6444c4010 100644 --- a/src/main/resources/assets/botania/models/block/corporea_funnel.json +++ b/src/main/resources/assets/botania/models/block/corporea_funnel.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/corporeaFunnel0", - "top": "botania:blocks/corporeaFunnel0", - "side": "botania:blocks/corporeaFunnel1" + "bottom": "botania:blocks/corporeafunnel0", + "top": "botania:blocks/corporeafunnel0", + "side": "botania:blocks/corporeafunnel1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_interceptor.json b/src/main/resources/assets/botania/models/block/corporea_interceptor.json index ec405725a..08fa3fc95 100644 --- a/src/main/resources/assets/botania/models/block/corporea_interceptor.json +++ b/src/main/resources/assets/botania/models/block/corporea_interceptor.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/corporeaInterceptor0", - "top": "botania:blocks/corporeaInterceptor0", - "side": "botania:blocks/corporeaInterceptor1" + "bottom": "botania:blocks/corporeainterceptor0", + "top": "botania:blocks/corporeainterceptor0", + "side": "botania:blocks/corporeainterceptor1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/corporea_retainer.json b/src/main/resources/assets/botania/models/block/corporea_retainer.json index c52158a50..ad0bef12e 100644 --- a/src/main/resources/assets/botania/models/block/corporea_retainer.json +++ b/src/main/resources/assets/botania/models/block/corporea_retainer.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/corporeaRetainer" + "all": "botania:blocks/corporearetainer" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/creative_pool.json b/src/main/resources/assets/botania/models/block/creative_pool.json index 11fa1c65e..b94e8c506 100644 --- a/src/main/resources/assets/botania/models/block/creative_pool.json +++ b/src/main/resources/assets/botania/models/block/creative_pool.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/pool", "textures": { - "all": "botania:model/infinitePool" + "all": "botania:model/infinitepool" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/block/creative_pool_full.json b/src/main/resources/assets/botania/models/block/creative_pool_full.json index 148cd08fc..f4560e763 100644 --- a/src/main/resources/assets/botania/models/block/creative_pool_full.json +++ b/src/main/resources/assets/botania/models/block/creative_pool_full.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/pool_full", "textures": { - "all": "botania:model/infinitePool", - "liquid": "botania:blocks/manaWater" + "all": "botania:model/infinitepool", + "liquid": "botania:blocks/manawater" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/default_pool_full.json b/src/main/resources/assets/botania/models/block/default_pool_full.json index 615f4d40a..047faacc0 100644 --- a/src/main/resources/assets/botania/models/block/default_pool_full.json +++ b/src/main/resources/assets/botania/models/block/default_pool_full.json @@ -2,6 +2,6 @@ "parent": "botania:block/shapes/pool_full", "textures": { "all": "botania:model/pool", - "liquid": "botania:blocks/manaWater" + "liquid": "botania:blocks/manawater" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/diluted_pool.json b/src/main/resources/assets/botania/models/block/diluted_pool.json index 43647054d..77db73098 100644 --- a/src/main/resources/assets/botania/models/block/diluted_pool.json +++ b/src/main/resources/assets/botania/models/block/diluted_pool.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/pool", "textures": { - "all": "botania:model/dilutedPool" + "all": "botania:model/dilutedpool" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/block/diluted_pool_full.json b/src/main/resources/assets/botania/models/block/diluted_pool_full.json index c39b6723c..92f4d92a9 100644 --- a/src/main/resources/assets/botania/models/block/diluted_pool_full.json +++ b/src/main/resources/assets/botania/models/block/diluted_pool_full.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/pool_full", "textures": { - "all": "botania:model/dilutedPool", - "liquid": "botania:blocks/manaWater" + "all": "botania:model/dilutedpool", + "liquid": "botania:blocks/manawater" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_canopy.json b/src/main/resources/assets/botania/models/block/drum_canopy.json index 24d215ac8..e21815c38 100644 --- a/src/main/resources/assets/botania/models/block/drum_canopy.json +++ b/src/main/resources/assets/botania/models/block/drum_canopy.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/drum", "textures": { - "top": "botania:blocks/forestDrum4", - "side": "botania:blocks/forestDrum5" + "top": "botania:blocks/forestdrum4", + "side": "botania:blocks/forestdrum5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_gathering.json b/src/main/resources/assets/botania/models/block/drum_gathering.json index 59c45b760..90cc93a6b 100644 --- a/src/main/resources/assets/botania/models/block/drum_gathering.json +++ b/src/main/resources/assets/botania/models/block/drum_gathering.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/drum", "textures": { - "top": "botania:blocks/forestDrum2", - "side": "botania:blocks/forestDrum3" + "top": "botania:blocks/forestdrum2", + "side": "botania:blocks/forestdrum3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/drum_wild.json b/src/main/resources/assets/botania/models/block/drum_wild.json index 14f676eb8..f79b07fcb 100644 --- a/src/main/resources/assets/botania/models/block/drum_wild.json +++ b/src/main/resources/assets/botania/models/block/drum_wild.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/drum", "textures": { - "top": "botania:blocks/forestDrum0", - "side": "botania:blocks/forestDrum1" + "top": "botania:blocks/forestdrum0", + "side": "botania:blocks/forestdrum1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/dry_grass.json b/src/main/resources/assets/botania/models/block/dry_grass.json index f61bfde5f..725dff165 100644 --- a/src/main/resources/assets/botania/models/block/dry_grass.json +++ b/src/main/resources/assets/botania/models/block/dry_grass.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/altGrass0", - "side": "botania:blocks/altGrass1" + "top": "botania:blocks/altgrass0", + "side": "botania:blocks/altgrass1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/enchanted_soil.json b/src/main/resources/assets/botania/models/block/enchanted_soil.json index 94d0bc551..11c68e6b7 100644 --- a/src/main/resources/assets/botania/models/block/enchanted_soil.json +++ b/src/main/resources/assets/botania/models/block/enchanted_soil.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/enchantedSoil0", - "side": "botania:blocks/enchantedSoil1" + "top": "botania:blocks/enchantedsoil0", + "side": "botania:blocks/enchantedsoil1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/ender_eye_block.json b/src/main/resources/assets/botania/models/block/ender_eye_block.json index ece4ad790..c939be9d4 100644 --- a/src/main/resources/assets/botania/models/block/ender_eye_block.json +++ b/src/main/resources/assets/botania/models/block/ender_eye_block.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/enderEyeBlock0" + "all": "botania:blocks/endereyeblock0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json b/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json index 21db23bae..1f83a59a6 100644 --- a/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json +++ b/src/main/resources/assets/botania/models/block/ender_eye_block_powered.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/enderEyeBlock1" + "all": "botania:blocks/endereyeblock1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/eye_of_ancients.json b/src/main/resources/assets/botania/models/block/eye_of_ancients.json index 57b92028c..dde43a97e 100644 --- a/src/main/resources/assets/botania/models/block/eye_of_ancients.json +++ b/src/main/resources/assets/botania/models/block/eye_of_ancients.json @@ -1,11 +1,11 @@ { "parent": "botania:block/shapes/eightbyeight", "textures": { - "bottom": "botania:blocks/forestEye0", - "top": "botania:blocks/forestEye1", - "north": "botania:blocks/forestEye2", - "south": "botania:blocks/forestEye3", - "west": "botania:blocks/forestEye4", - "east": "botania:blocks/forestEye5" + "bottom": "botania:blocks/foresteye0", + "top": "botania:blocks/foresteye1", + "north": "botania:blocks/foresteye2", + "south": "botania:blocks/foresteye3", + "west": "botania:blocks/foresteye4", + "east": "botania:blocks/foresteye5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fabulous_pool_full.json b/src/main/resources/assets/botania/models/block/fabulous_pool_full.json index 615f4d40a..047faacc0 100644 --- a/src/main/resources/assets/botania/models/block/fabulous_pool_full.json +++ b/src/main/resources/assets/botania/models/block/fabulous_pool_full.json @@ -2,6 +2,6 @@ "parent": "botania:block/shapes/pool_full", "textures": { "all": "botania:model/pool", - "liquid": "botania:blocks/manaWater" + "liquid": "botania:blocks/manawater" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/fel_pumpkin.json b/src/main/resources/assets/botania/models/block/fel_pumpkin.json index 8d46f4eb2..305cfafe7 100644 --- a/src/main/resources/assets/botania/models/block/fel_pumpkin.json +++ b/src/main/resources/assets/botania/models/block/fel_pumpkin.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/orientable", "textures": { "top": "minecraft:blocks/pumpkin_top", - "front": "botania:blocks/felPumpkin", + "front": "botania:blocks/felpumpkin", "side": "minecraft:blocks/pumpkin_side" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/force_relay.json b/src/main/resources/assets/botania/models/block/force_relay.json index e26dd6888..53832a9af 100644 --- a/src/main/resources/assets/botania/models/block/force_relay.json +++ b/src/main/resources/assets/botania/models/block/force_relay.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/pistonRelay" + "all": "botania:blocks/pistonrelay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/golden_grass.json b/src/main/resources/assets/botania/models/block/golden_grass.json index 8cb20c191..e127f0c69 100644 --- a/src/main/resources/assets/botania/models/block/golden_grass.json +++ b/src/main/resources/assets/botania/models/block/golden_grass.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/altGrass2", - "side": "botania:blocks/altGrass3" + "top": "botania:blocks/altgrass2", + "side": "botania:blocks/altgrass3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/incense_plate.json b/src/main/resources/assets/botania/models/block/incense_plate.json index dc050fc94..458c89b19 100644 --- a/src/main/resources/assets/botania/models/block/incense_plate.json +++ b/src/main/resources/assets/botania/models/block/incense_plate.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/block", "textures": { - "all": "botania:model/incensePlate", - "particle": "botania:model/incensePlate" + "all": "botania:model/incenseplate", + "particle": "botania:model/incenseplate" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/infused_grass.json b/src/main/resources/assets/botania/models/block/infused_grass.json index 07a8c64d4..27fab6828 100644 --- a/src/main/resources/assets/botania/models/block/infused_grass.json +++ b/src/main/resources/assets/botania/models/block/infused_grass.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/altGrass8", - "side": "botania:blocks/altGrass9" + "top": "botania:blocks/altgrass8", + "side": "botania:blocks/altgrass9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_dry.json b/src/main/resources/assets/botania/models/block/islands/island_dry.json index f46344a46..78b290dd2 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_dry.json +++ b/src/main/resources/assets/botania/models/block/islands/island_dry.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/altGrass0", - "side": "botania:blocks/altGrass1" + "top": "botania:blocks/altgrass0", + "side": "botania:blocks/altgrass1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_golden.json b/src/main/resources/assets/botania/models/block/islands/island_golden.json index 316cce245..62e6e6824 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_golden.json +++ b/src/main/resources/assets/botania/models/block/islands/island_golden.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/altGrass2", - "side": "botania:blocks/altGrass3" + "top": "botania:blocks/altgrass2", + "side": "botania:blocks/altgrass3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_grass.json b/src/main/resources/assets/botania/models/block/islands/island_grass.json index b8363476a..55fd69aaf 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_grass.json +++ b/src/main/resources/assets/botania/models/block/islands/island_grass.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/islandTop", - "side": "botania:blocks/islandSide" + "top": "botania:blocks/islandtop", + "side": "botania:blocks/islandside" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_infused.json b/src/main/resources/assets/botania/models/block/islands/island_infused.json index 99954cc27..a4e87912b 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_infused.json +++ b/src/main/resources/assets/botania/models/block/islands/island_infused.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/altGrass8", - "side": "botania:blocks/altGrass9" + "top": "botania:blocks/altgrass8", + "side": "botania:blocks/altgrass9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_mutated.json b/src/main/resources/assets/botania/models/block/islands/island_mutated.json index dc5f45142..d9535048b 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_mutated.json +++ b/src/main/resources/assets/botania/models/block/islands/island_mutated.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/altGrass10", - "side": "botania:blocks/altGrass11" + "top": "botania:blocks/altgrass10", + "side": "botania:blocks/altgrass11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_mycel.json b/src/main/resources/assets/botania/models/block/islands/island_mycel.json index 246aff29f..c16996267 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_mycel.json +++ b/src/main/resources/assets/botania/models/block/islands/island_mycel.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { "top": "blocks/mycelium_top", "side": "blocks/mycelium_side" diff --git a/src/main/resources/assets/botania/models/block/islands/island_podzol.json b/src/main/resources/assets/botania/models/block/islands/island_podzol.json index 687876f84..436c16da8 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_podzol.json +++ b/src/main/resources/assets/botania/models/block/islands/island_podzol.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { "top": "blocks/dirt_podzol_top", "side": "blocks/dirt_podzol_side" diff --git a/src/main/resources/assets/botania/models/block/islands/island_scorched.json b/src/main/resources/assets/botania/models/block/islands/island_scorched.json index 3f8fd1bab..a3071135e 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_scorched.json +++ b/src/main/resources/assets/botania/models/block/islands/island_scorched.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/altGrass6", - "side": "botania:blocks/altGrass7" + "top": "botania:blocks/altgrass6", + "side": "botania:blocks/altgrass7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/islands/island_snow.json b/src/main/resources/assets/botania/models/block/islands/island_snow.json index f10646a43..4789e36a8 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_snow.json +++ b/src/main/resources/assets/botania/models/block/islands/island_snow.json @@ -1,5 +1,5 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { "top": "blocks/snow", "side": "blocks/grass_side_snowed" diff --git a/src/main/resources/assets/botania/models/block/islands/island_vivid.json b/src/main/resources/assets/botania/models/block/islands/island_vivid.json index 3208c123a..c690af33b 100644 --- a/src/main/resources/assets/botania/models/block/islands/island_vivid.json +++ b/src/main/resources/assets/botania/models/block/islands/island_vivid.json @@ -1,7 +1,7 @@ { - "parent": "botania:block/shapes/miniIsland", + "parent": "botania:block/shapes/miniisland", "textures": { - "top": "botania:blocks/altGrass4", - "side": "botania:blocks/altGrass5" + "top": "botania:blocks/altgrass4", + "side": "botania:blocks/altgrass5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/life_imbuer.json b/src/main/resources/assets/botania/models/block/life_imbuer.json index 83a5becdc..261b78f97 100644 --- a/src/main/resources/assets/botania/models/block/life_imbuer.json +++ b/src/main/resources/assets/botania/models/block/life_imbuer.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/claw", "textures": { - "all": "botania:model/spawnerClaw" + "all": "botania:model/spawnerclaw" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/luminizer_launcher.json b/src/main/resources/assets/botania/models/block/luminizer_launcher.json index 9d87e408b..40a419282 100644 --- a/src/main/resources/assets/botania/models/block/luminizer_launcher.json +++ b/src/main/resources/assets/botania/models/block/luminizer_launcher.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/four_high_bottom_top", "textures": { - "bottom": "botania:blocks/lightLauncher", - "top": "botania:blocks/lightLauncher", - "side": "botania:blocks/lightLauncher" + "bottom": "botania:blocks/lightlauncher", + "top": "botania:blocks/lightlauncher", + "side": "botania:blocks/lightlauncher" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector.json b/src/main/resources/assets/botania/models/block/mana_detector.json index 4ddc0f74a..01b5e2d76 100644 --- a/src/main/resources/assets/botania/models/block/mana_detector.json +++ b/src/main/resources/assets/botania/models/block/mana_detector.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manaDetector0" + "all": "botania:blocks/manadetector0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_detector_powered.json b/src/main/resources/assets/botania/models/block/mana_detector_powered.json index 3af9228ba..2b69bb7d1 100644 --- a/src/main/resources/assets/botania/models/block/mana_detector_powered.json +++ b/src/main/resources/assets/botania/models/block/mana_detector_powered.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manaDetector1" + "all": "botania:blocks/manadetector1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_fluxfield.json b/src/main/resources/assets/botania/models/block/mana_fluxfield.json index 9423529e7..d47b333db 100644 --- a/src/main/resources/assets/botania/models/block/mana_fluxfield.json +++ b/src/main/resources/assets/botania/models/block/mana_fluxfield.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/rfGenerator" + "all": "botania:blocks/rfgenerator" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_glass.json b/src/main/resources/assets/botania/models/block/mana_glass.json index dc3338aa9..fad7df3dd 100644 --- a/src/main/resources/assets/botania/models/block/mana_glass.json +++ b/src/main/resources/assets/botania/models/block/mana_glass.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manaGlass" + "all": "botania:blocks/managlass" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mana_void.json b/src/main/resources/assets/botania/models/block/mana_void.json index 402d24915..7c67e6732 100644 --- a/src/main/resources/assets/botania/models/block/mana_void.json +++ b/src/main/resources/assets/botania/models/block/mana_void.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manaVoid0" + "all": "botania:blocks/manavoid0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/manastorm_charge.json b/src/main/resources/assets/botania/models/block/manastorm_charge.json index 3cc4fdce3..efebe11fe 100644 --- a/src/main/resources/assets/botania/models/block/manastorm_charge.json +++ b/src/main/resources/assets/botania/models/block/manastorm_charge.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/manaBomb" + "all": "botania:blocks/manabomb" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json index d3f6257f1..0cc09d6ec 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone21" + "all": "botania:blocks/biomestone21" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json index d72dc70c7..f915d558d 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone29" + "all": "botania:blocks/biomestone29" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json index d649c97d1..ab9044588 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone13" + "all": "botania:blocks/biomestone13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json index d67da6739..446bd17e3 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/desert_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone5" + "all": "botania:blocks/biomestone5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json index 7dbbaf74c..36af8b9ad 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone16" + "all": "botania:blocks/biomestone16" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json index 23e27a7e2..b8569a415 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone24" + "all": "botania:blocks/biomestone24" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json index 8bfba3dd5..b50b9fc1c 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone8" + "all": "botania:blocks/biomestone8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json index c749b11af..a506f5ed4 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/forest_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone0" + "all": "botania:blocks/biomestone0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json index 69550fe61..68217ef65 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone19" + "all": "botania:blocks/biomestone19" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json index 3cc15bf6f..17b2bc710 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone27" + "all": "botania:blocks/biomestone27" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json index 5cb950824..e2912fcb5 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone11" + "all": "botania:blocks/biomestone11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json index 68dd2e184..81fd2ab64 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/fungal_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone3" + "all": "botania:blocks/biomestone3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json index baaa34b53..acbbabccd 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone23" + "all": "botania:blocks/biomestone23" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json index 4df5848c3..a1c909936 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone31" + "all": "botania:blocks/biomestone31" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json index f97bdd014..927ed56e1 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone15" + "all": "botania:blocks/biomestone15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json index 98b5666ab..1617a7b60 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mesa_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone7" + "all": "botania:blocks/biomestone7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json index e7ec9c31f..29161e800 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone18" + "all": "botania:blocks/biomestone18" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json index b3b170ce0..898a6f91e 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone26" + "all": "botania:blocks/biomestone26" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json index a8af764c3..5a52c81bb 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone10" + "all": "botania:blocks/biomestone10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json index 3ef66eaea..a212f2aa4 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/mountain_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone2" + "all": "botania:blocks/biomestone2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json index 12fb32f4a..17e44801b 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone17" + "all": "botania:blocks/biomestone17" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json index 664cc97d8..482358f66 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone25" + "all": "botania:blocks/biomestone25" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json index e102ce939..34d0956bc 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone9" + "all": "botania:blocks/biomestone9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json index 2f8758753..c8bd5c491 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/plains_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone1" + "all": "botania:blocks/biomestone1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json index c8a878f5e..c4da52cf6 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone20" + "all": "botania:blocks/biomestone20" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json index 6fc624583..0eefe692a 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone28" + "all": "botania:blocks/biomestone28" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json index 5bf0c567d..df3fcb296 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone12" + "all": "botania:blocks/biomestone12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json index 67f6676df..2a7938e80 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/swamp_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone4" + "all": "botania:blocks/biomestone4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json index 2e56f6e9b..f496ef0c5 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone22" + "all": "botania:blocks/biomestone22" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json index 341449e07..25dd6e33f 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_brick_chiseled.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone30" + "all": "botania:blocks/biomestone30" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json index 87d553f31..9772ac4ec 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_cobble_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone14" + "all": "botania:blocks/biomestone14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json b/src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json index b5817f427..bd0df2abe 100644 --- a/src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json +++ b/src/main/resources/assets/botania/models/block/metamorphic/taiga_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/biomeStone6" + "all": "botania:blocks/biomestone6" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/mutated_grass.json b/src/main/resources/assets/botania/models/block/mutated_grass.json index fa6af5245..9f19ce451 100644 --- a/src/main/resources/assets/botania/models/block/mutated_grass.json +++ b/src/main/resources/assets/botania/models/block/mutated_grass.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/altGrass10", - "side": "botania:blocks/altGrass11" + "top": "botania:blocks/altgrass10", + "side": "botania:blocks/altgrass11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/petal_block.json b/src/main/resources/assets/botania/models/block/petal_block.json index 6f010e3f9..f6d0ff683 100644 --- a/src/main/resources/assets/botania/models/block/petal_block.json +++ b/src/main/resources/assets/botania/models/block/petal_block.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/cube_all_tinted", "textures": { - "all": "botania:blocks/petalBlock" + "all": "botania:blocks/petalblock" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json index 3bded4905..cade4694d 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_black.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering15" + "cross": "botania:blocks/flowerglimmering15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json index fdbfff359..0b4d54894 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering11" + "cross": "botania:blocks/flowerglimmering11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json index 3bb133d50..4bc2efdbc 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_brown.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering12" + "cross": "botania:blocks/flowerglimmering12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json index 77a701a1b..e3269daa6 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_cyan.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering9" + "cross": "botania:blocks/flowerglimmering9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json index 29fe5c73f..41d64c218 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_gray.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering7" + "cross": "botania:blocks/flowerglimmering7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json index 22d92ffbf..1e762fd82 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_green.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering13" + "cross": "botania:blocks/flowerglimmering13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json index 89490999c..f85e649e8 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_light_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering3" + "cross": "botania:blocks/flowerglimmering3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json index 07862b0a3..9a6b2e538 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_lime.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering5" + "cross": "botania:blocks/flowerglimmering5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json index f20cc0e84..5bdbca7c4 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_magenta.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering2" + "cross": "botania:blocks/flowerglimmering2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json index 05a56031a..73e77f53b 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_orange.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering1" + "cross": "botania:blocks/flowerglimmering1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json index d53240004..836006279 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_pink.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering6" + "cross": "botania:blocks/flowerglimmering6" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json index ddf0b9f9c..a131f6116 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_purple.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering10" + "cross": "botania:blocks/flowerglimmering10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json index 8ea3ea26d..cbd58e1d4 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_red.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering14" + "cross": "botania:blocks/flowerglimmering14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json index 367bfbe3b..89e59194d 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_silver.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering8" + "cross": "botania:blocks/flowerglimmering8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json index 0a106deef..8bbfba2aa 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_white.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering0" + "cross": "botania:blocks/flowerglimmering0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json index 0b6d9c508..d9f54567d 100644 --- a/src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json +++ b/src/main/resources/assets/botania/models/block/plants/glimmering_flower_yellow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cross", "textures": { - "cross": "botania:blocks/flowerGlimmering4" + "cross": "botania:blocks/flowerglimmering4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json index f44a954f6..45984f629 100644 --- a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockBlazeQuartz0", - "top": "botania:blocks/blockBlazeQuartz1", - "side": "botania:blocks/blockBlazeQuartz2" + "bottom": "botania:blocks/blockblazequartz0", + "top": "botania:blocks/blockblazequartz1", + "side": "botania:blocks/blockblazequartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json index 1532d2d11..e16c1448d 100644 --- a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledBlazeQuartz0", - "end": "botania:blocks/chiseledBlazeQuartz1" + "side": "botania:blocks/chiseledblazequartz0", + "end": "botania:blocks/chiseledblazequartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json index eb34dda3a..bf4bcd76a 100644 --- a/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/blaze_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarBlazeQuartz0", - "end": "botania:blocks/pillarBlazeQuartz1" + "side": "botania:blocks/pillarblazequartz0", + "end": "botania:blocks/pillarblazequartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json index e48195fab..ab63f0c23 100644 --- a/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockDarkQuartz0", - "top": "botania:blocks/blockDarkQuartz1", - "side": "botania:blocks/blockDarkQuartz2" + "bottom": "botania:blocks/blockdarkquartz0", + "top": "botania:blocks/blockdarkquartz1", + "side": "botania:blocks/blockdarkquartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json index 7c1da5c3a..9cf2292f2 100644 --- a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledDarkQuartz0", - "end": "botania:blocks/chiseledDarkQuartz1" + "side": "botania:blocks/chiseleddarkquartz0", + "end": "botania:blocks/chiseleddarkquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json index c610d0b25..90e7b950c 100644 --- a/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/dark_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarDarkQuartz0", - "end": "botania:blocks/pillarDarkQuartz1" + "side": "botania:blocks/pillardarkquartz0", + "end": "botania:blocks/pillardarkquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json index d68e10781..5b24bdb8a 100644 --- a/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockElfQuartz0", - "top": "botania:blocks/blockElfQuartz1", - "side": "botania:blocks/blockElfQuartz2" + "bottom": "botania:blocks/blockelfquartz0", + "top": "botania:blocks/blockelfquartz1", + "side": "botania:blocks/blockelfquartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json index d2ba907cc..031fc8f38 100644 --- a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledElfQuartz0", - "end": "botania:blocks/chiseledElfQuartz1" + "side": "botania:blocks/chiseledelfquartz0", + "end": "botania:blocks/chiseledelfquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json index 49ce41ac7..f034fc79e 100644 --- a/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/elf_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarElfQuartz0", - "end": "botania:blocks/pillarElfQuartz1" + "side": "botania:blocks/pillarelfquartz0", + "end": "botania:blocks/pillarelfquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json index a15700d32..fc17715e7 100644 --- a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockLavenderQuartz0", - "top": "botania:blocks/blockLavenderQuartz1", - "side": "botania:blocks/blockLavenderQuartz2" + "bottom": "botania:blocks/blocklavenderquartz0", + "top": "botania:blocks/blocklavenderquartz1", + "side": "botania:blocks/blocklavenderquartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json index 743d29abb..d47526b89 100644 --- a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledLavenderQuartz0", - "end": "botania:blocks/chiseledLavenderQuartz1" + "side": "botania:blocks/chiseledlavenderquartz0", + "end": "botania:blocks/chiseledlavenderquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json index a6baaf582..7d4aeb38b 100644 --- a/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/lavender_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarLavenderQuartz0", - "end": "botania:blocks/pillarLavenderQuartz1" + "side": "botania:blocks/pillarlavenderquartz0", + "end": "botania:blocks/pillarlavenderquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json index 4d7592100..56cfe8500 100644 --- a/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockManaQuartz0", - "top": "botania:blocks/blockManaQuartz1", - "side": "botania:blocks/blockManaQuartz2" + "bottom": "botania:blocks/blockmanaquartz0", + "top": "botania:blocks/blockmanaquartz1", + "side": "botania:blocks/blockmanaquartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json index 365192d7d..c7f16979d 100644 --- a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledManaQuartz0", - "end": "botania:blocks/chiseledManaQuartz1" + "side": "botania:blocks/chiseledmanaquartz0", + "end": "botania:blocks/chiseledmanaquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json index 6ab1a24dc..ceb34b9a7 100644 --- a/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/mana_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarManaQuartz0", - "end": "botania:blocks/pillarManaQuartz1" + "side": "botania:blocks/pillarmanaquartz0", + "end": "botania:blocks/pillarmanaquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz.json index 6f8745719..848c074f4 100644 --- a/src/main/resources/assets/botania/models/block/quartz/red_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockRedQuartz0", - "top": "botania:blocks/blockRedQuartz1", - "side": "botania:blocks/blockRedQuartz2" + "bottom": "botania:blocks/blockredquartz0", + "top": "botania:blocks/blockredquartz1", + "side": "botania:blocks/blockredquartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json index 618377628..7412ed2e3 100644 --- a/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledRedQuartz0", - "end": "botania:blocks/chiseledRedQuartz1" + "side": "botania:blocks/chiseledredquartz0", + "end": "botania:blocks/chiseledredquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json index eb722fa5c..610580168 100644 --- a/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/red_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarRedQuartz0", - "end": "botania:blocks/pillarRedQuartz1" + "side": "botania:blocks/pillarredquartz0", + "end": "botania:blocks/pillarredquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json index c4629562c..a787abc04 100644 --- a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/cube_bottom_top", "textures": { - "bottom": "botania:blocks/blockSunnyQuartz0", - "top": "botania:blocks/blockSunnyQuartz1", - "side": "botania:blocks/blockSunnyQuartz2" + "bottom": "botania:blocks/blocksunnyquartz0", + "top": "botania:blocks/blocksunnyquartz1", + "side": "botania:blocks/blocksunnyquartz2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json index 9dc208c8f..cfaff9365 100644 --- a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_chiseled.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/chiseledSunnyQuartz0", - "end": "botania:blocks/chiseledSunnyQuartz1" + "side": "botania:blocks/chiseledsunnyquartz0", + "end": "botania:blocks/chiseledsunnyquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json index 037c8054b..a8e95c039 100644 --- a/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json +++ b/src/main/resources/assets/botania/models/block/quartz/sunny_quartz_pillar.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/cube_column", "textures": { - "side": "botania:blocks/pillarSunnyQuartz0", - "end": "botania:blocks/pillarSunnyQuartz1" + "side": "botania:blocks/pillarsunnyquartz0", + "end": "botania:blocks/pillarsunnyquartz1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_comparator.json b/src/main/resources/assets/botania/models/block/red_string_comparator.json index 58070033a..a3a4479da 100644 --- a/src/main/resources/assets/botania/models/block/red_string_comparator.json +++ b/src/main/resources/assets/botania/models/block/red_string_comparator.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redStringComparator", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringComparator" + "top": "botania:blocks/redstringcomparator", + "front": "botania:blocks/redstringsender", + "side": "botania:blocks/redstringcomparator" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_container.json b/src/main/resources/assets/botania/models/block/red_string_container.json index 4a8ebe34c..c15f416bf 100644 --- a/src/main/resources/assets/botania/models/block/red_string_container.json +++ b/src/main/resources/assets/botania/models/block/red_string_container.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redStringContainer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringContainer" + "top": "botania:blocks/redstringcontainer", + "front": "botania:blocks/redstringsender", + "side": "botania:blocks/redstringcontainer" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_dispenser.json b/src/main/resources/assets/botania/models/block/red_string_dispenser.json index bbddc9883..bc13dab7f 100644 --- a/src/main/resources/assets/botania/models/block/red_string_dispenser.json +++ b/src/main/resources/assets/botania/models/block/red_string_dispenser.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redStringDispenser", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringDispenser" + "top": "botania:blocks/redstringdispenser", + "front": "botania:blocks/redstringsender", + "side": "botania:blocks/redstringdispenser" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json index 10771f70c..994fcf8f3 100644 --- a/src/main/resources/assets/botania/models/block/red_string_fertilizer.json +++ b/src/main/resources/assets/botania/models/block/red_string_fertilizer.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redStringFertilizer", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringFertilizer" + "top": "botania:blocks/redstringfertilizer", + "front": "botania:blocks/redstringsender", + "side": "botania:blocks/redstringfertilizer" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_interceptor.json b/src/main/resources/assets/botania/models/block/red_string_interceptor.json index 6c31f846b..80c3d7a76 100644 --- a/src/main/resources/assets/botania/models/block/red_string_interceptor.json +++ b/src/main/resources/assets/botania/models/block/red_string_interceptor.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redStringInterceptor", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringInterceptor" + "top": "botania:blocks/redstringinterceptor", + "front": "botania:blocks/redstringsender", + "side": "botania:blocks/redstringinterceptor" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/red_string_relay.json b/src/main/resources/assets/botania/models/block/red_string_relay.json index d62841e01..212ee770d 100644 --- a/src/main/resources/assets/botania/models/block/red_string_relay.json +++ b/src/main/resources/assets/botania/models/block/red_string_relay.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/orientable", "textures": { - "top": "botania:blocks/redStringRelay", - "front": "botania:blocks/redStringSender", - "side": "botania:blocks/redStringRelay" + "top": "botania:blocks/redstringrelay", + "front": "botania:blocks/redstringsender", + "side": "botania:blocks/redstringrelay" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/runic_altar.json b/src/main/resources/assets/botania/models/block/runic_altar.json index bb055b11d..e32069056 100644 --- a/src/main/resources/assets/botania/models/block/runic_altar.json +++ b/src/main/resources/assets/botania/models/block/runic_altar.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/twelve_high_bottom_top", "textures": { - "top": "botania:blocks/runeAltar1", - "side": "botania:blocks/runeAltar2", - "bottom": "botania:blocks/runeAltar0" + "top": "botania:blocks/runealtar1", + "side": "botania:blocks/runealtar2", + "bottom": "botania:blocks/runealtar0" } } diff --git a/src/main/resources/assets/botania/models/block/scorched_grass.json b/src/main/resources/assets/botania/models/block/scorched_grass.json index ad5d14643..e49201662 100644 --- a/src/main/resources/assets/botania/models/block/scorched_grass.json +++ b/src/main/resources/assets/botania/models/block/scorched_grass.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/altGrass6", - "side": "botania:blocks/altGrass7" + "top": "botania:blocks/altgrass6", + "side": "botania:blocks/altgrass7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/shapes/miniIsland.json b/src/main/resources/assets/botania/models/block/shapes/miniisland.json similarity index 100% rename from src/main/resources/assets/botania/models/block/shapes/miniIsland.json rename to src/main/resources/assets/botania/models/block/shapes/miniisland.json diff --git a/src/main/resources/assets/botania/models/block/shimmerwood_planks.json b/src/main/resources/assets/botania/models/block/shimmerwood_planks.json index 2843c22c4..0a81068f8 100644 --- a/src/main/resources/assets/botania/models/block/shimmerwood_planks.json +++ b/src/main/resources/assets/botania/models/block/shimmerwood_planks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "botania:blocks/shimmerwoodPlanks" + "all": "botania:blocks/shimmerwoodplanks" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/spark_tinkerer.json b/src/main/resources/assets/botania/models/block/spark_tinkerer.json index 3466d1c1d..58a89a43e 100644 --- a/src/main/resources/assets/botania/models/block/spark_tinkerer.json +++ b/src/main/resources/assets/botania/models/block/spark_tinkerer.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/three_high_bottom_top", "textures": { - "bottom": "botania:blocks/sparkChanger0", - "top": "botania:blocks/sparkChanger1", - "side": "botania:blocks/sparkChanger2" + "bottom": "botania:blocks/sparkchanger0", + "top": "botania:blocks/sparkchanger1", + "side": "botania:blocks/sparkchanger2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/terra_plate.json b/src/main/resources/assets/botania/models/block/terra_plate.json index 22f023eff..894810b23 100644 --- a/src/main/resources/assets/botania/models/block/terra_plate.json +++ b/src/main/resources/assets/botania/models/block/terra_plate.json @@ -1,8 +1,8 @@ { "parent": "botania:block/shapes/three_high_bottom_top", "textures": { - "bottom": "botania:blocks/terraPlate0", - "top": "botania:blocks/terraPlate1", - "side": "botania:blocks/terraPlate2" + "bottom": "botania:blocks/terraplate0", + "top": "botania:blocks/terraplate1", + "side": "botania:blocks/terraplate2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/tiny_planet_block.json b/src/main/resources/assets/botania/models/block/tiny_planet_block.json index 62c80768e..da7dccab0 100644 --- a/src/main/resources/assets/botania/models/block/tiny_planet_block.json +++ b/src/main/resources/assets/botania/models/block/tiny_planet_block.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/tenbyten_all", "textures": { - "all": "botania:blocks/tinyPlanetBlock" + "all": "botania:blocks/tinyplanetblock" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/tiny_potato.json b/src/main/resources/assets/botania/models/block/tiny_potato.json index 84f06fe5f..9d9996032 100644 --- a/src/main/resources/assets/botania/models/block/tiny_potato.json +++ b/src/main/resources/assets/botania/models/block/tiny_potato.json @@ -1,8 +1,8 @@ { "parent": "minecraft:block/block", "textures": { - "all": "botania:model/tinyPotatoCopy", - "particle": "botania:model/tinyPotatoCopy" + "all": "botania:model/tinypotatocopy", + "particle": "botania:model/tinypotatocopy" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/block/trodden_dirt.json b/src/main/resources/assets/botania/models/block/trodden_dirt.json index 3547f8951..df4cb830e 100644 --- a/src/main/resources/assets/botania/models/block/trodden_dirt.json +++ b/src/main/resources/assets/botania/models/block/trodden_dirt.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/fifteen_high_all", "textures": { - "all": "botania:blocks/dirtPath" + "all": "botania:blocks/dirtpath" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/unstable_beacon.json b/src/main/resources/assets/botania/models/block/unstable_beacon.json index 2d0e6eb60..3b0a31a2b 100644 --- a/src/main/resources/assets/botania/models/block/unstable_beacon.json +++ b/src/main/resources/assets/botania/models/block/unstable_beacon.json @@ -1,7 +1,7 @@ { "parent": "botania:block/shapes/tenbyten_top_tinted", "textures": { - "all": "botania:blocks/manaBeacon0", - "top": "botania:blocks/manaBeacon1" + "all": "botania:blocks/manabeacon0", + "top": "botania:blocks/manabeacon1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/unstable_cube.json b/src/main/resources/assets/botania/models/block/unstable_cube.json index 9be86d7a0..5bec3dcf7 100644 --- a/src/main/resources/assets/botania/models/block/unstable_cube.json +++ b/src/main/resources/assets/botania/models/block/unstable_cube.json @@ -1,6 +1,6 @@ { "parent": "botania:block/shapes/eightbyeight_all_tinted", "textures": { - "all": "botania:blocks/unstableBlock" + "all": "botania:blocks/unstableblock" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/vivid_grass.json b/src/main/resources/assets/botania/models/block/vivid_grass.json index a6b3c3112..f5d2a0852 100644 --- a/src/main/resources/assets/botania/models/block/vivid_grass.json +++ b/src/main/resources/assets/botania/models/block/vivid_grass.json @@ -2,7 +2,7 @@ "parent": "minecraft:block/cube_bottom_top", "textures": { "bottom": "minecraft:blocks/dirt", - "top": "botania:blocks/altGrass4", - "side": "botania:blocks/altGrass5" + "top": "botania:blocks/altgrass4", + "side": "botania:blocks/altgrass5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_post.json index 33636683b..063aa4e8b 100644 --- a/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone13" + "wall": "botania:blocks/biomestone13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_side.json index c8943f49c..f9c6fb0f9 100644 --- a/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/desert_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone13" + "wall": "botania:blocks/biomestone13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_post.json index 0a10f6f38..c6a673da0 100644 --- a/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone8" + "wall": "botania:blocks/biomestone8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_side.json index 0ca607833..a62a9ffc9 100644 --- a/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/forest_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone8" + "wall": "botania:blocks/biomestone8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_post.json index ce1756c91..1b20248fd 100644 --- a/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone11" + "wall": "botania:blocks/biomestone11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_side.json index 7abed6202..c75a7edfb 100644 --- a/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/fungal_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone11" + "wall": "botania:blocks/biomestone11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_post.json index 8fb930ad8..416c884c1 100644 --- a/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone15" + "wall": "botania:blocks/biomestone15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_side.json index c968443d8..0407fd30d 100644 --- a/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/mesa_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone15" + "wall": "botania:blocks/biomestone15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_post.json index b00803b65..16faabe19 100644 --- a/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone10" + "wall": "botania:blocks/biomestone10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_side.json index 350481030..b0e1f004a 100644 --- a/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/mountain_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone10" + "wall": "botania:blocks/biomestone10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_post.json index 6ea6ee189..6b0dc13d2 100644 --- a/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone9" + "wall": "botania:blocks/biomestone9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_side.json index 7b2077e0a..4dc249164 100644 --- a/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/plains_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone9" + "wall": "botania:blocks/biomestone9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_post.json index 67d8fe9fa..a81ecebcf 100644 --- a/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone12" + "wall": "botania:blocks/biomestone12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_side.json index cbda4914e..eaab785c4 100644 --- a/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/swamp_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone12" + "wall": "botania:blocks/biomestone12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_post.json b/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_post.json index 20ac75792..767c46f83 100644 --- a/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_post.json +++ b/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_post", "textures": { - "wall": "botania:blocks/biomeStone14" + "wall": "botania:blocks/biomestone14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_side.json b/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_side.json index 4fa74426f..520ea6a02 100644 --- a/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_side.json +++ b/src/main/resources/assets/botania/models/block/walls/taiga_cobble_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_side", "textures": { - "wall": "botania:blocks/biomeStone14" + "wall": "botania:blocks/biomestone14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/aesirRing.json b/src/main/resources/assets/botania/models/item/aesirring.json similarity index 61% rename from src/main/resources/assets/botania/models/item/aesirRing.json rename to src/main/resources/assets/botania/models/item/aesirring.json index 37830baf7..179676b1d 100644 --- a/src/main/resources/assets/botania/models/item/aesirRing.json +++ b/src/main/resources/assets/botania/models/item/aesirring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/aesirRing" + "layer0": "botania:items/aesirring" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill3.json b/src/main/resources/assets/botania/models/item/ancientWill3.json deleted file mode 100644 index 7cf9afaaa..000000000 --- a/src/main/resources/assets/botania/models/item/ancientWill3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/ancientWill3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill4.json b/src/main/resources/assets/botania/models/item/ancientWill4.json deleted file mode 100644 index 118f3951f..000000000 --- a/src/main/resources/assets/botania/models/item/ancientWill4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/ancientWill4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill5.json b/src/main/resources/assets/botania/models/item/ancientWill5.json deleted file mode 100644 index 62aef6264..000000000 --- a/src/main/resources/assets/botania/models/item/ancientWill5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/ancientWill5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill0.json b/src/main/resources/assets/botania/models/item/ancientwill0.json similarity index 59% rename from src/main/resources/assets/botania/models/item/ancientWill0.json rename to src/main/resources/assets/botania/models/item/ancientwill0.json index 8617367b9..8a0f5ed8a 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill0.json +++ b/src/main/resources/assets/botania/models/item/ancientwill0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/ancientWill0" + "layer0": "botania:items/ancientwill0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill1.json b/src/main/resources/assets/botania/models/item/ancientwill1.json similarity index 59% rename from src/main/resources/assets/botania/models/item/ancientWill1.json rename to src/main/resources/assets/botania/models/item/ancientwill1.json index 03d79a318..5136e26de 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill1.json +++ b/src/main/resources/assets/botania/models/item/ancientwill1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/ancientWill1" + "layer0": "botania:items/ancientwill1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientWill2.json b/src/main/resources/assets/botania/models/item/ancientwill2.json similarity index 59% rename from src/main/resources/assets/botania/models/item/ancientWill2.json rename to src/main/resources/assets/botania/models/item/ancientwill2.json index 2b671db8b..2aea6f42f 100644 --- a/src/main/resources/assets/botania/models/item/ancientWill2.json +++ b/src/main/resources/assets/botania/models/item/ancientwill2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/ancientWill2" + "layer0": "botania:items/ancientwill2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientwill3.json b/src/main/resources/assets/botania/models/item/ancientwill3.json new file mode 100644 index 000000000..5f7937e11 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientwill3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/ancientwill3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientwill4.json b/src/main/resources/assets/botania/models/item/ancientwill4.json new file mode 100644 index 000000000..85f393cb9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientwill4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/ancientwill4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/ancientwill5.json b/src/main/resources/assets/botania/models/item/ancientwill5.json new file mode 100644 index 000000000..30fd8c500 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/ancientwill5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/ancientwill5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/animatedTorch.json b/src/main/resources/assets/botania/models/item/animatedtorch.json similarity index 100% rename from src/main/resources/assets/botania/models/item/animatedTorch.json rename to src/main/resources/assets/botania/models/item/animatedtorch.json diff --git a/src/main/resources/assets/botania/models/item/auraRingGreater.json b/src/main/resources/assets/botania/models/item/auraRingGreater.json deleted file mode 100644 index 0d64d8dcc..000000000 --- a/src/main/resources/assets/botania/models/item/auraRingGreater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/auraRingGreater" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/auraRing.json b/src/main/resources/assets/botania/models/item/auraring.json similarity index 61% rename from src/main/resources/assets/botania/models/item/auraRing.json rename to src/main/resources/assets/botania/models/item/auraring.json index 2f617e0f8..7da24b58d 100644 --- a/src/main/resources/assets/botania/models/item/auraRing.json +++ b/src/main/resources/assets/botania/models/item/auraring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/auraRing" + "layer0": "botania:items/auraring" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/auraringgreater.json b/src/main/resources/assets/botania/models/item/auraringgreater.json new file mode 100644 index 000000000..b1b2a0d9d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/auraringgreater.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/auraringgreater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/autocraftingHalo.json b/src/main/resources/assets/botania/models/item/autocraftingHalo.json deleted file mode 100644 index 14b837d15..000000000 --- a/src/main/resources/assets/botania/models/item/autocraftingHalo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/autocraftingHalo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/autocraftinghalo.json b/src/main/resources/assets/botania/models/item/autocraftinghalo.json new file mode 100644 index 000000000..13910ca71 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/autocraftinghalo.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/autocraftinghalo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/balanceCloak.json b/src/main/resources/assets/botania/models/item/balanceCloak.json deleted file mode 100644 index 6d76e4bef..000000000 --- a/src/main/resources/assets/botania/models/item/balanceCloak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/balanceCloak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/balancecloak.json b/src/main/resources/assets/botania/models/item/balancecloak.json new file mode 100644 index 000000000..e7eb66572 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/balancecloak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/balancecloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/baubleBox.json b/src/main/resources/assets/botania/models/item/baublebox.json similarity index 61% rename from src/main/resources/assets/botania/models/item/baubleBox.json rename to src/main/resources/assets/botania/models/item/baublebox.json index 1e3b1ba76..5ec94d128 100644 --- a/src/main/resources/assets/botania/models/item/baubleBox.json +++ b/src/main/resources/assets/botania/models/item/baublebox.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/baubleBox" + "layer0": "botania:items/baublebox" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json b/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json deleted file mode 100644 index b089c2d16..000000000 --- a/src/main/resources/assets/botania/models/item/blackHoleTalisman0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/blackHoleTalisman0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json b/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json deleted file mode 100644 index 946207626..000000000 --- a/src/main/resources/assets/botania/models/item/blackHoleTalisman1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/blackHoleTalisman1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackholetalisman0.json b/src/main/resources/assets/botania/models/item/blackholetalisman0.json new file mode 100644 index 000000000..469ce54dd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackholetalisman0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/blackholetalisman0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackholetalisman1.json b/src/main/resources/assets/botania/models/item/blackholetalisman1.json new file mode 100644 index 000000000..fbdafb62d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackholetalisman1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/blackholetalisman1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackLotus0.json b/src/main/resources/assets/botania/models/item/blacklotus0.json similarity index 60% rename from src/main/resources/assets/botania/models/item/blackLotus0.json rename to src/main/resources/assets/botania/models/item/blacklotus0.json index bfab19bc4..bfdcd3673 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus0.json +++ b/src/main/resources/assets/botania/models/item/blacklotus0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/blackLotus" + "layer0": "botania:items/blacklotus" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackLotus1.json b/src/main/resources/assets/botania/models/item/blacklotus1.json similarity index 60% rename from src/main/resources/assets/botania/models/item/blackLotus1.json rename to src/main/resources/assets/botania/models/item/blacklotus1.json index 94c1f6ae9..0bc7ee409 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus1.json +++ b/src/main/resources/assets/botania/models/item/blacklotus1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/blackLotus" + "layer0": "botania:items/blacklotus" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bloodPendant.json b/src/main/resources/assets/botania/models/item/bloodPendant.json deleted file mode 100644 index 2337a14c1..000000000 --- a/src/main/resources/assets/botania/models/item/bloodPendant.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/bloodPendant0", - "layer1": "botania:items/bloodPendant1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/bloodpendant.json b/src/main/resources/assets/botania/models/item/bloodpendant.json new file mode 100644 index 000000000..f63fd66c1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/bloodpendant.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/bloodpendant0", + "layer1": "botania:items/bloodpendant1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewFlask.json b/src/main/resources/assets/botania/models/item/brewflask.json similarity index 72% rename from src/main/resources/assets/botania/models/item/brewFlask.json rename to src/main/resources/assets/botania/models/item/brewflask.json index 9cdf4a51d..e195728fc 100644 --- a/src/main/resources/assets/botania/models/item/brewFlask.json +++ b/src/main/resources/assets/botania/models/item/brewflask.json @@ -9,31 +9,31 @@ "predicate": { "botania:swigs_taken": 1 }, - "model": "botania:item/brewFlask_1" + "model": "botania:item/brewflask_1" }, { "predicate": { "botania:swigs_taken": 2 }, - "model": "botania:item/brewFlask_2" + "model": "botania:item/brewflask_2" }, { "predicate": { "botania:swigs_taken": 3 }, - "model": "botania:item/brewFlask_3" + "model": "botania:item/brewflask_3" }, { "predicate": { "botania:swigs_taken": 4 }, - "model": "botania:item/brewFlask_4" + "model": "botania:item/brewflask_4" }, { "predicate": { "botania:swigs_taken": 5 }, - "model": "botania:item/brewFlask_5" + "model": "botania:item/brewflask_5" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewFlask_1.json b/src/main/resources/assets/botania/models/item/brewflask_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewFlask_1.json rename to src/main/resources/assets/botania/models/item/brewflask_1.json diff --git a/src/main/resources/assets/botania/models/item/brewFlask_2.json b/src/main/resources/assets/botania/models/item/brewflask_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewFlask_2.json rename to src/main/resources/assets/botania/models/item/brewflask_2.json diff --git a/src/main/resources/assets/botania/models/item/brewFlask_3.json b/src/main/resources/assets/botania/models/item/brewflask_3.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewFlask_3.json rename to src/main/resources/assets/botania/models/item/brewflask_3.json diff --git a/src/main/resources/assets/botania/models/item/brewFlask_4.json b/src/main/resources/assets/botania/models/item/brewflask_4.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewFlask_4.json rename to src/main/resources/assets/botania/models/item/brewflask_4.json diff --git a/src/main/resources/assets/botania/models/item/brewFlask_5.json b/src/main/resources/assets/botania/models/item/brewflask_5.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewFlask_5.json rename to src/main/resources/assets/botania/models/item/brewflask_5.json diff --git a/src/main/resources/assets/botania/models/item/brewVial.json b/src/main/resources/assets/botania/models/item/brewvial.json similarity index 75% rename from src/main/resources/assets/botania/models/item/brewVial.json rename to src/main/resources/assets/botania/models/item/brewvial.json index 42d0aef20..be49171d8 100644 --- a/src/main/resources/assets/botania/models/item/brewVial.json +++ b/src/main/resources/assets/botania/models/item/brewvial.json @@ -9,19 +9,19 @@ "predicate": { "botania:swigs_taken": 1 }, - "model": "botania:item/brewVial_1" + "model": "botania:item/brewvial_1" }, { "predicate": { "botania:swigs_taken": 2 }, - "model": "botania:item/brewVial_2" + "model": "botania:item/brewvial_2" }, { "predicate": { "botania:swigs_taken": 3 }, - "model": "botania:item/brewVial_3" + "model": "botania:item/brewvial_3" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/brewVial_1.json b/src/main/resources/assets/botania/models/item/brewvial_1.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewVial_1.json rename to src/main/resources/assets/botania/models/item/brewvial_1.json diff --git a/src/main/resources/assets/botania/models/item/brewVial_2.json b/src/main/resources/assets/botania/models/item/brewvial_2.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewVial_2.json rename to src/main/resources/assets/botania/models/item/brewvial_2.json diff --git a/src/main/resources/assets/botania/models/item/brewVial_3.json b/src/main/resources/assets/botania/models/item/brewvial_3.json similarity index 100% rename from src/main/resources/assets/botania/models/item/brewVial_3.json rename to src/main/resources/assets/botania/models/item/brewvial_3.json diff --git a/src/main/resources/assets/botania/models/item/goddessCharm.json b/src/main/resources/assets/botania/models/item/cloudpendant.json similarity index 55% rename from src/main/resources/assets/botania/models/item/goddessCharm.json rename to src/main/resources/assets/botania/models/item/cloudpendant.json index 946b6c992..a30696a7d 100644 --- a/src/main/resources/assets/botania/models/item/goddessCharm.json +++ b/src/main/resources/assets/botania/models/item/cloudpendant.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/goddessCharm" + "layer0": "botania:items/cloudpendant" } } diff --git a/src/main/resources/assets/botania/models/item/cobbleRod.json b/src/main/resources/assets/botania/models/item/cobblerod.json similarity index 61% rename from src/main/resources/assets/botania/models/item/cobbleRod.json rename to src/main/resources/assets/botania/models/item/cobblerod.json index ea5426796..2bd116443 100644 --- a/src/main/resources/assets/botania/models/item/cobbleRod.json +++ b/src/main/resources/assets/botania/models/item/cobblerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/cobbleRod" + "layer0": "botania:items/cobblerod" } } diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark0.json b/src/main/resources/assets/botania/models/item/corporeaSpark0.json deleted file mode 100644 index 879f117b2..000000000 --- a/src/main/resources/assets/botania/models/item/corporeaSpark0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/corporeaSpark0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaSpark1.json b/src/main/resources/assets/botania/models/item/corporeaSpark1.json deleted file mode 100644 index 609037769..000000000 --- a/src/main/resources/assets/botania/models/item/corporeaSpark1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/corporeaSpark2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaspark0.json b/src/main/resources/assets/botania/models/item/corporeaspark0.json new file mode 100644 index 000000000..457c6e28c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaspark0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/corporeaspark0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/corporeaspark1.json b/src/main/resources/assets/botania/models/item/corporeaspark1.json new file mode 100644 index 000000000..3eb7533d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/corporeaspark1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/corporeaspark2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/craftPattern4.json b/src/main/resources/assets/botania/models/item/craftPattern4.json deleted file mode 100644 index ff3d3db91..000000000 --- a/src/main/resources/assets/botania/models/item/craftPattern4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/craftPattern4" - } -} diff --git a/src/main/resources/assets/botania/models/item/craftPattern5.json b/src/main/resources/assets/botania/models/item/craftPattern5.json deleted file mode 100644 index ec69319d2..000000000 --- a/src/main/resources/assets/botania/models/item/craftPattern5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/craftPattern5" - } -} diff --git a/src/main/resources/assets/botania/models/item/craftPattern6.json b/src/main/resources/assets/botania/models/item/craftPattern6.json deleted file mode 100644 index 7ed12fe2c..000000000 --- a/src/main/resources/assets/botania/models/item/craftPattern6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/craftPattern6" - } -} diff --git a/src/main/resources/assets/botania/models/item/craftPattern7.json b/src/main/resources/assets/botania/models/item/craftPattern7.json deleted file mode 100644 index 5b6be2d6f..000000000 --- a/src/main/resources/assets/botania/models/item/craftPattern7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/craftPattern7" - } -} diff --git a/src/main/resources/assets/botania/models/item/craftPattern8.json b/src/main/resources/assets/botania/models/item/craftPattern8.json deleted file mode 100644 index 9561616e3..000000000 --- a/src/main/resources/assets/botania/models/item/craftPattern8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/craftPattern8" - } -} diff --git a/src/main/resources/assets/botania/models/item/craftingHalo.json b/src/main/resources/assets/botania/models/item/craftingHalo.json deleted file mode 100644 index 967f53d58..000000000 --- a/src/main/resources/assets/botania/models/item/craftingHalo.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/craftingHalo" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/craftinghalo.json b/src/main/resources/assets/botania/models/item/craftinghalo.json new file mode 100644 index 000000000..1ad4d0a11 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftinghalo.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/craftinghalo" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/craftPattern0.json b/src/main/resources/assets/botania/models/item/craftpattern0.json similarity index 59% rename from src/main/resources/assets/botania/models/item/craftPattern0.json rename to src/main/resources/assets/botania/models/item/craftpattern0.json index d26639414..62902d994 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern0.json +++ b/src/main/resources/assets/botania/models/item/craftpattern0.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftPattern0" + "layer0": "botania:items/craftpattern0" } } diff --git a/src/main/resources/assets/botania/models/item/craftPattern1.json b/src/main/resources/assets/botania/models/item/craftpattern1.json similarity index 59% rename from src/main/resources/assets/botania/models/item/craftPattern1.json rename to src/main/resources/assets/botania/models/item/craftpattern1.json index 1e82f5781..bb6d7ced5 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern1.json +++ b/src/main/resources/assets/botania/models/item/craftpattern1.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftPattern1" + "layer0": "botania:items/craftpattern1" } } diff --git a/src/main/resources/assets/botania/models/item/craftPattern2.json b/src/main/resources/assets/botania/models/item/craftpattern2.json similarity index 59% rename from src/main/resources/assets/botania/models/item/craftPattern2.json rename to src/main/resources/assets/botania/models/item/craftpattern2.json index 4481706af..381c60e29 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern2.json +++ b/src/main/resources/assets/botania/models/item/craftpattern2.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftPattern2" + "layer0": "botania:items/craftpattern2" } } diff --git a/src/main/resources/assets/botania/models/item/craftPattern3.json b/src/main/resources/assets/botania/models/item/craftpattern3.json similarity index 59% rename from src/main/resources/assets/botania/models/item/craftPattern3.json rename to src/main/resources/assets/botania/models/item/craftpattern3.json index d784cfb24..761ec3d8d 100644 --- a/src/main/resources/assets/botania/models/item/craftPattern3.json +++ b/src/main/resources/assets/botania/models/item/craftpattern3.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/craftPattern3" + "layer0": "botania:items/craftpattern3" } } diff --git a/src/main/resources/assets/botania/models/item/craftpattern4.json b/src/main/resources/assets/botania/models/item/craftpattern4.json new file mode 100644 index 000000000..1103f82e7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftpattern4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/craftpattern4" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftpattern5.json b/src/main/resources/assets/botania/models/item/craftpattern5.json new file mode 100644 index 000000000..13a64f330 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftpattern5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/craftpattern5" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftpattern6.json b/src/main/resources/assets/botania/models/item/craftpattern6.json new file mode 100644 index 000000000..0a74f2cd9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftpattern6.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/craftpattern6" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftpattern7.json b/src/main/resources/assets/botania/models/item/craftpattern7.json new file mode 100644 index 000000000..ccd13514d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftpattern7.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/craftpattern7" + } +} diff --git a/src/main/resources/assets/botania/models/item/craftpattern8.json b/src/main/resources/assets/botania/models/item/craftpattern8.json new file mode 100644 index 000000000..caf7e4f80 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/craftpattern8.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/craftpattern8" + } +} diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json deleted file mode 100644 index d907d7b2e..000000000 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/crystalBow", - "textures": { - "layer0": "botania:items/crystalBow1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json deleted file mode 100644 index 87aa0174f..000000000 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/crystalBow", - "textures": { - "layer0": "botania:items/crystalBow2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json deleted file mode 100644 index cbc3df1f5..000000000 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/crystalBow", - "textures": { - "layer0": "botania:items/crystalBow3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json deleted file mode 100644 index 9ffa86873..000000000 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/crystalBow", - "textures": { - "layer0": "botania:items/crystalBow4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json deleted file mode 100644 index b4d560244..000000000 --- a/src/main/resources/assets/botania/models/item/crystalBow_pulling_5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/crystalBow", - "textures": { - "layer0": "botania:items/crystalBow5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalBow.json b/src/main/resources/assets/botania/models/item/crystalbow.json similarity index 80% rename from src/main/resources/assets/botania/models/item/crystalBow.json rename to src/main/resources/assets/botania/models/item/crystalbow.json index 42a50a9a6..b18df708c 100644 --- a/src/main/resources/assets/botania/models/item/crystalBow.json +++ b/src/main/resources/assets/botania/models/item/crystalbow.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/crystalBow0" + "layer0": "botania:items/crystalbow0" }, "display": { "thirdperson_righthand": { @@ -30,35 +30,35 @@ "predicate": { "minecraft:pulling": 1 }, - "model": "botania:item/crystalBow_pulling_1" + "model": "botania:item/crystalbow_pulling_1" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.35 }, - "model": "botania:item/crystalBow_pulling_2" + "model": "botania:item/crystalbow_pulling_2" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.65 }, - "model": "botania:item/crystalBow_pulling_3" + "model": "botania:item/crystalbow_pulling_3" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.8 }, - "model": "botania:item/crystalBow_pulling_4" + "model": "botania:item/crystalbow_pulling_4" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.9 }, - "model": "botania:item/crystalBow_pulling_5" + "model": "botania:item/crystalbow_pulling_5" } ] } diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json new file mode 100644 index 000000000..e3671b355 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/crystalbow", + "textures": { + "layer0": "botania:items/crystalbow1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json new file mode 100644 index 000000000..36b89e937 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/crystalbow", + "textures": { + "layer0": "botania:items/crystalbow2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json new file mode 100644 index 000000000..c1c361ab2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/crystalbow", + "textures": { + "layer0": "botania:items/crystalbow3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json new file mode 100644 index 000000000..6e624c2e5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_4.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/crystalbow", + "textures": { + "layer0": "botania:items/crystalbow4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json b/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json new file mode 100644 index 000000000..a3a404994 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/crystalbow_pulling_5.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/crystalbow", + "textures": { + "layer0": "botania:items/crystalbow5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dammitReddit.json b/src/main/resources/assets/botania/models/item/dammitreddit.json similarity index 59% rename from src/main/resources/assets/botania/models/item/dammitReddit.json rename to src/main/resources/assets/botania/models/item/dammitreddit.json index 816e1b861..42ef9e45c 100644 --- a/src/main/resources/assets/botania/models/item/dammitReddit.json +++ b/src/main/resources/assets/botania/models/item/dammitreddit.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/dammitReddit" + "layer0": "botania:items/dammitreddit" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desuGun.json b/src/main/resources/assets/botania/models/item/desuGun.json deleted file mode 100644 index 91bbace8f..000000000 --- a/src/main/resources/assets/botania/models/item/desuGun.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/desuGun0", - "layer1": "botania:items/desuGun1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desuGunClip.json b/src/main/resources/assets/botania/models/item/desuGunClip.json deleted file mode 100644 index 7574143b7..000000000 --- a/src/main/resources/assets/botania/models/item/desuGunClip.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/desuGun2", - "layer1": "botania:items/desuGun1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desugun.json b/src/main/resources/assets/botania/models/item/desugun.json new file mode 100644 index 000000000..cd2620978 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desugun.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/desugun0", + "layer1": "botania:items/desugun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/desugunclip.json b/src/main/resources/assets/botania/models/item/desugunclip.json new file mode 100644 index 000000000..c0f65ca23 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/desugunclip.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/desugun2", + "layer1": "botania:items/desugun1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/fireRod.json b/src/main/resources/assets/botania/models/item/dirtrod.json similarity index 62% rename from src/main/resources/assets/botania/models/item/fireRod.json rename to src/main/resources/assets/botania/models/item/dirtrod.json index 29197907c..137842f46 100644 --- a/src/main/resources/assets/botania/models/item/fireRod.json +++ b/src/main/resources/assets/botania/models/item/dirtrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/fireRod" + "layer0": "botania:items/dirtrod" } } diff --git a/src/main/resources/assets/botania/models/item/divaCharm.json b/src/main/resources/assets/botania/models/item/divacharm.json similarity index 61% rename from src/main/resources/assets/botania/models/item/divaCharm.json rename to src/main/resources/assets/botania/models/item/divacharm.json index e2d73329d..3d1b17fab 100644 --- a/src/main/resources/assets/botania/models/item/divaCharm.json +++ b/src/main/resources/assets/botania/models/item/divacharm.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/divaCharm" + "layer0": "botania:items/divacharm" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/exchangeRod.json b/src/main/resources/assets/botania/models/item/diviningrod.json similarity index 59% rename from src/main/resources/assets/botania/models/item/exchangeRod.json rename to src/main/resources/assets/botania/models/item/diviningrod.json index e96848b86..df42fcaf4 100644 --- a/src/main/resources/assets/botania/models/item/exchangeRod.json +++ b/src/main/resources/assets/botania/models/item/diviningrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/exchangeRod" + "layer0": "botania:items/diviningrod" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dodgeRing.json b/src/main/resources/assets/botania/models/item/dodgeRing.json deleted file mode 100644 index ea3790034..000000000 --- a/src/main/resources/assets/botania/models/item/dodgeRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/dodgeRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dodgering.json b/src/main/resources/assets/botania/models/item/dodgering.json new file mode 100644 index 000000000..e9076fbda --- /dev/null +++ b/src/main/resources/assets/botania/models/item/dodgering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/dodgering" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json b/src/main/resources/assets/botania/models/item/dreamwoodtwig.json similarity index 60% rename from src/main/resources/assets/botania/models/item/dreamwoodTwig.json rename to src/main/resources/assets/botania/models/item/dreamwoodtwig.json index 6e8f6e582..a32354d60 100644 --- a/src/main/resources/assets/botania/models/item/dreamwoodTwig.json +++ b/src/main/resources/assets/botania/models/item/dreamwoodtwig.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/dreamwoodTwig" + "layer0": "botania:items/dreamwoodtwig" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json b/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json deleted file mode 100644 index 4a9cc954a..000000000 --- a/src/main/resources/assets/botania/models/item/elementiumHelmReveal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/elementiumHelmReveal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumNugget.json b/src/main/resources/assets/botania/models/item/elementiumNugget.json deleted file mode 100644 index 55a651884..000000000 --- a/src/main/resources/assets/botania/models/item/elementiumNugget.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/elementiumNugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelPick.json b/src/main/resources/assets/botania/models/item/elementiumaxe.json similarity index 60% rename from src/main/resources/assets/botania/models/item/manasteelPick.json rename to src/main/resources/assets/botania/models/item/elementiumaxe.json index 2f8fad6ab..62d8a3178 100644 --- a/src/main/resources/assets/botania/models/item/manasteelPick.json +++ b/src/main/resources/assets/botania/models/item/elementiumaxe.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelPick" + "layer0": "botania:items/elementiumaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumChest.json b/src/main/resources/assets/botania/models/item/elementiumboots.json similarity index 59% rename from src/main/resources/assets/botania/models/item/elementiumChest.json rename to src/main/resources/assets/botania/models/item/elementiumboots.json index 4d9c37adc..9c776e941 100644 --- a/src/main/resources/assets/botania/models/item/elementiumChest.json +++ b/src/main/resources/assets/botania/models/item/elementiumboots.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumChest" + "layer0": "botania:items/elementiumboots" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumBoots.json b/src/main/resources/assets/botania/models/item/elementiumchest.json similarity index 59% rename from src/main/resources/assets/botania/models/item/elementiumBoots.json rename to src/main/resources/assets/botania/models/item/elementiumchest.json index 2e191683e..fff53f0ac 100644 --- a/src/main/resources/assets/botania/models/item/elementiumBoots.json +++ b/src/main/resources/assets/botania/models/item/elementiumchest.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumBoots" + "layer0": "botania:items/elementiumchest" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumHelm.json b/src/main/resources/assets/botania/models/item/elementiumhelm.json similarity index 60% rename from src/main/resources/assets/botania/models/item/elementiumHelm.json rename to src/main/resources/assets/botania/models/item/elementiumhelm.json index 85fa4d453..a0060fa61 100644 --- a/src/main/resources/assets/botania/models/item/elementiumHelm.json +++ b/src/main/resources/assets/botania/models/item/elementiumhelm.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumHelm" + "layer0": "botania:items/elementiumhelm" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json b/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json new file mode 100644 index 000000000..69c6d5035 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumhelmreveal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/elementiumhelmreveal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumLegs.json b/src/main/resources/assets/botania/models/item/elementiumlegs.json similarity index 60% rename from src/main/resources/assets/botania/models/item/elementiumLegs.json rename to src/main/resources/assets/botania/models/item/elementiumlegs.json index 40e24a6cf..deb3776cc 100644 --- a/src/main/resources/assets/botania/models/item/elementiumLegs.json +++ b/src/main/resources/assets/botania/models/item/elementiumlegs.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/elementiumLegs" + "layer0": "botania:items/elementiumlegs" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumnugget.json b/src/main/resources/assets/botania/models/item/elementiumnugget.json new file mode 100644 index 000000000..ba4ab115e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/elementiumnugget.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/elementiumnugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumPick.json b/src/main/resources/assets/botania/models/item/elementiumpick.json similarity index 59% rename from src/main/resources/assets/botania/models/item/elementiumPick.json rename to src/main/resources/assets/botania/models/item/elementiumpick.json index 49405a587..77cebf6cf 100644 --- a/src/main/resources/assets/botania/models/item/elementiumPick.json +++ b/src/main/resources/assets/botania/models/item/elementiumpick.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumPick" + "layer0": "botania:items/elementiumpick" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShears.json b/src/main/resources/assets/botania/models/item/elementiumshears.json similarity index 62% rename from src/main/resources/assets/botania/models/item/elementiumShears.json rename to src/main/resources/assets/botania/models/item/elementiumshears.json index 70b29c93f..ccb33ea82 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShears.json +++ b/src/main/resources/assets/botania/models/item/elementiumshears.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumShears" + "layer0": "botania:items/elementiumshears" }, "overrides": [{ "predicate": { "botania:reddit": 1 }, - "model": "botania:item/dammitReddit" + "model": "botania:item/dammitreddit" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumShovel.json b/src/main/resources/assets/botania/models/item/elementiumshovel.json similarity index 58% rename from src/main/resources/assets/botania/models/item/elementiumShovel.json rename to src/main/resources/assets/botania/models/item/elementiumshovel.json index eca40c561..0810f92ee 100644 --- a/src/main/resources/assets/botania/models/item/elementiumShovel.json +++ b/src/main/resources/assets/botania/models/item/elementiumshovel.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumShovel" + "layer0": "botania:items/elementiumshovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumSword.json b/src/main/resources/assets/botania/models/item/elementiumsword.json similarity index 59% rename from src/main/resources/assets/botania/models/item/elementiumSword.json rename to src/main/resources/assets/botania/models/item/elementiumsword.json index 117839d5b..625ea03a2 100644 --- a/src/main/resources/assets/botania/models/item/elementiumSword.json +++ b/src/main/resources/assets/botania/models/item/elementiumsword.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumSword" + "layer0": "botania:items/elementiumsword" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderDagger.json b/src/main/resources/assets/botania/models/item/enderDagger.json deleted file mode 100644 index 013865926..000000000 --- a/src/main/resources/assets/botania/models/item/enderDagger.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/enderDagger0", - "layer1": "botania:items/enderDagger1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderHand.json b/src/main/resources/assets/botania/models/item/enderHand.json deleted file mode 100644 index a559e70ca..000000000 --- a/src/main/resources/assets/botania/models/item/enderHand.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/enderHand" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderAirBottle.json b/src/main/resources/assets/botania/models/item/enderairbottle.json similarity index 60% rename from src/main/resources/assets/botania/models/item/enderAirBottle.json rename to src/main/resources/assets/botania/models/item/enderairbottle.json index f20925d88..e204f4ad8 100644 --- a/src/main/resources/assets/botania/models/item/enderAirBottle.json +++ b/src/main/resources/assets/botania/models/item/enderairbottle.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/enderAirBottle" + "layer0": "botania:items/enderairbottle" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderdagger.json b/src/main/resources/assets/botania/models/item/enderdagger.json new file mode 100644 index 000000000..706277a0c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderdagger.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/enderdagger0", + "layer1": "botania:items/enderdagger1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/enderhand.json b/src/main/resources/assets/botania/models/item/enderhand.json new file mode 100644 index 000000000..00676ef5e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/enderhand.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/enderhand" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/diviningRod.json b/src/main/resources/assets/botania/models/item/exchangerod.json similarity index 59% rename from src/main/resources/assets/botania/models/item/diviningRod.json rename to src/main/resources/assets/botania/models/item/exchangerod.json index 44661ba77..8b4600523 100644 --- a/src/main/resources/assets/botania/models/item/diviningRod.json +++ b/src/main/resources/assets/botania/models/item/exchangerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/diviningRod" + "layer0": "botania:items/exchangerod" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/dirtRod.json b/src/main/resources/assets/botania/models/item/firerod.json similarity index 62% rename from src/main/resources/assets/botania/models/item/dirtRod.json rename to src/main/resources/assets/botania/models/item/firerod.json index 034a169d2..047fbd2ce 100644 --- a/src/main/resources/assets/botania/models/item/dirtRod.json +++ b/src/main/resources/assets/botania/models/item/firerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/dirtRod" + "layer0": "botania:items/firerod" } } diff --git a/src/main/resources/assets/botania/models/item/flightTiara.json b/src/main/resources/assets/botania/models/item/flightTiara.json deleted file mode 100644 index bcf6b570f..000000000 --- a/src/main/resources/assets/botania/models/item/flightTiara.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/flightTiara0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flighttiara.json b/src/main/resources/assets/botania/models/item/flighttiara.json new file mode 100644 index 000000000..a30b7ee36 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flighttiara.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/flighttiara0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flowerBag.json b/src/main/resources/assets/botania/models/item/flowerBag.json deleted file mode 100644 index 1a4958f59..000000000 --- a/src/main/resources/assets/botania/models/item/flowerBag.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/flowerBag" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flowerbag.json b/src/main/resources/assets/botania/models/item/flowerbag.json new file mode 100644 index 000000000..761acb1b3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flowerbag.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/flowerbag" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flugelEye.json b/src/main/resources/assets/botania/models/item/flugelEye.json deleted file mode 100644 index 5bcb64fdb..000000000 --- a/src/main/resources/assets/botania/models/item/flugelEye.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/flugelEye" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/flugeleye.json b/src/main/resources/assets/botania/models/item/flugeleye.json new file mode 100644 index 000000000..fd9669967 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/flugeleye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/flugeleye" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gaiaHead.json b/src/main/resources/assets/botania/models/item/gaiahead.json similarity index 100% rename from src/main/resources/assets/botania/models/item/gaiaHead.json rename to src/main/resources/assets/botania/models/item/gaiahead.json diff --git a/src/main/resources/assets/botania/models/item/gaiaIngot.json b/src/main/resources/assets/botania/models/item/gaiaingot.json similarity index 62% rename from src/main/resources/assets/botania/models/item/gaiaIngot.json rename to src/main/resources/assets/botania/models/item/gaiaingot.json index e472b6ee8..c2522ed0f 100644 --- a/src/main/resources/assets/botania/models/item/gaiaIngot.json +++ b/src/main/resources/assets/botania/models/item/gaiaingot.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/gaiaIngot" + "layer0": "botania:items/gaiaingot" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/starSword.json b/src/main/resources/assets/botania/models/item/glasspick.json similarity index 62% rename from src/main/resources/assets/botania/models/item/starSword.json rename to src/main/resources/assets/botania/models/item/glasspick.json index 979f81d5f..e3b279e49 100644 --- a/src/main/resources/assets/botania/models/item/starSword.json +++ b/src/main/resources/assets/botania/models/item/glasspick.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/starSword" + "layer0": "botania:items/glasspick" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/cloudPendant.json b/src/main/resources/assets/botania/models/item/goddesscharm.json similarity index 55% rename from src/main/resources/assets/botania/models/item/cloudPendant.json rename to src/main/resources/assets/botania/models/item/goddesscharm.json index 270524935..55d3fb9d7 100644 --- a/src/main/resources/assets/botania/models/item/cloudPendant.json +++ b/src/main/resources/assets/botania/models/item/goddesscharm.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/cloudPendant" + "layer0": "botania:items/goddesscharm" } } diff --git a/src/main/resources/assets/botania/models/item/goldenLaurel.json b/src/main/resources/assets/botania/models/item/goldenLaurel.json deleted file mode 100644 index 8c78ef8f7..000000000 --- a/src/main/resources/assets/botania/models/item/goldenLaurel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/goldenLaurel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds0.json b/src/main/resources/assets/botania/models/item/grassSeeds0.json deleted file mode 100644 index a454907f0..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds1.json b/src/main/resources/assets/botania/models/item/grassSeeds1.json deleted file mode 100644 index 5f76f84ff..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds2.json b/src/main/resources/assets/botania/models/item/grassSeeds2.json deleted file mode 100644 index 3e72c6b9d..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds3.json b/src/main/resources/assets/botania/models/item/grassSeeds3.json deleted file mode 100644 index 0901fc3be..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds4.json b/src/main/resources/assets/botania/models/item/grassSeeds4.json deleted file mode 100644 index c693d2a93..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds5.json b/src/main/resources/assets/botania/models/item/grassSeeds5.json deleted file mode 100644 index 97aeedc91..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds6.json b/src/main/resources/assets/botania/models/item/grassSeeds6.json deleted file mode 100644 index 4a87d5137..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds6.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds6" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds7.json b/src/main/resources/assets/botania/models/item/grassSeeds7.json deleted file mode 100644 index 4dc850cad..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds7.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds7" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassSeeds8.json b/src/main/resources/assets/botania/models/item/grassSeeds8.json deleted file mode 100644 index 30fdcd1e6..000000000 --- a/src/main/resources/assets/botania/models/item/grassSeeds8.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/grassSeeds8" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassHorn0.json b/src/main/resources/assets/botania/models/item/grasshorn0.json similarity index 81% rename from src/main/resources/assets/botania/models/item/grassHorn0.json rename to src/main/resources/assets/botania/models/item/grasshorn0.json index 41fe77a90..76c0c36e1 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn0.json +++ b/src/main/resources/assets/botania/models/item/grasshorn0.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/grassHorn0" + "layer0": "botania:items/grasshorn0" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/grassHorn1.json b/src/main/resources/assets/botania/models/item/grasshorn1.json similarity index 81% rename from src/main/resources/assets/botania/models/item/grassHorn1.json rename to src/main/resources/assets/botania/models/item/grasshorn1.json index 519d2b035..3974d69a6 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn1.json +++ b/src/main/resources/assets/botania/models/item/grasshorn1.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/grassHorn1" + "layer0": "botania:items/grasshorn1" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/grassHorn2.json b/src/main/resources/assets/botania/models/item/grasshorn2.json similarity index 81% rename from src/main/resources/assets/botania/models/item/grassHorn2.json rename to src/main/resources/assets/botania/models/item/grasshorn2.json index 96e0cadc3..e0bf57177 100644 --- a/src/main/resources/assets/botania/models/item/grassHorn2.json +++ b/src/main/resources/assets/botania/models/item/grasshorn2.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/grassHorn2" + "layer0": "botania:items/grasshorn2" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/grassseeds0.json b/src/main/resources/assets/botania/models/item/grassseeds0.json new file mode 100644 index 000000000..1f4f357c5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds1.json b/src/main/resources/assets/botania/models/item/grassseeds1.json new file mode 100644 index 000000000..0d9abb538 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds2.json b/src/main/resources/assets/botania/models/item/grassseeds2.json new file mode 100644 index 000000000..3fa9ddf3f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds3.json b/src/main/resources/assets/botania/models/item/grassseeds3.json new file mode 100644 index 000000000..0429a58de --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds4.json b/src/main/resources/assets/botania/models/item/grassseeds4.json new file mode 100644 index 000000000..2ee28abf9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds5.json b/src/main/resources/assets/botania/models/item/grassseeds5.json new file mode 100644 index 000000000..b44762e41 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds6.json b/src/main/resources/assets/botania/models/item/grassseeds6.json new file mode 100644 index 000000000..18412888d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds6.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds6" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds7.json b/src/main/resources/assets/botania/models/item/grassseeds7.json new file mode 100644 index 000000000..fd417c780 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds7.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds7" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/grassseeds8.json b/src/main/resources/assets/botania/models/item/grassseeds8.json new file mode 100644 index 000000000..ae3f0c811 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/grassseeds8.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/grassseeds8" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/missileRod.json b/src/main/resources/assets/botania/models/item/gravityrod.json similarity index 60% rename from src/main/resources/assets/botania/models/item/missileRod.json rename to src/main/resources/assets/botania/models/item/gravityrod.json index 8ca598a28..2ebd5fc85 100644 --- a/src/main/resources/assets/botania/models/item/missileRod.json +++ b/src/main/resources/assets/botania/models/item/gravityrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/missileRod" + "layer0": "botania:items/gravityrod" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/holyCloak.json b/src/main/resources/assets/botania/models/item/holyCloak.json deleted file mode 100644 index 5aa4b4f2b..000000000 --- a/src/main/resources/assets/botania/models/item/holyCloak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/holyCloak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/holycloak.json b/src/main/resources/assets/botania/models/item/holycloak.json new file mode 100644 index 000000000..44e62373a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/holycloak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/holycloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/icePendant.json b/src/main/resources/assets/botania/models/item/icePendant.json deleted file mode 100644 index a725f8243..000000000 --- a/src/main/resources/assets/botania/models/item/icePendant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/icePendant" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/icependant.json b/src/main/resources/assets/botania/models/item/icependant.json new file mode 100644 index 000000000..8718b3f45 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/icependant.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/icependant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/incenseStick.json b/src/main/resources/assets/botania/models/item/incenseStick.json deleted file mode 100644 index 5bcb467d2..000000000 --- a/src/main/resources/assets/botania/models/item/incenseStick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/incenseStick0", - "layer1": "botania:items/incenseStick1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/incensestick.json b/src/main/resources/assets/botania/models/item/incensestick.json new file mode 100644 index 000000000..20731f364 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/incensestick.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/incensestick0", + "layer1": "botania:items/incensestick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infiniteFruit.json b/src/main/resources/assets/botania/models/item/infinitefruit.json similarity index 60% rename from src/main/resources/assets/botania/models/item/infiniteFruit.json rename to src/main/resources/assets/botania/models/item/infinitefruit.json index bac332e08..57ac5c8ff 100644 --- a/src/main/resources/assets/botania/models/item/infiniteFruit.json +++ b/src/main/resources/assets/botania/models/item/infinitefruit.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/infiniteFruit" + "layer0": "botania:items/infinitefruit" }, "overrides": [{ "predicate": { "botania:boot": 1 }, - "model": "botania:item/infiniteFruitBoot" + "model": "botania:item/infinitefruitboot" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json b/src/main/resources/assets/botania/models/item/infinitefruitboot.json similarity index 62% rename from src/main/resources/assets/botania/models/item/infiniteFruitBoot.json rename to src/main/resources/assets/botania/models/item/infinitefruitboot.json index f1d1d4dea..03e0336c8 100644 --- a/src/main/resources/assets/botania/models/item/infiniteFruitBoot.json +++ b/src/main/resources/assets/botania/models/item/infinitefruitboot.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/dasBoot" + "layer0": "botania:items/dasboot" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/invisibilityCloak.json b/src/main/resources/assets/botania/models/item/invisibilityCloak.json deleted file mode 100644 index 539b58b1b..000000000 --- a/src/main/resources/assets/botania/models/item/invisibilityCloak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/invisibilityCloak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/invisibilitycloak.json b/src/main/resources/assets/botania/models/item/invisibilitycloak.json new file mode 100644 index 000000000..02bf33b78 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/invisibilitycloak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/invisibilitycloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemFinder.json b/src/main/resources/assets/botania/models/item/itemFinder.json deleted file mode 100644 index cd2c87773..000000000 --- a/src/main/resources/assets/botania/models/item/itemFinder.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/itemFinder" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json index 421b6da4d..827f0c96e 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json +++ b/src/main/resources/assets/botania/models/item/itemblock/alfglass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/elfGlass" + "layer0": "botania:blocks/elfglass" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json index c3487cd69..f3352ab13 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/desert_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone13" + "wall": "botania:blocks/biomestone13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json index e4a45a6db..e60ffb151 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_black.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower15Tall1" + "layer0": "botania:blocks/flower15tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json index 9668e1b59..fa5a4f416 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower11Tall1" + "layer0": "botania:blocks/flower11tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json index b3d75c7f6..8443ea1db 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_brown.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower12Tall1" + "layer0": "botania:blocks/flower12tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json index ef2e30ccb..02d150e88 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_cyan.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower9Tall1" + "layer0": "botania:blocks/flower9tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json index 75f4a0808..f35b52535 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_gray.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower7Tall1" + "layer0": "botania:blocks/flower7tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json index 18828e58a..9f947b355 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_green.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower13Tall1" + "layer0": "botania:blocks/flower13tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json index 8320ee8c8..37fe607b9 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_light_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower3Tall1" + "layer0": "botania:blocks/flower3tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json index f608684b6..552b76614 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_lime.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower5Tall1" + "layer0": "botania:blocks/flower5tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json index c483545ff..936452196 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_magenta.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower2Tall1" + "layer0": "botania:blocks/flower2tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json index 3f8539119..1c051b58b 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_orange.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower1Tall1" + "layer0": "botania:blocks/flower1tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json index 914aaa92f..ab2a29a87 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_pink.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower6Tall1" + "layer0": "botania:blocks/flower6tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json index d472eb44c..304eb40e5 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_purple.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower10Tall1" + "layer0": "botania:blocks/flower10tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json index b28bc6877..b9f6fc662 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_red.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower14Tall1" + "layer0": "botania:blocks/flower14tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json index 46cfc57db..2a6f930ac 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_silver.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower8Tall1" + "layer0": "botania:blocks/flower8tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json index e46bcdf60..a98c90510 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_white.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower0Tall1" + "layer0": "botania:blocks/flower0tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json b/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json index b0555d4fa..f790788d6 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json +++ b/src/main/resources/assets/botania/models/item/itemblock/double_flower_yellow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flower4Tall1" + "layer0": "botania:blocks/flower4tall1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json index 9cde1a1d5..9f2f2e9ab 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/forest_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone8" + "wall": "botania:blocks/biomestone8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json index 00845bd40..ff421cb05 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/fungal_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone11" + "wall": "botania:blocks/biomestone11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json index 5d7e72edb..12b64d196 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json +++ b/src/main/resources/assets/botania/models/item/itemblock/ghost_rail.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/ghostRail" + "layer0": "botania:blocks/ghostrail" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json index 7db03e570..0ba4ced64 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_black.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering15" + "layer0": "botania:blocks/flowerglimmering15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json index 386070987..ddb84e1ea 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering11" + "layer0": "botania:blocks/flowerglimmering11" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json index 57785a008..b54e0775f 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_brown.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering12" + "layer0": "botania:blocks/flowerglimmering12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json index 78c2694ed..a8c87c7ea 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_cyan.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering9" + "layer0": "botania:blocks/flowerglimmering9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json index a3d4c6d9e..9fef9a17b 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_gray.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering7" + "layer0": "botania:blocks/flowerglimmering7" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json index 766eaea66..69d544551 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_green.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering13" + "layer0": "botania:blocks/flowerglimmering13" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json index d1741a155..07fdf2e37 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_light_blue.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering3" + "layer0": "botania:blocks/flowerglimmering3" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json index 93bd43215..deb2fd5f3 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_lime.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering5" + "layer0": "botania:blocks/flowerglimmering5" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json index b97b05c9d..031ee8d1b 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_magenta.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering2" + "layer0": "botania:blocks/flowerglimmering2" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json index cfd163cc3..210594c48 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_orange.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering1" + "layer0": "botania:blocks/flowerglimmering1" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json index 12ff0e450..173b53340 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_pink.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering6" + "layer0": "botania:blocks/flowerglimmering6" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json index 308c42aba..041186005 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_purple.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering10" + "layer0": "botania:blocks/flowerglimmering10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json index c99198612..dc188717c 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_red.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering14" + "layer0": "botania:blocks/flowerglimmering14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json index e289f2fbd..c79ebe256 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_silver.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering8" + "layer0": "botania:blocks/flowerglimmering8" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json index 929d50392..83faeb679 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_white.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering0" + "layer0": "botania:blocks/flowerglimmering0" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json index 38009d69f..fd1ee24ef 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json +++ b/src/main/resources/assets/botania/models/item/itemblock/glimmering_flower_yellow.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/flowerGlimmering4" + "layer0": "botania:blocks/flowerglimmering4" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json index 0316bf04a..5b0e25376 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json +++ b/src/main/resources/assets/botania/models/item/itemblock/managlass_pane.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:blocks/manaGlass" + "layer0": "botania:blocks/managlass" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json index 4b6794cfd..2b9798ad7 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/mesa_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone15" + "wall": "botania:blocks/biomestone15" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json index 0c229f43c..24975ac9b 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/mountain_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone10" + "wall": "botania:blocks/biomestone10" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json index 14a90dc0c..4ae359434 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/plains_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone9" + "wall": "botania:blocks/biomestone9" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json index 3367852d2..3c0b04e01 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/swamp_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone12" + "wall": "botania:blocks/biomestone12" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json b/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json index 18efd12a0..ac9902981 100644 --- a/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json +++ b/src/main/resources/assets/botania/models/item/itemblock/taiga_cobble_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "botania:blocks/biomeStone14" + "wall": "botania:blocks/biomestone14" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/itemfinder.json b/src/main/resources/assets/botania/models/item/itemfinder.json new file mode 100644 index 000000000..fcfe858e4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/itemfinder.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/itemfinder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/keepIvy.json b/src/main/resources/assets/botania/models/item/keepivy.json similarity index 62% rename from src/main/resources/assets/botania/models/item/keepIvy.json rename to src/main/resources/assets/botania/models/item/keepivy.json index dcd6a0e49..523f6bb2b 100644 --- a/src/main/resources/assets/botania/models/item/keepIvy.json +++ b/src/main/resources/assets/botania/models/item/keepivy.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/keepIvy" + "layer0": "botania:items/keepivy" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/kingKey.json b/src/main/resources/assets/botania/models/item/kingkey.json similarity index 62% rename from src/main/resources/assets/botania/models/item/kingKey.json rename to src/main/resources/assets/botania/models/item/kingkey.json index bf3fea763..edf697fc4 100644 --- a/src/main/resources/assets/botania/models/item/kingKey.json +++ b/src/main/resources/assets/botania/models/item/kingkey.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/kingKey" + "layer0": "botania:items/kingkey" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/knockbackBelt.json b/src/main/resources/assets/botania/models/item/knockbackBelt.json deleted file mode 100644 index f40761906..000000000 --- a/src/main/resources/assets/botania/models/item/knockbackBelt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/knockbackBelt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/knockbackbelt.json b/src/main/resources/assets/botania/models/item/knockbackbelt.json new file mode 100644 index 000000000..1747de2d7 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/knockbackbelt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/knockbackbelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/laputaShard.json b/src/main/resources/assets/botania/models/item/laputaShard.json deleted file mode 100644 index b82a58265..000000000 --- a/src/main/resources/assets/botania/models/item/laputaShard.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/laputaShard" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/laputashard.json b/src/main/resources/assets/botania/models/item/laputashard.json new file mode 100644 index 000000000..7c024d830 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/laputashard.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/laputashard" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavaPendant.json b/src/main/resources/assets/botania/models/item/lavaPendant.json deleted file mode 100644 index a07c427fb..000000000 --- a/src/main/resources/assets/botania/models/item/lavaPendant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lavaPendant" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lavapendant.json b/src/main/resources/assets/botania/models/item/lavapendant.json new file mode 100644 index 000000000..dc9b7fb51 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lavapendant.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lavapendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensBounce.json b/src/main/resources/assets/botania/models/item/lensBounce.json deleted file mode 100644 index 64c3af30c..000000000 --- a/src/main/resources/assets/botania/models/item/lensBounce.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensBounce" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensDamage.json b/src/main/resources/assets/botania/models/item/lensDamage.json deleted file mode 100644 index 55e010a1a..000000000 --- a/src/main/resources/assets/botania/models/item/lensDamage.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensDamage" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensEfficiency.json b/src/main/resources/assets/botania/models/item/lensEfficiency.json deleted file mode 100644 index b95924877..000000000 --- a/src/main/resources/assets/botania/models/item/lensEfficiency.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensEfficiency" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensExplosive.json b/src/main/resources/assets/botania/models/item/lensExplosive.json deleted file mode 100644 index 82dc3af79..000000000 --- a/src/main/resources/assets/botania/models/item/lensExplosive.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensExplosive" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFire.json b/src/main/resources/assets/botania/models/item/lensFire.json deleted file mode 100644 index 20a6415bb..000000000 --- a/src/main/resources/assets/botania/models/item/lensFire.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensFire" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFirework.json b/src/main/resources/assets/botania/models/item/lensFirework.json deleted file mode 100644 index 4d6dbb636..000000000 --- a/src/main/resources/assets/botania/models/item/lensFirework.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensFirework" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensFlare.json b/src/main/resources/assets/botania/models/item/lensFlare.json deleted file mode 100644 index 732067903..000000000 --- a/src/main/resources/assets/botania/models/item/lensFlare.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensFlare" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensGravity.json b/src/main/resources/assets/botania/models/item/lensGravity.json deleted file mode 100644 index 1ff6583dd..000000000 --- a/src/main/resources/assets/botania/models/item/lensGravity.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensGravity" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensInfluence.json b/src/main/resources/assets/botania/models/item/lensInfluence.json deleted file mode 100644 index 351e65427..000000000 --- a/src/main/resources/assets/botania/models/item/lensInfluence.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensInfluence" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensLight.json b/src/main/resources/assets/botania/models/item/lensLight.json deleted file mode 100644 index ff4d53799..000000000 --- a/src/main/resources/assets/botania/models/item/lensLight.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensLight" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMagnet.json b/src/main/resources/assets/botania/models/item/lensMagnet.json deleted file mode 100644 index 481e3b44f..000000000 --- a/src/main/resources/assets/botania/models/item/lensMagnet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensMagnet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMessenger.json b/src/main/resources/assets/botania/models/item/lensMessenger.json deleted file mode 100644 index 9ec14408f..000000000 --- a/src/main/resources/assets/botania/models/item/lensMessenger.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensMessenger" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensMine.json b/src/main/resources/assets/botania/models/item/lensMine.json deleted file mode 100644 index 496ee9d37..000000000 --- a/src/main/resources/assets/botania/models/item/lensMine.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensMine" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensNormal.json b/src/main/resources/assets/botania/models/item/lensNormal.json deleted file mode 100644 index cba49b27e..000000000 --- a/src/main/resources/assets/botania/models/item/lensNormal.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensNormal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPaint.json b/src/main/resources/assets/botania/models/item/lensPaint.json deleted file mode 100644 index 6555d1415..000000000 --- a/src/main/resources/assets/botania/models/item/lensPaint.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensPaint" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPhantom.json b/src/main/resources/assets/botania/models/item/lensPhantom.json deleted file mode 100644 index 8338d9f01..000000000 --- a/src/main/resources/assets/botania/models/item/lensPhantom.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensPhantom" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPiston.json b/src/main/resources/assets/botania/models/item/lensPiston.json deleted file mode 100644 index e2c8e8cd1..000000000 --- a/src/main/resources/assets/botania/models/item/lensPiston.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensPiston" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensPower.json b/src/main/resources/assets/botania/models/item/lensPower.json deleted file mode 100644 index 19f14c990..000000000 --- a/src/main/resources/assets/botania/models/item/lensPower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensPower" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensRedirect.json b/src/main/resources/assets/botania/models/item/lensRedirect.json deleted file mode 100644 index 8093c7c14..000000000 --- a/src/main/resources/assets/botania/models/item/lensRedirect.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensRedirect" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensSpeed.json b/src/main/resources/assets/botania/models/item/lensSpeed.json deleted file mode 100644 index ba122d36a..000000000 --- a/src/main/resources/assets/botania/models/item/lensSpeed.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensSpeed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensTime.json b/src/main/resources/assets/botania/models/item/lensTime.json deleted file mode 100644 index 2dfb1d0a3..000000000 --- a/src/main/resources/assets/botania/models/item/lensTime.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensTime" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensTripwire.json b/src/main/resources/assets/botania/models/item/lensTripwire.json deleted file mode 100644 index 65e88b7fd..000000000 --- a/src/main/resources/assets/botania/models/item/lensTripwire.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensTripwire" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensWarp.json b/src/main/resources/assets/botania/models/item/lensWarp.json deleted file mode 100644 index 0cd2f394d..000000000 --- a/src/main/resources/assets/botania/models/item/lensWarp.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensWarp" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensWeight.json b/src/main/resources/assets/botania/models/item/lensWeight.json deleted file mode 100644 index 1a3322955..000000000 --- a/src/main/resources/assets/botania/models/item/lensWeight.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/lensInside", - "layer1": "botania:items/lensWeight" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensbounce.json b/src/main/resources/assets/botania/models/item/lensbounce.json new file mode 100644 index 000000000..4378f7e7f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensbounce.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensbounce" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensdamage.json b/src/main/resources/assets/botania/models/item/lensdamage.json new file mode 100644 index 000000000..38820b593 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensdamage.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensdamage" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensefficiency.json b/src/main/resources/assets/botania/models/item/lensefficiency.json new file mode 100644 index 000000000..0e6729d7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensefficiency.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensefficiency" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensexplosive.json b/src/main/resources/assets/botania/models/item/lensexplosive.json new file mode 100644 index 000000000..d884f7908 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensexplosive.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensexplosive" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensfire.json b/src/main/resources/assets/botania/models/item/lensfire.json new file mode 100644 index 000000000..2348ae544 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensfire.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensfire" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensfirework.json b/src/main/resources/assets/botania/models/item/lensfirework.json new file mode 100644 index 000000000..93f168c0b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensfirework.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensfirework" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensflare.json b/src/main/resources/assets/botania/models/item/lensflare.json new file mode 100644 index 000000000..980d32062 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensflare.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensflare" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensgravity.json b/src/main/resources/assets/botania/models/item/lensgravity.json new file mode 100644 index 000000000..5bf96e98d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensgravity.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensgravity" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensinfluence.json b/src/main/resources/assets/botania/models/item/lensinfluence.json new file mode 100644 index 000000000..ffd4029e8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensinfluence.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensinfluence" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenslight.json b/src/main/resources/assets/botania/models/item/lenslight.json new file mode 100644 index 000000000..c486c60ae --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenslight.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenslight" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmagnet.json b/src/main/resources/assets/botania/models/item/lensmagnet.json new file mode 100644 index 000000000..2ff9465eb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensmagnet.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensmagnet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmessenger.json b/src/main/resources/assets/botania/models/item/lensmessenger.json new file mode 100644 index 000000000..191d3084c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensmessenger.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensmessenger" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensmine.json b/src/main/resources/assets/botania/models/item/lensmine.json new file mode 100644 index 000000000..6bfc5b5d8 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensmine.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensmine" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensnormal.json b/src/main/resources/assets/botania/models/item/lensnormal.json new file mode 100644 index 000000000..0f242e7cd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensnormal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensnormal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspaint.json b/src/main/resources/assets/botania/models/item/lenspaint.json new file mode 100644 index 000000000..2b1b98ccc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenspaint.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenspaint" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensphantom.json b/src/main/resources/assets/botania/models/item/lensphantom.json new file mode 100644 index 000000000..d5ffbf301 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensphantom.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensphantom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspiston.json b/src/main/resources/assets/botania/models/item/lenspiston.json new file mode 100644 index 000000000..381a4521e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenspiston.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenspiston" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenspower.json b/src/main/resources/assets/botania/models/item/lenspower.json new file mode 100644 index 000000000..19d999568 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenspower.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenspower" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensredirect.json b/src/main/resources/assets/botania/models/item/lensredirect.json new file mode 100644 index 000000000..26daf6d62 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensredirect.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensredirect" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensspeed.json b/src/main/resources/assets/botania/models/item/lensspeed.json new file mode 100644 index 000000000..c868f4bec --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensspeed.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensspeed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstime.json b/src/main/resources/assets/botania/models/item/lenstime.json new file mode 100644 index 000000000..ecafbdf3b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenstime.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenstime" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenstripwire.json b/src/main/resources/assets/botania/models/item/lenstripwire.json new file mode 100644 index 000000000..55d997160 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenstripwire.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenstripwire" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lenswarp.json b/src/main/resources/assets/botania/models/item/lenswarp.json new file mode 100644 index 000000000..8216f761d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lenswarp.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lenswarp" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lensweight.json b/src/main/resources/assets/botania/models/item/lensweight.json new file mode 100644 index 000000000..f4de36db0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/lensweight.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/lensinside", + "layer1": "botania:items/lensweight" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lifeEssence.json b/src/main/resources/assets/botania/models/item/lifeessence.json similarity index 61% rename from src/main/resources/assets/botania/models/item/lifeEssence.json rename to src/main/resources/assets/botania/models/item/lifeessence.json index 3c6b80c69..5eb82d609 100644 --- a/src/main/resources/assets/botania/models/item/lifeEssence.json +++ b/src/main/resources/assets/botania/models/item/lifeessence.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lifeEssence" + "layer0": "botania:items/lifeessence" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingRoot.json b/src/main/resources/assets/botania/models/item/livingroot.json similarity index 100% rename from src/main/resources/assets/botania/models/item/livingRoot.json rename to src/main/resources/assets/botania/models/item/livingroot.json diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json deleted file mode 100644 index 3dd9b8449..000000000 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/livingwoodBow", - "textures": { - "layer0": "botania:items/livingwoodBow1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json deleted file mode 100644 index 9b67919b4..000000000 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/livingwoodBow", - "textures": { - "layer0": "botania:items/livingwoodBow2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json deleted file mode 100644 index ffa377cbb..000000000 --- a/src/main/resources/assets/botania/models/item/livingwoodBow_pulling_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/livingwoodBow", - "textures": { - "layer0": "botania:items/livingwoodBow3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodTwig.json b/src/main/resources/assets/botania/models/item/livingwoodTwig.json deleted file mode 100644 index 871523258..000000000 --- a/src/main/resources/assets/botania/models/item/livingwoodTwig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/livingwoodTwig" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodBow.json b/src/main/resources/assets/botania/models/item/livingwoodbow.json similarity index 82% rename from src/main/resources/assets/botania/models/item/livingwoodBow.json rename to src/main/resources/assets/botania/models/item/livingwoodbow.json index 179a3ab2b..b7d548208 100644 --- a/src/main/resources/assets/botania/models/item/livingwoodBow.json +++ b/src/main/resources/assets/botania/models/item/livingwoodbow.json @@ -1,7 +1,7 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/livingwoodBow0" + "layer0": "botania:items/livingwoodbow0" }, "display": { "thirdperson_righthand": { @@ -30,21 +30,21 @@ "predicate": { "minecraft:pulling": 1 }, - "model": "botania:item/livingwoodBow_pulling_1" + "model": "botania:item/livingwoodbow_pulling_1" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.65 }, - "model": "botania:item/livingwoodBow_pulling_2" + "model": "botania:item/livingwoodbow_pulling_2" }, { "predicate": { "minecraft:pulling": 1, "minecraft:pull": 0.9 }, - "model": "botania:item/livingwoodBow_pulling_3" + "model": "botania:item/livingwoodbow_pulling_3" } ] } diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json new file mode 100644 index 000000000..16da6cd0e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_1.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/livingwoodbow", + "textures": { + "layer0": "botania:items/livingwoodbow1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json new file mode 100644 index 000000000..d03705b2b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_2.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/livingwoodbow", + "textures": { + "layer0": "botania:items/livingwoodbow2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json new file mode 100644 index 000000000..0b0665f93 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodbow_pulling_3.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/livingwoodbow", + "textures": { + "layer0": "botania:items/livingwoodbow3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/livingwoodtwig.json b/src/main/resources/assets/botania/models/item/livingwoodtwig.json new file mode 100644 index 000000000..db4b34fc3 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/livingwoodtwig.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/livingwoodtwig" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/lokiRing.json b/src/main/resources/assets/botania/models/item/lokiring.json similarity index 61% rename from src/main/resources/assets/botania/models/item/lokiRing.json rename to src/main/resources/assets/botania/models/item/lokiring.json index 1181e275c..c25d5e3d9 100644 --- a/src/main/resources/assets/botania/models/item/lokiRing.json +++ b/src/main/resources/assets/botania/models/item/lokiring.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/lokiRing" + "layer0": "botania:items/lokiring" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json b/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json deleted file mode 100644 index 996663ee9..000000000 --- a/src/main/resources/assets/botania/models/item/magnetRingGreaterOn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/magnetRingGreater0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingOn.json b/src/main/resources/assets/botania/models/item/magnetRingOn.json deleted file mode 100644 index 306838b7c..000000000 --- a/src/main/resources/assets/botania/models/item/magnetRingOn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/magnetRing0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRing.json b/src/main/resources/assets/botania/models/item/magnetring.json similarity index 61% rename from src/main/resources/assets/botania/models/item/magnetRing.json rename to src/main/resources/assets/botania/models/item/magnetring.json index 273320918..196988b50 100644 --- a/src/main/resources/assets/botania/models/item/magnetRing.json +++ b/src/main/resources/assets/botania/models/item/magnetring.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/magnetRing1" + "layer0": "botania:items/magnetring1" }, "overrides": [{ "predicate": { "botania:on": 1 }, - "model": "botania:item/magnetRingOn" + "model": "botania:item/magnetringon" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetRingGreater.json b/src/main/resources/assets/botania/models/item/magnetringgreater.json similarity index 58% rename from src/main/resources/assets/botania/models/item/magnetRingGreater.json rename to src/main/resources/assets/botania/models/item/magnetringgreater.json index f84549423..18470ee10 100644 --- a/src/main/resources/assets/botania/models/item/magnetRingGreater.json +++ b/src/main/resources/assets/botania/models/item/magnetringgreater.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/magnetRingGreater1" + "layer0": "botania:items/magnetringgreater1" }, "overrides": [{ "predicate": { "botania:on": 1 }, - "model": "botania:item/magnetRingGreaterOn" + "model": "botania:item/magnetringgreateron" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetringgreateron.json b/src/main/resources/assets/botania/models/item/magnetringgreateron.json new file mode 100644 index 000000000..6417dfc96 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetringgreateron.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/magnetringgreater0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/magnetringon.json b/src/main/resources/assets/botania/models/item/magnetringon.json new file mode 100644 index 000000000..344481dd2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/magnetringon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/magnetring0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle0.json b/src/main/resources/assets/botania/models/item/manaBottle0.json deleted file mode 100644 index 51e07ede8..000000000 --- a/src/main/resources/assets/botania/models/item/manaBottle0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaBottle0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle1.json b/src/main/resources/assets/botania/models/item/manaBottle1.json deleted file mode 100644 index 16a31af33..000000000 --- a/src/main/resources/assets/botania/models/item/manaBottle1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaBottle1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle2.json b/src/main/resources/assets/botania/models/item/manaBottle2.json deleted file mode 100644 index b0b032bc1..000000000 --- a/src/main/resources/assets/botania/models/item/manaBottle2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaBottle2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle3.json b/src/main/resources/assets/botania/models/item/manaBottle3.json deleted file mode 100644 index 1e495be31..000000000 --- a/src/main/resources/assets/botania/models/item/manaBottle3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaBottle3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle4.json b/src/main/resources/assets/botania/models/item/manaBottle4.json deleted file mode 100644 index 3ac1bcda8..000000000 --- a/src/main/resources/assets/botania/models/item/manaBottle4.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaBottle4" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaBottle5.json b/src/main/resources/assets/botania/models/item/manaBottle5.json deleted file mode 100644 index c85cb48e1..000000000 --- a/src/main/resources/assets/botania/models/item/manaBottle5.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaBottle5" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaInkwell.json b/src/main/resources/assets/botania/models/item/manaInkwell.json deleted file mode 100644 index 6c75018c4..000000000 --- a/src/main/resources/assets/botania/models/item/manaInkwell.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaInkwell" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaMirror.json b/src/main/resources/assets/botania/models/item/manaMirror.json deleted file mode 100644 index 71df4d562..000000000 --- a/src/main/resources/assets/botania/models/item/manaMirror.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaMirror0", - "layer1": "botania:items/manaMirror1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaRing.json b/src/main/resources/assets/botania/models/item/manaRing.json deleted file mode 100644 index d1351432a..000000000 --- a/src/main/resources/assets/botania/models/item/manaRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaRingGreater.json b/src/main/resources/assets/botania/models/item/manaRingGreater.json deleted file mode 100644 index 906e35a9a..000000000 --- a/src/main/resources/assets/botania/models/item/manaRingGreater.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaRingGreater" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaTablet.json b/src/main/resources/assets/botania/models/item/manaTablet.json deleted file mode 100644 index 513ff9acb..000000000 --- a/src/main/resources/assets/botania/models/item/manaTablet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manaTablet0", - "layer1": "botania:items/manaTablet1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle0.json b/src/main/resources/assets/botania/models/item/manabottle0.json new file mode 100644 index 000000000..a2f440a46 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manabottle0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle1.json b/src/main/resources/assets/botania/models/item/manabottle1.json new file mode 100644 index 000000000..198f565d9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manabottle1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle2.json b/src/main/resources/assets/botania/models/item/manabottle2.json new file mode 100644 index 000000000..1912efabb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manabottle2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle3.json b/src/main/resources/assets/botania/models/item/manabottle3.json new file mode 100644 index 000000000..b65ab4339 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manabottle3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle4.json b/src/main/resources/assets/botania/models/item/manabottle4.json new file mode 100644 index 000000000..1c62d4c74 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle4.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manabottle4" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manabottle5.json b/src/main/resources/assets/botania/models/item/manabottle5.json new file mode 100644 index 000000000..aa936e9ec --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manabottle5.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manabottle5" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaCookie.json b/src/main/resources/assets/botania/models/item/manacookie.json similarity index 63% rename from src/main/resources/assets/botania/models/item/manaCookie.json rename to src/main/resources/assets/botania/models/item/manacookie.json index 3f825a6c8..8aea1098d 100644 --- a/src/main/resources/assets/botania/models/item/manaCookie.json +++ b/src/main/resources/assets/botania/models/item/manacookie.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaCookie" + "layer0": "botania:items/manacookie" }, "overrides": [{ "predicate": { "botania:totalbiscuit": 1 }, - "model": "botania:item/totalBiscuit" + "model": "botania:item/totalbiscuit" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaDiamond.json b/src/main/resources/assets/botania/models/item/manadiamond.json similarity index 61% rename from src/main/resources/assets/botania/models/item/manaDiamond.json rename to src/main/resources/assets/botania/models/item/manadiamond.json index 9b03388db..d99e09175 100644 --- a/src/main/resources/assets/botania/models/item/manaDiamond.json +++ b/src/main/resources/assets/botania/models/item/manadiamond.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaDiamond" + "layer0": "botania:items/manadiamond" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaGun.json b/src/main/resources/assets/botania/models/item/managun.json similarity index 98% rename from src/main/resources/assets/botania/models/item/manaGun.json rename to src/main/resources/assets/botania/models/item/managun.json index 2173f234e..b9bc2b402 100644 --- a/src/main/resources/assets/botania/models/item/manaGun.json +++ b/src/main/resources/assets/botania/models/item/managun.json @@ -1,9 +1,9 @@ { "__comment": "Author: wiiv", "textures": { - "layer0": "botania:items/manaBlaster", - "layer1": "botania:items/manaBlasterColor", - "layer2": "botania:items/manaBlasterGlass" + "layer0": "botania:items/manablaster", + "layer1": "botania:items/manablastercolor", + "layer2": "botania:items/manablasterglass" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/item/manaGunClip.json b/src/main/resources/assets/botania/models/item/managunclip.json similarity index 97% rename from src/main/resources/assets/botania/models/item/manaGunClip.json rename to src/main/resources/assets/botania/models/item/managunclip.json index aa7221398..6153c87d0 100644 --- a/src/main/resources/assets/botania/models/item/manaGunClip.json +++ b/src/main/resources/assets/botania/models/item/managunclip.json @@ -1,10 +1,10 @@ { "__comment": "Author: wiiv", "textures": { - "layer0": "botania:items/manaBlaster", - "layer1": "botania:items/manaBlasterColor", - "layer2": "botania:items/manaBlasterGlass", - "layer3": "botania:items/manaBlasterLensClip" + "layer0": "botania:items/manablaster", + "layer1": "botania:items/manablastercolor", + "layer2": "botania:items/manablasterglass", + "layer3": "botania:items/manablasterlensclip" }, "elements": [ { diff --git a/src/main/resources/assets/botania/models/item/manainkwell.json b/src/main/resources/assets/botania/models/item/manainkwell.json new file mode 100644 index 000000000..a97c1f31c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manainkwell.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manainkwell" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manamirror.json b/src/main/resources/assets/botania/models/item/manamirror.json new file mode 100644 index 000000000..14608ccec --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manamirror.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manamirror0", + "layer1": "botania:items/manamirror1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaPearl.json b/src/main/resources/assets/botania/models/item/manapearl.json similarity index 62% rename from src/main/resources/assets/botania/models/item/manaPearl.json rename to src/main/resources/assets/botania/models/item/manapearl.json index 5d231a549..0fc9a1254 100644 --- a/src/main/resources/assets/botania/models/item/manaPearl.json +++ b/src/main/resources/assets/botania/models/item/manapearl.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaPearl" + "layer0": "botania:items/manapearl" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaPowder.json b/src/main/resources/assets/botania/models/item/manapowder.json similarity index 62% rename from src/main/resources/assets/botania/models/item/manaPowder.json rename to src/main/resources/assets/botania/models/item/manapowder.json index d5a884e32..1740b510a 100644 --- a/src/main/resources/assets/botania/models/item/manaPowder.json +++ b/src/main/resources/assets/botania/models/item/manapowder.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaPowder" + "layer0": "botania:items/manapowder" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaring.json b/src/main/resources/assets/botania/models/item/manaring.json new file mode 100644 index 000000000..0c5f78381 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manaring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaringgreater.json b/src/main/resources/assets/botania/models/item/manaringgreater.json new file mode 100644 index 000000000..7e221456d --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaringgreater.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manaringgreater" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelBoots.json b/src/main/resources/assets/botania/models/item/manasteelBoots.json deleted file mode 100644 index f1b52078f..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelBoots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/manasteelBoots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelChest.json b/src/main/resources/assets/botania/models/item/manasteelChest.json deleted file mode 100644 index fe9b46a8a..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelChest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/manasteelChest" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelHelm.json b/src/main/resources/assets/botania/models/item/manasteelHelm.json deleted file mode 100644 index 8126b821d..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelHelm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/manasteelHelm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json b/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json deleted file mode 100644 index 39aac7ede..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelHelmReveal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/manasteelHelmReveal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelLegs.json b/src/main/resources/assets/botania/models/item/manasteelLegs.json deleted file mode 100644 index 02ec3aea7..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelLegs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/manasteelLegs" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelNugget.json b/src/main/resources/assets/botania/models/item/manasteelNugget.json deleted file mode 100644 index 599cd8ed8..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelNugget.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/manasteelNugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShears.json b/src/main/resources/assets/botania/models/item/manasteelShears.json deleted file mode 100644 index e4b8a0cc6..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelShears.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": - { - "layer0": "botania:items/manasteelShears" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelShovel.json b/src/main/resources/assets/botania/models/item/manasteelShovel.json deleted file mode 100644 index 0f2ce4744..000000000 --- a/src/main/resources/assets/botania/models/item/manasteelShovel.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": - { - "layer0": "botania:items/manasteelShovel" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelAxe.json b/src/main/resources/assets/botania/models/item/manasteelaxe.json similarity index 60% rename from src/main/resources/assets/botania/models/item/manasteelAxe.json rename to src/main/resources/assets/botania/models/item/manasteelaxe.json index 4755fed67..7da075ce2 100644 --- a/src/main/resources/assets/botania/models/item/manasteelAxe.json +++ b/src/main/resources/assets/botania/models/item/manasteelaxe.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelAxe" + "layer0": "botania:items/manasteelaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelboots.json b/src/main/resources/assets/botania/models/item/manasteelboots.json new file mode 100644 index 000000000..b8868aa99 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelboots.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manasteelboots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelchest.json b/src/main/resources/assets/botania/models/item/manasteelchest.json new file mode 100644 index 000000000..4eb327468 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelchest.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manasteelchest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelhelm.json b/src/main/resources/assets/botania/models/item/manasteelhelm.json new file mode 100644 index 000000000..f013363fb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelhelm.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manasteelhelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json b/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json new file mode 100644 index 000000000..9ce034522 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelhelmreveal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manasteelhelmreveal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteellegs.json b/src/main/resources/assets/botania/models/item/manasteellegs.json new file mode 100644 index 000000000..f19521d3f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteellegs.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manasteellegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelnugget.json b/src/main/resources/assets/botania/models/item/manasteelnugget.json new file mode 100644 index 000000000..51d8a8a2e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelnugget.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manasteelnugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/elementiumAxe.json b/src/main/resources/assets/botania/models/item/manasteelpick.json similarity index 60% rename from src/main/resources/assets/botania/models/item/elementiumAxe.json rename to src/main/resources/assets/botania/models/item/manasteelpick.json index dff087e23..f65fbead8 100644 --- a/src/main/resources/assets/botania/models/item/elementiumAxe.json +++ b/src/main/resources/assets/botania/models/item/manasteelpick.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/elementiumAxe" + "layer0": "botania:items/manasteelpick" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelshears.json b/src/main/resources/assets/botania/models/item/manasteelshears.json new file mode 100644 index 000000000..43ad3c08c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelshears.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/handheld", + "textures": + { + "layer0": "botania:items/manasteelshears" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelshovel.json b/src/main/resources/assets/botania/models/item/manasteelshovel.json new file mode 100644 index 000000000..a3208cc0a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manasteelshovel.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/handheld", + "textures": + { + "layer0": "botania:items/manasteelshovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manasteelSword.json b/src/main/resources/assets/botania/models/item/manasteelsword.json similarity index 81% rename from src/main/resources/assets/botania/models/item/manasteelSword.json rename to src/main/resources/assets/botania/models/item/manasteelsword.json index 2279051fb..a30b7e567 100644 --- a/src/main/resources/assets/botania/models/item/manasteelSword.json +++ b/src/main/resources/assets/botania/models/item/manasteelsword.json @@ -2,7 +2,7 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/manasteelSword" + "layer0": "botania:items/manasteelsword" }, "overrides": [{ "predicate": { diff --git a/src/main/resources/assets/botania/models/item/manaString.json b/src/main/resources/assets/botania/models/item/manastring.json similarity index 62% rename from src/main/resources/assets/botania/models/item/manaString.json rename to src/main/resources/assets/botania/models/item/manastring.json index 6357d8e4b..f63bb4bff 100644 --- a/src/main/resources/assets/botania/models/item/manaString.json +++ b/src/main/resources/assets/botania/models/item/manastring.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaString" + "layer0": "botania:items/manastring" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manatablet.json b/src/main/resources/assets/botania/models/item/manatablet.json new file mode 100644 index 000000000..4e9ea65be --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manatablet.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/manatablet0", + "layer1": "botania:items/manatablet1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveCloth.json b/src/main/resources/assets/botania/models/item/manaweaveCloth.json deleted file mode 100644 index f164e0f2d..000000000 --- a/src/main/resources/assets/botania/models/item/manaweaveCloth.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/manaweaveCloth" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBoots.json b/src/main/resources/assets/botania/models/item/manaweaveboots.json similarity index 61% rename from src/main/resources/assets/botania/models/item/manaweaveBoots.json rename to src/main/resources/assets/botania/models/item/manaweaveboots.json index 21f61818a..0be235782 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBoots.json +++ b/src/main/resources/assets/botania/models/item/manaweaveboots.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveBoots" + "layer0": "botania:items/manaweaveboots" }, "overrides": [{ "predicate": { "botania:holiday": 1 }, - "model": "botania:item/manaweaveBootsHoliday" + "model": "botania:item/manaweavebootsholiday" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json b/src/main/resources/assets/botania/models/item/manaweavebootsholiday.json similarity index 55% rename from src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json rename to src/main/resources/assets/botania/models/item/manaweavebootsholiday.json index dbbcfb782..23c552478 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveBootsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweavebootsholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveBootsHoliday" + "layer0": "botania:items/manaweavebootsholiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChest.json b/src/main/resources/assets/botania/models/item/manaweavechest.json similarity index 61% rename from src/main/resources/assets/botania/models/item/manaweaveChest.json rename to src/main/resources/assets/botania/models/item/manaweavechest.json index 42f9e20cf..cba5dce8f 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChest.json +++ b/src/main/resources/assets/botania/models/item/manaweavechest.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveChest" + "layer0": "botania:items/manaweavechest" }, "overrides": [{ "predicate": { "botania:holiday": 1 }, - "model": "botania:item/manaweaveChestHoliday" + "model": "botania:item/manaweavechestholiday" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json b/src/main/resources/assets/botania/models/item/manaweavechestholiday.json similarity index 55% rename from src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json rename to src/main/resources/assets/botania/models/item/manaweavechestholiday.json index 96a9d8450..47041eb16 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveChestHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweavechestholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveChestHoliday" + "layer0": "botania:items/manaweavechestholiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweavecloth.json b/src/main/resources/assets/botania/models/item/manaweavecloth.json new file mode 100644 index 000000000..116b8e720 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/manaweavecloth.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/manaweavecloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegs.json b/src/main/resources/assets/botania/models/item/manaweavehelm.json similarity index 61% rename from src/main/resources/assets/botania/models/item/manaweaveLegs.json rename to src/main/resources/assets/botania/models/item/manaweavehelm.json index 506d1733f..82067fa44 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegs.json +++ b/src/main/resources/assets/botania/models/item/manaweavehelm.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveLegs" + "layer0": "botania:items/manaweavehelm" }, "overrides": [{ "predicate": { "botania:holiday": 1 }, - "model": "botania:item/manaweaveLegsHoliday" + "model": "botania:item/manaweavehelmholiday" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json b/src/main/resources/assets/botania/models/item/manaweavehelmholiday.json similarity index 55% rename from src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json rename to src/main/resources/assets/botania/models/item/manaweavehelmholiday.json index e16a174b8..cd956073a 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveLegsHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweavehelmholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveLegsHoliday" + "layer0": "botania:items/manaweavehelmholiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelm.json b/src/main/resources/assets/botania/models/item/manaweavelegs.json similarity index 61% rename from src/main/resources/assets/botania/models/item/manaweaveHelm.json rename to src/main/resources/assets/botania/models/item/manaweavelegs.json index 3f8ecc2ed..196e1ccae 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelm.json +++ b/src/main/resources/assets/botania/models/item/manaweavelegs.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveHelm" + "layer0": "botania:items/manaweavelegs" }, "overrides": [{ "predicate": { "botania:holiday": 1 }, - "model": "botania:item/manaweaveHelmHoliday" + "model": "botania:item/manaweavelegsholiday" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json b/src/main/resources/assets/botania/models/item/manaweavelegsholiday.json similarity index 55% rename from src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json rename to src/main/resources/assets/botania/models/item/manaweavelegsholiday.json index 3fad87e44..963ed0317 100644 --- a/src/main/resources/assets/botania/models/item/manaweaveHelmHoliday.json +++ b/src/main/resources/assets/botania/models/item/manaweavelegsholiday.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/manaweaveHelmHoliday" + "layer0": "botania:items/manaweavelegsholiday" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/miningRing.json b/src/main/resources/assets/botania/models/item/miningRing.json deleted file mode 100644 index 09dcc9045..000000000 --- a/src/main/resources/assets/botania/models/item/miningRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/miningRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/miningring.json b/src/main/resources/assets/botania/models/item/miningring.json new file mode 100644 index 000000000..cb9b1d6ec --- /dev/null +++ b/src/main/resources/assets/botania/models/item/miningring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/miningring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/gravityRod.json b/src/main/resources/assets/botania/models/item/missilerod.json similarity index 60% rename from src/main/resources/assets/botania/models/item/gravityRod.json rename to src/main/resources/assets/botania/models/item/missilerod.json index 26a8afbee..53e95312d 100644 --- a/src/main/resources/assets/botania/models/item/gravityRod.json +++ b/src/main/resources/assets/botania/models/item/missilerod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/gravityRod" + "layer0": "botania:items/missilerod" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/obedienceStick.json b/src/main/resources/assets/botania/models/item/obedienceStick.json deleted file mode 100644 index af91086e8..000000000 --- a/src/main/resources/assets/botania/models/item/obedienceStick.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/obedienceStick" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/obediencestick.json b/src/main/resources/assets/botania/models/item/obediencestick.json new file mode 100644 index 000000000..d14b15526 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/obediencestick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/obediencestick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/odinRing.json b/src/main/resources/assets/botania/models/item/odinRing.json deleted file mode 100644 index 6546b3462..000000000 --- a/src/main/resources/assets/botania/models/item/odinRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/odinRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/odinring.json b/src/main/resources/assets/botania/models/item/odinring.json new file mode 100644 index 000000000..ea24049bf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/odinring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/odinring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/openBucket.json b/src/main/resources/assets/botania/models/item/openBucket.json deleted file mode 100644 index 18bf286ec..000000000 --- a/src/main/resources/assets/botania/models/item/openBucket.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/openBucket" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/openbucket.json b/src/main/resources/assets/botania/models/item/openbucket.json new file mode 100644 index 000000000..f3a464a67 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/openbucket.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/openbucket" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/overgrowthSeed.json b/src/main/resources/assets/botania/models/item/overgrowthSeed.json deleted file mode 100644 index 5662c5e99..000000000 --- a/src/main/resources/assets/botania/models/item/overgrowthSeed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/overgrowthSeed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/overgrowthseed.json b/src/main/resources/assets/botania/models/item/overgrowthseed.json new file mode 100644 index 000000000..0420e47e5 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/overgrowthseed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/overgrowthseed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pestleAndMortar.json b/src/main/resources/assets/botania/models/item/pestleAndMortar.json deleted file mode 100644 index e692d812f..000000000 --- a/src/main/resources/assets/botania/models/item/pestleAndMortar.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/pestleAndMortar" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pestleandmortar.json b/src/main/resources/assets/botania/models/item/pestleandmortar.json new file mode 100644 index 000000000..f8178b028 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pestleandmortar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/pestleandmortar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/phantomInk.json b/src/main/resources/assets/botania/models/item/phantomInk.json deleted file mode 100644 index 838272c72..000000000 --- a/src/main/resources/assets/botania/models/item/phantomInk.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/phantomInk" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/phantomink.json b/src/main/resources/assets/botania/models/item/phantomink.json new file mode 100644 index 000000000..cf86da17c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/phantomink.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/phantomink" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieRing.json b/src/main/resources/assets/botania/models/item/pixieRing.json deleted file mode 100644 index 4141216bd..000000000 --- a/src/main/resources/assets/botania/models/item/pixieRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/pixieRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixieDust.json b/src/main/resources/assets/botania/models/item/pixiedust.json similarity index 62% rename from src/main/resources/assets/botania/models/item/pixieDust.json rename to src/main/resources/assets/botania/models/item/pixiedust.json index fa6b8aacf..ea3a5a52d 100644 --- a/src/main/resources/assets/botania/models/item/pixieDust.json +++ b/src/main/resources/assets/botania/models/item/pixiedust.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/pixieDust" + "layer0": "botania:items/pixiedust" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/pixiering.json b/src/main/resources/assets/botania/models/item/pixiering.json new file mode 100644 index 000000000..1c5dd604f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/pixiering.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/pixiering" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/poolMinecart.json b/src/main/resources/assets/botania/models/item/poolMinecart.json deleted file mode 100644 index 1907d578b..000000000 --- a/src/main/resources/assets/botania/models/item/poolMinecart.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/poolMinecart" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/poolminecart.json b/src/main/resources/assets/botania/models/item/poolminecart.json new file mode 100644 index 000000000..b10c67768 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/poolminecart.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/poolminecart" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/prismarineShard.json b/src/main/resources/assets/botania/models/item/prismarineshard.json similarity index 100% rename from src/main/resources/assets/botania/models/item/prismarineShard.json rename to src/main/resources/assets/botania/models/item/prismarineshard.json diff --git a/src/main/resources/assets/botania/models/item/rainbowRod.json b/src/main/resources/assets/botania/models/item/rainbowrod.json similarity index 60% rename from src/main/resources/assets/botania/models/item/rainbowRod.json rename to src/main/resources/assets/botania/models/item/rainbowrod.json index f8a0496d1..77f64532a 100644 --- a/src/main/resources/assets/botania/models/item/rainbowRod.json +++ b/src/main/resources/assets/botania/models/item/rainbowrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/rainbowRod" + "layer0": "botania:items/rainbowrod" } } diff --git a/src/main/resources/assets/botania/models/item/reachRing.json b/src/main/resources/assets/botania/models/item/reachRing.json deleted file mode 100644 index b8c7b2ed6..000000000 --- a/src/main/resources/assets/botania/models/item/reachRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/reachRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/reachring.json b/src/main/resources/assets/botania/models/item/reachring.json new file mode 100644 index 000000000..a39b29aba --- /dev/null +++ b/src/main/resources/assets/botania/models/item/reachring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/reachring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordGaia1.json b/src/main/resources/assets/botania/models/item/recordGaia1.json deleted file mode 100644 index bb47b70fd..000000000 --- a/src/main/resources/assets/botania/models/item/recordGaia1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/recordGaia1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordGaia2.json b/src/main/resources/assets/botania/models/item/recordGaia2.json deleted file mode 100644 index 2da70f384..000000000 --- a/src/main/resources/assets/botania/models/item/recordGaia2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/recordGaia2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordgaia1.json b/src/main/resources/assets/botania/models/item/recordgaia1.json new file mode 100644 index 000000000..618a16bd4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/recordgaia1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/recordgaia1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/recordgaia2.json b/src/main/resources/assets/botania/models/item/recordgaia2.json new file mode 100644 index 000000000..e77b42b1e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/recordgaia2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/recordgaia2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstoneRoot.json b/src/main/resources/assets/botania/models/item/redstoneRoot.json deleted file mode 100644 index 1175a4924..000000000 --- a/src/main/resources/assets/botania/models/item/redstoneRoot.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/redstoneRoot" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redstoneroot.json b/src/main/resources/assets/botania/models/item/redstoneroot.json new file mode 100644 index 000000000..c73b57526 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/redstoneroot.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/redstoneroot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/redString.json b/src/main/resources/assets/botania/models/item/redstring.json similarity index 62% rename from src/main/resources/assets/botania/models/item/redString.json rename to src/main/resources/assets/botania/models/item/redstring.json index 4bc444d96..dd27dab74 100644 --- a/src/main/resources/assets/botania/models/item/redString.json +++ b/src/main/resources/assets/botania/models/item/redstring.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/redString" + "layer0": "botania:items/redstring" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/regenIvy.json b/src/main/resources/assets/botania/models/item/regenIvy.json deleted file mode 100644 index 4c7da101e..000000000 --- a/src/main/resources/assets/botania/models/item/regenIvy.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/regenIvy" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/regenivy.json b/src/main/resources/assets/botania/models/item/regenivy.json new file mode 100644 index 000000000..2ce55277e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/regenivy.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/regenivy" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/signalFlare.json b/src/main/resources/assets/botania/models/item/signalFlare.json deleted file mode 100644 index 3fffde5d5..000000000 --- a/src/main/resources/assets/botania/models/item/signalFlare.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/signalFlare0", - "layer1": "botania:items/signalFlare1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/signalflare.json b/src/main/resources/assets/botania/models/item/signalflare.json new file mode 100644 index 000000000..b3387281c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/signalflare.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/signalflare0", + "layer1": "botania:items/signalflare1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/skyDirtRod.json b/src/main/resources/assets/botania/models/item/skyDirtRod.json deleted file mode 100644 index 93d2949b7..000000000 --- a/src/main/resources/assets/botania/models/item/skyDirtRod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/skyDirtRod" - } -} diff --git a/src/main/resources/assets/botania/models/item/skydirtrod.json b/src/main/resources/assets/botania/models/item/skydirtrod.json new file mode 100644 index 000000000..0bf96af7e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/skydirtrod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/skydirtrod" + } +} diff --git a/src/main/resources/assets/botania/models/item/slimeBottle0.json b/src/main/resources/assets/botania/models/item/slimeBottle0.json deleted file mode 100644 index db61916b9..000000000 --- a/src/main/resources/assets/botania/models/item/slimeBottle0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/slimeBottle0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimeBottle1.json b/src/main/resources/assets/botania/models/item/slimeBottle1.json deleted file mode 100644 index c766d6ad6..000000000 --- a/src/main/resources/assets/botania/models/item/slimeBottle1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/slimeBottle1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimebottle0.json b/src/main/resources/assets/botania/models/item/slimebottle0.json new file mode 100644 index 000000000..dbd8110a0 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slimebottle0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/slimebottle0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/slimebottle1.json b/src/main/resources/assets/botania/models/item/slimebottle1.json new file mode 100644 index 000000000..37adf68dc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/slimebottle1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/slimebottle1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/smeltRod.json b/src/main/resources/assets/botania/models/item/smeltrod.json similarity index 61% rename from src/main/resources/assets/botania/models/item/smeltRod.json rename to src/main/resources/assets/botania/models/item/smeltrod.json index bf321e92b..77d195188 100644 --- a/src/main/resources/assets/botania/models/item/smeltRod.json +++ b/src/main/resources/assets/botania/models/item/smeltrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/smeltRod" + "layer0": "botania:items/smeltrod" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade0.json b/src/main/resources/assets/botania/models/item/sparkUpgrade0.json deleted file mode 100644 index 6564ebf2d..000000000 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/sparkUpgrade0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade1.json b/src/main/resources/assets/botania/models/item/sparkUpgrade1.json deleted file mode 100644 index 98185bd84..000000000 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/sparkUpgrade1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade2.json b/src/main/resources/assets/botania/models/item/sparkUpgrade2.json deleted file mode 100644 index 7d7a36eb8..000000000 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/sparkUpgrade2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkUpgrade3.json b/src/main/resources/assets/botania/models/item/sparkUpgrade3.json deleted file mode 100644 index d7a18e778..000000000 --- a/src/main/resources/assets/botania/models/item/sparkUpgrade3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/sparkUpgrade3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade0.json b/src/main/resources/assets/botania/models/item/sparkupgrade0.json new file mode 100644 index 000000000..7638ff08f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkupgrade0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/sparkupgrade0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade1.json b/src/main/resources/assets/botania/models/item/sparkupgrade1.json new file mode 100644 index 000000000..06a7e57f4 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkupgrade1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/sparkupgrade1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade2.json b/src/main/resources/assets/botania/models/item/sparkupgrade2.json new file mode 100644 index 000000000..7fc9e2126 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkupgrade2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/sparkupgrade2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/sparkupgrade3.json b/src/main/resources/assets/botania/models/item/sparkupgrade3.json new file mode 100644 index 000000000..d67eb9369 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/sparkupgrade3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/sparkupgrade3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawnerMoverFull.json b/src/main/resources/assets/botania/models/item/spawnerMoverFull.json deleted file mode 100644 index 8d8221966..000000000 --- a/src/main/resources/assets/botania/models/item/spawnerMoverFull.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/spawnerMover1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawnerMover.json b/src/main/resources/assets/botania/models/item/spawnermover.json similarity index 60% rename from src/main/resources/assets/botania/models/item/spawnerMover.json rename to src/main/resources/assets/botania/models/item/spawnermover.json index daaca965c..e6c7f0641 100644 --- a/src/main/resources/assets/botania/models/item/spawnerMover.json +++ b/src/main/resources/assets/botania/models/item/spawnermover.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "botania:items/spawnerMover0" + "layer0": "botania:items/spawnermover0" }, "overrides": [{ "predicate": { "botania:full": 1 }, - "model": "botania:item/spawnerMoverFull" + "model": "botania:item/spawnermoverfull" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spawnermoverfull.json b/src/main/resources/assets/botania/models/item/spawnermoverfull.json new file mode 100644 index 000000000..0f150c1e9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spawnermoverfull.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/spawnermover1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/speedUpBelt.json b/src/main/resources/assets/botania/models/item/speedUpBelt.json deleted file mode 100644 index c8e9e9637..000000000 --- a/src/main/resources/assets/botania/models/item/speedUpBelt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/speedUpBelt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/speedupbelt.json b/src/main/resources/assets/botania/models/item/speedupbelt.json new file mode 100644 index 000000000..92e42f7d2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/speedupbelt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/speedupbelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spellCloth.json b/src/main/resources/assets/botania/models/item/spellCloth.json deleted file mode 100644 index 860658c5d..000000000 --- a/src/main/resources/assets/botania/models/item/spellCloth.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/spellCloth" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/spellcloth.json b/src/main/resources/assets/botania/models/item/spellcloth.json new file mode 100644 index 000000000..f75fbb1ce --- /dev/null +++ b/src/main/resources/assets/botania/models/item/spellcloth.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/spellcloth" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/glassPick.json b/src/main/resources/assets/botania/models/item/starsword.json similarity index 62% rename from src/main/resources/assets/botania/models/item/glassPick.json rename to src/main/resources/assets/botania/models/item/starsword.json index 285214c5c..59b76ee90 100644 --- a/src/main/resources/assets/botania/models/item/glassPick.json +++ b/src/main/resources/assets/botania/models/item/starsword.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/glassPick" + "layer0": "botania:items/starsword" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superLavaPendant.json b/src/main/resources/assets/botania/models/item/superLavaPendant.json deleted file mode 100644 index 32e5ab6d5..000000000 --- a/src/main/resources/assets/botania/models/item/superLavaPendant.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/superLavaPendant" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superTravelBelt.json b/src/main/resources/assets/botania/models/item/superTravelBelt.json deleted file mode 100644 index afbe1998d..000000000 --- a/src/main/resources/assets/botania/models/item/superTravelBelt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/superTravelBelt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/superCloudPendant.json b/src/main/resources/assets/botania/models/item/supercloudpendant.json similarity index 53% rename from src/main/resources/assets/botania/models/item/superCloudPendant.json rename to src/main/resources/assets/botania/models/item/supercloudpendant.json index 2a5303e20..34291650a 100644 --- a/src/main/resources/assets/botania/models/item/superCloudPendant.json +++ b/src/main/resources/assets/botania/models/item/supercloudpendant.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "botania:items/superCloudPendant" + "layer0": "botania:items/supercloudpendant" } } diff --git a/src/main/resources/assets/botania/models/item/superlavapendant.json b/src/main/resources/assets/botania/models/item/superlavapendant.json new file mode 100644 index 000000000..5bbe65acf --- /dev/null +++ b/src/main/resources/assets/botania/models/item/superlavapendant.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/superlavapendant" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/supertravelbelt.json b/src/main/resources/assets/botania/models/item/supertravelbelt.json new file mode 100644 index 000000000..d1eef311c --- /dev/null +++ b/src/main/resources/assets/botania/models/item/supertravelbelt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/supertravelbelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swapRing.json b/src/main/resources/assets/botania/models/item/swapRing.json deleted file mode 100644 index f7d6a66ed..000000000 --- a/src/main/resources/assets/botania/models/item/swapRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/swapRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/swapring.json b/src/main/resources/assets/botania/models/item/swapring.json new file mode 100644 index 000000000..9ae99edcc --- /dev/null +++ b/src/main/resources/assets/botania/models/item/swapring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/swapring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperanceStone0.json b/src/main/resources/assets/botania/models/item/temperanceStone0.json deleted file mode 100644 index bee4e34c7..000000000 --- a/src/main/resources/assets/botania/models/item/temperanceStone0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/temperanceStone0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperanceStone1.json b/src/main/resources/assets/botania/models/item/temperanceStone1.json deleted file mode 100644 index 6021f8300..000000000 --- a/src/main/resources/assets/botania/models/item/temperanceStone1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/temperanceStone1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperancestone0.json b/src/main/resources/assets/botania/models/item/temperancestone0.json new file mode 100644 index 000000000..860d81455 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/temperancestone0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/temperancestone0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/temperancestone1.json b/src/main/resources/assets/botania/models/item/temperancestone1.json new file mode 100644 index 000000000..4e7256080 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/temperancestone1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/temperancestone1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraAxeOn.json b/src/main/resources/assets/botania/models/item/terraAxeOn.json deleted file mode 100644 index e017e1cc0..000000000 --- a/src/main/resources/assets/botania/models/item/terraAxeOn.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "botania:item/terraAxe", - "textures": { - "layer0": "botania:items/terraAxe0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPickEnabled.json b/src/main/resources/assets/botania/models/item/terraPickEnabled.json deleted file mode 100644 index c93049bb0..000000000 --- a/src/main/resources/assets/botania/models/item/terraPickEnabled.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/terraPick0", - "layer1": "botania:items/terraPick1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPickTipped.json b/src/main/resources/assets/botania/models/item/terraPickTipped.json deleted file mode 100644 index 54c6b5284..000000000 --- a/src/main/resources/assets/botania/models/item/terraPickTipped.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/terraPick2" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json b/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json deleted file mode 100644 index 38fcdc28c..000000000 --- a/src/main/resources/assets/botania/models/item/terraPickTippedEnabled.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/terraPick2", - "layer1": "botania:items/terraPick1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraSword.json b/src/main/resources/assets/botania/models/item/terraSword.json deleted file mode 100644 index fb892a284..000000000 --- a/src/main/resources/assets/botania/models/item/terraSword.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/terraSword" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraAxe.json b/src/main/resources/assets/botania/models/item/terraaxe.json similarity index 64% rename from src/main/resources/assets/botania/models/item/terraAxe.json rename to src/main/resources/assets/botania/models/item/terraaxe.json index 0c5e50ea7..389cdc6e4 100644 --- a/src/main/resources/assets/botania/models/item/terraAxe.json +++ b/src/main/resources/assets/botania/models/item/terraaxe.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terraAxe1" + "layer0": "botania:items/terraaxe1" }, "overrides": [{ "predicate": { "botania:terraaxe_on": 1 }, - "model": "botania:item/terraAxeOn" + "model": "botania:item/terraaxeon" }] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraaxeon.json b/src/main/resources/assets/botania/models/item/terraaxeon.json new file mode 100644 index 000000000..1058562bb --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraaxeon.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/terraaxe", + "textures": { + "layer0": "botania:items/terraaxe0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terraformRod.json b/src/main/resources/assets/botania/models/item/terraformRod.json deleted file mode 100644 index 42f5509c9..000000000 --- a/src/main/resources/assets/botania/models/item/terraformRod.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/terraformRod" - } -} diff --git a/src/main/resources/assets/botania/models/item/terraformrod.json b/src/main/resources/assets/botania/models/item/terraformrod.json new file mode 100644 index 000000000..1ccea3f94 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terraformrod.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/terraformrod" + } +} diff --git a/src/main/resources/assets/botania/models/item/terraPick.json b/src/main/resources/assets/botania/models/item/terrapick.json similarity index 63% rename from src/main/resources/assets/botania/models/item/terraPick.json rename to src/main/resources/assets/botania/models/item/terrapick.json index ba3f22a7e..3df18f803 100644 --- a/src/main/resources/assets/botania/models/item/terraPick.json +++ b/src/main/resources/assets/botania/models/item/terrapick.json @@ -1,27 +1,27 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/terraPick0" + "layer0": "botania:items/terrapick0" }, "overrides": [ { "predicate": { "botania:enabled": 1 }, - "model": "botania:item/terraPickEnabled" + "model": "botania:item/terrapickenabled" }, { "predicate": { "botania:tipped": 1 }, - "model": "botania:item/terraPickTipped" + "model": "botania:item/terrapicktipped" }, { "predicate": { "botania:tipped": 1, "botania:enabled": 1 }, - "model": "botania:item/terraPickTippedEnabled" + "model": "botania:item/terrapicktippedenabled" } ] } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrapickenabled.json b/src/main/resources/assets/botania/models/item/terrapickenabled.json new file mode 100644 index 000000000..de9cce431 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrapickenabled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/terrapick0", + "layer1": "botania:items/terrapick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrapicktipped.json b/src/main/resources/assets/botania/models/item/terrapicktipped.json new file mode 100644 index 000000000..3623a8e31 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrapicktipped.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/terrapick2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json b/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json new file mode 100644 index 000000000..4665e1aa2 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrapicktippedenabled.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/terrapick2", + "layer1": "botania:items/terrapick1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelBoots.json b/src/main/resources/assets/botania/models/item/terrasteelBoots.json deleted file mode 100644 index b9e2743a7..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteelBoots.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/terrasteelBoots" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelChest.json b/src/main/resources/assets/botania/models/item/terrasteelChest.json deleted file mode 100644 index 6b959f638..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteelChest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/terrasteelChest" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelm.json b/src/main/resources/assets/botania/models/item/terrasteelHelm.json deleted file mode 100644 index 97514ddb9..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteelHelm.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/terrasteelHelm" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json b/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json deleted file mode 100644 index 98f1522f9..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteelHelmReveal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/terrasteelHelmReveal" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelLegs.json b/src/main/resources/assets/botania/models/item/terrasteelLegs.json deleted file mode 100644 index 2f6ea5c2f..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteelLegs.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/terrasteelLegs" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelNugget.json b/src/main/resources/assets/botania/models/item/terrasteelNugget.json deleted file mode 100644 index e5657aafc..000000000 --- a/src/main/resources/assets/botania/models/item/terrasteelNugget.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": - { - "layer0": "botania:items/terrasteelNugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelboots.json b/src/main/resources/assets/botania/models/item/terrasteelboots.json new file mode 100644 index 000000000..427bbb02a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelboots.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/terrasteelboots" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelchest.json b/src/main/resources/assets/botania/models/item/terrasteelchest.json new file mode 100644 index 000000000..a0fac2da6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelchest.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/terrasteelchest" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelhelm.json b/src/main/resources/assets/botania/models/item/terrasteelhelm.json new file mode 100644 index 000000000..abbd803ab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelhelm.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/terrasteelhelm" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json b/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json new file mode 100644 index 000000000..2dd1b6a1e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelhelmreveal.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/terrasteelhelmreveal" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteellegs.json b/src/main/resources/assets/botania/models/item/terrasteellegs.json new file mode 100644 index 000000000..94f7f3725 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteellegs.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/terrasteellegs" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasteelnugget.json b/src/main/resources/assets/botania/models/item/terrasteelnugget.json new file mode 100644 index 000000000..678c1353f --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasteelnugget.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:item/generated", + "textures": + { + "layer0": "botania:items/terrasteelnugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/terrasword.json b/src/main/resources/assets/botania/models/item/terrasword.json new file mode 100644 index 000000000..e95fa3aab --- /dev/null +++ b/src/main/resources/assets/botania/models/item/terrasword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/terrasword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thirdEye.json b/src/main/resources/assets/botania/models/item/thirdEye.json deleted file mode 100644 index 362c5a52c..000000000 --- a/src/main/resources/assets/botania/models/item/thirdEye.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "botania:items/thirdEye0", - "layer1": "botania:items/thirdEye1", - "layer2": "botania:items/thirdEye2" - } -} diff --git a/src/main/resources/assets/botania/models/item/thirdeye.json b/src/main/resources/assets/botania/models/item/thirdeye.json new file mode 100644 index 000000000..e0314983e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thirdeye.json @@ -0,0 +1,8 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "botania:items/thirdeye0", + "layer1": "botania:items/thirdeye1", + "layer2": "botania:items/thirdeye2" + } +} diff --git a/src/main/resources/assets/botania/models/item/thorRing.json b/src/main/resources/assets/botania/models/item/thorRing.json deleted file mode 100644 index 63da9fbb6..000000000 --- a/src/main/resources/assets/botania/models/item/thorRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/thorRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thornChakram0.json b/src/main/resources/assets/botania/models/item/thornChakram0.json deleted file mode 100644 index d28678238..000000000 --- a/src/main/resources/assets/botania/models/item/thornChakram0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/thornChakram0" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thornChakram1.json b/src/main/resources/assets/botania/models/item/thornChakram1.json deleted file mode 100644 index 699b33dc0..000000000 --- a/src/main/resources/assets/botania/models/item/thornChakram1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/thornChakram1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thornchakram0.json b/src/main/resources/assets/botania/models/item/thornchakram0.json new file mode 100644 index 000000000..38624811a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thornchakram0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/thornchakram0" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thornchakram1.json b/src/main/resources/assets/botania/models/item/thornchakram1.json new file mode 100644 index 000000000..8c971befa --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thornchakram1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/thornchakram1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thorring.json b/src/main/resources/assets/botania/models/item/thorring.json new file mode 100644 index 000000000..b887ce98a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/thorring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/thorring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/thunderSword.json b/src/main/resources/assets/botania/models/item/thundersword.json similarity index 60% rename from src/main/resources/assets/botania/models/item/thunderSword.json rename to src/main/resources/assets/botania/models/item/thundersword.json index ea13075e1..7a149ee6e 100644 --- a/src/main/resources/assets/botania/models/item/thunderSword.json +++ b/src/main/resources/assets/botania/models/item/thundersword.json @@ -2,6 +2,6 @@ "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/thunderSword" + "layer0": "botania:items/thundersword" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tinyPlanet.json b/src/main/resources/assets/botania/models/item/tinyPlanet.json deleted file mode 100644 index 6816f4f5f..000000000 --- a/src/main/resources/assets/botania/models/item/tinyPlanet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/tinyPlanet" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tinyplanet.json b/src/main/resources/assets/botania/models/item/tinyplanet.json new file mode 100644 index 000000000..d0a8fcba1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tinyplanet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/tinyplanet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json b/src/main/resources/assets/botania/models/item/tornadoRod_flying.json deleted file mode 100644 index 8a2a698de..000000000 --- a/src/main/resources/assets/botania/models/item/tornadoRod_flying.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/tornadoRod1" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/tornadoRod.json b/src/main/resources/assets/botania/models/item/tornadorod.json similarity index 61% rename from src/main/resources/assets/botania/models/item/tornadoRod.json rename to src/main/resources/assets/botania/models/item/tornadorod.json index 7c58a9f61..e8685173b 100644 --- a/src/main/resources/assets/botania/models/item/tornadoRod.json +++ b/src/main/resources/assets/botania/models/item/tornadorod.json @@ -1,12 +1,12 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/tornadoRod0" + "layer0": "botania:items/tornadorod0" }, "overrides": [{ "predicate": { "botania:flying": 1 }, - "model": "botania:item/tornadoRod_flying" + "model": "botania:item/tornadorod_flying" }] } diff --git a/src/main/resources/assets/botania/models/item/tornadorod_flying.json b/src/main/resources/assets/botania/models/item/tornadorod_flying.json new file mode 100644 index 000000000..bc3217080 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/tornadorod_flying.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/tornadorod1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/totalBiscuit.json b/src/main/resources/assets/botania/models/item/totalBiscuit.json deleted file mode 100644 index 57428e745..000000000 --- a/src/main/resources/assets/botania/models/item/totalBiscuit.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/totalBiscuit" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/totalbiscuit.json b/src/main/resources/assets/botania/models/item/totalbiscuit.json new file mode 100644 index 000000000..a532dc9fd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/totalbiscuit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/totalbiscuit" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/travelBelt.json b/src/main/resources/assets/botania/models/item/travelBelt.json deleted file mode 100644 index e9e94cf11..000000000 --- a/src/main/resources/assets/botania/models/item/travelBelt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/travelBelt" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/travelbelt.json b/src/main/resources/assets/botania/models/item/travelbelt.json new file mode 100644 index 000000000..e9abfdb26 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/travelbelt.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/travelbelt" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigWand.json b/src/main/resources/assets/botania/models/item/twigWand.json deleted file mode 100644 index ab49ee092..000000000 --- a/src/main/resources/assets/botania/models/item/twigWand.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/twigWand0", - "layer1": "botania:items/twigWand1", - "layer2": "botania:items/twigWand2" - }, - "overrides": [{ - "predicate": { - "botania:bindmode": 1 - }, - "model": "botania:item/twigWand_bind" - }] -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigWand_bind.json b/src/main/resources/assets/botania/models/item/twigWand_bind.json deleted file mode 100644 index 0c1b31567..000000000 --- a/src/main/resources/assets/botania/models/item/twigWand_bind.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:item/handheld", - "textures": { - "layer0": "botania:items/twigWand0", - "layer1": "botania:items/twigWand1", - "layer2": "botania:items/twigWand2", - "layer3": "botania:items/twigWand3" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigwand.json b/src/main/resources/assets/botania/models/item/twigwand.json new file mode 100644 index 000000000..da964e7cd --- /dev/null +++ b/src/main/resources/assets/botania/models/item/twigwand.json @@ -0,0 +1,14 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/twigwand0", + "layer1": "botania:items/twigwand1", + "layer2": "botania:items/twigwand2" + }, + "overrides": [{ + "predicate": { + "botania:bindmode": 1 + }, + "model": "botania:item/twigwand_bind" + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/twigwand_bind.json b/src/main/resources/assets/botania/models/item/twigwand_bind.json new file mode 100644 index 000000000..2353af5f1 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/twigwand_bind.json @@ -0,0 +1,9 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "botania:items/twigwand0", + "layer1": "botania:items/twigwand1", + "layer2": "botania:items/twigwand2", + "layer3": "botania:items/twigwand3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/unholyCloak.json b/src/main/resources/assets/botania/models/item/unholyCloak.json deleted file mode 100644 index 3bfd0b2ed..000000000 --- a/src/main/resources/assets/botania/models/item/unholyCloak.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/unholyCloak" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/unholycloak.json b/src/main/resources/assets/botania/models/item/unholycloak.json new file mode 100644 index 000000000..b8801b976 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/unholycloak.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/unholycloak" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vineBall.json b/src/main/resources/assets/botania/models/item/vineBall.json deleted file mode 100644 index 744ca6f8c..000000000 --- a/src/main/resources/assets/botania/models/item/vineBall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/vineBall" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/vineball.json b/src/main/resources/assets/botania/models/item/vineball.json new file mode 100644 index 000000000..d1448ea5a --- /dev/null +++ b/src/main/resources/assets/botania/models/item/vineball.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/vineball" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterRing.json b/src/main/resources/assets/botania/models/item/waterRing.json deleted file mode 100644 index 778f5dc47..000000000 --- a/src/main/resources/assets/botania/models/item/waterRing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/waterRing" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterring.json b/src/main/resources/assets/botania/models/item/waterring.json new file mode 100644 index 000000000..9ac0e18c6 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterring.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/waterring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterRod.json b/src/main/resources/assets/botania/models/item/waterrod.json similarity index 61% rename from src/main/resources/assets/botania/models/item/waterRod.json rename to src/main/resources/assets/botania/models/item/waterrod.json index 641897bbe..c63b4d931 100644 --- a/src/main/resources/assets/botania/models/item/waterRod.json +++ b/src/main/resources/assets/botania/models/item/waterrod.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/handheld", "textures": { - "layer0": "botania:items/waterRod" + "layer0": "botania:items/waterrod" } } diff --git a/src/main/resources/assets/botania/models/item/worldSeed.json b/src/main/resources/assets/botania/models/item/worldSeed.json deleted file mode 100644 index 9e64b0c64..000000000 --- a/src/main/resources/assets/botania/models/item/worldSeed.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "botania:items/worldSeed" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/worldseed.json b/src/main/resources/assets/botania/models/item/worldseed.json new file mode 100644 index 000000000..86a9a267e --- /dev/null +++ b/src/main/resources/assets/botania/models/item/worldseed.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/worldseed" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/sounds.json b/src/main/resources/assets/botania/sounds.json index 49e44dff1..fa6587fb8 100644 --- a/src/main/resources/assets/botania/sounds.json +++ b/src/main/resources/assets/botania/sounds.json @@ -1,46 +1,46 @@ { - "airRod": { "sounds":["botania:airRod"], "subtitle": "botania.subtitle.airRod" }, + "airrod": { "sounds":["botania:airrod"], "subtitle": "botania.subtitle.airRod" }, "agricarnation": { "sounds":["botania:agricarnation"], "subtitle": "botania.subtitle.agricarnation" }, - "altarCraft": { "sounds":["botania:altarCraft"], "subtitle": "botania.subtitle.altarCraft" }, - "babylonAttack": { "sounds":["botania:babylonAttack"], "subtitle": "botania.subtitle.babylonAttack" }, - "babylonSpawn": { "sounds":["botania:babylonSpawn"], "subtitle": "botania.subtitle.babylonSpawn" }, + "altarcraft": { "sounds":["botania:altarcraft"], "subtitle": "botania.subtitle.altarCraft" }, + "babylonattack": { "sounds":["botania:babylonattack"], "subtitle": "botania.subtitle.babylonAttack" }, + "babylonspawn": { "sounds":["botania:babylonspawn"], "subtitle": "botania.subtitle.babylonSpawn" }, "bellows": { "sounds":["botania:bellows"], "subtitle": "botania.subtitle.bellows" }, - "bifrostRod": { "sounds":["botania:bifrostRod"], "subtitle": "botania.subtitle.bifrostRod" }, - "blackLotus": { "sounds":["botania:blackLotus"], "subtitle": "botania.subtitle.blackLotus" }, + "bifrostrod": { "sounds":["botania:bifrostrod"], "subtitle": "botania.subtitle.bifrostRod" }, + "blacklotus": { "sounds":["botania:blacklotus"], "subtitle": "botania.subtitle.blackLotus" }, "dash": { "sounds":["botania:dash"], "subtitle": "botania.subtitle.dash" }, "ding": { "sounds":["botania:ding"], "subtitle": "botania.subtitle.ding" }, - "divaCharm": { "sounds":["botania:divaCharm"], "subtitle": "botania.subtitle.divaCharm" }, - "divinationRod": { "sounds":["botania:divinationRod"], "subtitle": "botania.subtitle.divinationROd" }, + "divacharm": { "sounds":["botania:divacharm"], "subtitle": "botania.subtitle.divaCharm" }, + "divinationrod": { "sounds":["botania:divinationrod"], "subtitle": "botania.subtitle.divinationROd" }, "doit": { "sounds":["botania:doit"], "subtitle": "botania.subtitle.doit" }, - "enchanterFade": { "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterForm" }, - "enchanterForm": { "sounds":["botania:enchanterBlock"], "subtitle": "botania.subtitle.enchanterFade" }, - "enchanterEnchant": { "sounds":["botania:enchanterEnchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, + "enchanterfade": { "sounds":["botania:enchanterblock"], "subtitle": "botania.subtitle.enchanterForm" }, + "enchanterform": { "sounds":["botania:enchanterblock"], "subtitle": "botania.subtitle.enchanterFade" }, + "enchanterenchant": { "sounds":["botania:enchanterenchant"], "subtitle": "botania.subtitle.enchanterEnchant" }, "endoflame": { "sounds":["botania:endoflame"], "subtitle": "botania.subtitle.endoflame" }, - "equipBauble": { "sounds":["botania:equipBauble"], "subtitle": "botania.subtitle.equipBauble" }, - "gaiaTrap": { "sounds":["botania:gaiaTrap"], "subtitle": "botania.subtitle.gaiaTrap" }, - "goldenLaurel": { "sounds":["botania:goldenLaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, - "holyCloak": { "sounds":["botania:holyCloak"], "subtitle": "botania.subtitle.holyCloak" }, - "laputaStart": { "sounds":["botania:laputaStart"], "subtitle": "botania.subtitle.laputaStart" }, - "lexiconOpen": { "sounds":["botania:lexiconOpen"], "subtitle": "botania.subtitle.lexiconOpen" }, - "lexiconPage": { "sounds":["botania:lexiconPage"], "subtitle": "botania.subtitle.lexiconPage" }, - "lightRelay": { "sounds":["botania:lightRelay"], "subtitle": "botania.subtitle.lightRelay" }, - "manaBlaster": { "sounds":["botania:manaBlaster"], "subtitle": "botania.subtitle.manaBlaster" }, - "manaPoolCraft": { "sounds":["botania:manaPoolCraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, + "equipbauble": { "sounds":["botania:equipbauble"], "subtitle": "botania.subtitle.equipBauble" }, + "gaiatrap": { "sounds":["botania:gaiatrap"], "subtitle": "botania.subtitle.gaiaTrap" }, + "goldenlaurel": { "sounds":["botania:goldenlaurel"], "subtitle": "botania.subtitle.goldenLaurel" }, + "holycloak": { "sounds":["botania:holycloak"], "subtitle": "botania.subtitle.holyCloak" }, + "laputastart": { "sounds":["botania:laputastart"], "subtitle": "botania.subtitle.laputaStart" }, + "lexiconopen": { "sounds":["botania:lexiconopen"], "subtitle": "botania.subtitle.lexiconOpen" }, + "lexiconpage": { "sounds":["botania:lexiconpage"], "subtitle": "botania.subtitle.lexiconPage" }, + "lightrelay": { "sounds":["botania:lightrelay"], "subtitle": "botania.subtitle.lightRelay" }, + "manablaster": { "sounds":["botania:manablaster"], "subtitle": "botania.subtitle.manaBlaster" }, + "manapoolcraft": { "sounds":["botania:manapoolcraft"], "subtitle": "botania.subtitle.manaPoolCraft" }, "missile": { "sounds":["botania:missile"], "subtitle": "botania.subtitle.missile" }, "orechid": { "sounds":["botania:orechid"], "subtitle": "botania.subtitle.orechid" }, - "potionCreate": { "sounds":["botania:potionCreate"], "subtitle": "botania.subtitle.potionCreate" }, - "runeAltarCraft": { "sounds":["botania:runeAltarCraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, - "runeAltarStart": { "sounds":["botania:runeAltarStart"], "subtitle": "botania.subtitle.runeAltarStart" }, - "spreaderFire": { "sounds":["botania:spreaderFire"], "subtitle": "botania.subtitle.spreaderFire" }, + "potioncreate": { "sounds":["botania:potioncreate"], "subtitle": "botania.subtitle.potionCreate" }, + "runealtarcraft": { "sounds":["botania:runealtarcraft"], "subtitle": "botania.subtitle.runeAltarCraft" }, + "runealtarstart": { "sounds":["botania:runealtarstart"], "subtitle": "botania.subtitle.runeAltarStart" }, + "spreaderfire": { "sounds":["botania:spreaderfire"], "subtitle": "botania.subtitle.spreaderFire" }, "starcaller": { "sounds":["botania:starcaller"], "subtitle": "botania.subtitle.starcaller" }, - "terraBlade": { "sounds":["botania:terraBlade"], "subtitle": "botania.subtitle.terraBlade" }, - "terraformRod": { "sounds":["botania:terraformRod"], "subtitle": "botania.subtitle.terraformRod" }, - "terraPickMode": { "sounds":["botania:terraPickMode"], "subtitle": "botania.subtitle.terraPickMode" }, - "terrasteelCraft": { "sounds":["botania:terrasteelCraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, + "terrablade": { "sounds":["botania:terrablade"], "subtitle": "botania.subtitle.terraBlade" }, + "terraformrod": { "sounds":["botania:terraformrod"], "subtitle": "botania.subtitle.terraformRod" }, + "terrapickmode": { "sounds":["botania:terrapickmode"], "subtitle": "botania.subtitle.terraPickMode" }, + "terrasteelcraft": { "sounds":["botania:terrasteelcraft"], "subtitle": "botania.subtitle.terrasteelCraft" }, "thermalily": { "sounds":["botania:thermalily"], "subtitle": "botania.subtitle.thermalily" }, - "unholyCloak": { "sounds":["botania:unholyCloak"], "subtitle": "botania.subtitle.unholyCloak" }, + "unholycloak": { "sounds":["botania:unholycloak"], "subtitle": "botania.subtitle.unholyCloak" }, "way": { "sounds":["botania:way"], "subtitle": "botania.subtitle.way" }, - "music.gaia1": { "sounds":[{"name": "botania:music/EndureEmptiness", "stream": true}] }, - "music.gaia2": { "sounds":[{"name": "botania:music/FightForQuiescence", "stream": true}] } + "music.gaia1": { "sounds":[{"name": "botania:music/endureemptiness", "stream": true}] }, + "music.gaia2": { "sounds":[{"name": "botania:music/fightforquiescence", "stream": true}] } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/sounds/airRod.ogg b/src/main/resources/assets/botania/sounds/airrod.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/airRod.ogg rename to src/main/resources/assets/botania/sounds/airrod.ogg diff --git a/src/main/resources/assets/botania/sounds/altarCraft.ogg b/src/main/resources/assets/botania/sounds/altarcraft.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/altarCraft.ogg rename to src/main/resources/assets/botania/sounds/altarcraft.ogg diff --git a/src/main/resources/assets/botania/sounds/babylonAttack.ogg b/src/main/resources/assets/botania/sounds/babylonattack.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/babylonAttack.ogg rename to src/main/resources/assets/botania/sounds/babylonattack.ogg diff --git a/src/main/resources/assets/botania/sounds/babylonSpawn.ogg b/src/main/resources/assets/botania/sounds/babylonspawn.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/babylonSpawn.ogg rename to src/main/resources/assets/botania/sounds/babylonspawn.ogg diff --git a/src/main/resources/assets/botania/sounds/bifrostRod.ogg b/src/main/resources/assets/botania/sounds/bifrostrod.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/bifrostRod.ogg rename to src/main/resources/assets/botania/sounds/bifrostrod.ogg diff --git a/src/main/resources/assets/botania/sounds/blackLotus.ogg b/src/main/resources/assets/botania/sounds/blacklotus.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/blackLotus.ogg rename to src/main/resources/assets/botania/sounds/blacklotus.ogg diff --git a/src/main/resources/assets/botania/sounds/divaCharm.ogg b/src/main/resources/assets/botania/sounds/divacharm.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/divaCharm.ogg rename to src/main/resources/assets/botania/sounds/divacharm.ogg diff --git a/src/main/resources/assets/botania/sounds/divinationRod.ogg b/src/main/resources/assets/botania/sounds/divinationrod.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/divinationRod.ogg rename to src/main/resources/assets/botania/sounds/divinationrod.ogg diff --git a/src/main/resources/assets/botania/sounds/enchanterBlock.ogg b/src/main/resources/assets/botania/sounds/enchanterblock.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/enchanterBlock.ogg rename to src/main/resources/assets/botania/sounds/enchanterblock.ogg diff --git a/src/main/resources/assets/botania/sounds/enchanterEnchant.ogg b/src/main/resources/assets/botania/sounds/enchanterenchant.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/enchanterEnchant.ogg rename to src/main/resources/assets/botania/sounds/enchanterenchant.ogg diff --git a/src/main/resources/assets/botania/sounds/equipBauble.ogg b/src/main/resources/assets/botania/sounds/equipbauble.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/equipBauble.ogg rename to src/main/resources/assets/botania/sounds/equipbauble.ogg diff --git a/src/main/resources/assets/botania/sounds/gaiaTrap.ogg b/src/main/resources/assets/botania/sounds/gaiatrap.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/gaiaTrap.ogg rename to src/main/resources/assets/botania/sounds/gaiatrap.ogg diff --git a/src/main/resources/assets/botania/sounds/goldenLaurel.ogg b/src/main/resources/assets/botania/sounds/goldenlaurel.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/goldenLaurel.ogg rename to src/main/resources/assets/botania/sounds/goldenlaurel.ogg diff --git a/src/main/resources/assets/botania/sounds/holyCloak.ogg b/src/main/resources/assets/botania/sounds/holycloak.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/holyCloak.ogg rename to src/main/resources/assets/botania/sounds/holycloak.ogg diff --git a/src/main/resources/assets/botania/sounds/laputaStart.ogg b/src/main/resources/assets/botania/sounds/laputastart.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/laputaStart.ogg rename to src/main/resources/assets/botania/sounds/laputastart.ogg diff --git a/src/main/resources/assets/botania/sounds/lexiconOpen.ogg b/src/main/resources/assets/botania/sounds/lexiconopen.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/lexiconOpen.ogg rename to src/main/resources/assets/botania/sounds/lexiconopen.ogg diff --git a/src/main/resources/assets/botania/sounds/lexiconPage.ogg b/src/main/resources/assets/botania/sounds/lexiconpage.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/lexiconPage.ogg rename to src/main/resources/assets/botania/sounds/lexiconpage.ogg diff --git a/src/main/resources/assets/botania/sounds/lightRelay.ogg b/src/main/resources/assets/botania/sounds/lightrelay.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/lightRelay.ogg rename to src/main/resources/assets/botania/sounds/lightrelay.ogg diff --git a/src/main/resources/assets/botania/sounds/manaBlaster.ogg b/src/main/resources/assets/botania/sounds/manablaster.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/manaBlaster.ogg rename to src/main/resources/assets/botania/sounds/manablaster.ogg diff --git a/src/main/resources/assets/botania/sounds/manaPoolCraft.ogg b/src/main/resources/assets/botania/sounds/manapoolcraft.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/manaPoolCraft.ogg rename to src/main/resources/assets/botania/sounds/manapoolcraft.ogg diff --git a/src/main/resources/assets/botania/sounds/music/EndureEmptiness.ogg b/src/main/resources/assets/botania/sounds/music/endureemptiness.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/music/EndureEmptiness.ogg rename to src/main/resources/assets/botania/sounds/music/endureemptiness.ogg diff --git a/src/main/resources/assets/botania/sounds/music/FightForQuiescence.ogg b/src/main/resources/assets/botania/sounds/music/fightforquiescence.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/music/FightForQuiescence.ogg rename to src/main/resources/assets/botania/sounds/music/fightforquiescence.ogg diff --git a/src/main/resources/assets/botania/sounds/potionCreate.ogg b/src/main/resources/assets/botania/sounds/potioncreate.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/potionCreate.ogg rename to src/main/resources/assets/botania/sounds/potioncreate.ogg diff --git a/src/main/resources/assets/botania/sounds/runeAltarCraft.ogg b/src/main/resources/assets/botania/sounds/runealtarcraft.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/runeAltarCraft.ogg rename to src/main/resources/assets/botania/sounds/runealtarcraft.ogg diff --git a/src/main/resources/assets/botania/sounds/runeAltarStart.ogg b/src/main/resources/assets/botania/sounds/runealtarstart.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/runeAltarStart.ogg rename to src/main/resources/assets/botania/sounds/runealtarstart.ogg diff --git a/src/main/resources/assets/botania/sounds/spreaderFire.ogg b/src/main/resources/assets/botania/sounds/spreaderfire.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/spreaderFire.ogg rename to src/main/resources/assets/botania/sounds/spreaderfire.ogg diff --git a/src/main/resources/assets/botania/sounds/terraBlade.ogg b/src/main/resources/assets/botania/sounds/terrablade.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/terraBlade.ogg rename to src/main/resources/assets/botania/sounds/terrablade.ogg diff --git a/src/main/resources/assets/botania/sounds/terraformRod.ogg b/src/main/resources/assets/botania/sounds/terraformrod.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/terraformRod.ogg rename to src/main/resources/assets/botania/sounds/terraformrod.ogg diff --git a/src/main/resources/assets/botania/sounds/terraPickMode.ogg b/src/main/resources/assets/botania/sounds/terrapickmode.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/terraPickMode.ogg rename to src/main/resources/assets/botania/sounds/terrapickmode.ogg diff --git a/src/main/resources/assets/botania/sounds/terrasteelCraft.ogg b/src/main/resources/assets/botania/sounds/terrasteelcraft.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/terrasteelCraft.ogg rename to src/main/resources/assets/botania/sounds/terrasteelcraft.ogg diff --git a/src/main/resources/assets/botania/sounds/unholyCloak.ogg b/src/main/resources/assets/botania/sounds/unholycloak.ogg similarity index 100% rename from src/main/resources/assets/botania/sounds/unholyCloak.ogg rename to src/main/resources/assets/botania/sounds/unholycloak.ogg diff --git a/src/main/resources/assets/botania/textures/blocks/agricarnationChibi.png b/src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/agricarnationChibi.png rename to src/main/resources/assets/botania/textures/blocks/agricarnationchibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemyCatalyst0.png b/src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemyCatalyst0.png rename to src/main/resources/assets/botania/textures/blocks/alchemycatalyst0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemyCatalyst1.png b/src/main/resources/assets/botania/textures/blocks/alchemycatalyst1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemyCatalyst1.png rename to src/main/resources/assets/botania/textures/blocks/alchemycatalyst1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemyCatalyst2.png b/src/main/resources/assets/botania/textures/blocks/alchemycatalyst2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemyCatalyst2.png rename to src/main/resources/assets/botania/textures/blocks/alchemycatalyst2.png diff --git a/src/main/resources/assets/botania/textures/blocks/alchemyCatalyst3.png b/src/main/resources/assets/botania/textures/blocks/alchemycatalyst3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alchemyCatalyst3.png rename to src/main/resources/assets/botania/textures/blocks/alchemycatalyst3.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimPortal0.png b/src/main/resources/assets/botania/textures/blocks/alfheimportal0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimPortal0.png rename to src/main/resources/assets/botania/textures/blocks/alfheimportal0.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimPortal1.png b/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimPortal1.png rename to src/main/resources/assets/botania/textures/blocks/alfheimportal1.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimPortal1.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/alfheimportal1.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimPortal1.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/alfheimportal1.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimPortalInside.png b/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimPortalInside.png rename to src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png diff --git a/src/main/resources/assets/botania/textures/blocks/alfheimPortalInside.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/alfheimPortalInside.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/alfheimportalinside.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass0.png b/src/main/resources/assets/botania/textures/blocks/altgrass0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass0.png rename to src/main/resources/assets/botania/textures/blocks/altgrass0.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass1.png b/src/main/resources/assets/botania/textures/blocks/altgrass1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass1.png rename to src/main/resources/assets/botania/textures/blocks/altgrass1.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass10.png b/src/main/resources/assets/botania/textures/blocks/altgrass10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass10.png rename to src/main/resources/assets/botania/textures/blocks/altgrass10.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass11.png b/src/main/resources/assets/botania/textures/blocks/altgrass11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass11.png rename to src/main/resources/assets/botania/textures/blocks/altgrass11.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass2.png b/src/main/resources/assets/botania/textures/blocks/altgrass2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass2.png rename to src/main/resources/assets/botania/textures/blocks/altgrass2.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass3.png b/src/main/resources/assets/botania/textures/blocks/altgrass3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass3.png rename to src/main/resources/assets/botania/textures/blocks/altgrass3.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass4.png b/src/main/resources/assets/botania/textures/blocks/altgrass4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass4.png rename to src/main/resources/assets/botania/textures/blocks/altgrass4.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass5.png b/src/main/resources/assets/botania/textures/blocks/altgrass5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass5.png rename to src/main/resources/assets/botania/textures/blocks/altgrass5.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass6.png b/src/main/resources/assets/botania/textures/blocks/altgrass6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass6.png rename to src/main/resources/assets/botania/textures/blocks/altgrass6.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass7.png b/src/main/resources/assets/botania/textures/blocks/altgrass7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass7.png rename to src/main/resources/assets/botania/textures/blocks/altgrass7.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass8.png b/src/main/resources/assets/botania/textures/blocks/altgrass8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass8.png rename to src/main/resources/assets/botania/textures/blocks/altgrass8.png diff --git a/src/main/resources/assets/botania/textures/blocks/altGrass9.png b/src/main/resources/assets/botania/textures/blocks/altgrass9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/altGrass9.png rename to src/main/resources/assets/botania/textures/blocks/altgrass9.png diff --git a/src/main/resources/assets/botania/textures/blocks/bellethornChibi.png b/src/main/resources/assets/botania/textures/blocks/bellethornchibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bellethornChibi.png rename to src/main/resources/assets/botania/textures/blocks/bellethornchibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/bifrostPermPane.png b/src/main/resources/assets/botania/textures/blocks/bifrostpermpane.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bifrostPermPane.png rename to src/main/resources/assets/botania/textures/blocks/bifrostpermpane.png diff --git a/src/main/resources/assets/botania/textures/blocks/bifrostPermPane.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/bifrostpermpane.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bifrostPermPane.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/bifrostpermpane.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone0.png b/src/main/resources/assets/botania/textures/blocks/biomestone0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone0.png rename to src/main/resources/assets/botania/textures/blocks/biomestone0.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone1.png b/src/main/resources/assets/botania/textures/blocks/biomestone1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone1.png rename to src/main/resources/assets/botania/textures/blocks/biomestone1.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone10.png b/src/main/resources/assets/botania/textures/blocks/biomestone10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone10.png rename to src/main/resources/assets/botania/textures/blocks/biomestone10.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone11.png b/src/main/resources/assets/botania/textures/blocks/biomestone11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone11.png rename to src/main/resources/assets/botania/textures/blocks/biomestone11.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone12.png b/src/main/resources/assets/botania/textures/blocks/biomestone12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone12.png rename to src/main/resources/assets/botania/textures/blocks/biomestone12.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone13.png b/src/main/resources/assets/botania/textures/blocks/biomestone13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone13.png rename to src/main/resources/assets/botania/textures/blocks/biomestone13.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone14.png b/src/main/resources/assets/botania/textures/blocks/biomestone14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone14.png rename to src/main/resources/assets/botania/textures/blocks/biomestone14.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone15.png b/src/main/resources/assets/botania/textures/blocks/biomestone15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone15.png rename to src/main/resources/assets/botania/textures/blocks/biomestone15.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone16.png b/src/main/resources/assets/botania/textures/blocks/biomestone16.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone16.png rename to src/main/resources/assets/botania/textures/blocks/biomestone16.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone17.png b/src/main/resources/assets/botania/textures/blocks/biomestone17.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone17.png rename to src/main/resources/assets/botania/textures/blocks/biomestone17.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone18.png b/src/main/resources/assets/botania/textures/blocks/biomestone18.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone18.png rename to src/main/resources/assets/botania/textures/blocks/biomestone18.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone19.png b/src/main/resources/assets/botania/textures/blocks/biomestone19.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone19.png rename to src/main/resources/assets/botania/textures/blocks/biomestone19.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone2.png b/src/main/resources/assets/botania/textures/blocks/biomestone2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone2.png rename to src/main/resources/assets/botania/textures/blocks/biomestone2.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone20.png b/src/main/resources/assets/botania/textures/blocks/biomestone20.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone20.png rename to src/main/resources/assets/botania/textures/blocks/biomestone20.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone21.png b/src/main/resources/assets/botania/textures/blocks/biomestone21.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone21.png rename to src/main/resources/assets/botania/textures/blocks/biomestone21.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone22.png b/src/main/resources/assets/botania/textures/blocks/biomestone22.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone22.png rename to src/main/resources/assets/botania/textures/blocks/biomestone22.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone23.png b/src/main/resources/assets/botania/textures/blocks/biomestone23.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone23.png rename to src/main/resources/assets/botania/textures/blocks/biomestone23.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone24.png b/src/main/resources/assets/botania/textures/blocks/biomestone24.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone24.png rename to src/main/resources/assets/botania/textures/blocks/biomestone24.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone25.png b/src/main/resources/assets/botania/textures/blocks/biomestone25.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone25.png rename to src/main/resources/assets/botania/textures/blocks/biomestone25.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone26.png b/src/main/resources/assets/botania/textures/blocks/biomestone26.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone26.png rename to src/main/resources/assets/botania/textures/blocks/biomestone26.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone27.png b/src/main/resources/assets/botania/textures/blocks/biomestone27.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone27.png rename to src/main/resources/assets/botania/textures/blocks/biomestone27.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone28.png b/src/main/resources/assets/botania/textures/blocks/biomestone28.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone28.png rename to src/main/resources/assets/botania/textures/blocks/biomestone28.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone29.png b/src/main/resources/assets/botania/textures/blocks/biomestone29.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone29.png rename to src/main/resources/assets/botania/textures/blocks/biomestone29.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone3.png b/src/main/resources/assets/botania/textures/blocks/biomestone3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone3.png rename to src/main/resources/assets/botania/textures/blocks/biomestone3.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone30.png b/src/main/resources/assets/botania/textures/blocks/biomestone30.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone30.png rename to src/main/resources/assets/botania/textures/blocks/biomestone30.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone31.png b/src/main/resources/assets/botania/textures/blocks/biomestone31.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone31.png rename to src/main/resources/assets/botania/textures/blocks/biomestone31.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone4.png b/src/main/resources/assets/botania/textures/blocks/biomestone4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone4.png rename to src/main/resources/assets/botania/textures/blocks/biomestone4.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone5.png b/src/main/resources/assets/botania/textures/blocks/biomestone5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone5.png rename to src/main/resources/assets/botania/textures/blocks/biomestone5.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone6.png b/src/main/resources/assets/botania/textures/blocks/biomestone6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone6.png rename to src/main/resources/assets/botania/textures/blocks/biomestone6.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone7.png b/src/main/resources/assets/botania/textures/blocks/biomestone7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone7.png rename to src/main/resources/assets/botania/textures/blocks/biomestone7.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone8.png b/src/main/resources/assets/botania/textures/blocks/biomestone8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone8.png rename to src/main/resources/assets/botania/textures/blocks/biomestone8.png diff --git a/src/main/resources/assets/botania/textures/blocks/biomeStone9.png b/src/main/resources/assets/botania/textures/blocks/biomestone9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/biomeStone9.png rename to src/main/resources/assets/botania/textures/blocks/biomestone9.png diff --git a/src/main/resources/assets/botania/textures/blocks/blazeBlock.png b/src/main/resources/assets/botania/textures/blocks/blazeblock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blazeBlock.png rename to src/main/resources/assets/botania/textures/blocks/blazeblock.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockBlazeQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blockblazequartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockBlazeQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blockblazequartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockBlazeQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockblazequartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockBlazeQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockblazequartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockBlazeQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blockblazequartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockBlazeQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blockblazequartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockDarkQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blockdarkquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockDarkQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blockdarkquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockDarkQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockdarkquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockDarkQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockdarkquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockDarkQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blockdarkquartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockDarkQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blockdarkquartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockElfQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blockelfquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockElfQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blockelfquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockElfQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockelfquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockElfQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockelfquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockElfQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blockelfquartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockElfQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blockelfquartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockLavenderQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blocklavenderquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockLavenderQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blocklavenderquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockLavenderQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blocklavenderquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockLavenderQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blocklavenderquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockLavenderQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blocklavenderquartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockLavenderQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blocklavenderquartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockManaQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blockmanaquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockManaQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blockmanaquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockManaQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockmanaquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockManaQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockmanaquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockManaQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blockmanaquartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockManaQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blockmanaquartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockRedQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blockredquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockRedQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blockredquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockRedQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blockredquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockRedQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blockredquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockRedQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blockredquartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockRedQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blockredquartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz0.png b/src/main/resources/assets/botania/textures/blocks/blocksunnyquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/blocksunnyquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz1.png b/src/main/resources/assets/botania/textures/blocks/blocksunnyquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/blocksunnyquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz2.png b/src/main/resources/assets/botania/textures/blocks/blocksunnyquartz2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/blockSunnyQuartz2.png rename to src/main/resources/assets/botania/textures/blocks/blocksunnyquartz2.png diff --git a/src/main/resources/assets/botania/textures/blocks/bubbellChibi.png b/src/main/resources/assets/botania/textures/blocks/bubbellchibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/bubbellChibi.png rename to src/main/resources/assets/botania/textures/blocks/bubbellchibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/buriedPetals.png b/src/main/resources/assets/botania/textures/blocks/buriedpetals.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/buriedPetals.png rename to src/main/resources/assets/botania/textures/blocks/buriedpetals.png diff --git a/src/main/resources/assets/botania/textures/blocks/cacophoniumBlock0.png b/src/main/resources/assets/botania/textures/blocks/cacophoniumblock0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cacophoniumBlock0.png rename to src/main/resources/assets/botania/textures/blocks/cacophoniumblock0.png diff --git a/src/main/resources/assets/botania/textures/blocks/cacophoniumBlock1.png b/src/main/resources/assets/botania/textures/blocks/cacophoniumblock1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cacophoniumBlock1.png rename to src/main/resources/assets/botania/textures/blocks/cacophoniumblock1.png diff --git a/src/main/resources/assets/botania/textures/blocks/cellBlock.png b/src/main/resources/assets/botania/textures/blocks/cellblock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/cellBlock.png rename to src/main/resources/assets/botania/textures/blocks/cellblock.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledBlazeQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledblazequartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledBlazeQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledblazequartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledBlazeQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledblazequartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledBlazeQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseledblazequartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledDarkQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseleddarkquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledDarkQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseleddarkquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledDarkQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseleddarkquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledDarkQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseleddarkquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledElfQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledelfquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledElfQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledelfquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledElfQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledelfquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledElfQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseledelfquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledLavenderQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledlavenderquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledLavenderQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledlavenderquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledLavenderQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledlavenderquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledLavenderQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseledlavenderquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledManaQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledmanaquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledManaQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledmanaquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledManaQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledmanaquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledManaQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseledmanaquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledRedQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledredquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledRedQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledredquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledRedQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledredquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledRedQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseledredquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz0.png b/src/main/resources/assets/botania/textures/blocks/chiseledsunnyquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/chiseledsunnyquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz1.png b/src/main/resources/assets/botania/textures/blocks/chiseledsunnyquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/chiseledSunnyQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/chiseledsunnyquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/clayconiaChibi.png b/src/main/resources/assets/botania/textures/blocks/clayconiachibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/clayconiaChibi.png rename to src/main/resources/assets/botania/textures/blocks/clayconiachibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationCatalyst0.png b/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationCatalyst0.png rename to src/main/resources/assets/botania/textures/blocks/conjurationcatalyst0.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationCatalyst1.png b/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationCatalyst1.png rename to src/main/resources/assets/botania/textures/blocks/conjurationcatalyst1.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationCatalyst2.png b/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationCatalyst2.png rename to src/main/resources/assets/botania/textures/blocks/conjurationcatalyst2.png diff --git a/src/main/resources/assets/botania/textures/blocks/conjurationCatalyst3.png b/src/main/resources/assets/botania/textures/blocks/conjurationcatalyst3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/conjurationCatalyst3.png rename to src/main/resources/assets/botania/textures/blocks/conjurationcatalyst3.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaFunnel0.png b/src/main/resources/assets/botania/textures/blocks/corporeafunnel0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeaFunnel0.png rename to src/main/resources/assets/botania/textures/blocks/corporeafunnel0.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaFunnel1.png b/src/main/resources/assets/botania/textures/blocks/corporeafunnel1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeaFunnel1.png rename to src/main/resources/assets/botania/textures/blocks/corporeafunnel1.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaInterceptor0.png b/src/main/resources/assets/botania/textures/blocks/corporeainterceptor0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeaInterceptor0.png rename to src/main/resources/assets/botania/textures/blocks/corporeainterceptor0.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaInterceptor1.png b/src/main/resources/assets/botania/textures/blocks/corporeainterceptor1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeaInterceptor1.png rename to src/main/resources/assets/botania/textures/blocks/corporeainterceptor1.png diff --git a/src/main/resources/assets/botania/textures/blocks/corporeaRetainer.png b/src/main/resources/assets/botania/textures/blocks/corporearetainer.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/corporeaRetainer.png rename to src/main/resources/assets/botania/textures/blocks/corporearetainer.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick0.png b/src/main/resources/assets/botania/textures/blocks/custombrick0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick0.png rename to src/main/resources/assets/botania/textures/blocks/custombrick0.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick1.png b/src/main/resources/assets/botania/textures/blocks/custombrick1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick1.png rename to src/main/resources/assets/botania/textures/blocks/custombrick1.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick10.png b/src/main/resources/assets/botania/textures/blocks/custombrick10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick10.png rename to src/main/resources/assets/botania/textures/blocks/custombrick10.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick11.png b/src/main/resources/assets/botania/textures/blocks/custombrick11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick11.png rename to src/main/resources/assets/botania/textures/blocks/custombrick11.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick12.png b/src/main/resources/assets/botania/textures/blocks/custombrick12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick12.png rename to src/main/resources/assets/botania/textures/blocks/custombrick12.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick13.png b/src/main/resources/assets/botania/textures/blocks/custombrick13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick13.png rename to src/main/resources/assets/botania/textures/blocks/custombrick13.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick14.png b/src/main/resources/assets/botania/textures/blocks/custombrick14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick14.png rename to src/main/resources/assets/botania/textures/blocks/custombrick14.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick15.png b/src/main/resources/assets/botania/textures/blocks/custombrick15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick15.png rename to src/main/resources/assets/botania/textures/blocks/custombrick15.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick2.png b/src/main/resources/assets/botania/textures/blocks/custombrick2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick2.png rename to src/main/resources/assets/botania/textures/blocks/custombrick2.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick3.png b/src/main/resources/assets/botania/textures/blocks/custombrick3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick3.png rename to src/main/resources/assets/botania/textures/blocks/custombrick3.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick4.png b/src/main/resources/assets/botania/textures/blocks/custombrick4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick4.png rename to src/main/resources/assets/botania/textures/blocks/custombrick4.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick5.png b/src/main/resources/assets/botania/textures/blocks/custombrick5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick5.png rename to src/main/resources/assets/botania/textures/blocks/custombrick5.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick6.png b/src/main/resources/assets/botania/textures/blocks/custombrick6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick6.png rename to src/main/resources/assets/botania/textures/blocks/custombrick6.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick7.png b/src/main/resources/assets/botania/textures/blocks/custombrick7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick7.png rename to src/main/resources/assets/botania/textures/blocks/custombrick7.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick8.png b/src/main/resources/assets/botania/textures/blocks/custombrick8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick8.png rename to src/main/resources/assets/botania/textures/blocks/custombrick8.png diff --git a/src/main/resources/assets/botania/textures/blocks/customBrick9.png b/src/main/resources/assets/botania/textures/blocks/custombrick9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/customBrick9.png rename to src/main/resources/assets/botania/textures/blocks/custombrick9.png diff --git a/src/main/resources/assets/botania/textures/blocks/daybloomDecor.png b/src/main/resources/assets/botania/textures/blocks/daybloomdecor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/daybloomDecor.png rename to src/main/resources/assets/botania/textures/blocks/daybloomdecor.png diff --git a/src/main/resources/assets/botania/textures/blocks/daybloomPrime.png b/src/main/resources/assets/botania/textures/blocks/daybloomprime.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/daybloomPrime.png rename to src/main/resources/assets/botania/textures/blocks/daybloomprime.png diff --git a/src/main/resources/assets/botania/textures/blocks/dirtPath.png b/src/main/resources/assets/botania/textures/blocks/dirtpath.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/dirtPath.png rename to src/main/resources/assets/botania/textures/blocks/dirtpath.png diff --git a/src/main/resources/assets/botania/textures/blocks/elfGlass.png b/src/main/resources/assets/botania/textures/blocks/elfglass.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/elfGlass.png rename to src/main/resources/assets/botania/textures/blocks/elfglass.png diff --git a/src/main/resources/assets/botania/textures/blocks/elfGlass0.png b/src/main/resources/assets/botania/textures/blocks/elfglass0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/elfGlass0.png rename to src/main/resources/assets/botania/textures/blocks/elfglass0.png diff --git a/src/main/resources/assets/botania/textures/blocks/elfGlass1.png b/src/main/resources/assets/botania/textures/blocks/elfglass1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/elfGlass1.png rename to src/main/resources/assets/botania/textures/blocks/elfglass1.png diff --git a/src/main/resources/assets/botania/textures/blocks/elfGlass2.png b/src/main/resources/assets/botania/textures/blocks/elfglass2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/elfGlass2.png rename to src/main/resources/assets/botania/textures/blocks/elfglass2.png diff --git a/src/main/resources/assets/botania/textures/blocks/elfGlass3.png b/src/main/resources/assets/botania/textures/blocks/elfglass3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/elfGlass3.png rename to src/main/resources/assets/botania/textures/blocks/elfglass3.png diff --git a/src/main/resources/assets/botania/textures/blocks/elfGlassPane.png b/src/main/resources/assets/botania/textures/blocks/elfglasspane.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/elfGlassPane.png rename to src/main/resources/assets/botania/textures/blocks/elfglasspane.png diff --git a/src/main/resources/assets/botania/textures/blocks/enchantedSoil0.png b/src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enchantedSoil0.png rename to src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png diff --git a/src/main/resources/assets/botania/textures/blocks/enchantedSoil0.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enchantedSoil0.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/enchantedsoil0.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/enchantedSoil1.png b/src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enchantedSoil1.png rename to src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png diff --git a/src/main/resources/assets/botania/textures/blocks/enchantedSoil1.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enchantedSoil1.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/enchantedsoil1.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/enchanterOverlay.png b/src/main/resources/assets/botania/textures/blocks/enchanteroverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enchanterOverlay.png rename to src/main/resources/assets/botania/textures/blocks/enchanteroverlay.png diff --git a/src/main/resources/assets/botania/textures/blocks/enderEyeBlock0.png b/src/main/resources/assets/botania/textures/blocks/endereyeblock0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enderEyeBlock0.png rename to src/main/resources/assets/botania/textures/blocks/endereyeblock0.png diff --git a/src/main/resources/assets/botania/textures/blocks/enderEyeBlock1.png b/src/main/resources/assets/botania/textures/blocks/endereyeblock1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/enderEyeBlock1.png rename to src/main/resources/assets/botania/textures/blocks/endereyeblock1.png diff --git a/src/main/resources/assets/botania/textures/blocks/fallenKanade.png b/src/main/resources/assets/botania/textures/blocks/fallenkanade.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/fallenKanade.png rename to src/main/resources/assets/botania/textures/blocks/fallenkanade.png diff --git a/src/main/resources/assets/botania/textures/blocks/felPumpkin.png b/src/main/resources/assets/botania/textures/blocks/felpumpkin.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/felPumpkin.png rename to src/main/resources/assets/botania/textures/blocks/felpumpkin.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower0Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower0tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower0Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower0tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower0Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower0tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower0Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower0tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower10Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower10tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower10Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower10tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower10Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower10tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower10Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower10tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower11Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower11tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower11Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower11tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower11Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower11tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower11Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower11tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower12Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower12tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower12Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower12tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower12Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower12tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower12Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower12tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower13Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower13tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower13Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower13tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower13Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower13tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower13Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower13tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower14Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower14tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower14Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower14tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower14Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower14tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower14Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower14tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower15Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower15tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower15Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower15tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower15Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower15tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower15Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower15tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower1Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower1tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower1Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower1tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower1Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower1tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower1Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower1tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower2Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower2tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower2Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower2tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower2Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower2tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower2Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower2tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower3Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower3tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower3Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower3tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower3Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower3tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower3Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower3tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower4Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower4tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower4Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower4tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower4Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower4tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower4Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower4tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower5Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower5tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower5Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower5tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower5Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower5tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower5Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower5tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower6Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower6tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower6Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower6tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower6Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower6tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower6Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower6tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower7Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower7tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower7Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower7tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower7Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower7tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower7Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower7tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower8Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower8tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower8Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower8tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower8Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower8tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower8Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower8tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower9Tall0.png b/src/main/resources/assets/botania/textures/blocks/flower9tall0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower9Tall0.png rename to src/main/resources/assets/botania/textures/blocks/flower9tall0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flower9Tall1.png b/src/main/resources/assets/botania/textures/blocks/flower9tall1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flower9Tall1.png rename to src/main/resources/assets/botania/textures/blocks/flower9tall1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering0.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering0.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering0.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering1.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering1.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering1.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering10.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering10.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering10.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering10.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering11.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering11.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering11.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering11.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering12.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering12.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering12.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering12.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering13.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering13.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering13.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering13.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering14.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering14.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering14.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering14.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering15.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering15.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering15.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering15.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering2.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering2.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering2.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering3.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering3.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering3.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering4.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering4.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering4.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering5.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering5.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering5.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering6.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering6.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering6.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering7.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering7.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering7.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering8.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering8.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering8.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerGlimmering9.png b/src/main/resources/assets/botania/textures/blocks/flowerglimmering9.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerGlimmering9.png rename to src/main/resources/assets/botania/textures/blocks/flowerglimmering9.png diff --git a/src/main/resources/assets/botania/textures/blocks/flowerPot.png b/src/main/resources/assets/botania/textures/blocks/flowerpot.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/flowerPot.png rename to src/main/resources/assets/botania/textures/blocks/flowerpot.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum0.png b/src/main/resources/assets/botania/textures/blocks/forestdrum0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestDrum0.png rename to src/main/resources/assets/botania/textures/blocks/forestdrum0.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum1.png b/src/main/resources/assets/botania/textures/blocks/forestdrum1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestDrum1.png rename to src/main/resources/assets/botania/textures/blocks/forestdrum1.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum2.png b/src/main/resources/assets/botania/textures/blocks/forestdrum2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestDrum2.png rename to src/main/resources/assets/botania/textures/blocks/forestdrum2.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum3.png b/src/main/resources/assets/botania/textures/blocks/forestdrum3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestDrum3.png rename to src/main/resources/assets/botania/textures/blocks/forestdrum3.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum4.png b/src/main/resources/assets/botania/textures/blocks/forestdrum4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestDrum4.png rename to src/main/resources/assets/botania/textures/blocks/forestdrum4.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestDrum5.png b/src/main/resources/assets/botania/textures/blocks/forestdrum5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestDrum5.png rename to src/main/resources/assets/botania/textures/blocks/forestdrum5.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye0.png b/src/main/resources/assets/botania/textures/blocks/foresteye0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye0.png rename to src/main/resources/assets/botania/textures/blocks/foresteye0.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye1.png b/src/main/resources/assets/botania/textures/blocks/foresteye1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye1.png rename to src/main/resources/assets/botania/textures/blocks/foresteye1.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye2.png b/src/main/resources/assets/botania/textures/blocks/foresteye2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye2.png rename to src/main/resources/assets/botania/textures/blocks/foresteye2.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye2.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye2.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye2.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/foresteye2.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye3.png b/src/main/resources/assets/botania/textures/blocks/foresteye3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye3.png rename to src/main/resources/assets/botania/textures/blocks/foresteye3.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye3.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye3.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye3.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/foresteye3.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye4.png b/src/main/resources/assets/botania/textures/blocks/foresteye4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye4.png rename to src/main/resources/assets/botania/textures/blocks/foresteye4.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye4.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye4.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye4.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/foresteye4.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye5.png b/src/main/resources/assets/botania/textures/blocks/foresteye5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye5.png rename to src/main/resources/assets/botania/textures/blocks/foresteye5.png diff --git a/src/main/resources/assets/botania/textures/blocks/forestEye5.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/foresteye5.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/forestEye5.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/foresteye5.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/ghostRail.png b/src/main/resources/assets/botania/textures/blocks/ghostrail.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ghostRail.png rename to src/main/resources/assets/botania/textures/blocks/ghostrail.png diff --git a/src/main/resources/assets/botania/textures/blocks/heiseiDream.png b/src/main/resources/assets/botania/textures/blocks/heiseidream.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/heiseiDream.png rename to src/main/resources/assets/botania/textures/blocks/heiseidream.png diff --git a/src/main/resources/assets/botania/textures/blocks/hopperhockChibi.png b/src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hopperhockChibi.png rename to src/main/resources/assets/botania/textures/blocks/hopperhockchibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/hydroangeasDecor.png b/src/main/resources/assets/botania/textures/blocks/hydroangeasdecor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/hydroangeasDecor.png rename to src/main/resources/assets/botania/textures/blocks/hydroangeasdecor.png diff --git a/src/main/resources/assets/botania/textures/blocks/islandSide.png b/src/main/resources/assets/botania/textures/blocks/islandside.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/islandSide.png rename to src/main/resources/assets/botania/textures/blocks/islandside.png diff --git a/src/main/resources/assets/botania/textures/blocks/islandTop.png b/src/main/resources/assets/botania/textures/blocks/islandtop.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/islandTop.png rename to src/main/resources/assets/botania/textures/blocks/islandtop.png diff --git a/src/main/resources/assets/botania/textures/blocks/jadedAmaranthus.png b/src/main/resources/assets/botania/textures/blocks/jadedamaranthus.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/jadedAmaranthus.png rename to src/main/resources/assets/botania/textures/blocks/jadedamaranthus.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightLauncher.png b/src/main/resources/assets/botania/textures/blocks/lightlauncher.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightLauncher.png rename to src/main/resources/assets/botania/textures/blocks/lightlauncher.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay0.png b/src/main/resources/assets/botania/textures/blocks/lightrelay0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay0.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay0.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay1.png b/src/main/resources/assets/botania/textures/blocks/lightrelay1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay1.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay1.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay2.png b/src/main/resources/assets/botania/textures/blocks/lightrelay2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay2.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay2.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay3.png b/src/main/resources/assets/botania/textures/blocks/lightrelay3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay3.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay3.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay4.png b/src/main/resources/assets/botania/textures/blocks/lightrelay4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay4.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay4.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay5.png b/src/main/resources/assets/botania/textures/blocks/lightrelay5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay5.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay5.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay6.png b/src/main/resources/assets/botania/textures/blocks/lightrelay6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay6.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay6.png diff --git a/src/main/resources/assets/botania/textures/blocks/lightRelay7.png b/src/main/resources/assets/botania/textures/blocks/lightrelay7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/lightRelay7.png rename to src/main/resources/assets/botania/textures/blocks/lightrelay7.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaBeacon0.png b/src/main/resources/assets/botania/textures/blocks/manabeacon0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaBeacon0.png rename to src/main/resources/assets/botania/textures/blocks/manabeacon0.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaBeacon1.png b/src/main/resources/assets/botania/textures/blocks/manabeacon1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaBeacon1.png rename to src/main/resources/assets/botania/textures/blocks/manabeacon1.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaBomb.png b/src/main/resources/assets/botania/textures/blocks/manabomb.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaBomb.png rename to src/main/resources/assets/botania/textures/blocks/manabomb.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetector0.png b/src/main/resources/assets/botania/textures/blocks/manadetector0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetector0.png rename to src/main/resources/assets/botania/textures/blocks/manadetector0.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaDetector1.png b/src/main/resources/assets/botania/textures/blocks/manadetector1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaDetector1.png rename to src/main/resources/assets/botania/textures/blocks/manadetector1.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaGlass.png b/src/main/resources/assets/botania/textures/blocks/managlass.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaGlass.png rename to src/main/resources/assets/botania/textures/blocks/managlass.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaGlassPane.png b/src/main/resources/assets/botania/textures/blocks/managlasspane.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaGlassPane.png rename to src/main/resources/assets/botania/textures/blocks/managlasspane.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaVoid0.png b/src/main/resources/assets/botania/textures/blocks/manavoid0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaVoid0.png rename to src/main/resources/assets/botania/textures/blocks/manavoid0.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaVoid1.png b/src/main/resources/assets/botania/textures/blocks/manavoid1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaVoid1.png rename to src/main/resources/assets/botania/textures/blocks/manavoid1.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaWater.png b/src/main/resources/assets/botania/textures/blocks/manawater.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaWater.png rename to src/main/resources/assets/botania/textures/blocks/manawater.png diff --git a/src/main/resources/assets/botania/textures/blocks/manaWater.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/manawater.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/manaWater.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/manawater.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/marimorphosisChibi.png b/src/main/resources/assets/botania/textures/blocks/marimorphosischibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/marimorphosisChibi.png rename to src/main/resources/assets/botania/textures/blocks/marimorphosischibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/nightshadeDecor.png b/src/main/resources/assets/botania/textures/blocks/nightshadedecor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/nightshadeDecor.png rename to src/main/resources/assets/botania/textures/blocks/nightshadedecor.png diff --git a/src/main/resources/assets/botania/textures/blocks/nightshadePrime.png b/src/main/resources/assets/botania/textures/blocks/nightshadeprime.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/nightshadePrime.png rename to src/main/resources/assets/botania/textures/blocks/nightshadeprime.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern0.png b/src/main/resources/assets/botania/textures/blocks/ocpattern0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern0.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern0.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern1.png b/src/main/resources/assets/botania/textures/blocks/ocpattern1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern1.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern1.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern2.png b/src/main/resources/assets/botania/textures/blocks/ocpattern2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern2.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern2.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern3.png b/src/main/resources/assets/botania/textures/blocks/ocpattern3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern3.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern3.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern4.png b/src/main/resources/assets/botania/textures/blocks/ocpattern4.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern4.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern4.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern5.png b/src/main/resources/assets/botania/textures/blocks/ocpattern5.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern5.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern5.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern6.png b/src/main/resources/assets/botania/textures/blocks/ocpattern6.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern6.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern6.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern7.png b/src/main/resources/assets/botania/textures/blocks/ocpattern7.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern7.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern7.png diff --git a/src/main/resources/assets/botania/textures/blocks/ocPattern8.png b/src/main/resources/assets/botania/textures/blocks/ocpattern8.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/ocPattern8.png rename to src/main/resources/assets/botania/textures/blocks/ocpattern8.png diff --git a/src/main/resources/assets/botania/textures/blocks/openCrate0.png b/src/main/resources/assets/botania/textures/blocks/opencrate0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/openCrate0.png rename to src/main/resources/assets/botania/textures/blocks/opencrate0.png diff --git a/src/main/resources/assets/botania/textures/blocks/openCrate1.png b/src/main/resources/assets/botania/textures/blocks/opencrate1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/openCrate1.png rename to src/main/resources/assets/botania/textures/blocks/opencrate1.png diff --git a/src/main/resources/assets/botania/textures/blocks/openCrate2.png b/src/main/resources/assets/botania/textures/blocks/opencrate2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/openCrate2.png rename to src/main/resources/assets/botania/textures/blocks/opencrate2.png diff --git a/src/main/resources/assets/botania/textures/blocks/openCrate3.png b/src/main/resources/assets/botania/textures/blocks/opencrate3.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/openCrate3.png rename to src/main/resources/assets/botania/textures/blocks/opencrate3.png diff --git a/src/main/resources/assets/botania/textures/blocks/orechidIgnem.png b/src/main/resources/assets/botania/textures/blocks/orechidignem.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/orechidIgnem.png rename to src/main/resources/assets/botania/textures/blocks/orechidignem.png diff --git a/src/main/resources/assets/botania/textures/blocks/petalBlock.png b/src/main/resources/assets/botania/textures/blocks/petalblock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/petalBlock.png rename to src/main/resources/assets/botania/textures/blocks/petalblock.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarBlazeQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarblazequartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarBlazeQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillarblazequartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarBlazeQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarblazequartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarBlazeQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillarblazequartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarDarkQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillardarkquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarDarkQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillardarkquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarDarkQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillardarkquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarDarkQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillardarkquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarElfQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarelfquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarElfQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillarelfquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarElfQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarelfquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarElfQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillarelfquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarLavenderQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarlavenderquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarLavenderQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillarlavenderquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarLavenderQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarlavenderquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarLavenderQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillarlavenderquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarManaQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarmanaquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarManaQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillarmanaquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarManaQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarmanaquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarManaQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillarmanaquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarRedQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarredquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarRedQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillarredquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarRedQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarredquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarRedQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillarredquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz0.png b/src/main/resources/assets/botania/textures/blocks/pillarsunnyquartz0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz0.png rename to src/main/resources/assets/botania/textures/blocks/pillarsunnyquartz0.png diff --git a/src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz1.png b/src/main/resources/assets/botania/textures/blocks/pillarsunnyquartz1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pillarSunnyQuartz1.png rename to src/main/resources/assets/botania/textures/blocks/pillarsunnyquartz1.png diff --git a/src/main/resources/assets/botania/textures/blocks/pistonRelay.png b/src/main/resources/assets/botania/textures/blocks/pistonrelay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/pistonRelay.png rename to src/main/resources/assets/botania/textures/blocks/pistonrelay.png diff --git a/src/main/resources/assets/botania/textures/blocks/rannuncarpusChibi.png b/src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/rannuncarpusChibi.png rename to src/main/resources/assets/botania/textures/blocks/rannuncarpuschibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringComparator.png b/src/main/resources/assets/botania/textures/blocks/redstringcomparator.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringComparator.png rename to src/main/resources/assets/botania/textures/blocks/redstringcomparator.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringContainer.png b/src/main/resources/assets/botania/textures/blocks/redstringcontainer.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringContainer.png rename to src/main/resources/assets/botania/textures/blocks/redstringcontainer.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringDispenser.png b/src/main/resources/assets/botania/textures/blocks/redstringdispenser.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringDispenser.png rename to src/main/resources/assets/botania/textures/blocks/redstringdispenser.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringFertilizer.png b/src/main/resources/assets/botania/textures/blocks/redstringfertilizer.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringFertilizer.png rename to src/main/resources/assets/botania/textures/blocks/redstringfertilizer.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringInterceptor.png b/src/main/resources/assets/botania/textures/blocks/redstringinterceptor.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringInterceptor.png rename to src/main/resources/assets/botania/textures/blocks/redstringinterceptor.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringPattern.psd b/src/main/resources/assets/botania/textures/blocks/redstringpattern.psd similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringPattern.psd rename to src/main/resources/assets/botania/textures/blocks/redstringpattern.psd diff --git a/src/main/resources/assets/botania/textures/blocks/redStringRelay.png b/src/main/resources/assets/botania/textures/blocks/redstringrelay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringRelay.png rename to src/main/resources/assets/botania/textures/blocks/redstringrelay.png diff --git a/src/main/resources/assets/botania/textures/blocks/redStringSender.png b/src/main/resources/assets/botania/textures/blocks/redstringsender.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/redStringSender.png rename to src/main/resources/assets/botania/textures/blocks/redstringsender.png diff --git a/src/main/resources/assets/botania/textures/blocks/rfGenerator.png b/src/main/resources/assets/botania/textures/blocks/rfgenerator.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/rfGenerator.png rename to src/main/resources/assets/botania/textures/blocks/rfgenerator.png diff --git a/src/main/resources/assets/botania/textures/blocks/runeAltar0.png b/src/main/resources/assets/botania/textures/blocks/runealtar0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/runeAltar0.png rename to src/main/resources/assets/botania/textures/blocks/runealtar0.png diff --git a/src/main/resources/assets/botania/textures/blocks/runeAltar1.png b/src/main/resources/assets/botania/textures/blocks/runealtar1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/runeAltar1.png rename to src/main/resources/assets/botania/textures/blocks/runealtar1.png diff --git a/src/main/resources/assets/botania/textures/blocks/runeAltar2.png b/src/main/resources/assets/botania/textures/blocks/runealtar2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/runeAltar2.png rename to src/main/resources/assets/botania/textures/blocks/runealtar2.png diff --git a/src/main/resources/assets/botania/textures/blocks/shimmerwoodPlanks.png b/src/main/resources/assets/botania/textures/blocks/shimmerwoodplanks.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/shimmerwoodPlanks.png rename to src/main/resources/assets/botania/textures/blocks/shimmerwoodplanks.png diff --git a/src/main/resources/assets/botania/textures/blocks/shimmerwoodPlanks.png.mcmeta b/src/main/resources/assets/botania/textures/blocks/shimmerwoodplanks.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/shimmerwoodPlanks.png.mcmeta rename to src/main/resources/assets/botania/textures/blocks/shimmerwoodplanks.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/blocks/solegnoliaChibi.png b/src/main/resources/assets/botania/textures/blocks/solegnoliachibi.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/solegnoliaChibi.png rename to src/main/resources/assets/botania/textures/blocks/solegnoliachibi.png diff --git a/src/main/resources/assets/botania/textures/blocks/sparkChanger0.png b/src/main/resources/assets/botania/textures/blocks/sparkchanger0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/sparkChanger0.png rename to src/main/resources/assets/botania/textures/blocks/sparkchanger0.png diff --git a/src/main/resources/assets/botania/textures/blocks/sparkChanger1.png b/src/main/resources/assets/botania/textures/blocks/sparkchanger1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/sparkChanger1.png rename to src/main/resources/assets/botania/textures/blocks/sparkchanger1.png diff --git a/src/main/resources/assets/botania/textures/blocks/sparkChanger2.png b/src/main/resources/assets/botania/textures/blocks/sparkchanger2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/sparkChanger2.png rename to src/main/resources/assets/botania/textures/blocks/sparkchanger2.png diff --git a/src/main/resources/assets/botania/textures/blocks/terraPlate0.png b/src/main/resources/assets/botania/textures/blocks/terraplate0.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/terraPlate0.png rename to src/main/resources/assets/botania/textures/blocks/terraplate0.png diff --git a/src/main/resources/assets/botania/textures/blocks/terraPlate1.png b/src/main/resources/assets/botania/textures/blocks/terraplate1.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/terraPlate1.png rename to src/main/resources/assets/botania/textures/blocks/terraplate1.png diff --git a/src/main/resources/assets/botania/textures/blocks/terraPlate2.png b/src/main/resources/assets/botania/textures/blocks/terraplate2.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/terraPlate2.png rename to src/main/resources/assets/botania/textures/blocks/terraplate2.png diff --git a/src/main/resources/assets/botania/textures/blocks/terraPlateOverlay.png b/src/main/resources/assets/botania/textures/blocks/terraplateoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/terraPlateOverlay.png rename to src/main/resources/assets/botania/textures/blocks/terraplateoverlay.png diff --git a/src/main/resources/assets/botania/textures/blocks/tinyPlanetBlock.png b/src/main/resources/assets/botania/textures/blocks/tinyplanetblock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/tinyPlanetBlock.png rename to src/main/resources/assets/botania/textures/blocks/tinyplanetblock.png diff --git a/src/main/resources/assets/botania/textures/blocks/unstableBlock.png b/src/main/resources/assets/botania/textures/blocks/unstableblock.png similarity index 100% rename from src/main/resources/assets/botania/textures/blocks/unstableBlock.png rename to src/main/resources/assets/botania/textures/blocks/unstableblock.png diff --git a/src/main/resources/assets/botania/textures/gui/baubleBox.png b/src/main/resources/assets/botania/textures/gui/baublebox.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/baubleBox.png rename to src/main/resources/assets/botania/textures/gui/baublebox.png diff --git a/src/main/resources/assets/botania/textures/gui/bossBar.png b/src/main/resources/assets/botania/textures/gui/bossbar.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/bossBar.png rename to src/main/resources/assets/botania/textures/gui/bossbar.png diff --git a/src/main/resources/assets/botania/textures/gui/categories/functionalFlowers.png b/src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/categories/functionalFlowers.png rename to src/main/resources/assets/botania/textures/gui/categories/functionalflowers.png diff --git a/src/main/resources/assets/botania/textures/gui/categories/generationFlowers.png b/src/main/resources/assets/botania/textures/gui/categories/generationflowers.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/categories/generationFlowers.png rename to src/main/resources/assets/botania/textures/gui/categories/generationflowers.png diff --git a/src/main/resources/assets/botania/textures/gui/craftingOverlay.png b/src/main/resources/assets/botania/textures/gui/craftingoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/craftingOverlay.png rename to src/main/resources/assets/botania/textures/gui/craftingoverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png b/src/main/resources/assets/botania/textures/gui/elventradeoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/elvenTradeOverlay.png rename to src/main/resources/assets/botania/textures/gui/elventradeoverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/craftCrate.png b/src/main/resources/assets/botania/textures/gui/entries/craftcrate.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/craftCrate.png rename to src/main/resources/assets/botania/textures/gui/entries/craftcrate.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/diminishingReturns.png b/src/main/resources/assets/botania/textures/gui/entries/diminishingreturns.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/diminishingReturns.png rename to src/main/resources/assets/botania/textures/gui/entries/diminishingreturns.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/elvenGarde.png b/src/main/resources/assets/botania/textures/gui/entries/elvengarde.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/elvenGarde.png rename to src/main/resources/assets/botania/textures/gui/entries/elvengarde.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/metamorphicStones.png b/src/main/resources/assets/botania/textures/gui/entries/metamorphicstones.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/metamorphicStones.png rename to src/main/resources/assets/botania/textures/gui/entries/metamorphicstones.png diff --git a/src/main/resources/assets/botania/textures/gui/entries/pureDaisy.png b/src/main/resources/assets/botania/textures/gui/entries/puredaisy.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/entries/pureDaisy.png rename to src/main/resources/assets/botania/textures/gui/entries/puredaisy.png diff --git a/src/main/resources/assets/botania/textures/gui/flowerBag.png b/src/main/resources/assets/botania/textures/gui/flowerbag.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/flowerBag.png rename to src/main/resources/assets/botania/textures/gui/flowerbag.png diff --git a/src/main/resources/assets/botania/textures/gui/hudIcons.png b/src/main/resources/assets/botania/textures/gui/hudicons.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/hudIcons.png rename to src/main/resources/assets/botania/textures/gui/hudicons.png diff --git a/src/main/resources/assets/botania/textures/gui/manaHud.png b/src/main/resources/assets/botania/textures/gui/manahud.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/manaHud.png rename to src/main/resources/assets/botania/textures/gui/manahud.png diff --git a/src/main/resources/assets/botania/textures/gui/manaInfusionOverlay.png b/src/main/resources/assets/botania/textures/gui/manainfusionoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/manaInfusionOverlay.png rename to src/main/resources/assets/botania/textures/gui/manainfusionoverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/multiblockOverlay.png b/src/main/resources/assets/botania/textures/gui/multiblockoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/multiblockOverlay.png rename to src/main/resources/assets/botania/textures/gui/multiblockoverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/neiBlank.png b/src/main/resources/assets/botania/textures/gui/neiblank.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/neiBlank.png rename to src/main/resources/assets/botania/textures/gui/neiblank.png diff --git a/src/main/resources/assets/botania/textures/gui/neiBrewery.png b/src/main/resources/assets/botania/textures/gui/neibrewery.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/neiBrewery.png rename to src/main/resources/assets/botania/textures/gui/neibrewery.png diff --git a/src/main/resources/assets/botania/textures/gui/petalOverlay.png b/src/main/resources/assets/botania/textures/gui/petaloverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/petalOverlay.png rename to src/main/resources/assets/botania/textures/gui/petaloverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/pureDaisyOverlay.png b/src/main/resources/assets/botania/textures/gui/puredaisyoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/pureDaisyOverlay.png rename to src/main/resources/assets/botania/textures/gui/puredaisyoverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/sheddingOverlay.png b/src/main/resources/assets/botania/textures/gui/sheddingoverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/sheddingOverlay.png rename to src/main/resources/assets/botania/textures/gui/sheddingoverlay.png diff --git a/src/main/resources/assets/botania/textures/gui/terrasteelOverlay.png b/src/main/resources/assets/botania/textures/gui/terrasteeloverlay.png similarity index 100% rename from src/main/resources/assets/botania/textures/gui/terrasteelOverlay.png rename to src/main/resources/assets/botania/textures/gui/terrasteeloverlay.png diff --git a/src/main/resources/assets/botania/textures/items/aesirRing.png b/src/main/resources/assets/botania/textures/items/aesirring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/aesirRing.png rename to src/main/resources/assets/botania/textures/items/aesirring.png diff --git a/src/main/resources/assets/botania/textures/items/ancientWill0.png b/src/main/resources/assets/botania/textures/items/ancientwill0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/ancientWill0.png rename to src/main/resources/assets/botania/textures/items/ancientwill0.png diff --git a/src/main/resources/assets/botania/textures/items/ancientWill1.png b/src/main/resources/assets/botania/textures/items/ancientwill1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/ancientWill1.png rename to src/main/resources/assets/botania/textures/items/ancientwill1.png diff --git a/src/main/resources/assets/botania/textures/items/ancientWill2.png b/src/main/resources/assets/botania/textures/items/ancientwill2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/ancientWill2.png rename to src/main/resources/assets/botania/textures/items/ancientwill2.png diff --git a/src/main/resources/assets/botania/textures/items/ancientWill3.png b/src/main/resources/assets/botania/textures/items/ancientwill3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/ancientWill3.png rename to src/main/resources/assets/botania/textures/items/ancientwill3.png diff --git a/src/main/resources/assets/botania/textures/items/ancientWill4.png b/src/main/resources/assets/botania/textures/items/ancientwill4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/ancientWill4.png rename to src/main/resources/assets/botania/textures/items/ancientwill4.png diff --git a/src/main/resources/assets/botania/textures/items/ancientWill5.png b/src/main/resources/assets/botania/textures/items/ancientwill5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/ancientWill5.png rename to src/main/resources/assets/botania/textures/items/ancientwill5.png diff --git a/src/main/resources/assets/botania/textures/items/auraRing.png b/src/main/resources/assets/botania/textures/items/auraring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/auraRing.png rename to src/main/resources/assets/botania/textures/items/auraring.png diff --git a/src/main/resources/assets/botania/textures/items/auraRingGreater.png b/src/main/resources/assets/botania/textures/items/auraringgreater.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/auraRingGreater.png rename to src/main/resources/assets/botania/textures/items/auraringgreater.png diff --git a/src/main/resources/assets/botania/textures/items/autocraftingHalo.png b/src/main/resources/assets/botania/textures/items/autocraftinghalo.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/autocraftingHalo.png rename to src/main/resources/assets/botania/textures/items/autocraftinghalo.png diff --git a/src/main/resources/assets/botania/textures/items/balanceCloak.png b/src/main/resources/assets/botania/textures/items/balancecloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/balanceCloak.png rename to src/main/resources/assets/botania/textures/items/balancecloak.png diff --git a/src/main/resources/assets/botania/textures/items/baubleBox.png b/src/main/resources/assets/botania/textures/items/baublebox.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/baubleBox.png rename to src/main/resources/assets/botania/textures/items/baublebox.png diff --git a/src/main/resources/assets/botania/textures/items/blackHoleTalisman0.png b/src/main/resources/assets/botania/textures/items/blackholetalisman0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/blackHoleTalisman0.png rename to src/main/resources/assets/botania/textures/items/blackholetalisman0.png diff --git a/src/main/resources/assets/botania/textures/items/blackHoleTalisman1.png b/src/main/resources/assets/botania/textures/items/blackholetalisman1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/blackHoleTalisman1.png rename to src/main/resources/assets/botania/textures/items/blackholetalisman1.png diff --git a/src/main/resources/assets/botania/textures/items/blackLotus.png b/src/main/resources/assets/botania/textures/items/blacklotus.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/blackLotus.png rename to src/main/resources/assets/botania/textures/items/blacklotus.png diff --git a/src/main/resources/assets/botania/textures/items/bloodPendant0.png b/src/main/resources/assets/botania/textures/items/bloodpendant0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodPendant0.png rename to src/main/resources/assets/botania/textures/items/bloodpendant0.png diff --git a/src/main/resources/assets/botania/textures/items/bloodPendant1.png b/src/main/resources/assets/botania/textures/items/bloodpendant1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodPendant1.png rename to src/main/resources/assets/botania/textures/items/bloodpendant1.png diff --git a/src/main/resources/assets/botania/textures/items/bloodPendant2.png b/src/main/resources/assets/botania/textures/items/bloodpendant2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodPendant2.png rename to src/main/resources/assets/botania/textures/items/bloodpendant2.png diff --git a/src/main/resources/assets/botania/textures/items/bloodPendant3.png b/src/main/resources/assets/botania/textures/items/bloodpendant3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/bloodPendant3.png rename to src/main/resources/assets/botania/textures/items/bloodpendant3.png diff --git a/src/main/resources/assets/botania/textures/items/cloudPendant.png b/src/main/resources/assets/botania/textures/items/cloudpendant.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cloudPendant.png rename to src/main/resources/assets/botania/textures/items/cloudpendant.png diff --git a/src/main/resources/assets/botania/textures/items/cloudPendantGem.png b/src/main/resources/assets/botania/textures/items/cloudpendantgem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cloudPendantGem.png rename to src/main/resources/assets/botania/textures/items/cloudpendantgem.png diff --git a/src/main/resources/assets/botania/textures/items/cobbleRod.png b/src/main/resources/assets/botania/textures/items/cobblerod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/cobbleRod.png rename to src/main/resources/assets/botania/textures/items/cobblerod.png diff --git a/src/main/resources/assets/botania/textures/items/cobbleRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/cobblerod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/cobbleRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/cobblerod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark0.png b/src/main/resources/assets/botania/textures/items/corporeaspark0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark0.png rename to src/main/resources/assets/botania/textures/items/corporeaspark0.png diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark0.png.mcmeta b/src/main/resources/assets/botania/textures/items/corporeaspark0.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark0.png.mcmeta rename to src/main/resources/assets/botania/textures/items/corporeaspark0.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark1.png b/src/main/resources/assets/botania/textures/items/corporeaspark1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark1.png rename to src/main/resources/assets/botania/textures/items/corporeaspark1.png diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark1.png.mcmeta b/src/main/resources/assets/botania/textures/items/corporeaspark1.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark1.png.mcmeta rename to src/main/resources/assets/botania/textures/items/corporeaspark1.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark2.png b/src/main/resources/assets/botania/textures/items/corporeaspark2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark2.png rename to src/main/resources/assets/botania/textures/items/corporeaspark2.png diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark2.png.mcmeta b/src/main/resources/assets/botania/textures/items/corporeaspark2.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark2.png.mcmeta rename to src/main/resources/assets/botania/textures/items/corporeaspark2.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark3.png b/src/main/resources/assets/botania/textures/items/corporeaspark3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark3.png rename to src/main/resources/assets/botania/textures/items/corporeaspark3.png diff --git a/src/main/resources/assets/botania/textures/items/corporeaSpark3.png.mcmeta b/src/main/resources/assets/botania/textures/items/corporeaspark3.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSpark3.png.mcmeta rename to src/main/resources/assets/botania/textures/items/corporeaspark3.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/corporeaSparkStar.png b/src/main/resources/assets/botania/textures/items/corporeasparkstar.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/corporeaSparkStar.png rename to src/main/resources/assets/botania/textures/items/corporeasparkstar.png diff --git a/src/main/resources/assets/botania/textures/items/craftingHalo.png b/src/main/resources/assets/botania/textures/items/craftinghalo.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftingHalo.png rename to src/main/resources/assets/botania/textures/items/craftinghalo.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern0.png b/src/main/resources/assets/botania/textures/items/craftpattern0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern0.png rename to src/main/resources/assets/botania/textures/items/craftpattern0.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern1.png b/src/main/resources/assets/botania/textures/items/craftpattern1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern1.png rename to src/main/resources/assets/botania/textures/items/craftpattern1.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern2.png b/src/main/resources/assets/botania/textures/items/craftpattern2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern2.png rename to src/main/resources/assets/botania/textures/items/craftpattern2.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern3.png b/src/main/resources/assets/botania/textures/items/craftpattern3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern3.png rename to src/main/resources/assets/botania/textures/items/craftpattern3.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern4.png b/src/main/resources/assets/botania/textures/items/craftpattern4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern4.png rename to src/main/resources/assets/botania/textures/items/craftpattern4.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern5.png b/src/main/resources/assets/botania/textures/items/craftpattern5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern5.png rename to src/main/resources/assets/botania/textures/items/craftpattern5.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern6.png b/src/main/resources/assets/botania/textures/items/craftpattern6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern6.png rename to src/main/resources/assets/botania/textures/items/craftpattern6.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern7.png b/src/main/resources/assets/botania/textures/items/craftpattern7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern7.png rename to src/main/resources/assets/botania/textures/items/craftpattern7.png diff --git a/src/main/resources/assets/botania/textures/items/craftPattern8.png b/src/main/resources/assets/botania/textures/items/craftpattern8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/craftPattern8.png rename to src/main/resources/assets/botania/textures/items/craftpattern8.png diff --git a/src/main/resources/assets/botania/textures/items/crystalBow0.png b/src/main/resources/assets/botania/textures/items/crystalbow0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBow0.png rename to src/main/resources/assets/botania/textures/items/crystalbow0.png diff --git a/src/main/resources/assets/botania/textures/items/crystalBow1.png b/src/main/resources/assets/botania/textures/items/crystalbow1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBow1.png rename to src/main/resources/assets/botania/textures/items/crystalbow1.png diff --git a/src/main/resources/assets/botania/textures/items/crystalBow2.png b/src/main/resources/assets/botania/textures/items/crystalbow2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBow2.png rename to src/main/resources/assets/botania/textures/items/crystalbow2.png diff --git a/src/main/resources/assets/botania/textures/items/crystalBow3.png b/src/main/resources/assets/botania/textures/items/crystalbow3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBow3.png rename to src/main/resources/assets/botania/textures/items/crystalbow3.png diff --git a/src/main/resources/assets/botania/textures/items/crystalBow4.png b/src/main/resources/assets/botania/textures/items/crystalbow4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBow4.png rename to src/main/resources/assets/botania/textures/items/crystalbow4.png diff --git a/src/main/resources/assets/botania/textures/items/crystalBow5.png b/src/main/resources/assets/botania/textures/items/crystalbow5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/crystalBow5.png rename to src/main/resources/assets/botania/textures/items/crystalbow5.png diff --git a/src/main/resources/assets/botania/textures/items/dammitReddit.png b/src/main/resources/assets/botania/textures/items/dammitreddit.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dammitReddit.png rename to src/main/resources/assets/botania/textures/items/dammitreddit.png diff --git a/src/main/resources/assets/botania/textures/items/dasBoot.png b/src/main/resources/assets/botania/textures/items/dasboot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dasBoot.png rename to src/main/resources/assets/botania/textures/items/dasboot.png diff --git a/src/main/resources/assets/botania/textures/items/desuGun0.png b/src/main/resources/assets/botania/textures/items/desugun0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/desuGun0.png rename to src/main/resources/assets/botania/textures/items/desugun0.png diff --git a/src/main/resources/assets/botania/textures/items/desuGun1.png b/src/main/resources/assets/botania/textures/items/desugun1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/desuGun1.png rename to src/main/resources/assets/botania/textures/items/desugun1.png diff --git a/src/main/resources/assets/botania/textures/items/desuGun2.png b/src/main/resources/assets/botania/textures/items/desugun2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/desuGun2.png rename to src/main/resources/assets/botania/textures/items/desugun2.png diff --git a/src/main/resources/assets/botania/textures/items/dirtRod.png b/src/main/resources/assets/botania/textures/items/dirtrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dirtRod.png rename to src/main/resources/assets/botania/textures/items/dirtrod.png diff --git a/src/main/resources/assets/botania/textures/items/dirtRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/dirtrod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/dirtRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/dirtrod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/divaCharm.png b/src/main/resources/assets/botania/textures/items/divacharm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/divaCharm.png rename to src/main/resources/assets/botania/textures/items/divacharm.png diff --git a/src/main/resources/assets/botania/textures/items/diviningRod.png b/src/main/resources/assets/botania/textures/items/diviningrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/diviningRod.png rename to src/main/resources/assets/botania/textures/items/diviningrod.png diff --git a/src/main/resources/assets/botania/textures/items/dodgeRing.png b/src/main/resources/assets/botania/textures/items/dodgering.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dodgeRing.png rename to src/main/resources/assets/botania/textures/items/dodgering.png diff --git a/src/main/resources/assets/botania/textures/items/dreamwoodTwig.png b/src/main/resources/assets/botania/textures/items/dreamwoodtwig.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/dreamwoodTwig.png rename to src/main/resources/assets/botania/textures/items/dreamwoodtwig.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumAxe.png b/src/main/resources/assets/botania/textures/items/elementiumaxe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumAxe.png rename to src/main/resources/assets/botania/textures/items/elementiumaxe.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumBoots.png b/src/main/resources/assets/botania/textures/items/elementiumboots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumBoots.png rename to src/main/resources/assets/botania/textures/items/elementiumboots.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumChest.png b/src/main/resources/assets/botania/textures/items/elementiumchest.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumChest.png rename to src/main/resources/assets/botania/textures/items/elementiumchest.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumHelm.png b/src/main/resources/assets/botania/textures/items/elementiumhelm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumHelm.png rename to src/main/resources/assets/botania/textures/items/elementiumhelm.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumHelmReveal.png b/src/main/resources/assets/botania/textures/items/elementiumhelmreveal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumHelmReveal.png rename to src/main/resources/assets/botania/textures/items/elementiumhelmreveal.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumLegs.png b/src/main/resources/assets/botania/textures/items/elementiumlegs.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumLegs.png rename to src/main/resources/assets/botania/textures/items/elementiumlegs.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumNugget.png b/src/main/resources/assets/botania/textures/items/elementiumnugget.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumNugget.png rename to src/main/resources/assets/botania/textures/items/elementiumnugget.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumPick.png b/src/main/resources/assets/botania/textures/items/elementiumpick.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumPick.png rename to src/main/resources/assets/botania/textures/items/elementiumpick.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumShears.png b/src/main/resources/assets/botania/textures/items/elementiumshears.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumShears.png rename to src/main/resources/assets/botania/textures/items/elementiumshears.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumShovel.png b/src/main/resources/assets/botania/textures/items/elementiumshovel.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumShovel.png rename to src/main/resources/assets/botania/textures/items/elementiumshovel.png diff --git a/src/main/resources/assets/botania/textures/items/elementiumSword.png b/src/main/resources/assets/botania/textures/items/elementiumsword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/elementiumSword.png rename to src/main/resources/assets/botania/textures/items/elementiumsword.png diff --git a/src/main/resources/assets/botania/textures/items/enderAirBottle.png b/src/main/resources/assets/botania/textures/items/enderairbottle.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderAirBottle.png rename to src/main/resources/assets/botania/textures/items/enderairbottle.png diff --git a/src/main/resources/assets/botania/textures/items/enderDagger0.png b/src/main/resources/assets/botania/textures/items/enderdagger0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderDagger0.png rename to src/main/resources/assets/botania/textures/items/enderdagger0.png diff --git a/src/main/resources/assets/botania/textures/items/enderDagger1.png b/src/main/resources/assets/botania/textures/items/enderdagger1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderDagger1.png rename to src/main/resources/assets/botania/textures/items/enderdagger1.png diff --git a/src/main/resources/assets/botania/textures/items/enderHand.png b/src/main/resources/assets/botania/textures/items/enderhand.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/enderHand.png rename to src/main/resources/assets/botania/textures/items/enderhand.png diff --git a/src/main/resources/assets/botania/textures/items/exchangeRod.png b/src/main/resources/assets/botania/textures/items/exchangerod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/exchangeRod.png rename to src/main/resources/assets/botania/textures/items/exchangerod.png diff --git a/src/main/resources/assets/botania/textures/items/exchangeRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/exchangerod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/exchangeRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/exchangerod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/fireRod.png b/src/main/resources/assets/botania/textures/items/firerod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/fireRod.png rename to src/main/resources/assets/botania/textures/items/firerod.png diff --git a/src/main/resources/assets/botania/textures/items/fireRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/firerod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/fireRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/firerod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/flightTiara0.png b/src/main/resources/assets/botania/textures/items/flighttiara0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara0.png rename to src/main/resources/assets/botania/textures/items/flighttiara0.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara1.png b/src/main/resources/assets/botania/textures/items/flighttiara1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara1.png rename to src/main/resources/assets/botania/textures/items/flighttiara1.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara2.png b/src/main/resources/assets/botania/textures/items/flighttiara2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara2.png rename to src/main/resources/assets/botania/textures/items/flighttiara2.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara3.png b/src/main/resources/assets/botania/textures/items/flighttiara3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara3.png rename to src/main/resources/assets/botania/textures/items/flighttiara3.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara4.png b/src/main/resources/assets/botania/textures/items/flighttiara4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara4.png rename to src/main/resources/assets/botania/textures/items/flighttiara4.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara5.png b/src/main/resources/assets/botania/textures/items/flighttiara5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara5.png rename to src/main/resources/assets/botania/textures/items/flighttiara5.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara6.png b/src/main/resources/assets/botania/textures/items/flighttiara6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara6.png rename to src/main/resources/assets/botania/textures/items/flighttiara6.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara7.png b/src/main/resources/assets/botania/textures/items/flighttiara7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara7.png rename to src/main/resources/assets/botania/textures/items/flighttiara7.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara8.png b/src/main/resources/assets/botania/textures/items/flighttiara8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara8.png rename to src/main/resources/assets/botania/textures/items/flighttiara8.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara9.png b/src/main/resources/assets/botania/textures/items/flighttiara9.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara9.png rename to src/main/resources/assets/botania/textures/items/flighttiara9.png diff --git a/src/main/resources/assets/botania/textures/items/flightTiara9.png.mcmeta b/src/main/resources/assets/botania/textures/items/flighttiara9.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/flightTiara9.png.mcmeta rename to src/main/resources/assets/botania/textures/items/flighttiara9.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/flowerBag.png b/src/main/resources/assets/botania/textures/items/flowerbag.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flowerBag.png rename to src/main/resources/assets/botania/textures/items/flowerbag.png diff --git a/src/main/resources/assets/botania/textures/items/flugelEye.png b/src/main/resources/assets/botania/textures/items/flugeleye.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/flugelEye.png rename to src/main/resources/assets/botania/textures/items/flugeleye.png diff --git a/src/main/resources/assets/botania/textures/items/gaiaHead.png b/src/main/resources/assets/botania/textures/items/gaiahead.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gaiaHead.png rename to src/main/resources/assets/botania/textures/items/gaiahead.png diff --git a/src/main/resources/assets/botania/textures/items/gaiaHead.png.mcmeta b/src/main/resources/assets/botania/textures/items/gaiahead.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/gaiaHead.png.mcmeta rename to src/main/resources/assets/botania/textures/items/gaiahead.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/gaiaIngot.png b/src/main/resources/assets/botania/textures/items/gaiaingot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gaiaIngot.png rename to src/main/resources/assets/botania/textures/items/gaiaingot.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon0.png b/src/main/resources/assets/botania/textures/items/gateweapon0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon0.png rename to src/main/resources/assets/botania/textures/items/gateweapon0.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon1.png b/src/main/resources/assets/botania/textures/items/gateweapon1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon1.png rename to src/main/resources/assets/botania/textures/items/gateweapon1.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon10.png b/src/main/resources/assets/botania/textures/items/gateweapon10.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon10.png rename to src/main/resources/assets/botania/textures/items/gateweapon10.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon11.png b/src/main/resources/assets/botania/textures/items/gateweapon11.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon11.png rename to src/main/resources/assets/botania/textures/items/gateweapon11.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon2.png b/src/main/resources/assets/botania/textures/items/gateweapon2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon2.png rename to src/main/resources/assets/botania/textures/items/gateweapon2.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon3.png b/src/main/resources/assets/botania/textures/items/gateweapon3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon3.png rename to src/main/resources/assets/botania/textures/items/gateweapon3.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon4.png b/src/main/resources/assets/botania/textures/items/gateweapon4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon4.png rename to src/main/resources/assets/botania/textures/items/gateweapon4.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon5.png b/src/main/resources/assets/botania/textures/items/gateweapon5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon5.png rename to src/main/resources/assets/botania/textures/items/gateweapon5.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon6.png b/src/main/resources/assets/botania/textures/items/gateweapon6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon6.png rename to src/main/resources/assets/botania/textures/items/gateweapon6.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon7.png b/src/main/resources/assets/botania/textures/items/gateweapon7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon7.png rename to src/main/resources/assets/botania/textures/items/gateweapon7.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon8.png b/src/main/resources/assets/botania/textures/items/gateweapon8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon8.png rename to src/main/resources/assets/botania/textures/items/gateweapon8.png diff --git a/src/main/resources/assets/botania/textures/items/gateWeapon9.png b/src/main/resources/assets/botania/textures/items/gateweapon9.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gateWeapon9.png rename to src/main/resources/assets/botania/textures/items/gateweapon9.png diff --git a/src/main/resources/assets/botania/textures/items/glassPick.png b/src/main/resources/assets/botania/textures/items/glasspick.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/glassPick.png rename to src/main/resources/assets/botania/textures/items/glasspick.png diff --git a/src/main/resources/assets/botania/textures/items/goddessCharm.png b/src/main/resources/assets/botania/textures/items/goddesscharm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/goddessCharm.png rename to src/main/resources/assets/botania/textures/items/goddesscharm.png diff --git a/src/main/resources/assets/botania/textures/items/grassHorn.png b/src/main/resources/assets/botania/textures/items/grasshorn.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassHorn.png rename to src/main/resources/assets/botania/textures/items/grasshorn.png diff --git a/src/main/resources/assets/botania/textures/items/grassHorn0.png b/src/main/resources/assets/botania/textures/items/grasshorn0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassHorn0.png rename to src/main/resources/assets/botania/textures/items/grasshorn0.png diff --git a/src/main/resources/assets/botania/textures/items/grassHorn1.png b/src/main/resources/assets/botania/textures/items/grasshorn1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassHorn1.png rename to src/main/resources/assets/botania/textures/items/grasshorn1.png diff --git a/src/main/resources/assets/botania/textures/items/grassHorn2.png b/src/main/resources/assets/botania/textures/items/grasshorn2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassHorn2.png rename to src/main/resources/assets/botania/textures/items/grasshorn2.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds0.png b/src/main/resources/assets/botania/textures/items/grassseeds0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds0.png rename to src/main/resources/assets/botania/textures/items/grassseeds0.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds1.png b/src/main/resources/assets/botania/textures/items/grassseeds1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds1.png rename to src/main/resources/assets/botania/textures/items/grassseeds1.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds2.png b/src/main/resources/assets/botania/textures/items/grassseeds2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds2.png rename to src/main/resources/assets/botania/textures/items/grassseeds2.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds3.png b/src/main/resources/assets/botania/textures/items/grassseeds3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds3.png rename to src/main/resources/assets/botania/textures/items/grassseeds3.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds4.png b/src/main/resources/assets/botania/textures/items/grassseeds4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds4.png rename to src/main/resources/assets/botania/textures/items/grassseeds4.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds5.png b/src/main/resources/assets/botania/textures/items/grassseeds5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds5.png rename to src/main/resources/assets/botania/textures/items/grassseeds5.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds6.png b/src/main/resources/assets/botania/textures/items/grassseeds6.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds6.png rename to src/main/resources/assets/botania/textures/items/grassseeds6.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds7.png b/src/main/resources/assets/botania/textures/items/grassseeds7.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds7.png rename to src/main/resources/assets/botania/textures/items/grassseeds7.png diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds8.png b/src/main/resources/assets/botania/textures/items/grassseeds8.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/grassSeeds8.png rename to src/main/resources/assets/botania/textures/items/grassseeds8.png diff --git a/src/main/resources/assets/botania/textures/items/gravityRod.png b/src/main/resources/assets/botania/textures/items/gravityrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/gravityRod.png rename to src/main/resources/assets/botania/textures/items/gravityrod.png diff --git a/src/main/resources/assets/botania/textures/items/gravityRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/gravityrod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/gravityRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/gravityrod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/holyCloak.png b/src/main/resources/assets/botania/textures/items/holycloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/holyCloak.png rename to src/main/resources/assets/botania/textures/items/holycloak.png diff --git a/src/main/resources/assets/botania/textures/items/icePendant.png b/src/main/resources/assets/botania/textures/items/icependant.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/icePendant.png rename to src/main/resources/assets/botania/textures/items/icependant.png diff --git a/src/main/resources/assets/botania/textures/items/icePendantGem.png b/src/main/resources/assets/botania/textures/items/icependantgem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/icePendantGem.png rename to src/main/resources/assets/botania/textures/items/icependantgem.png diff --git a/src/main/resources/assets/botania/textures/items/incenseStick0.png b/src/main/resources/assets/botania/textures/items/incensestick0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/incenseStick0.png rename to src/main/resources/assets/botania/textures/items/incensestick0.png diff --git a/src/main/resources/assets/botania/textures/items/incenseStick1.png b/src/main/resources/assets/botania/textures/items/incensestick1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/incenseStick1.png rename to src/main/resources/assets/botania/textures/items/incensestick1.png diff --git a/src/main/resources/assets/botania/textures/items/infiniteFruit.png b/src/main/resources/assets/botania/textures/items/infinitefruit.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/infiniteFruit.png rename to src/main/resources/assets/botania/textures/items/infinitefruit.png diff --git a/src/main/resources/assets/botania/textures/items/invisibilityCloak.png b/src/main/resources/assets/botania/textures/items/invisibilitycloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/invisibilityCloak.png rename to src/main/resources/assets/botania/textures/items/invisibilitycloak.png diff --git a/src/main/resources/assets/botania/textures/items/itemFinder.png b/src/main/resources/assets/botania/textures/items/itemfinder.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/itemFinder.png rename to src/main/resources/assets/botania/textures/items/itemfinder.png diff --git a/src/main/resources/assets/botania/textures/items/itemFinderGem.png b/src/main/resources/assets/botania/textures/items/itemfindergem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/itemFinderGem.png rename to src/main/resources/assets/botania/textures/items/itemfindergem.png diff --git a/src/main/resources/assets/botania/textures/items/keepIvy.png b/src/main/resources/assets/botania/textures/items/keepivy.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/keepIvy.png rename to src/main/resources/assets/botania/textures/items/keepivy.png diff --git a/src/main/resources/assets/botania/textures/items/kingKey.png b/src/main/resources/assets/botania/textures/items/kingkey.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/kingKey.png rename to src/main/resources/assets/botania/textures/items/kingkey.png diff --git a/src/main/resources/assets/botania/textures/items/knockbackBelt.png b/src/main/resources/assets/botania/textures/items/knockbackbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/knockbackBelt.png rename to src/main/resources/assets/botania/textures/items/knockbackbelt.png diff --git a/src/main/resources/assets/botania/textures/items/laputaShard.png b/src/main/resources/assets/botania/textures/items/laputashard.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/laputaShard.png rename to src/main/resources/assets/botania/textures/items/laputashard.png diff --git a/src/main/resources/assets/botania/textures/items/lavaPendant.png b/src/main/resources/assets/botania/textures/items/lavapendant.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lavaPendant.png rename to src/main/resources/assets/botania/textures/items/lavapendant.png diff --git a/src/main/resources/assets/botania/textures/items/lavaPendantGem.png b/src/main/resources/assets/botania/textures/items/lavapendantgem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lavaPendantGem.png rename to src/main/resources/assets/botania/textures/items/lavapendantgem.png diff --git a/src/main/resources/assets/botania/textures/items/lensBounce.png b/src/main/resources/assets/botania/textures/items/lensbounce.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensBounce.png rename to src/main/resources/assets/botania/textures/items/lensbounce.png diff --git a/src/main/resources/assets/botania/textures/items/lensDamage.png b/src/main/resources/assets/botania/textures/items/lensdamage.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensDamage.png rename to src/main/resources/assets/botania/textures/items/lensdamage.png diff --git a/src/main/resources/assets/botania/textures/items/lensEfficiency.png b/src/main/resources/assets/botania/textures/items/lensefficiency.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensEfficiency.png rename to src/main/resources/assets/botania/textures/items/lensefficiency.png diff --git a/src/main/resources/assets/botania/textures/items/lensExplosive.png b/src/main/resources/assets/botania/textures/items/lensexplosive.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensExplosive.png rename to src/main/resources/assets/botania/textures/items/lensexplosive.png diff --git a/src/main/resources/assets/botania/textures/items/lensFire.png b/src/main/resources/assets/botania/textures/items/lensfire.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensFire.png rename to src/main/resources/assets/botania/textures/items/lensfire.png diff --git a/src/main/resources/assets/botania/textures/items/lensFirework.png b/src/main/resources/assets/botania/textures/items/lensfirework.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensFirework.png rename to src/main/resources/assets/botania/textures/items/lensfirework.png diff --git a/src/main/resources/assets/botania/textures/items/lensFlare.png b/src/main/resources/assets/botania/textures/items/lensflare.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensFlare.png rename to src/main/resources/assets/botania/textures/items/lensflare.png diff --git a/src/main/resources/assets/botania/textures/items/lensGravity.png b/src/main/resources/assets/botania/textures/items/lensgravity.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensGravity.png rename to src/main/resources/assets/botania/textures/items/lensgravity.png diff --git a/src/main/resources/assets/botania/textures/items/lensInfluence.png b/src/main/resources/assets/botania/textures/items/lensinfluence.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensInfluence.png rename to src/main/resources/assets/botania/textures/items/lensinfluence.png diff --git a/src/main/resources/assets/botania/textures/items/lensInside.png b/src/main/resources/assets/botania/textures/items/lensinside.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensInside.png rename to src/main/resources/assets/botania/textures/items/lensinside.png diff --git a/src/main/resources/assets/botania/textures/items/lensLight.png b/src/main/resources/assets/botania/textures/items/lenslight.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensLight.png rename to src/main/resources/assets/botania/textures/items/lenslight.png diff --git a/src/main/resources/assets/botania/textures/items/lensMagnet.png b/src/main/resources/assets/botania/textures/items/lensmagnet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensMagnet.png rename to src/main/resources/assets/botania/textures/items/lensmagnet.png diff --git a/src/main/resources/assets/botania/textures/items/lensMessenger.png b/src/main/resources/assets/botania/textures/items/lensmessenger.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensMessenger.png rename to src/main/resources/assets/botania/textures/items/lensmessenger.png diff --git a/src/main/resources/assets/botania/textures/items/lensMine.png b/src/main/resources/assets/botania/textures/items/lensmine.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensMine.png rename to src/main/resources/assets/botania/textures/items/lensmine.png diff --git a/src/main/resources/assets/botania/textures/items/lensNormal.png b/src/main/resources/assets/botania/textures/items/lensnormal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensNormal.png rename to src/main/resources/assets/botania/textures/items/lensnormal.png diff --git a/src/main/resources/assets/botania/textures/items/lensPaint.png b/src/main/resources/assets/botania/textures/items/lenspaint.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensPaint.png rename to src/main/resources/assets/botania/textures/items/lenspaint.png diff --git a/src/main/resources/assets/botania/textures/items/lensPhantom.png b/src/main/resources/assets/botania/textures/items/lensphantom.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensPhantom.png rename to src/main/resources/assets/botania/textures/items/lensphantom.png diff --git a/src/main/resources/assets/botania/textures/items/lensPiston.png b/src/main/resources/assets/botania/textures/items/lenspiston.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensPiston.png rename to src/main/resources/assets/botania/textures/items/lenspiston.png diff --git a/src/main/resources/assets/botania/textures/items/lensPower.png b/src/main/resources/assets/botania/textures/items/lenspower.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensPower.png rename to src/main/resources/assets/botania/textures/items/lenspower.png diff --git a/src/main/resources/assets/botania/textures/items/lensRedirect.png b/src/main/resources/assets/botania/textures/items/lensredirect.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensRedirect.png rename to src/main/resources/assets/botania/textures/items/lensredirect.png diff --git a/src/main/resources/assets/botania/textures/items/lensSpeed.png b/src/main/resources/assets/botania/textures/items/lensspeed.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensSpeed.png rename to src/main/resources/assets/botania/textures/items/lensspeed.png diff --git a/src/main/resources/assets/botania/textures/items/lensTime.png b/src/main/resources/assets/botania/textures/items/lenstime.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensTime.png rename to src/main/resources/assets/botania/textures/items/lenstime.png diff --git a/src/main/resources/assets/botania/textures/items/lensTripwire.png b/src/main/resources/assets/botania/textures/items/lenstripwire.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensTripwire.png rename to src/main/resources/assets/botania/textures/items/lenstripwire.png diff --git a/src/main/resources/assets/botania/textures/items/lensWarp.png b/src/main/resources/assets/botania/textures/items/lenswarp.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensWarp.png rename to src/main/resources/assets/botania/textures/items/lenswarp.png diff --git a/src/main/resources/assets/botania/textures/items/lensWeight.png b/src/main/resources/assets/botania/textures/items/lensweight.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lensWeight.png rename to src/main/resources/assets/botania/textures/items/lensweight.png diff --git a/src/main/resources/assets/botania/textures/items/lifeEssence.png b/src/main/resources/assets/botania/textures/items/lifeessence.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lifeEssence.png rename to src/main/resources/assets/botania/textures/items/lifeessence.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodBow0.png b/src/main/resources/assets/botania/textures/items/livingwoodbow0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodBow0.png rename to src/main/resources/assets/botania/textures/items/livingwoodbow0.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodBow1.png b/src/main/resources/assets/botania/textures/items/livingwoodbow1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodBow1.png rename to src/main/resources/assets/botania/textures/items/livingwoodbow1.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodBow2.png b/src/main/resources/assets/botania/textures/items/livingwoodbow2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodBow2.png rename to src/main/resources/assets/botania/textures/items/livingwoodbow2.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodBow3.png b/src/main/resources/assets/botania/textures/items/livingwoodbow3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodBow3.png rename to src/main/resources/assets/botania/textures/items/livingwoodbow3.png diff --git a/src/main/resources/assets/botania/textures/items/livingwoodTwig.png b/src/main/resources/assets/botania/textures/items/livingwoodtwig.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/livingwoodTwig.png rename to src/main/resources/assets/botania/textures/items/livingwoodtwig.png diff --git a/src/main/resources/assets/botania/textures/items/lokiRing.png b/src/main/resources/assets/botania/textures/items/lokiring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lokiRing.png rename to src/main/resources/assets/botania/textures/items/lokiring.png diff --git a/src/main/resources/assets/botania/textures/items/lookingGlass.png b/src/main/resources/assets/botania/textures/items/lookingglass.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/lookingGlass.png rename to src/main/resources/assets/botania/textures/items/lookingglass.png diff --git a/src/main/resources/assets/botania/textures/items/magnetRing0.png b/src/main/resources/assets/botania/textures/items/magnetring0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/magnetRing0.png rename to src/main/resources/assets/botania/textures/items/magnetring0.png diff --git a/src/main/resources/assets/botania/textures/items/magnetRing1.png b/src/main/resources/assets/botania/textures/items/magnetring1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/magnetRing1.png rename to src/main/resources/assets/botania/textures/items/magnetring1.png diff --git a/src/main/resources/assets/botania/textures/items/magnetRingGreater0.png b/src/main/resources/assets/botania/textures/items/magnetringgreater0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/magnetRingGreater0.png rename to src/main/resources/assets/botania/textures/items/magnetringgreater0.png diff --git a/src/main/resources/assets/botania/textures/items/magnetRingGreater1.png b/src/main/resources/assets/botania/textures/items/magnetringgreater1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/magnetRingGreater1.png rename to src/main/resources/assets/botania/textures/items/magnetringgreater1.png diff --git a/src/main/resources/assets/botania/textures/items/manaBlaster.png b/src/main/resources/assets/botania/textures/items/manablaster.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBlaster.png rename to src/main/resources/assets/botania/textures/items/manablaster.png diff --git a/src/main/resources/assets/botania/textures/items/manaBlasterColor.png b/src/main/resources/assets/botania/textures/items/manablastercolor.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBlasterColor.png rename to src/main/resources/assets/botania/textures/items/manablastercolor.png diff --git a/src/main/resources/assets/botania/textures/items/manaBlasterGlass.png b/src/main/resources/assets/botania/textures/items/manablasterglass.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBlasterGlass.png rename to src/main/resources/assets/botania/textures/items/manablasterglass.png diff --git a/src/main/resources/assets/botania/textures/items/manaBlasterLensClip.png b/src/main/resources/assets/botania/textures/items/manablasterlensclip.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBlasterLensClip.png rename to src/main/resources/assets/botania/textures/items/manablasterlensclip.png diff --git a/src/main/resources/assets/botania/textures/items/manaBottle0.png b/src/main/resources/assets/botania/textures/items/manabottle0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBottle0.png rename to src/main/resources/assets/botania/textures/items/manabottle0.png diff --git a/src/main/resources/assets/botania/textures/items/manaBottle1.png b/src/main/resources/assets/botania/textures/items/manabottle1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBottle1.png rename to src/main/resources/assets/botania/textures/items/manabottle1.png diff --git a/src/main/resources/assets/botania/textures/items/manaBottle2.png b/src/main/resources/assets/botania/textures/items/manabottle2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBottle2.png rename to src/main/resources/assets/botania/textures/items/manabottle2.png diff --git a/src/main/resources/assets/botania/textures/items/manaBottle3.png b/src/main/resources/assets/botania/textures/items/manabottle3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBottle3.png rename to src/main/resources/assets/botania/textures/items/manabottle3.png diff --git a/src/main/resources/assets/botania/textures/items/manaBottle4.png b/src/main/resources/assets/botania/textures/items/manabottle4.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBottle4.png rename to src/main/resources/assets/botania/textures/items/manabottle4.png diff --git a/src/main/resources/assets/botania/textures/items/manaBottle5.png b/src/main/resources/assets/botania/textures/items/manabottle5.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaBottle5.png rename to src/main/resources/assets/botania/textures/items/manabottle5.png diff --git a/src/main/resources/assets/botania/textures/items/manaCookie.png b/src/main/resources/assets/botania/textures/items/manacookie.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaCookie.png rename to src/main/resources/assets/botania/textures/items/manacookie.png diff --git a/src/main/resources/assets/botania/textures/items/manaDiamond.png b/src/main/resources/assets/botania/textures/items/manadiamond.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaDiamond.png rename to src/main/resources/assets/botania/textures/items/manadiamond.png diff --git a/src/main/resources/assets/botania/textures/items/manaGun0.png b/src/main/resources/assets/botania/textures/items/managun0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaGun0.png rename to src/main/resources/assets/botania/textures/items/managun0.png diff --git a/src/main/resources/assets/botania/textures/items/manaGun1.png b/src/main/resources/assets/botania/textures/items/managun1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaGun1.png rename to src/main/resources/assets/botania/textures/items/managun1.png diff --git a/src/main/resources/assets/botania/textures/items/manaGun2.png b/src/main/resources/assets/botania/textures/items/managun2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaGun2.png rename to src/main/resources/assets/botania/textures/items/managun2.png diff --git a/src/main/resources/assets/botania/textures/items/manaInkwell.png b/src/main/resources/assets/botania/textures/items/manainkwell.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaInkwell.png rename to src/main/resources/assets/botania/textures/items/manainkwell.png diff --git a/src/main/resources/assets/botania/textures/items/manaInkwell.png.mcmeta b/src/main/resources/assets/botania/textures/items/manainkwell.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaInkwell.png.mcmeta rename to src/main/resources/assets/botania/textures/items/manainkwell.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/manaMirror0.png b/src/main/resources/assets/botania/textures/items/manamirror0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaMirror0.png rename to src/main/resources/assets/botania/textures/items/manamirror0.png diff --git a/src/main/resources/assets/botania/textures/items/manaMirror1.png b/src/main/resources/assets/botania/textures/items/manamirror1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaMirror1.png rename to src/main/resources/assets/botania/textures/items/manamirror1.png diff --git a/src/main/resources/assets/botania/textures/items/manaPearl.png b/src/main/resources/assets/botania/textures/items/manapearl.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaPearl.png rename to src/main/resources/assets/botania/textures/items/manapearl.png diff --git a/src/main/resources/assets/botania/textures/items/manaPetal.png b/src/main/resources/assets/botania/textures/items/manapetal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaPetal.png rename to src/main/resources/assets/botania/textures/items/manapetal.png diff --git a/src/main/resources/assets/botania/textures/items/manaPowder.png b/src/main/resources/assets/botania/textures/items/manapowder.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaPowder.png rename to src/main/resources/assets/botania/textures/items/manapowder.png diff --git a/src/main/resources/assets/botania/textures/items/manaRing.png b/src/main/resources/assets/botania/textures/items/manaring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaRing.png rename to src/main/resources/assets/botania/textures/items/manaring.png diff --git a/src/main/resources/assets/botania/textures/items/manaRingGreater.png b/src/main/resources/assets/botania/textures/items/manaringgreater.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaRingGreater.png rename to src/main/resources/assets/botania/textures/items/manaringgreater.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelAxe.png b/src/main/resources/assets/botania/textures/items/manasteelaxe.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelAxe.png rename to src/main/resources/assets/botania/textures/items/manasteelaxe.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelBoots.png b/src/main/resources/assets/botania/textures/items/manasteelboots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelBoots.png rename to src/main/resources/assets/botania/textures/items/manasteelboots.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelChest.png b/src/main/resources/assets/botania/textures/items/manasteelchest.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelChest.png rename to src/main/resources/assets/botania/textures/items/manasteelchest.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelHelm.png b/src/main/resources/assets/botania/textures/items/manasteelhelm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelHelm.png rename to src/main/resources/assets/botania/textures/items/manasteelhelm.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelHelmReveal.png b/src/main/resources/assets/botania/textures/items/manasteelhelmreveal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelHelmReveal.png rename to src/main/resources/assets/botania/textures/items/manasteelhelmreveal.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelLegs.png b/src/main/resources/assets/botania/textures/items/manasteellegs.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelLegs.png rename to src/main/resources/assets/botania/textures/items/manasteellegs.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelNugget.png b/src/main/resources/assets/botania/textures/items/manasteelnugget.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelNugget.png rename to src/main/resources/assets/botania/textures/items/manasteelnugget.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelPick.png b/src/main/resources/assets/botania/textures/items/manasteelpick.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelPick.png rename to src/main/resources/assets/botania/textures/items/manasteelpick.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelShears.png b/src/main/resources/assets/botania/textures/items/manasteelshears.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelShears.png rename to src/main/resources/assets/botania/textures/items/manasteelshears.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelShovel.png b/src/main/resources/assets/botania/textures/items/manasteelshovel.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelShovel.png rename to src/main/resources/assets/botania/textures/items/manasteelshovel.png diff --git a/src/main/resources/assets/botania/textures/items/manasteelSword.png b/src/main/resources/assets/botania/textures/items/manasteelsword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manasteelSword.png rename to src/main/resources/assets/botania/textures/items/manasteelsword.png diff --git a/src/main/resources/assets/botania/textures/items/manaString.png b/src/main/resources/assets/botania/textures/items/manastring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaString.png rename to src/main/resources/assets/botania/textures/items/manastring.png diff --git a/src/main/resources/assets/botania/textures/items/manaTablet0.png b/src/main/resources/assets/botania/textures/items/manatablet0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaTablet0.png rename to src/main/resources/assets/botania/textures/items/manatablet0.png diff --git a/src/main/resources/assets/botania/textures/items/manaTablet1.png b/src/main/resources/assets/botania/textures/items/manatablet1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaTablet1.png rename to src/main/resources/assets/botania/textures/items/manatablet1.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveBoots.png b/src/main/resources/assets/botania/textures/items/manaweaveboots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveBoots.png rename to src/main/resources/assets/botania/textures/items/manaweaveboots.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveBootsHoliday.png b/src/main/resources/assets/botania/textures/items/manaweavebootsholiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveBootsHoliday.png rename to src/main/resources/assets/botania/textures/items/manaweavebootsholiday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveChest.png b/src/main/resources/assets/botania/textures/items/manaweavechest.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveChest.png rename to src/main/resources/assets/botania/textures/items/manaweavechest.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png b/src/main/resources/assets/botania/textures/items/manaweavechestholiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveChestHoliday.png rename to src/main/resources/assets/botania/textures/items/manaweavechestholiday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveCloth.png b/src/main/resources/assets/botania/textures/items/manaweavecloth.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveCloth.png rename to src/main/resources/assets/botania/textures/items/manaweavecloth.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveHelm.png b/src/main/resources/assets/botania/textures/items/manaweavehelm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveHelm.png rename to src/main/resources/assets/botania/textures/items/manaweavehelm.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveHelmHoliday.png b/src/main/resources/assets/botania/textures/items/manaweavehelmholiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveHelmHoliday.png rename to src/main/resources/assets/botania/textures/items/manaweavehelmholiday.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveLegs.png b/src/main/resources/assets/botania/textures/items/manaweavelegs.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveLegs.png rename to src/main/resources/assets/botania/textures/items/manaweavelegs.png diff --git a/src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png b/src/main/resources/assets/botania/textures/items/manaweavelegsholiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/manaweaveLegsHoliday.png rename to src/main/resources/assets/botania/textures/items/manaweavelegsholiday.png diff --git a/src/main/resources/assets/botania/textures/items/miningRing.png b/src/main/resources/assets/botania/textures/items/miningring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/miningRing.png rename to src/main/resources/assets/botania/textures/items/miningring.png diff --git a/src/main/resources/assets/botania/textures/items/missileRod.png b/src/main/resources/assets/botania/textures/items/missilerod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/missileRod.png rename to src/main/resources/assets/botania/textures/items/missilerod.png diff --git a/src/main/resources/assets/botania/textures/items/nerfBat.png b/src/main/resources/assets/botania/textures/items/nerfbat.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/nerfBat.png rename to src/main/resources/assets/botania/textures/items/nerfbat.png diff --git a/src/main/resources/assets/botania/textures/items/obedienceStick.png b/src/main/resources/assets/botania/textures/items/obediencestick.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/obedienceStick.png rename to src/main/resources/assets/botania/textures/items/obediencestick.png diff --git a/src/main/resources/assets/botania/textures/items/odinRing.png b/src/main/resources/assets/botania/textures/items/odinring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/odinRing.png rename to src/main/resources/assets/botania/textures/items/odinring.png diff --git a/src/main/resources/assets/botania/textures/items/openBucket.png b/src/main/resources/assets/botania/textures/items/openbucket.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/openBucket.png rename to src/main/resources/assets/botania/textures/items/openbucket.png diff --git a/src/main/resources/assets/botania/textures/items/overgrowthSeed.png b/src/main/resources/assets/botania/textures/items/overgrowthseed.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/overgrowthSeed.png rename to src/main/resources/assets/botania/textures/items/overgrowthseed.png diff --git a/src/main/resources/assets/botania/textures/items/overgrowthSeed.png.mcmeta b/src/main/resources/assets/botania/textures/items/overgrowthseed.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/overgrowthSeed.png.mcmeta rename to src/main/resources/assets/botania/textures/items/overgrowthseed.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/pestleAndMortar.png b/src/main/resources/assets/botania/textures/items/pestleandmortar.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/pestleAndMortar.png rename to src/main/resources/assets/botania/textures/items/pestleandmortar.png diff --git a/src/main/resources/assets/botania/textures/items/phantomInk.png b/src/main/resources/assets/botania/textures/items/phantomink.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/phantomInk.png rename to src/main/resources/assets/botania/textures/items/phantomink.png diff --git a/src/main/resources/assets/botania/textures/items/phiFlower.png b/src/main/resources/assets/botania/textures/items/phiflower.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/phiFlower.png rename to src/main/resources/assets/botania/textures/items/phiflower.png diff --git a/src/main/resources/assets/botania/textures/items/pixieDust.png b/src/main/resources/assets/botania/textures/items/pixiedust.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/pixieDust.png rename to src/main/resources/assets/botania/textures/items/pixiedust.png diff --git a/src/main/resources/assets/botania/textures/items/pixieRing.png b/src/main/resources/assets/botania/textures/items/pixiering.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/pixieRing.png rename to src/main/resources/assets/botania/textures/items/pixiering.png diff --git a/src/main/resources/assets/botania/textures/items/poolMinecart.png b/src/main/resources/assets/botania/textures/items/poolminecart.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/poolMinecart.png rename to src/main/resources/assets/botania/textures/items/poolminecart.png diff --git a/src/main/resources/assets/botania/textures/items/rainbowRod.png b/src/main/resources/assets/botania/textures/items/rainbowrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/rainbowRod.png rename to src/main/resources/assets/botania/textures/items/rainbowrod.png diff --git a/src/main/resources/assets/botania/textures/items/reachRing.png b/src/main/resources/assets/botania/textures/items/reachring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/reachRing.png rename to src/main/resources/assets/botania/textures/items/reachring.png diff --git a/src/main/resources/assets/botania/textures/items/recordGaia1.png b/src/main/resources/assets/botania/textures/items/recordgaia1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/recordGaia1.png rename to src/main/resources/assets/botania/textures/items/recordgaia1.png diff --git a/src/main/resources/assets/botania/textures/items/recordGaia2.png b/src/main/resources/assets/botania/textures/items/recordgaia2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/recordGaia2.png rename to src/main/resources/assets/botania/textures/items/recordgaia2.png diff --git a/src/main/resources/assets/botania/textures/items/redstoneRoot.png b/src/main/resources/assets/botania/textures/items/redstoneroot.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/redstoneRoot.png rename to src/main/resources/assets/botania/textures/items/redstoneroot.png diff --git a/src/main/resources/assets/botania/textures/items/redString.png b/src/main/resources/assets/botania/textures/items/redstring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/redString.png rename to src/main/resources/assets/botania/textures/items/redstring.png diff --git a/src/main/resources/assets/botania/textures/items/regenIvy.png b/src/main/resources/assets/botania/textures/items/regenivy.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/regenIvy.png rename to src/main/resources/assets/botania/textures/items/regenivy.png diff --git a/src/main/resources/assets/botania/textures/items/signalFlare0.png b/src/main/resources/assets/botania/textures/items/signalflare0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/signalFlare0.png rename to src/main/resources/assets/botania/textures/items/signalflare0.png diff --git a/src/main/resources/assets/botania/textures/items/signalFlare1.png b/src/main/resources/assets/botania/textures/items/signalflare1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/signalFlare1.png rename to src/main/resources/assets/botania/textures/items/signalflare1.png diff --git a/src/main/resources/assets/botania/textures/items/skyDirtRod.png b/src/main/resources/assets/botania/textures/items/skydirtrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/skyDirtRod.png rename to src/main/resources/assets/botania/textures/items/skydirtrod.png diff --git a/src/main/resources/assets/botania/textures/items/skyDirtRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/skydirtrod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/skyDirtRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/skydirtrod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/slimeBottle0.png b/src/main/resources/assets/botania/textures/items/slimebottle0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/slimeBottle0.png rename to src/main/resources/assets/botania/textures/items/slimebottle0.png diff --git a/src/main/resources/assets/botania/textures/items/slimeBottle1.png b/src/main/resources/assets/botania/textures/items/slimebottle1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/slimeBottle1.png rename to src/main/resources/assets/botania/textures/items/slimebottle1.png diff --git a/src/main/resources/assets/botania/textures/items/slimeBottle1.png.mcmeta b/src/main/resources/assets/botania/textures/items/slimebottle1.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/slimeBottle1.png.mcmeta rename to src/main/resources/assets/botania/textures/items/slimebottle1.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/smeltRod.png b/src/main/resources/assets/botania/textures/items/smeltrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/smeltRod.png rename to src/main/resources/assets/botania/textures/items/smeltrod.png diff --git a/src/main/resources/assets/botania/textures/items/smeltRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/smeltrod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/smeltRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/smeltrod.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgrade0.png b/src/main/resources/assets/botania/textures/items/sparkupgrade0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgrade0.png rename to src/main/resources/assets/botania/textures/items/sparkupgrade0.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgrade1.png b/src/main/resources/assets/botania/textures/items/sparkupgrade1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgrade1.png rename to src/main/resources/assets/botania/textures/items/sparkupgrade1.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgrade2.png b/src/main/resources/assets/botania/textures/items/sparkupgrade2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgrade2.png rename to src/main/resources/assets/botania/textures/items/sparkupgrade2.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgrade3.png b/src/main/resources/assets/botania/textures/items/sparkupgrade3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgrade3.png rename to src/main/resources/assets/botania/textures/items/sparkupgrade3.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgradeL0.png b/src/main/resources/assets/botania/textures/items/sparkupgradel0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgradeL0.png rename to src/main/resources/assets/botania/textures/items/sparkupgradel0.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgradeL1.png b/src/main/resources/assets/botania/textures/items/sparkupgradel1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgradeL1.png rename to src/main/resources/assets/botania/textures/items/sparkupgradel1.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgradeL2.png b/src/main/resources/assets/botania/textures/items/sparkupgradel2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgradeL2.png rename to src/main/resources/assets/botania/textures/items/sparkupgradel2.png diff --git a/src/main/resources/assets/botania/textures/items/sparkUpgradeL3.png b/src/main/resources/assets/botania/textures/items/sparkupgradel3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/sparkUpgradeL3.png rename to src/main/resources/assets/botania/textures/items/sparkupgradel3.png diff --git a/src/main/resources/assets/botania/textures/items/spawnerMover0.png b/src/main/resources/assets/botania/textures/items/spawnermover0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/spawnerMover0.png rename to src/main/resources/assets/botania/textures/items/spawnermover0.png diff --git a/src/main/resources/assets/botania/textures/items/spawnerMover1.png b/src/main/resources/assets/botania/textures/items/spawnermover1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/spawnerMover1.png rename to src/main/resources/assets/botania/textures/items/spawnermover1.png diff --git a/src/main/resources/assets/botania/textures/items/speedUpBelt.png b/src/main/resources/assets/botania/textures/items/speedupbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/speedUpBelt.png rename to src/main/resources/assets/botania/textures/items/speedupbelt.png diff --git a/src/main/resources/assets/botania/textures/items/spellCloth.png b/src/main/resources/assets/botania/textures/items/spellcloth.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/spellCloth.png rename to src/main/resources/assets/botania/textures/items/spellcloth.png diff --git a/src/main/resources/assets/botania/textures/items/starSword.png b/src/main/resources/assets/botania/textures/items/starsword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/starSword.png rename to src/main/resources/assets/botania/textures/items/starsword.png diff --git a/src/main/resources/assets/botania/textures/items/superCloudPendant.png b/src/main/resources/assets/botania/textures/items/supercloudpendant.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superCloudPendant.png rename to src/main/resources/assets/botania/textures/items/supercloudpendant.png diff --git a/src/main/resources/assets/botania/textures/items/superCloudPendantGem.png b/src/main/resources/assets/botania/textures/items/supercloudpendantgem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superCloudPendantGem.png rename to src/main/resources/assets/botania/textures/items/supercloudpendantgem.png diff --git a/src/main/resources/assets/botania/textures/items/superLavaPendant.png b/src/main/resources/assets/botania/textures/items/superlavapendant.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superLavaPendant.png rename to src/main/resources/assets/botania/textures/items/superlavapendant.png diff --git a/src/main/resources/assets/botania/textures/items/superLavaPendantGem.png b/src/main/resources/assets/botania/textures/items/superlavapendantgem.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superLavaPendantGem.png rename to src/main/resources/assets/botania/textures/items/superlavapendantgem.png diff --git a/src/main/resources/assets/botania/textures/items/superTravelBelt.png b/src/main/resources/assets/botania/textures/items/supertravelbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/superTravelBelt.png rename to src/main/resources/assets/botania/textures/items/supertravelbelt.png diff --git a/src/main/resources/assets/botania/textures/items/swapRing.png b/src/main/resources/assets/botania/textures/items/swapring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/swapRing.png rename to src/main/resources/assets/botania/textures/items/swapring.png diff --git a/src/main/resources/assets/botania/textures/items/temperanceStone0.png b/src/main/resources/assets/botania/textures/items/temperancestone0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/temperanceStone0.png rename to src/main/resources/assets/botania/textures/items/temperancestone0.png diff --git a/src/main/resources/assets/botania/textures/items/temperanceStone1.png b/src/main/resources/assets/botania/textures/items/temperancestone1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/temperanceStone1.png rename to src/main/resources/assets/botania/textures/items/temperancestone1.png diff --git a/src/main/resources/assets/botania/textures/items/terraAxe0.png b/src/main/resources/assets/botania/textures/items/terraaxe0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraAxe0.png rename to src/main/resources/assets/botania/textures/items/terraaxe0.png diff --git a/src/main/resources/assets/botania/textures/items/terraAxe1.png b/src/main/resources/assets/botania/textures/items/terraaxe1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraAxe1.png rename to src/main/resources/assets/botania/textures/items/terraaxe1.png diff --git a/src/main/resources/assets/botania/textures/items/terraformRod.png b/src/main/resources/assets/botania/textures/items/terraformrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraformRod.png rename to src/main/resources/assets/botania/textures/items/terraformrod.png diff --git a/src/main/resources/assets/botania/textures/items/terraPick0.png b/src/main/resources/assets/botania/textures/items/terrapick0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraPick0.png rename to src/main/resources/assets/botania/textures/items/terrapick0.png diff --git a/src/main/resources/assets/botania/textures/items/terraPick1.png b/src/main/resources/assets/botania/textures/items/terrapick1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraPick1.png rename to src/main/resources/assets/botania/textures/items/terrapick1.png diff --git a/src/main/resources/assets/botania/textures/items/terraPick2.png b/src/main/resources/assets/botania/textures/items/terrapick2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraPick2.png rename to src/main/resources/assets/botania/textures/items/terrapick2.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelBoots.png b/src/main/resources/assets/botania/textures/items/terrasteelboots.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelBoots.png rename to src/main/resources/assets/botania/textures/items/terrasteelboots.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelChest.png b/src/main/resources/assets/botania/textures/items/terrasteelchest.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelChest.png rename to src/main/resources/assets/botania/textures/items/terrasteelchest.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelHelm.png b/src/main/resources/assets/botania/textures/items/terrasteelhelm.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelHelm.png rename to src/main/resources/assets/botania/textures/items/terrasteelhelm.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelHelmReveal.png b/src/main/resources/assets/botania/textures/items/terrasteelhelmreveal.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelHelmReveal.png rename to src/main/resources/assets/botania/textures/items/terrasteelhelmreveal.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelLegs.png b/src/main/resources/assets/botania/textures/items/terrasteellegs.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelLegs.png rename to src/main/resources/assets/botania/textures/items/terrasteellegs.png diff --git a/src/main/resources/assets/botania/textures/items/terrasteelNugget.png b/src/main/resources/assets/botania/textures/items/terrasteelnugget.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terrasteelNugget.png rename to src/main/resources/assets/botania/textures/items/terrasteelnugget.png diff --git a/src/main/resources/assets/botania/textures/items/terraSword.png b/src/main/resources/assets/botania/textures/items/terrasword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/terraSword.png rename to src/main/resources/assets/botania/textures/items/terrasword.png diff --git a/src/main/resources/assets/botania/textures/items/thirdEye0.png b/src/main/resources/assets/botania/textures/items/thirdeye0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdEye0.png rename to src/main/resources/assets/botania/textures/items/thirdeye0.png diff --git a/src/main/resources/assets/botania/textures/items/thirdEye1.png b/src/main/resources/assets/botania/textures/items/thirdeye1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdEye1.png rename to src/main/resources/assets/botania/textures/items/thirdeye1.png diff --git a/src/main/resources/assets/botania/textures/items/thirdEye2.png b/src/main/resources/assets/botania/textures/items/thirdeye2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdEye2.png rename to src/main/resources/assets/botania/textures/items/thirdeye2.png diff --git a/src/main/resources/assets/botania/textures/items/thirdEye2.png.mcmeta b/src/main/resources/assets/botania/textures/items/thirdeye2.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/thirdEye2.png.mcmeta rename to src/main/resources/assets/botania/textures/items/thirdeye2.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/thornChakram0.png b/src/main/resources/assets/botania/textures/items/thornchakram0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thornChakram0.png rename to src/main/resources/assets/botania/textures/items/thornchakram0.png diff --git a/src/main/resources/assets/botania/textures/items/thornChakram1.png b/src/main/resources/assets/botania/textures/items/thornchakram1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thornChakram1.png rename to src/main/resources/assets/botania/textures/items/thornchakram1.png diff --git a/src/main/resources/assets/botania/textures/items/thorRing.png b/src/main/resources/assets/botania/textures/items/thorring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thorRing.png rename to src/main/resources/assets/botania/textures/items/thorring.png diff --git a/src/main/resources/assets/botania/textures/items/thunderSword.png b/src/main/resources/assets/botania/textures/items/thundersword.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/thunderSword.png rename to src/main/resources/assets/botania/textures/items/thundersword.png diff --git a/src/main/resources/assets/botania/textures/items/tinyPlanet.png b/src/main/resources/assets/botania/textures/items/tinyplanet.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tinyPlanet.png rename to src/main/resources/assets/botania/textures/items/tinyplanet.png diff --git a/src/main/resources/assets/botania/textures/items/tornadoRod0.png b/src/main/resources/assets/botania/textures/items/tornadorod0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tornadoRod0.png rename to src/main/resources/assets/botania/textures/items/tornadorod0.png diff --git a/src/main/resources/assets/botania/textures/items/tornadoRod1.png b/src/main/resources/assets/botania/textures/items/tornadorod1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/tornadoRod1.png rename to src/main/resources/assets/botania/textures/items/tornadorod1.png diff --git a/src/main/resources/assets/botania/textures/items/tornadoRod1.png.mcmeta b/src/main/resources/assets/botania/textures/items/tornadorod1.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/tornadoRod1.png.mcmeta rename to src/main/resources/assets/botania/textures/items/tornadorod1.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/totalBiscuit.png b/src/main/resources/assets/botania/textures/items/totalbiscuit.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/totalBiscuit.png rename to src/main/resources/assets/botania/textures/items/totalbiscuit.png diff --git a/src/main/resources/assets/botania/textures/items/travelBelt.png b/src/main/resources/assets/botania/textures/items/travelbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/travelBelt.png rename to src/main/resources/assets/botania/textures/items/travelbelt.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/manaContains.png b/src/main/resources/assets/botania/textures/items/triggers/manacontains.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/manaContains.png rename to src/main/resources/assets/botania/textures/items/triggers/manacontains.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/manaDetector.png b/src/main/resources/assets/botania/textures/items/triggers/manadetector.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/manaDetector.png rename to src/main/resources/assets/botania/textures/items/triggers/manadetector.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/manaEmpty.png b/src/main/resources/assets/botania/textures/items/triggers/manaempty.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/manaEmpty.png rename to src/main/resources/assets/botania/textures/items/triggers/manaempty.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/manaFull.png b/src/main/resources/assets/botania/textures/items/triggers/manafull.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/manaFull.png rename to src/main/resources/assets/botania/textures/items/triggers/manafull.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/manaSpace.png b/src/main/resources/assets/botania/textures/items/triggers/manaspace.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/manaSpace.png rename to src/main/resources/assets/botania/textures/items/triggers/manaspace.png diff --git a/src/main/resources/assets/botania/textures/items/triggers/runeAltarCanCraft.png b/src/main/resources/assets/botania/textures/items/triggers/runealtarcancraft.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/triggers/runeAltarCanCraft.png rename to src/main/resources/assets/botania/textures/items/triggers/runealtarcancraft.png diff --git a/src/main/resources/assets/botania/textures/items/twigWand0.png b/src/main/resources/assets/botania/textures/items/twigwand0.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/twigWand0.png rename to src/main/resources/assets/botania/textures/items/twigwand0.png diff --git a/src/main/resources/assets/botania/textures/items/twigWand1.png b/src/main/resources/assets/botania/textures/items/twigwand1.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/twigWand1.png rename to src/main/resources/assets/botania/textures/items/twigwand1.png diff --git a/src/main/resources/assets/botania/textures/items/twigWand2.png b/src/main/resources/assets/botania/textures/items/twigwand2.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/twigWand2.png rename to src/main/resources/assets/botania/textures/items/twigwand2.png diff --git a/src/main/resources/assets/botania/textures/items/twigWand3.png b/src/main/resources/assets/botania/textures/items/twigwand3.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/twigWand3.png rename to src/main/resources/assets/botania/textures/items/twigwand3.png diff --git a/src/main/resources/assets/botania/textures/items/unholyCloak.png b/src/main/resources/assets/botania/textures/items/unholycloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unholyCloak.png rename to src/main/resources/assets/botania/textures/items/unholycloak.png diff --git a/src/main/resources/assets/botania/textures/items/unused/attachableAbacus.png b/src/main/resources/assets/botania/textures/items/unused/attachableabacus.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/attachableAbacus.png rename to src/main/resources/assets/botania/textures/items/unused/attachableabacus.png diff --git a/src/main/resources/assets/botania/textures/items/goldenLaurel.png b/src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/goldenLaurel.png rename to src/main/resources/assets/botania/textures/items/unused/goldenlaurel.png diff --git a/src/main/resources/assets/botania/textures/items/unused/heartAzoth.png b/src/main/resources/assets/botania/textures/items/unused/heartazoth.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/heartAzoth.png rename to src/main/resources/assets/botania/textures/items/unused/heartazoth.png diff --git a/src/main/resources/assets/botania/textures/items/unused/heartAzoth.png.mcmeta b/src/main/resources/assets/botania/textures/items/unused/heartazoth.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/heartAzoth.png.mcmeta rename to src/main/resources/assets/botania/textures/items/unused/heartazoth.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/unused/terrorVisage.png b/src/main/resources/assets/botania/textures/items/unused/terrorvisage.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/terrorVisage.png rename to src/main/resources/assets/botania/textures/items/unused/terrorvisage.png diff --git a/src/main/resources/assets/botania/textures/items/vineBall.png b/src/main/resources/assets/botania/textures/items/vineball.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/vineBall.png rename to src/main/resources/assets/botania/textures/items/vineball.png diff --git a/src/main/resources/assets/botania/textures/items/waterBowl.png b/src/main/resources/assets/botania/textures/items/waterbowl.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterBowl.png rename to src/main/resources/assets/botania/textures/items/waterbowl.png diff --git a/src/main/resources/assets/botania/textures/items/waterBowl_base.png b/src/main/resources/assets/botania/textures/items/waterbowl_base.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterBowl_base.png rename to src/main/resources/assets/botania/textures/items/waterbowl_base.png diff --git a/src/main/resources/assets/botania/textures/items/waterBowl_cover.png b/src/main/resources/assets/botania/textures/items/waterbowl_cover.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterBowl_cover.png rename to src/main/resources/assets/botania/textures/items/waterbowl_cover.png diff --git a/src/main/resources/assets/botania/textures/items/waterBowl_fluid.png b/src/main/resources/assets/botania/textures/items/waterbowl_fluid.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterBowl_fluid.png rename to src/main/resources/assets/botania/textures/items/waterbowl_fluid.png diff --git a/src/main/resources/assets/botania/textures/items/waterRing.png b/src/main/resources/assets/botania/textures/items/waterring.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterRing.png rename to src/main/resources/assets/botania/textures/items/waterring.png diff --git a/src/main/resources/assets/botania/textures/items/waterRod.png b/src/main/resources/assets/botania/textures/items/waterrod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/waterRod.png rename to src/main/resources/assets/botania/textures/items/waterrod.png diff --git a/src/main/resources/assets/botania/textures/items/willFlame.png b/src/main/resources/assets/botania/textures/items/willflame.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/willFlame.png rename to src/main/resources/assets/botania/textures/items/willflame.png diff --git a/src/main/resources/assets/botania/textures/items/willFlame.png.mcmeta b/src/main/resources/assets/botania/textures/items/willflame.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/willFlame.png.mcmeta rename to src/main/resources/assets/botania/textures/items/willflame.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/items/worldSeed.png b/src/main/resources/assets/botania/textures/items/worldseed.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/worldSeed.png rename to src/main/resources/assets/botania/textures/items/worldseed.png diff --git a/src/main/resources/assets/botania/textures/misc/wispLarge.png b/src/main/resources/assets/botania/textures/misc/wisplarge.png similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wispLarge.png rename to src/main/resources/assets/botania/textures/misc/wisplarge.png diff --git a/src/main/resources/assets/botania/textures/misc/wispLarge.png.mcmeta b/src/main/resources/assets/botania/textures/misc/wisplarge.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wispLarge.png.mcmeta rename to src/main/resources/assets/botania/textures/misc/wisplarge.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/misc/wispSmall.png b/src/main/resources/assets/botania/textures/misc/wispsmall.png similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wispSmall.png rename to src/main/resources/assets/botania/textures/misc/wispsmall.png diff --git a/src/main/resources/assets/botania/textures/misc/wispSmall.png.mcmeta b/src/main/resources/assets/botania/textures/misc/wispsmall.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/misc/wispSmall.png.mcmeta rename to src/main/resources/assets/botania/textures/misc/wispsmall.png.mcmeta diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/default/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/default/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/default/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/default/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/default/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/desert/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/desert/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/desert/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/desert/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/desert/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/forest/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/forest/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/forest/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/forest/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/forest/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/fungal/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/fungal/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/fungal/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/fungal/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mesa/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/mesa/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mesa/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/mesa/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mossy/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/mossy/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mossy/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/mossy/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/mountain/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/mountain/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/mountain/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/mountain/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/plains/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/plains/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/plains/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/plains/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/plains/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/swamp/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/swamp/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/swamp/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/swamp/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_sides.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase3_top.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase3_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletBase_top.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletbase_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_sides.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/gobletStand_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/gobletstand_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_sides.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_top.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase2_top.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase2_top.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_sides.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_sides.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_sides.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_top_bottom.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_top_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/kelkBase_top_bottom.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkbase_top_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/altar/taiga/kelkWall.png b/src/main/resources/assets/botania/textures/model/altar/taiga/kelkwall.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/altar/taiga/kelkWall.png rename to src/main/resources/assets/botania/textures/model/altar/taiga/kelkwall.png diff --git a/src/main/resources/assets/botania/textures/model/avatarDirt.png b/src/main/resources/assets/botania/textures/model/avatardirt.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/avatarDirt.png rename to src/main/resources/assets/botania/textures/model/avatardirt.png diff --git a/src/main/resources/assets/botania/textures/model/avatarDivining.png b/src/main/resources/assets/botania/textures/model/avatardivining.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/avatarDivining.png rename to src/main/resources/assets/botania/textures/model/avatardivining.png diff --git a/src/main/resources/assets/botania/textures/model/avatarFire.png b/src/main/resources/assets/botania/textures/model/avatarfire.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/avatarFire.png rename to src/main/resources/assets/botania/textures/model/avatarfire.png diff --git a/src/main/resources/assets/botania/textures/model/avatarMissile.png b/src/main/resources/assets/botania/textures/model/avatarmissile.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/avatarMissile.png rename to src/main/resources/assets/botania/textures/model/avatarmissile.png diff --git a/src/main/resources/assets/botania/textures/model/avatarRainbow.png b/src/main/resources/assets/botania/textures/model/avatarrainbow.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/avatarRainbow.png rename to src/main/resources/assets/botania/textures/model/avatarrainbow.png diff --git a/src/main/resources/assets/botania/textures/model/avatarTornado.png b/src/main/resources/assets/botania/textures/model/avatartornado.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/avatarTornado.png rename to src/main/resources/assets/botania/textures/model/avatartornado.png diff --git a/src/main/resources/assets/botania/textures/model/balanceCloak.png b/src/main/resources/assets/botania/textures/model/balancecloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/balanceCloak.png rename to src/main/resources/assets/botania/textures/model/balancecloak.png diff --git a/src/main/resources/assets/botania/textures/model/balanceCloakGlow.png b/src/main/resources/assets/botania/textures/model/balancecloakglow.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/balanceCloakGlow.png rename to src/main/resources/assets/botania/textures/model/balancecloakglow.png diff --git a/src/main/resources/assets/botania/textures/model/corporeaIndex.png b/src/main/resources/assets/botania/textures/model/corporeaindex.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/corporeaIndex.png rename to src/main/resources/assets/botania/textures/model/corporeaindex.png diff --git a/src/main/resources/assets/botania/textures/model/crystalCube.png b/src/main/resources/assets/botania/textures/model/crystalcube.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/crystalCube.png rename to src/main/resources/assets/botania/textures/model/crystalcube.png diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_base_bottom.png b/src/main/resources/assets/botania/textures/model/crystalcube_base_bottom.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/crystalCube_base_bottom.png rename to src/main/resources/assets/botania/textures/model/crystalcube_base_bottom.png diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_base_sides.png b/src/main/resources/assets/botania/textures/model/crystalcube_base_sides.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/crystalCube_base_sides.png rename to src/main/resources/assets/botania/textures/model/crystalcube_base_sides.png diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_base_top.png b/src/main/resources/assets/botania/textures/model/crystalcube_base_top.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/crystalCube_base_top.png rename to src/main/resources/assets/botania/textures/model/crystalcube_base_top.png diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_cube.png b/src/main/resources/assets/botania/textures/model/crystalcube_cube.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/crystalCube_cube.png rename to src/main/resources/assets/botania/textures/model/crystalcube_cube.png diff --git a/src/main/resources/assets/botania/textures/model/crystalCube_stand.png b/src/main/resources/assets/botania/textures/model/crystalcube_stand.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/crystalCube_stand.png rename to src/main/resources/assets/botania/textures/model/crystalcube_stand.png diff --git a/src/main/resources/assets/botania/textures/model/dilutedPool.png b/src/main/resources/assets/botania/textures/model/dilutedpool.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/dilutedPool.png rename to src/main/resources/assets/botania/textures/model/dilutedpool.png diff --git a/src/main/resources/assets/botania/textures/model/elementiumNew.png b/src/main/resources/assets/botania/textures/model/elementiumnew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/elementiumNew.png rename to src/main/resources/assets/botania/textures/model/elementiumnew.png diff --git a/src/main/resources/assets/botania/textures/model/holyCloak.png b/src/main/resources/assets/botania/textures/model/holycloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/holyCloak.png rename to src/main/resources/assets/botania/textures/model/holycloak.png diff --git a/src/main/resources/assets/botania/textures/model/holyCloakGlow.png b/src/main/resources/assets/botania/textures/model/holycloakglow.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/holyCloakGlow.png rename to src/main/resources/assets/botania/textures/model/holycloakglow.png diff --git a/src/main/resources/assets/botania/textures/model/incensePlate.png b/src/main/resources/assets/botania/textures/model/incenseplate.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/incensePlate.png rename to src/main/resources/assets/botania/textures/model/incenseplate.png diff --git a/src/main/resources/assets/botania/textures/model/infinitePool.png b/src/main/resources/assets/botania/textures/model/infinitepool.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/infinitePool.png rename to src/main/resources/assets/botania/textures/model/infinitepool.png diff --git a/src/main/resources/assets/botania/textures/model/invisibleArmor.png b/src/main/resources/assets/botania/textures/model/invisiblearmor.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/invisibleArmor.png rename to src/main/resources/assets/botania/textures/model/invisiblearmor.png diff --git a/src/main/resources/assets/botania/textures/model/knockbackBelt.png b/src/main/resources/assets/botania/textures/model/knockbackbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/knockbackBelt.png rename to src/main/resources/assets/botania/textures/model/knockbackbelt.png diff --git a/src/main/resources/assets/botania/textures/model/manasteelNew.png b/src/main/resources/assets/botania/textures/model/manasteelnew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manasteelNew.png rename to src/main/resources/assets/botania/textures/model/manasteelnew.png diff --git a/src/main/resources/assets/botania/textures/model/manaweaveNew.png b/src/main/resources/assets/botania/textures/model/manaweavenew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweaveNew.png rename to src/main/resources/assets/botania/textures/model/manaweavenew.png diff --git a/src/main/resources/assets/botania/textures/model/manaweaveNewHoliday.png b/src/main/resources/assets/botania/textures/model/manaweavenewholiday.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/manaweaveNewHoliday.png rename to src/main/resources/assets/botania/textures/model/manaweavenewholiday.png diff --git a/src/main/resources/assets/botania/textures/model/pinkWither.png b/src/main/resources/assets/botania/textures/model/pinkwither.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/pinkWither.png rename to src/main/resources/assets/botania/textures/model/pinkwither.png diff --git a/src/main/resources/assets/botania/textures/model/pylonOld.png b/src/main/resources/assets/botania/textures/model/pylonold.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/pylonOld.png rename to src/main/resources/assets/botania/textures/model/pylonold.png diff --git a/src/main/resources/assets/botania/textures/model/pylonOld1.png b/src/main/resources/assets/botania/textures/model/pylonold1.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/pylonOld1.png rename to src/main/resources/assets/botania/textures/model/pylonold1.png diff --git a/src/main/resources/assets/botania/textures/model/pylonOld2.png b/src/main/resources/assets/botania/textures/model/pylonold2.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/pylonOld2.png rename to src/main/resources/assets/botania/textures/model/pylonold2.png diff --git a/src/main/resources/assets/botania/textures/model/spawnerClaw.png b/src/main/resources/assets/botania/textures/model/spawnerclaw.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/spawnerClaw.png rename to src/main/resources/assets/botania/textures/model/spawnerclaw.png diff --git a/src/main/resources/assets/botania/textures/model/speedUpBelt.png b/src/main/resources/assets/botania/textures/model/speedupbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/speedUpBelt.png rename to src/main/resources/assets/botania/textures/model/speedupbelt.png diff --git a/src/main/resources/assets/botania/textures/model/spreaderDreamwood.png b/src/main/resources/assets/botania/textures/model/spreaderdreamwood.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/spreaderDreamwood.png rename to src/main/resources/assets/botania/textures/model/spreaderdreamwood.png diff --git a/src/main/resources/assets/botania/textures/model/spreaderDreamwood_halloween.png b/src/main/resources/assets/botania/textures/model/spreaderdreamwood_halloween.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/spreaderDreamwood_halloween.png rename to src/main/resources/assets/botania/textures/model/spreaderdreamwood_halloween.png diff --git a/src/main/resources/assets/botania/textures/model/spreaderRedstone.png b/src/main/resources/assets/botania/textures/model/spreaderredstone.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/spreaderRedstone.png rename to src/main/resources/assets/botania/textures/model/spreaderredstone.png diff --git a/src/main/resources/assets/botania/textures/model/spreaderRedstone_halloween.png b/src/main/resources/assets/botania/textures/model/spreaderredstone_halloween.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/spreaderRedstone_halloween.png rename to src/main/resources/assets/botania/textures/model/spreaderredstone_halloween.png diff --git a/src/main/resources/assets/botania/textures/model/superTravelBelt.png b/src/main/resources/assets/botania/textures/model/supertravelbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/superTravelBelt.png rename to src/main/resources/assets/botania/textures/model/supertravelbelt.png diff --git a/src/main/resources/assets/botania/textures/model/terrasteelNew.png b/src/main/resources/assets/botania/textures/model/terrasteelnew.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/terrasteelNew.png rename to src/main/resources/assets/botania/textures/model/terrasteelnew.png diff --git a/src/main/resources/assets/botania/textures/model/teruTeruBozu.png b/src/main/resources/assets/botania/textures/model/teruterubozu.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/teruTeruBozu.png rename to src/main/resources/assets/botania/textures/model/teruterubozu.png diff --git a/src/main/resources/assets/botania/textures/model/teruTeruBozu_halloween.png b/src/main/resources/assets/botania/textures/model/teruterubozu_halloween.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/teruTeruBozu_halloween.png rename to src/main/resources/assets/botania/textures/model/teruterubozu_halloween.png diff --git a/src/main/resources/assets/botania/textures/model/tinyPotato.png b/src/main/resources/assets/botania/textures/model/tinypotato.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/tinyPotato.png rename to src/main/resources/assets/botania/textures/model/tinypotato.png diff --git a/src/main/resources/assets/botania/textures/model/tinyPotato_halloween.png b/src/main/resources/assets/botania/textures/model/tinypotato_halloween.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/tinyPotato_halloween.png rename to src/main/resources/assets/botania/textures/model/tinypotato_halloween.png diff --git a/src/main/resources/assets/botania/textures/model/tinyPotatoCopy.png b/src/main/resources/assets/botania/textures/model/tinypotatocopy.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/tinyPotatoCopy.png rename to src/main/resources/assets/botania/textures/model/tinypotatocopy.png diff --git a/src/main/resources/assets/botania/textures/model/tinyPotatoGray.png b/src/main/resources/assets/botania/textures/model/tinypotatogray.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/tinyPotatoGray.png rename to src/main/resources/assets/botania/textures/model/tinypotatogray.png diff --git a/src/main/resources/assets/botania/textures/model/travelBelt.png b/src/main/resources/assets/botania/textures/model/travelbelt.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/travelBelt.png rename to src/main/resources/assets/botania/textures/model/travelbelt.png diff --git a/src/main/resources/assets/botania/textures/model/unholyCloak.png b/src/main/resources/assets/botania/textures/model/unholycloak.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/unholyCloak.png rename to src/main/resources/assets/botania/textures/model/unholycloak.png diff --git a/src/main/resources/assets/botania/textures/model/unholyCloakGlow.png b/src/main/resources/assets/botania/textures/model/unholycloakglow.png similarity index 100% rename from src/main/resources/assets/botania/textures/model/unholyCloakGlow.png rename to src/main/resources/assets/botania/textures/model/unholycloakglow.png diff --git a/src/main/resources/assets/botania/ToTextureArtists.txt b/src/main/resources/assets/botania/totextureartists.txt similarity index 100% rename from src/main/resources/assets/botania/ToTextureArtists.txt rename to src/main/resources/assets/botania/totextureartists.txt diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 5302a04d4..13400f7b1 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 2, + "pack_format": 3, "description": "Resources used for Botania" } } \ No newline at end of file