diff --git a/src/api/java/appeng/api/AEApi.java b/src/api/java/appeng/api/AEApi.java deleted file mode 100644 index 6185d79a..00000000 --- a/src/api/java/appeng/api/AEApi.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api; - - -import java.lang.reflect.Field; - -import appeng.api.exceptions.CoreInaccessibleException; - - -/** - * Entry point for api. - * - * Available IMCs: - */ -public enum AEApi -{ - ; - - private static final String CORE_API_FQN = "appeng.core.Api"; - private static final String CORE_API_FIELD = "INSTANCE"; - private static final IAppEngApi HELD_API; - - static - { - try - { - final Class apiClass = Class.forName( CORE_API_FQN ); - final Field apiField = apiClass.getField( CORE_API_FIELD ); - - HELD_API = (IAppEngApi) apiField.get( apiClass ); - } - catch( ClassNotFoundException e ) - { - throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FQN + " class, without it being declared." ); - } - catch( NoSuchFieldException e ) - { - throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without it being declared." ); - } - catch( IllegalAccessException e ) - { - throw new CoreInaccessibleException( "AE2 API tried to access the " + CORE_API_FIELD + " field in " + CORE_API_FQN + " without enough access permissions." ); - } - } - - /** - * API Entry Point. - * - * @return the {@link IAppEngApi} - */ - public static IAppEngApi instance() - { - return HELD_API; - } - -} diff --git a/src/api/java/appeng/api/IAppEngApi.java b/src/api/java/appeng/api/IAppEngApi.java deleted file mode 100644 index 8c3f127e..00000000 --- a/src/api/java/appeng/api/IAppEngApi.java +++ /dev/null @@ -1,114 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api; - - -import appeng.api.definitions.Blocks; -import appeng.api.definitions.IDefinitions; -import appeng.api.definitions.Items; -import appeng.api.definitions.Materials; -import appeng.api.definitions.Parts; -import appeng.api.exceptions.FailedConnection; -import appeng.api.features.IRegistryContainer; -import appeng.api.networking.IGridBlock; -import appeng.api.networking.IGridConnection; -import appeng.api.networking.IGridNode; -import appeng.api.parts.IPartHelper; -import appeng.api.storage.IStorageHelper; - - -public interface IAppEngApi -{ - - /** - * @return Registry Container for the numerous registries in AE2. - */ - IRegistryContainer registries(); - - /** - * @return helper for working with storage data types. - */ - IStorageHelper storage(); - - /** - * @return helper for working with grids, and buses. - */ - IPartHelper partHelper(); - - /** - * @return an accessible list of all of AE's Items - * - * @deprecated use {@link appeng.api.definitions.IDefinitions#items()} - */ - @Deprecated - Items items(); - - /** - * @return an accessible list of all of AE's materials; materials are items - * - * @deprecated use {@link appeng.api.definitions.IDefinitions#materials()} - */ - @Deprecated - Materials materials(); - - /** - * @return an accessible list of all of AE's blocks - * - * @deprecated use {@link appeng.api.definitions.IDefinitions#blocks()} - */ - @Deprecated - Blocks blocks(); - - /** - * @return an accessible list of all of AE's parts, parts are items - * - * @deprecated use {@link appeng.api.definitions.IDefinitions#parts()} - */ - @Deprecated - Parts parts(); - - /** - * @return an accessible list of all AE definitions - */ - IDefinitions definitions(); - - /** - * create a grid node for your {@link appeng.api.networking.IGridHost} - * - * @param block grid block - * - * @return grid node of block - */ - IGridNode createGridNode( IGridBlock block ); - - /** - * create a connection between two {@link appeng.api.networking.IGridNode} - * - * @param a to be connected gridnode - * @param b to be connected gridnode - * - * @throws appeng.api.exceptions.FailedConnection - */ - IGridConnection createGridConnection( IGridNode a, IGridNode b ) throws FailedConnection; -} \ No newline at end of file diff --git a/src/api/java/appeng/api/LICENSE b/src/api/java/appeng/api/LICENSE deleted file mode 100644 index 643181ca..00000000 --- a/src/api/java/appeng/api/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2013 AlgorithmX2 - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/src/api/java/appeng/api/config/AccessRestriction.java b/src/api/java/appeng/api/config/AccessRestriction.java deleted file mode 100644 index 9b7e4bf3..00000000 --- a/src/api/java/appeng/api/config/AccessRestriction.java +++ /dev/null @@ -1,73 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum AccessRestriction -{ - NO_ACCESS( 0 ), READ( 1 ), WRITE( 2 ), READ_WRITE( 3 ); - - private final int permissionBit; - - AccessRestriction( int v ) - { - this.permissionBit = v; - } - - public boolean hasPermission( AccessRestriction ar ) - { - return ( this.permissionBit & ar.permissionBit ) == ar.permissionBit; - } - - public AccessRestriction restrictPermissions( AccessRestriction ar ) - { - return this.getPermByBit( this.permissionBit & ar.permissionBit ); - } - - private AccessRestriction getPermByBit( int bit ) - { - switch( bit ) - { - default: - case 0: - return NO_ACCESS; - case 1: - return READ; - case 2: - return WRITE; - case 3: - return READ_WRITE; - } - } - - public AccessRestriction addPermissions( AccessRestriction ar ) - { - return this.getPermByBit( this.permissionBit | ar.permissionBit ); - } - - public AccessRestriction removePermissions( AccessRestriction ar ) - { - return this.getPermByBit( this.permissionBit & ( ~ar.permissionBit ) ); - } -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/ActionItems.java b/src/api/java/appeng/api/config/ActionItems.java deleted file mode 100644 index 9cb6fbf2..00000000 --- a/src/api/java/appeng/api/config/ActionItems.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum ActionItems -{ - WRENCH, CLOSE, STASH, ENCODE, SUBSTITUTION -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/Actionable.java b/src/api/java/appeng/api/config/Actionable.java deleted file mode 100644 index 8e5f1f54..00000000 --- a/src/api/java/appeng/api/config/Actionable.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum Actionable -{ - /** - * Perform the intended action. - */ - MODULATE, - - /** - * Pretend to perform the action. - */ - SIMULATE -} diff --git a/src/api/java/appeng/api/config/CondenserOutput.java b/src/api/java/appeng/api/config/CondenserOutput.java deleted file mode 100644 index cb9efae0..00000000 --- a/src/api/java/appeng/api/config/CondenserOutput.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum CondenserOutput -{ - - TRASH, // 0 - - MATTER_BALLS, // 256 - - SINGULARITY; // 250,000 - - public int requiredPower = 0; - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/CopyMode.java b/src/api/java/appeng/api/config/CopyMode.java deleted file mode 100644 index 7f2f3996..00000000 --- a/src/api/java/appeng/api/config/CopyMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum CopyMode -{ - CLEAR_ON_REMOVE, KEEP_ON_REMOVE -} diff --git a/src/api/java/appeng/api/config/FullnessMode.java b/src/api/java/appeng/api/config/FullnessMode.java deleted file mode 100644 index c52d4228..00000000 --- a/src/api/java/appeng/api/config/FullnessMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum FullnessMode -{ - EMPTY, HALF, FULL -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/FuzzyMode.java b/src/api/java/appeng/api/config/FuzzyMode.java deleted file mode 100644 index c5f91e12..00000000 --- a/src/api/java/appeng/api/config/FuzzyMode.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum FuzzyMode -{ - // Note that percentage damaged, is the inverse of percentage durability. - IGNORE_ALL( -1 ), PERCENT_99( 0 ), PERCENT_75( 25 ), PERCENT_50( 50 ), PERCENT_25( 75 ); - - public final float breakPoint; - public final float percentage; - - FuzzyMode( float p ) - { - this.percentage = p; - this.breakPoint = p / 100.0f; - } - - public int calculateBreakPoint( int maxDamage ) - { - return (int) ( ( this.percentage * maxDamage ) / 100.0f ); - } - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/IncludeExclude.java b/src/api/java/appeng/api/config/IncludeExclude.java deleted file mode 100644 index 53f0bbeb..00000000 --- a/src/api/java/appeng/api/config/IncludeExclude.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum IncludeExclude -{ - WHITELIST, BLACKLIST -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/LevelEmitterMode.java b/src/api/java/appeng/api/config/LevelEmitterMode.java deleted file mode 100644 index dcdd0ef8..00000000 --- a/src/api/java/appeng/api/config/LevelEmitterMode.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum LevelEmitterMode -{ - - STORED_AMOUNT, - - STORABLE_AMOUNT - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/LevelType.java b/src/api/java/appeng/api/config/LevelType.java deleted file mode 100644 index 0787abb7..00000000 --- a/src/api/java/appeng/api/config/LevelType.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum LevelType -{ - - ITEM_LEVEL, - - ENERGY_LEVEL - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/ModSettings.java b/src/api/java/appeng/api/config/ModSettings.java deleted file mode 100644 index b1225844..00000000 --- a/src/api/java/appeng/api/config/ModSettings.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum ModSettings -{ - -} diff --git a/src/api/java/appeng/api/config/NetworkEmitterMode.java b/src/api/java/appeng/api/config/NetworkEmitterMode.java deleted file mode 100644 index 03efd7c9..00000000 --- a/src/api/java/appeng/api/config/NetworkEmitterMode.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum NetworkEmitterMode -{ - - POWER_LEVEL, - - BOOTING, - - CHANNEL_ERROR - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/OperationMode.java b/src/api/java/appeng/api/config/OperationMode.java deleted file mode 100644 index f2c8ff30..00000000 --- a/src/api/java/appeng/api/config/OperationMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum OperationMode -{ - FILL, EMPTY -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/OutputMode.java b/src/api/java/appeng/api/config/OutputMode.java deleted file mode 100644 index f9bcffa5..00000000 --- a/src/api/java/appeng/api/config/OutputMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum OutputMode -{ - EXPORT_ONLY, EXPORT_OR_CRAFT, CRAFT_ONLY -} diff --git a/src/api/java/appeng/api/config/PowerMultiplier.java b/src/api/java/appeng/api/config/PowerMultiplier.java deleted file mode 100644 index a2029f8c..00000000 --- a/src/api/java/appeng/api/config/PowerMultiplier.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum PowerMultiplier -{ - ONE, CONFIG; - - /** - * please do not edit this value, it is set when AE loads its config files. - */ - public double multiplier = 1.0; - - public double multiply( double in ) - { - return in * this.multiplier; - } - - public double divide( double in ) - { - return in / this.multiplier; - } -} diff --git a/src/api/java/appeng/api/config/PowerUnits.java b/src/api/java/appeng/api/config/PowerUnits.java deleted file mode 100644 index c1a46be8..00000000 --- a/src/api/java/appeng/api/config/PowerUnits.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum PowerUnits -{ - AE( "gui.appliedenergistics2.units.appliedenergstics" ), // Native Units - AE Energy - EU( "gui.appliedenergistics2.units.ic2" ), // IndustrialCraft 2 - Energy Units - WA( "gui.appliedenergistics2.units.rotarycraft" ), // RotaryCraft - Watts - RF( "gui.appliedenergistics2.units.thermalexpansion" ), // ThermalExpansion - Redstone Flux - MK( "gui.appliedenergistics2.units.mekanism" ); // Mekanism - Joules - - /** - * unlocalized name for the power unit. - */ - public final String unlocalizedName; - /** - * please do not edit this value, it is set when AE loads its config files. - */ - public double conversionRatio = 1.0; - - PowerUnits( String un ) - { - this.unlocalizedName = un; - } - - /** - * do power conversion using AE's conversion rates. - * - * Example: PowerUnits.EU.convertTo( PowerUnits.AE, 32 ); - * - * will normally returns 64, as it will convert the EU, to AE with AE's power settings. - * - * @param target target power unit - * @param value value - * - * @return value converted to target units, from this units. - */ - public double convertTo( PowerUnits target, double value ) - { - return ( value * this.conversionRatio ) / target.conversionRatio; - } - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/RedstoneMode.java b/src/api/java/appeng/api/config/RedstoneMode.java deleted file mode 100644 index 0bb5a54d..00000000 --- a/src/api/java/appeng/api/config/RedstoneMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum RedstoneMode -{ - IGNORE, LOW_SIGNAL, HIGH_SIGNAL, SIGNAL_PULSE -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/RelativeDirection.java b/src/api/java/appeng/api/config/RelativeDirection.java deleted file mode 100644 index a81d2047..00000000 --- a/src/api/java/appeng/api/config/RelativeDirection.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum RelativeDirection -{ - LEFT, RIGHT, UP, DOW -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/SearchBoxMode.java b/src/api/java/appeng/api/config/SearchBoxMode.java deleted file mode 100644 index f2f2408e..00000000 --- a/src/api/java/appeng/api/config/SearchBoxMode.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum SearchBoxMode -{ - AUTOSEARCH, MANUAL_SEARCH, NEI_AUTOSEARCH, NEI_MANUAL_SEARCH -} diff --git a/src/api/java/appeng/api/config/SecurityPermissions.java b/src/api/java/appeng/api/config/SecurityPermissions.java deleted file mode 100644 index c3e69062..00000000 --- a/src/api/java/appeng/api/config/SecurityPermissions.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -/** - * Represent the security systems basic permissions, these are not for anti-griefing, they are part of the mod as a - * gameplay feature. - */ -public enum SecurityPermissions -{ - /** - * required to insert items into the network via terminal ( also used for machines based on the owner of the - * network, which is determined by its Security Block. ) - */ - INJECT, - - /** - * required to extract items from the network via terminal ( also used for machines based on the owner of the - * network, which is determined by its Security Block. ) - */ - EXTRACT, - - /** - * required to request crafting from the network via terminal. - */ - CRAFT, - - /** - * required to modify automation, and make modifications to the networks physical layout. - */ - BUILD, - - /** - * required to modify the security blocks settings. - */ - SECURITY; - - private final String unlocalizedName = "gui.appliedenergistics2.security." + this.name().toLowerCase(); - - public String getUnlocalizedName() - { - return this.unlocalizedName + ".name"; - } - - public String getUnlocalizedTip() - { - return this.unlocalizedName + ".tip"; - } -} diff --git a/src/api/java/appeng/api/config/Settings.java b/src/api/java/appeng/api/config/Settings.java deleted file mode 100644 index 97796dc2..00000000 --- a/src/api/java/appeng/api/config/Settings.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -import java.util.EnumSet; -import javax.annotation.Nonnull; - - -public enum Settings -{ - LEVEL_EMITTER_MODE( EnumSet.allOf( LevelEmitterMode.class ) ), - - REDSTONE_EMITTER( EnumSet.of( RedstoneMode.HIGH_SIGNAL, RedstoneMode.LOW_SIGNAL ) ), REDSTONE_CONTROLLED( EnumSet.allOf( RedstoneMode.class ) ), - - CONDENSER_OUTPUT( EnumSet.allOf( CondenserOutput.class ) ), - - POWER_UNITS( EnumSet.allOf( PowerUnits.class ) ), ACCESS( EnumSet.of( AccessRestriction.READ_WRITE, AccessRestriction.READ, AccessRestriction.WRITE ) ), - - SORT_DIRECTION( EnumSet.allOf( SortDir.class ) ), SORT_BY( EnumSet.allOf( SortOrder.class ) ), - - SEARCH_TOOLTIPS( EnumSet.of( YesNo.YES, YesNo.NO ) ), VIEW_MODE( EnumSet.allOf( ViewItems.class ) ), SEARCH_MODE( EnumSet.allOf( SearchBoxMode.class ) ), - - ACTIONS( EnumSet.allOf( ActionItems.class ) ), IO_DIRECTION( EnumSet.of( RelativeDirection.LEFT, RelativeDirection.RIGHT ) ), - - BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ), OPERATION_MODE( EnumSet.allOf( OperationMode.class ) ), - - FULLNESS_MODE( EnumSet.allOf( FullnessMode.class ) ), CRAFT_ONLY( EnumSet.of( YesNo.YES, YesNo.NO ) ), - - FUZZY_MODE( EnumSet.allOf( FuzzyMode.class ) ), LEVEL_TYPE( EnumSet.allOf( LevelType.class ) ), - - TERMINAL_STYLE( EnumSet.of( TerminalStyle.TALL, TerminalStyle.SMALL ) ), COPY_MODE( EnumSet.allOf( CopyMode.class ) ), - - INTERFACE_TERMINAL( EnumSet.of( YesNo.YES, YesNo.NO ) ), CRAFT_VIA_REDSTONE( EnumSet.of( YesNo.YES, YesNo.NO ) ), - - STORAGE_FILTER( EnumSet.allOf( StorageFilter.class ) ), PLACE_BLOCK( EnumSet.of( YesNo.YES, YesNo.NO ) ); - - private final EnumSet> values; - - Settings( @Nonnull EnumSet> possibleOptions ) - { - if ( possibleOptions.isEmpty() ) - { - throw new IllegalArgumentException( "Tried to instantiate an empty setting." ); - } - - this.values = possibleOptions; - } - - public EnumSet> getPossibleValues() - { - return this.values; - } - -} diff --git a/src/api/java/appeng/api/config/SortDir.java b/src/api/java/appeng/api/config/SortDir.java deleted file mode 100644 index 654fda0d..00000000 --- a/src/api/java/appeng/api/config/SortDir.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum SortDir -{ - ASCENDING, DESCENDING -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/SortOrder.java b/src/api/java/appeng/api/config/SortOrder.java deleted file mode 100644 index 51cde4e6..00000000 --- a/src/api/java/appeng/api/config/SortOrder.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum SortOrder -{ - NAME, AMOUNT, MOD, INVTWEAKS -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/StorageFilter.java b/src/api/java/appeng/api/config/StorageFilter.java deleted file mode 100644 index 64f63f70..00000000 --- a/src/api/java/appeng/api/config/StorageFilter.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum StorageFilter -{ - - NONE, - - EXTRACTABLE_ONLY - -} diff --git a/src/api/java/appeng/api/config/TerminalStyle.java b/src/api/java/appeng/api/config/TerminalStyle.java deleted file mode 100644 index d8687e1a..00000000 --- a/src/api/java/appeng/api/config/TerminalStyle.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum TerminalStyle -{ - - TALL, - - FULL, - - SMALL - -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/TunnelType.java b/src/api/java/appeng/api/config/TunnelType.java deleted file mode 100644 index b42d2856..00000000 --- a/src/api/java/appeng/api/config/TunnelType.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum TunnelType -{ - ME, // Network Tunnel - IC2_POWER, // EU Tunnel - RF_POWER, // RF Tunnel - REDSTONE, // Redstone Tunnel - FLUID, // Fluid Tunnel - ITEM, // Item Tunnel - LIGHT, // Light Tunnel - BUNDLED_REDSTONE, // Bundled Redstone Tunnel - COMPUTER_MESSAGE // Computer Message Tunnel -} diff --git a/src/api/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java deleted file mode 100644 index 07c679b6..00000000 --- a/src/api/java/appeng/api/config/Upgrades.java +++ /dev/null @@ -1,130 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.item.ItemStack; - -import com.google.common.base.Optional; - -import appeng.api.definitions.IItemDefinition; -import appeng.api.util.AEItemDefinition; - - -public enum Upgrades -{ - /** - * Gold Tier Upgrades. - */ - CAPACITY( 0 ), REDSTONE( 0 ), CRAFTING( 0 ), - - /** - * Diamond Tier Upgrades. - */ - FUZZY( 1 ), SPEED( 1 ), INVERTER( 1 ); - - /** - * @deprecated use {@link Upgrades#getTier()} - */ - @Deprecated - public final int tier; - - /** - * @deprecated use {@link Upgrades#getSupported()} - */ - @Deprecated - private final Map supportedMax = new HashMap(); - - Upgrades( int tier ) - { - this.tier = tier; - } - - /** - * @return list of Items/Blocks that support this upgrade, and how many it supports. - */ - public Map getSupported() - { - return this.supportedMax; - } - - /** - * Registers a specific amount of this upgrade into a specific machine - * - * @param item machine in which this upgrade can be installed - * @param maxSupported amount how many upgrades can be installed - */ - public void registerItem( IItemDefinition item, int maxSupported ) - { - final Optional maybeStack = item.maybeStack( 1 ); - for( ItemStack stack : maybeStack.asSet() ) - { - this.registerItem( stack, maxSupported ); - } - } - - /** - * Registers a specific amount of this upgrade into a specific machine - * - * @param stack machine in which this upgrade can be installed - * @param maxSupported amount how many upgrades can be installed - */ - public void registerItem( ItemStack stack, int maxSupported ) - { - if( stack != null ) - { - this.supportedMax.put( stack, maxSupported ); - } - } - - /** - * Registers a specific amount of this upgrade into a specific machine - * - * @param item machine in which this upgrade can be installed - * @param maxSupported amount how many upgrades can be installed - * - * @deprecated use {@link Upgrades#registerItem(IItemDefinition, int)} - */ - @Deprecated - public void registerItem( AEItemDefinition item, int maxSupported ) - { - if( item != null ) - { - final ItemStack stack = item.stack( 1 ); - - if( stack != null ) - { - this.registerItem( stack, maxSupported ); - } - } - } - - public int getTier() - { - return this.tier; - } -} diff --git a/src/api/java/appeng/api/config/ViewItems.java b/src/api/java/appeng/api/config/ViewItems.java deleted file mode 100644 index a87e0aa2..00000000 --- a/src/api/java/appeng/api/config/ViewItems.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum ViewItems -{ - ALL, STORED, CRAFTABLE -} \ No newline at end of file diff --git a/src/api/java/appeng/api/config/YesNo.java b/src/api/java/appeng/api/config/YesNo.java deleted file mode 100644 index c6bfcd60..00000000 --- a/src/api/java/appeng/api/config/YesNo.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.config; - - -public enum YesNo -{ - YES, NO, UNDECIDED -} diff --git a/src/api/java/appeng/api/definitions/Blocks.java b/src/api/java/appeng/api/definitions/Blocks.java deleted file mode 100644 index ec67d54e..00000000 --- a/src/api/java/appeng/api/definitions/Blocks.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -import appeng.api.util.AEItemDefinition; - - -/** - * @deprecated use {@link IBlocks} now - */ -@Deprecated -public class Blocks -{ - public AEItemDefinition blockQuartzOre; - - public AEItemDefinition blockQuartzOreCharged; - - public AEItemDefinition blockMatrixFrame; - - public AEItemDefinition blockQuartz; - - public AEItemDefinition blockQuartzPillar; - - public AEItemDefinition blockQuartzChiseled; - - public AEItemDefinition blockQuartzGlass; - - public AEItemDefinition blockQuartzVibrantGlass; - - public AEItemDefinition blockQuartzTorch; - - public AEItemDefinition blockFluix; - - public AEItemDefinition blockSkyStone; - - public AEItemDefinition blockSkyChest; - - public AEItemDefinition blockSkyCompass; - - public AEItemDefinition blockGrindStone; - - public AEItemDefinition blockCrankHandle; - - public AEItemDefinition blockInscriber; - - public AEItemDefinition blockWireless; - - public AEItemDefinition blockCharger; - - public AEItemDefinition blockTinyTNT; - - public AEItemDefinition blockSecurity; - - public AEItemDefinition blockQuantumRing; - - public AEItemDefinition blockQuantumLink; - - public AEItemDefinition blockSpatialPylon; - - public AEItemDefinition blockSpatialIOPort; - - public AEItemDefinition blockMultiPart; - - public AEItemDefinition blockController; - - public AEItemDefinition blockDrive; - - public AEItemDefinition blockChest; - - public AEItemDefinition blockInterface; - - public AEItemDefinition blockCellWorkbench; - - public AEItemDefinition blockIOPort; - - public AEItemDefinition blockCondenser; - - public AEItemDefinition blockEnergyAcceptor; - - public AEItemDefinition blockVibrationChamber; - - public AEItemDefinition blockQuartzGrowthAccelerator; - - public AEItemDefinition blockEnergyCell; - - public AEItemDefinition blockEnergyCellDense; - - public AEItemDefinition blockEnergyCellCreative; - - public AEItemDefinition blockCraftingUnit; - - public AEItemDefinition blockCraftingAccelerator; - - public AEItemDefinition blockCraftingStorage1k; - - public AEItemDefinition blockCraftingStorage4k; - - public AEItemDefinition blockCraftingStorage16k; - - public AEItemDefinition blockCraftingStorage64k; - - public AEItemDefinition blockCraftingMonitor; - - public AEItemDefinition blockMolecularAssembler; - - public AEItemDefinition blockLightDetector; - - public AEItemDefinition blockPaint; -} diff --git a/src/api/java/appeng/api/definitions/IBlockDefinition.java b/src/api/java/appeng/api/definitions/IBlockDefinition.java deleted file mode 100644 index 3acbd089..00000000 --- a/src/api/java/appeng/api/definitions/IBlockDefinition.java +++ /dev/null @@ -1,34 +0,0 @@ -package appeng.api.definitions; - - -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; -import net.minecraft.world.IBlockAccess; - -import com.google.common.base.Optional; - - -public interface IBlockDefinition extends IItemDefinition -{ - /** - * @return the {@link Block} implementation if applicable - */ - Optional maybeBlock(); - - /** - * @return the {@link ItemBlock} implementation if applicable - */ - Optional maybeItemBlock(); - - /** - * Compare Block with world. - * - * @param world world of block - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block - * - * @return if the block is placed in the world at the specific location. - */ - boolean isSameAs( IBlockAccess world, int x, int y, int z ); -} diff --git a/src/api/java/appeng/api/definitions/IBlocks.java b/src/api/java/appeng/api/definitions/IBlocks.java deleted file mode 100644 index 0cb1c6d2..00000000 --- a/src/api/java/appeng/api/definitions/IBlocks.java +++ /dev/null @@ -1,165 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -/** - * A list of all blocks in AE - */ -public interface IBlocks -{ - /* - * world gen - */ - IBlockDefinition quartzOre(); - - IBlockDefinition quartzOreCharged(); - - IBlockDefinition matrixFrame(); - - /* - * decorative - */ - IBlockDefinition quartz(); - - IBlockDefinition quartzPillar(); - - IBlockDefinition quartzChiseled(); - - IBlockDefinition quartzGlass(); - - IBlockDefinition quartzVibrantGlass(); - - IBlockDefinition quartzTorch(); - - IBlockDefinition fluix(); - - IBlockDefinition skyStone(); - - IBlockDefinition skyChest(); - - IBlockDefinition skyCompass(); - - IBlockDefinition skyStoneStair(); - - IBlockDefinition skyStoneBlockStair(); - - IBlockDefinition skyStoneBrickStair(); - - IBlockDefinition skyStoneSmallBrickStair(); - - IBlockDefinition fluixStair(); - - IBlockDefinition quartzStair(); - - IBlockDefinition chiseledQuartzStair(); - - IBlockDefinition quartzPillarStair(); - - /* - * misc - */ - ITileDefinition grindStone(); - - ITileDefinition crankHandle(); - - ITileDefinition inscriber(); - - ITileDefinition wireless(); - - ITileDefinition charger(); - - ITileDefinition tinyTNT(); - - ITileDefinition security(); - - /* - * quantum Network Bridge - */ - ITileDefinition quantumRing(); - - ITileDefinition quantumLink(); - - /* - * spatial iO - */ - ITileDefinition spatialPylon(); - - ITileDefinition spatialIOPort(); - - /* - * Bus / cables - */ - ITileDefinition multiPart(); - - /* - * machines - */ - ITileDefinition controller(); - - ITileDefinition drive(); - - ITileDefinition chest(); - - ITileDefinition iface(); - - ITileDefinition cellWorkbench(); - - ITileDefinition iOPort(); - - ITileDefinition condenser(); - - ITileDefinition energyAcceptor(); - - ITileDefinition vibrationChamber(); - - ITileDefinition quartzGrowthAccelerator(); - - ITileDefinition energyCell(); - - ITileDefinition energyCellDense(); - - ITileDefinition energyCellCreative(); - - // rv1 - ITileDefinition craftingUnit(); - - ITileDefinition craftingAccelerator(); - - ITileDefinition craftingStorage1k(); - - ITileDefinition craftingStorage4k(); - - ITileDefinition craftingStorage16k(); - - ITileDefinition craftingStorage64k(); - - ITileDefinition craftingMonitor(); - - ITileDefinition molecularAssembler(); - - ITileDefinition lightDetector(); - - ITileDefinition paint(); -} diff --git a/src/api/java/appeng/api/definitions/IComparableDefinition.java b/src/api/java/appeng/api/definitions/IComparableDefinition.java deleted file mode 100644 index bec1bde1..00000000 --- a/src/api/java/appeng/api/definitions/IComparableDefinition.java +++ /dev/null @@ -1,40 +0,0 @@ -package appeng.api.definitions; - - -import net.minecraft.item.ItemStack; -import net.minecraft.world.IBlockAccess; - - -/** - * Interface to compare a definition with an itemstack or a block - * - * @author thatsIch - * @version rv2 - * @since rv2 - */ -public interface IComparableDefinition -{ - /** - * Compare {@link ItemStack} with this - * - * @param comparableStack compared item - * - * @return true if the item stack is a matching item. - */ - boolean isSameAs( ItemStack comparableStack ); - - /** - * Compare Block with world. - * - * @param world world of block - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block - * - * @return if the block is placed in the world at the specific location. - * - * @deprecated moved to {@link IBlockDefinition}. Is removed in the next major release rv3 - */ - @Deprecated - boolean isSameAs( IBlockAccess world, int x, int y, int z ); -} diff --git a/src/api/java/appeng/api/definitions/IDefinitions.java b/src/api/java/appeng/api/definitions/IDefinitions.java deleted file mode 100644 index 354f8899..00000000 --- a/src/api/java/appeng/api/definitions/IDefinitions.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -/** - * All definitions in AE - */ -public interface IDefinitions -{ - /** - * @return an accessible list of all of AE's blocks - */ - IBlocks blocks(); - - /** - * @return an accessible list of all of AE's Items - */ - IItems items(); - - /** - * @return an accessible list of all of AE's materials; materials are items - */ - IMaterials materials(); - - /** - * @return an accessible list of all of AE's parts, parts are items - */ - IParts parts(); -} diff --git a/src/api/java/appeng/api/definitions/IItemDefinition.java b/src/api/java/appeng/api/definitions/IItemDefinition.java deleted file mode 100644 index 805d58de..00000000 --- a/src/api/java/appeng/api/definitions/IItemDefinition.java +++ /dev/null @@ -1,21 +0,0 @@ -package appeng.api.definitions; - - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import com.google.common.base.Optional; - - -public interface IItemDefinition extends IComparableDefinition -{ - /** - * @return the {@link Item} Implementation if applicable - */ - Optional maybeItem(); - - /** - * @return an {@link ItemStack} with specified quantity of this item. - */ - Optional maybeStack( int stackSize ); -} diff --git a/src/api/java/appeng/api/definitions/IItems.java b/src/api/java/appeng/api/definitions/IItems.java deleted file mode 100644 index 5ea20f2a..00000000 --- a/src/api/java/appeng/api/definitions/IItems.java +++ /dev/null @@ -1,109 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -import appeng.api.util.AEColoredItemDefinition; - - -/** - * A list of all items in AE - */ -public interface IItems -{ - IItemDefinition certusQuartzAxe(); - - IItemDefinition certusQuartzHoe(); - - IItemDefinition certusQuartzShovel(); - - IItemDefinition certusQuartzPick(); - - IItemDefinition certusQuartzSword(); - - IItemDefinition certusQuartzWrench(); - - IItemDefinition certusQuartzKnife(); - - IItemDefinition netherQuartzAxe(); - - IItemDefinition netherQuartzHoe(); - - IItemDefinition netherQuartzShovel(); - - IItemDefinition netherQuartzPick(); - - IItemDefinition netherQuartzSword(); - - IItemDefinition netherQuartzWrench(); - - IItemDefinition netherQuartzKnife(); - - IItemDefinition entropyManipulator(); - - IItemDefinition wirelessTerminal(); - - IItemDefinition biometricCard(); - - IItemDefinition chargedStaff(); - - IItemDefinition massCannon(); - - IItemDefinition memoryCard(); - - IItemDefinition networkTool(); - - IItemDefinition portableCell(); - - IItemDefinition cellCreative(); - - IItemDefinition viewCell(); - - IItemDefinition cell1k(); - - IItemDefinition cell4k(); - - IItemDefinition cell16k(); - - IItemDefinition cell64k(); - - IItemDefinition spatialCell2(); - - IItemDefinition spatialCell16(); - - IItemDefinition spatialCell128(); - - IItemDefinition facade(); - - IItemDefinition crystalSeed(); - - // rv1 - IItemDefinition encodedPattern(); - - IItemDefinition colorApplicator(); - - AEColoredItemDefinition coloredPaintBall(); - - AEColoredItemDefinition coloredLumenPaintBall(); -} diff --git a/src/api/java/appeng/api/definitions/IMaterials.java b/src/api/java/appeng/api/definitions/IMaterials.java deleted file mode 100644 index 8a52bfd5..00000000 --- a/src/api/java/appeng/api/definitions/IMaterials.java +++ /dev/null @@ -1,139 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -/** - * A list of all materials in AE - */ -public interface IMaterials -{ - IItemDefinition cell2SpatialPart(); - - IItemDefinition cell16SpatialPart(); - - IItemDefinition cell128SpatialPart(); - - IItemDefinition silicon(); - - IItemDefinition skyDust(); - - IItemDefinition calcProcessorPress(); - - IItemDefinition engProcessorPress(); - - IItemDefinition logicProcessorPress(); - - IItemDefinition calcProcessorPrint(); - - IItemDefinition engProcessorPrint(); - - IItemDefinition logicProcessorPrint(); - - IItemDefinition siliconPress(); - - IItemDefinition siliconPrint(); - - IItemDefinition namePress(); - - IItemDefinition logicProcessor(); - - IItemDefinition calcProcessor(); - - IItemDefinition engProcessor(); - - IItemDefinition basicCard(); - - IItemDefinition advCard(); - - IItemDefinition purifiedCertusQuartzCrystal(); - - IItemDefinition purifiedNetherQuartzCrystal(); - - IItemDefinition purifiedFluixCrystal(); - - IItemDefinition cell1kPart(); - - IItemDefinition cell4kPart(); - - IItemDefinition cell16kPart(); - - IItemDefinition cell64kPart(); - - IItemDefinition emptyStorageCell(); - - IItemDefinition cardRedstone(); - - IItemDefinition cardSpeed(); - - IItemDefinition cardCapacity(); - - IItemDefinition cardFuzzy(); - - IItemDefinition cardInverter(); - - IItemDefinition cardCrafting(); - - IItemDefinition enderDust(); - - IItemDefinition flour(); - - IItemDefinition goldDust(); - - IItemDefinition ironDust(); - - IItemDefinition fluixDust(); - - IItemDefinition certusQuartzDust(); - - IItemDefinition netherQuartzDust(); - - IItemDefinition matterBall(); - - IItemDefinition ironNugget(); - - IItemDefinition certusQuartzCrystal(); - - IItemDefinition certusQuartzCrystalCharged(); - - IItemDefinition fluixCrystal(); - - IItemDefinition fluixPearl(); - - IItemDefinition woodenGear(); - - IItemDefinition wireless(); - - IItemDefinition wirelessBooster(); - - IItemDefinition annihilationCore(); - - IItemDefinition formationCore(); - - IItemDefinition singularity(); - - IItemDefinition qESingularity(); - - IItemDefinition blankPattern(); -} diff --git a/src/api/java/appeng/api/definitions/IParts.java b/src/api/java/appeng/api/definitions/IParts.java deleted file mode 100644 index f79cf3e0..00000000 --- a/src/api/java/appeng/api/definitions/IParts.java +++ /dev/null @@ -1,104 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -import appeng.api.util.AEColoredItemDefinition; - - -/** - * A list of all parts in AE - */ -public interface IParts -{ - AEColoredItemDefinition cableSmart(); - - AEColoredItemDefinition cableCovered(); - - AEColoredItemDefinition cableGlass(); - - AEColoredItemDefinition cableDense(); - - AEColoredItemDefinition lumenCableSmart(); - - AEColoredItemDefinition lumenCableCovered(); - - AEColoredItemDefinition lumenCableGlass(); - - AEColoredItemDefinition lumenCableDense(); - - IItemDefinition quartzFiber(); - - IItemDefinition toggleBus(); - - IItemDefinition invertedToggleBus(); - - IItemDefinition storageBus(); - - IItemDefinition importBus(); - - IItemDefinition exportBus(); - - IItemDefinition iface(); - - IItemDefinition levelEmitter(); - - IItemDefinition annihilationPlane(); - - IItemDefinition formationPlane(); - - IItemDefinition p2PTunnelME(); - - IItemDefinition p2PTunnelRedstone(); - - IItemDefinition p2PTunnelItems(); - - IItemDefinition p2PTunnelLiquids(); - - IItemDefinition p2PTunnelEU(); - - IItemDefinition p2PTunnelRF(); - - IItemDefinition p2PTunnelLight(); - - IItemDefinition cableAnchor(); - - IItemDefinition monitor(); - - IItemDefinition semiDarkMonitor(); - - IItemDefinition darkMonitor(); - - IItemDefinition interfaceTerminal(); - - IItemDefinition patternTerminal(); - - IItemDefinition craftingTerminal(); - - IItemDefinition terminal(); - - IItemDefinition storageMonitor(); - - IItemDefinition conversionMonitor(); -} diff --git a/src/api/java/appeng/api/definitions/ITileDefinition.java b/src/api/java/appeng/api/definitions/ITileDefinition.java deleted file mode 100644 index 89f9641d..00000000 --- a/src/api/java/appeng/api/definitions/ITileDefinition.java +++ /dev/null @@ -1,15 +0,0 @@ -package appeng.api.definitions; - - -import net.minecraft.tileentity.TileEntity; - -import com.google.common.base.Optional; - - -public interface ITileDefinition extends IBlockDefinition -{ - /** - * @return the {@link TileEntity} Class if applicable. - */ - Optional> maybeEntity(); -} diff --git a/src/api/java/appeng/api/definitions/Items.java b/src/api/java/appeng/api/definitions/Items.java deleted file mode 100644 index 09c24262..00000000 --- a/src/api/java/appeng/api/definitions/Items.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -import appeng.api.util.AEColoredItemDefinition; -import appeng.api.util.AEItemDefinition; - - -/** - * @deprecated use {@link IItems} - */ -@Deprecated -public class Items -{ - public AEItemDefinition itemCertusQuartzAxe; - - public AEItemDefinition itemCertusQuartzHoe; - - public AEItemDefinition itemCertusQuartzShovel; - - public AEItemDefinition itemCertusQuartzPick; - - public AEItemDefinition itemCertusQuartzSword; - - public AEItemDefinition itemCertusQuartzWrench; - - public AEItemDefinition itemCertusQuartzKnife; - - public AEItemDefinition itemNetherQuartzAxe; - - public AEItemDefinition itemNetherQuartzHoe; - - public AEItemDefinition itemNetherQuartzShovel; - - public AEItemDefinition itemNetherQuartzPick; - - public AEItemDefinition itemNetherQuartzSword; - - public AEItemDefinition itemNetherQuartzWrench; - - public AEItemDefinition itemNetherQuartzKnife; - - public AEItemDefinition itemEntropyManipulator; - - public AEItemDefinition itemWirelessTerminal; - - public AEItemDefinition itemBiometricCard; - - public AEItemDefinition itemChargedStaff; - - public AEItemDefinition itemMassCannon; - - public AEItemDefinition itemMemoryCard; - - public AEItemDefinition itemNetworkTool; - - public AEItemDefinition itemPortableCell; - - public AEItemDefinition itemCellCreative; - - public AEItemDefinition itemViewCell; - - public AEItemDefinition itemCell1k; - - public AEItemDefinition itemCell4k; - - public AEItemDefinition itemCell16k; - - public AEItemDefinition itemCell64k; - - public AEItemDefinition itemSpatialCell2; - - public AEItemDefinition itemSpatialCell16; - - public AEItemDefinition itemSpatialCell128; - - public AEItemDefinition itemFacade; - - public AEItemDefinition itemCrystalSeed; - - public AEItemDefinition itemEncodedPattern; - - public AEItemDefinition itemColorApplicator; - - public AEColoredItemDefinition itemPaintBall; - - public AEColoredItemDefinition itemLumenPaintBall; -} diff --git a/src/api/java/appeng/api/definitions/Materials.java b/src/api/java/appeng/api/definitions/Materials.java deleted file mode 100644 index 88696474..00000000 --- a/src/api/java/appeng/api/definitions/Materials.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -import appeng.api.util.AEItemDefinition; - - -/** - * @deprecated use {@link IMaterials} - */ -@Deprecated -public class Materials -{ - public AEItemDefinition materialCell2SpatialPart; - - public AEItemDefinition materialCell16SpatialPart; - - public AEItemDefinition materialCell128SpatialPart; - - public AEItemDefinition materialSilicon; - - public AEItemDefinition materialSkyDust; - - public AEItemDefinition materialCalcProcessorPress; - - public AEItemDefinition materialEngProcessorPress; - - public AEItemDefinition materialLogicProcessorPress; - - public AEItemDefinition materialCalcProcessorPrint; - - public AEItemDefinition materialEngProcessorPrint; - - public AEItemDefinition materialLogicProcessorPrint; - - public AEItemDefinition materialSiliconPress; - - public AEItemDefinition materialSiliconPrint; - - public AEItemDefinition materialNamePress; - - public AEItemDefinition materialLogicProcessor; - - public AEItemDefinition materialCalcProcessor; - - public AEItemDefinition materialEngProcessor; - - public AEItemDefinition materialBasicCard; - - public AEItemDefinition materialAdvCard; - - public AEItemDefinition materialPurifiedCertusQuartzCrystal; - - public AEItemDefinition materialPurifiedNetherQuartzCrystal; - - public AEItemDefinition materialPurifiedFluixCrystal; - - public AEItemDefinition materialCell1kPart; - - public AEItemDefinition materialCell4kPart; - - public AEItemDefinition materialCell16kPart; - - public AEItemDefinition materialCell64kPart; - - public AEItemDefinition materialEmptyStorageCell; - - public AEItemDefinition materialCardRedstone; - - public AEItemDefinition materialCardSpeed; - - public AEItemDefinition materialCardCapacity; - - public AEItemDefinition materialCardFuzzy; - - public AEItemDefinition materialCardInverter; - - public AEItemDefinition materialCardCrafting; - - public AEItemDefinition materialEnderDust; - - public AEItemDefinition materialFlour; - - public AEItemDefinition materialGoldDust; - - public AEItemDefinition materialIronDust; - - public AEItemDefinition materialFluixDust; - - public AEItemDefinition materialCertusQuartzDust; - - public AEItemDefinition materialNetherQuartzDust; - - public AEItemDefinition materialMatterBall; - - public AEItemDefinition materialIronNugget; - - public AEItemDefinition materialCertusQuartzCrystal; - - public AEItemDefinition materialCertusQuartzCrystalCharged; - - public AEItemDefinition materialFluixCrystal; - - public AEItemDefinition materialFluixPearl; - - public AEItemDefinition materialWoodenGear; - - public AEItemDefinition materialWireless; - - public AEItemDefinition materialWirelessBooster; - - public AEItemDefinition materialAnnihilationCore; - - public AEItemDefinition materialFormationCore; - - public AEItemDefinition materialSingularity; - - public AEItemDefinition materialQESingularity; - - public AEItemDefinition materialBlankPattern; -} diff --git a/src/api/java/appeng/api/definitions/Parts.java b/src/api/java/appeng/api/definitions/Parts.java deleted file mode 100644 index 1d728a35..00000000 --- a/src/api/java/appeng/api/definitions/Parts.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.definitions; - - -import appeng.api.util.AEColoredItemDefinition; -import appeng.api.util.AEItemDefinition; - - -/** - * @deprecated use {@link IParts} - */ -@Deprecated -public class Parts -{ - public AEColoredItemDefinition partCableSmart; - - public AEColoredItemDefinition partCableCovered; - - public AEColoredItemDefinition partCableGlass; - - public AEColoredItemDefinition partCableDense; - - public AEColoredItemDefinition partLumenCableSmart; - - public AEColoredItemDefinition partLumenCableCovered; - - public AEColoredItemDefinition partLumenCableGlass; - - public AEColoredItemDefinition partLumenCableDense; - - public AEItemDefinition partQuartzFiber; - - public AEItemDefinition partToggleBus; - - public AEItemDefinition partInvertedToggleBus; - - public AEItemDefinition partStorageBus; - - public AEItemDefinition partImportBus; - - public AEItemDefinition partExportBus; - - public AEItemDefinition partInterface; - - public AEItemDefinition partLevelEmitter; - - public AEItemDefinition partAnnihilationPlane; - - public AEItemDefinition partFormationPlane; - - public AEItemDefinition partP2PTunnelME; - - public AEItemDefinition partP2PTunnelRedstone; - - public AEItemDefinition partP2PTunnelItems; - - public AEItemDefinition partP2PTunnelLiquids; - - public AEItemDefinition partP2PTunnelEU; - - public AEItemDefinition partP2PTunnelRF; - - public AEItemDefinition partP2PTunnelLight; - - public AEItemDefinition partCableAnchor; - - public AEItemDefinition partMonitor; - - public AEItemDefinition partSemiDarkMonitor; - - public AEItemDefinition partDarkMonitor; - - public AEItemDefinition partInterfaceTerminal; - - public AEItemDefinition partPatternTerminal; - - public AEItemDefinition partCraftingTerminal; - - public AEItemDefinition partTerminal; - - public AEItemDefinition partStorageMonitor; - - public AEItemDefinition partConversionMonitor; -} diff --git a/src/api/java/appeng/api/events/LocatableEventAnnounce.java b/src/api/java/appeng/api/events/LocatableEventAnnounce.java deleted file mode 100644 index ee4a8c73..00000000 --- a/src/api/java/appeng/api/events/LocatableEventAnnounce.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.events; - - -import cpw.mods.fml.common.eventhandler.Event; - -import appeng.api.features.ILocatable; - - -/** - * Input Event: - * - * Used to Notify the Location Registry of objects, and their availability. - */ -public class LocatableEventAnnounce extends Event -{ - - public final ILocatable target; - public final LocatableEvent change; - - public LocatableEventAnnounce( ILocatable o, LocatableEvent ev ) - { - this.target = o; - this.change = ev; - } - - public enum LocatableEvent - { - Register, // Adds the locatable to the registry - Unregister // Removes the locatable from the registry - } -} diff --git a/src/api/java/appeng/api/exceptions/AppEngException.java b/src/api/java/appeng/api/exceptions/AppEngException.java deleted file mode 100644 index 9734437f..00000000 --- a/src/api/java/appeng/api/exceptions/AppEngException.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.exceptions; - - -public class AppEngException extends Exception -{ - - private static final long serialVersionUID = -9051434206368465494L; - - public AppEngException( String t ) - { - super( t ); - } -} diff --git a/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java b/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java deleted file mode 100644 index a952bdc1..00000000 --- a/src/api/java/appeng/api/exceptions/CoreInaccessibleException.java +++ /dev/null @@ -1,10 +0,0 @@ -package appeng.api.exceptions; - - -public class CoreInaccessibleException extends RuntimeException -{ - public CoreInaccessibleException( String message ) - { - super( message ); - } -} diff --git a/src/api/java/appeng/api/exceptions/FailedConnection.java b/src/api/java/appeng/api/exceptions/FailedConnection.java deleted file mode 100644 index 086cea5a..00000000 --- a/src/api/java/appeng/api/exceptions/FailedConnection.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.exceptions; - - -public class FailedConnection extends Exception -{ - - private static final long serialVersionUID = -2544208090248293753L; - - public FailedConnection() - { - } -} diff --git a/src/api/java/appeng/api/exceptions/MissingDefinition.java b/src/api/java/appeng/api/exceptions/MissingDefinition.java deleted file mode 100644 index 09e05373..00000000 --- a/src/api/java/appeng/api/exceptions/MissingDefinition.java +++ /dev/null @@ -1,10 +0,0 @@ -package appeng.api.exceptions; - - -public class MissingDefinition extends RuntimeException -{ - public MissingDefinition( String message ) - { - super( message ); - } -} diff --git a/src/api/java/appeng/api/exceptions/MissingIngredientError.java b/src/api/java/appeng/api/exceptions/MissingIngredientError.java deleted file mode 100644 index 842747a0..00000000 --- a/src/api/java/appeng/api/exceptions/MissingIngredientError.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.exceptions; - - -public class MissingIngredientError extends Exception -{ - - private static final long serialVersionUID = -998858343831371697L; - - public MissingIngredientError( String n ) - { - super( n ); - } -} diff --git a/src/api/java/appeng/api/exceptions/ModNotInstalled.java b/src/api/java/appeng/api/exceptions/ModNotInstalled.java deleted file mode 100644 index 6f7bfa9b..00000000 --- a/src/api/java/appeng/api/exceptions/ModNotInstalled.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.exceptions; - - -public class ModNotInstalled extends Exception -{ - - private static final long serialVersionUID = -9052435206368425494L; - - public ModNotInstalled( String t ) - { - super( t ); - } -} diff --git a/src/api/java/appeng/api/exceptions/RecipeError.java b/src/api/java/appeng/api/exceptions/RecipeError.java deleted file mode 100644 index 1973f348..00000000 --- a/src/api/java/appeng/api/exceptions/RecipeError.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.exceptions; - - -public class RecipeError extends Exception -{ - - private static final long serialVersionUID = -6602870588617670262L; - - public RecipeError( String n ) - { - super( n ); - } -} diff --git a/src/api/java/appeng/api/exceptions/RegistrationError.java b/src/api/java/appeng/api/exceptions/RegistrationError.java deleted file mode 100644 index f3d2bdd0..00000000 --- a/src/api/java/appeng/api/exceptions/RegistrationError.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.exceptions; - - -public class RegistrationError extends Exception -{ - - private static final long serialVersionUID = -6602870588617670263L; - - public RegistrationError( String n ) - { - super( n ); - } -} diff --git a/src/api/java/appeng/api/features/IGrinderEntry.java b/src/api/java/appeng/api/features/IGrinderEntry.java deleted file mode 100644 index 1667f12c..00000000 --- a/src/api/java/appeng/api/features/IGrinderEntry.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.item.ItemStack; - - -/** - * Registration Records for {@link IGrinderRegistry} - */ -public interface IGrinderEntry -{ - - /** - * the current input - * - * @return input that the grinder will accept. - */ - ItemStack getInput(); - - /** - * lets you change the grinder recipe by changing its input. - * - * @param input input item - */ - void setInput( ItemStack input ); - - /** - * gets the current output - * - * @return output that the grinder will produce - */ - ItemStack getOutput(); - - /** - * allows you to change the output. - * - * @param output output item - */ - void setOutput( ItemStack output ); - - /** - * gets the current output - * - * @return output that the grinder will produce - */ - ItemStack getOptionalOutput(); - - /** - * gets the current output - * - * @return output that the grinder will produce - */ - ItemStack getSecondOptionalOutput(); - - /** - * stack, and 0.0-1.0 chance that it will be generated. - * - * @param output output item - * @param chance generation chance - */ - void setOptionalOutput( ItemStack output, float chance ); - - /** - * 0.0 - 1.0 the chance that the optional output will be generated. - * - * @return chance of optional output - */ - float getOptionalChance(); - - /** - * stack, and 0.0-1.0 chance that it will be generated. - * - * @param output second optional output item - * @param chance second optional output chance - */ - void setSecondOptionalOutput( ItemStack output, float chance ); - - /** - * 0.0 - 1.0 the chance that the optional output will be generated. - * - * @return second optional output chance - */ - float getSecondOptionalChance(); - - /** - * Energy cost, in turns. - * - * @return number of turns it takes to produce the output from the input. - */ - int getEnergyCost(); - - /** - * Allows you to adjust the number of turns - * - * @param c number of turns to produce output. - */ - void setEnergyCost( int c ); -} diff --git a/src/api/java/appeng/api/features/IGrinderRegistry.java b/src/api/java/appeng/api/features/IGrinderRegistry.java deleted file mode 100644 index 4076df43..00000000 --- a/src/api/java/appeng/api/features/IGrinderRegistry.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import java.util.List; - -import net.minecraft.item.ItemStack; - - -/** - * Lets you manipulate Grinder Recipes, by adding or editing existing ones. - */ -public interface IGrinderRegistry -{ - - /** - * Current list of registered recipes, you can modify this if you want too. - * - * @return currentlyRegisteredRecipes - */ - List getRecipes(); - - /** - * add a new recipe the easy way, in → out, how many turns., duplicates will not be added. - * - * @param in input - * @param out output - * @param turns amount of turns to turn the input into the output - */ - void addRecipe( ItemStack in, ItemStack out, int turns ); - - /** - * add a new recipe with optional outputs, duplicates will not be added. - * - * @param in input - * @param out output - * @param optional optional output - * @param chance chance to get the optional output within 0.0 - 1.0 - * @param turns amount of turns to turn the input into the outputs - */ - void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, int turns ); - - /** - * add a new recipe with optional outputs, duplicates will not be added. - * - * @param in input - * @param out output - * @param optional optional output - * @param chance chance to get the optional output within 0.0 - 1.0 - * @param optional2 second optional output - * @param chance2 chance to get the second optional output within 0.0 - 1.0 - * @param turns amount of turns to turn the input into the outputs - */ - void addRecipe( ItemStack in, ItemStack out, ItemStack optional, float chance, ItemStack optional2, float chance2, int turns ); - - /** - * Searches for a recipe for a given input, and returns it. - * - * @param input input - * - * @return identified recipe or null - */ - IGrinderEntry getRecipeForInput( ItemStack input ); -} diff --git a/src/api/java/appeng/api/features/IInscriberRecipe.java b/src/api/java/appeng/api/features/IInscriberRecipe.java deleted file mode 100644 index 04c8161e..00000000 --- a/src/api/java/appeng/api/features/IInscriberRecipe.java +++ /dev/null @@ -1,65 +0,0 @@ -package appeng.api.features; - - -import java.util.List; -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; - -import com.google.common.base.Optional; - - -/** - * Registration Records for {@link IInscriberRegistry} - * - * You have to pay attention though, that recipes are not mirrored, - * where the top and bottom slots are switching places. - * - * This is applied on runtime. - * - * @author thatsIch - * @version rv2 - * @since rv2 - */ -public interface IInscriberRecipe -{ - /** - * the current inputs - * - * @return inputs the inscriber will accept - */ - @Nonnull - List getInputs(); - - /** - * gets the current output - * - * @return output that the recipe will produce - */ - @Nonnull - ItemStack getOutput(); - - /** - * gets the top optional - * - * @return item which is used top - */ - @Nonnull - Optional getTopOptional(); - - /** - * gets the bottom optional - * - * @return item which is used bottom - */ - @Nonnull - Optional getBottomOptional(); - - /** - * type of inscriber process - * - * @return type of process the inscriber is doing - */ - @Nonnull - InscriberProcessType getProcessType(); -} diff --git a/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java b/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java deleted file mode 100644 index 43c3fa3e..00000000 --- a/src/api/java/appeng/api/features/IInscriberRecipeBuilder.java +++ /dev/null @@ -1,88 +0,0 @@ -package appeng.api.features; - - -import java.util.Collection; -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; - - -/** - * Builder for an inscriber recipe - * - * @author thatsIch - * @version rv2 - * @since rv2 - */ -public interface IInscriberRecipeBuilder -{ - /** - * Creates an inscriber recipe with inputs. - * Needs to be invoked. - * - * @param inputs new inputs for the recipe - * - * @return currently used builder - */ - @Nonnull - IInscriberRecipeBuilder withInputs( @Nonnull Collection inputs ); - - /** - * Creates an inscriber recipe with output. - * Needs to be invoked. - * - * @param output new output for the recipe - * - * @return currently used builder - */ - @Nonnull - IInscriberRecipeBuilder withOutput( @Nonnull ItemStack output ); - - /** - * Creates an inscriber recipe with top. - * Either this or bot needs to be invoked. - * - * @param topOptional new top for the recipe - * - * @return currently used builder - */ - @Nonnull - IInscriberRecipeBuilder withTopOptional( @Nonnull ItemStack topOptional ); - - /** - * Creates an inscriber recipe with bot. - * Either this or top needs to be invoked. - * - * @param bottomOptional new bot for the recipe - * - * @return currently used builder - */ - @Nonnull - IInscriberRecipeBuilder withBottomOptional( @Nonnull ItemStack bottomOptional ); - - /** - * Creates an inscriber recipe with type. - * Needs to be invoked. - * - * @param type new type for the recipe - * - * @return currently used builder - */ - @Nonnull - IInscriberRecipeBuilder withProcessType( @Nonnull InscriberProcessType type ); - - /** - * Finalizes the process of making the recipe. - * Needs to be invoked to fetch inscriber recipe. - * - * @return legal inscriber recipe - * - * @throws IllegalStateException when input is not defined - * @throws IllegalStateException when input has no size - * @throws IllegalStateException when output is not defined - * @throws IllegalStateException when both optionals are not defined - * @throws IllegalStateException when process type is not defined - */ - @Nonnull - IInscriberRecipe build(); -} diff --git a/src/api/java/appeng/api/features/IInscriberRegistry.java b/src/api/java/appeng/api/features/IInscriberRegistry.java deleted file mode 100644 index 0d535e78..00000000 --- a/src/api/java/appeng/api/features/IInscriberRegistry.java +++ /dev/null @@ -1,69 +0,0 @@ -package appeng.api.features; - - -import java.util.List; -import java.util.Set; -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; - - -/** - * Lets you manipulate Inscriber Recipes, by adding or editing existing ones. - * - * @author thatsIch - * @version rv2 - * @since rv2 - */ -public interface IInscriberRegistry -{ - /** - * Current list of registered recipes, you can modify this if you want too. - * Will never contain a null recipe - * - * @return currentlyRegisteredRecipes - */ - @Nonnull - List getRecipes(); - - /** - * Optional items which are used in the top or bottom slot - * - * @return set of all optional items - */ - @Nonnull - Set getOptionals(); - - /** - * Get all registered items which are valid inputs - * - * @return set of all input items - */ - @Nonnull - Set getInputs(); - - /** - * Extensible way to create an inscriber recipe - * - * @return builder for inscriber recipes - */ - @Nonnull - IInscriberRecipeBuilder builder(); - - /** - * add a new recipe the easy way, duplicates will not be added. - * Added recipes will be automatically added to the optionals and inputs. - * - * @param recipe new recipe - * - * @throws IllegalArgumentException if null is added - */ - void addRecipe( IInscriberRecipe recipe ); - - /** - * Removes a recipe from the registry - * - * @param toBeRemovedRecipe to be removed recipe, can be null, makes just no sense - */ - void removeRecipe( IInscriberRecipe toBeRemovedRecipe ); -} diff --git a/src/api/java/appeng/api/features/IItemComparison.java b/src/api/java/appeng/api/features/IItemComparison.java deleted file mode 100644 index b7d2b982..00000000 --- a/src/api/java/appeng/api/features/IItemComparison.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -public interface IItemComparison -{ - boolean sameAsPrecise( IItemComparison comp ); - - boolean sameAsFuzzy( IItemComparison comp ); -} diff --git a/src/api/java/appeng/api/features/IItemComparisonProvider.java b/src/api/java/appeng/api/features/IItemComparisonProvider.java deleted file mode 100644 index c432c0ba..00000000 --- a/src/api/java/appeng/api/features/IItemComparisonProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.item.ItemStack; - - -/** - * Provider for special comparisons. when an item is encountered AE Will request - * if the comparison function handles the item, by trying to request a - * IItemComparison class. - */ -public interface IItemComparisonProvider -{ - - /** - * should return a new IItemComparison, or return null if it doesn't handle - * the supplied item. - * - * @param is item - * - * @return IItemComparison, or null - */ - IItemComparison getComparison( ItemStack is ); - - /** - * Simple test for support ( AE generally skips this and calls the above function. ) - * - * @param stack item - * - * @return true, if getComparison will return a valid IItemComparison Object - */ - boolean canHandle( ItemStack stack ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/features/ILocatable.java b/src/api/java/appeng/api/features/ILocatable.java deleted file mode 100644 index c64a937f..00000000 --- a/src/api/java/appeng/api/features/ILocatable.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import appeng.api.events.LocatableEventAnnounce; - - -/** - * A registration record for the {@link ILocatableRegistry} use the {@link LocatableEventAnnounce} event on the Forge - * Event bus to update the registry. - */ -public interface ILocatable -{ - - /** - * @return the serial for a locatable object - */ - long getLocatableSerial(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/features/ILocatableRegistry.java b/src/api/java/appeng/api/features/ILocatableRegistry.java deleted file mode 100644 index 6c9d6225..00000000 --- a/src/api/java/appeng/api/features/ILocatableRegistry.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -/** - * A Registry for locatable items, works based on serial numbers. - */ -public interface ILocatableRegistry -{ - /** - * Attempts to find the object with the serial specified, if it can it - * returns the object. - * - * @param serial serial - * - * @return requestedObject, or null - * - * @deprecated use {@link ILocatableRegistry#getLocatableBy(long)} - */ - @Deprecated - Object findLocatableBySerial( long serial ); - - /** - * Gets the {@link ILocatable} with the registered serial, if available - * - * @param serial serial - * - * @return requestedObject, or null, if the object does not exist anymore - */ - ILocatable getLocatableBy( long serial ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java b/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java deleted file mode 100644 index 47a48e81..00000000 --- a/src/api/java/appeng/api/features/IMatterCannonAmmoRegistry.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.item.ItemStack; - - -public interface IMatterCannonAmmoRegistry -{ - - /** - * register a new ammo, generally speaking this is based off of atomic weight to make it easier to guess at - * - * @param ammo new ammo - * @param weight atomic weight - */ - void registerAmmo( ItemStack ammo, double weight ); - - /** - * get the penetration value for a particular ammo, 0 indicates a non-ammo. - * - * @param is ammo - * - * @return 0 or a valid penetration value. - */ - float getPenetration( ItemStack is ); -} diff --git a/src/api/java/appeng/api/features/INetworkEncodable.java b/src/api/java/appeng/api/features/INetworkEncodable.java deleted file mode 100644 index b9aa8bea..00000000 --- a/src/api/java/appeng/api/features/INetworkEncodable.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.item.ItemStack; - - -public interface INetworkEncodable -{ - - /** - * Used to get the current key from the item. - * - * @param item item - * - * @return string key of item - */ - String getEncryptionKey( ItemStack item ); - - /** - * Encode the wireless frequency via the Controller. - * - * @param item the wireless terminal. - * @param encKey the wireless encryption key. - * @param name null for now. - */ - void setEncryptionKey( ItemStack item, String encKey, String name ); -} diff --git a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java b/src/api/java/appeng/api/features/IP2PTunnelRegistry.java deleted file mode 100644 index 69e474cd..00000000 --- a/src/api/java/appeng/api/features/IP2PTunnelRegistry.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.item.ItemStack; - -import appeng.api.config.TunnelType; - - -/** - * A Registry for how p2p Tunnels are attuned - */ -public interface IP2PTunnelRegistry -{ - - /** - * Allows third parties to register items from their mod as potential - * attunements for AE's P2P Tunnels - * - * @param trigger - the item which triggers attunement - * @param type - the type of tunnel - */ - void addNewAttunement( ItemStack trigger, TunnelType type ); - - /** - * returns null if no attunement can be found. - * - * @param trigger attunement trigger - * - * @return null if no attunement can be found or attunement - */ - TunnelType getTunnelTypeByItem( ItemStack trigger ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/features/IPlayerRegistry.java b/src/api/java/appeng/api/features/IPlayerRegistry.java deleted file mode 100644 index 54cbc8f5..00000000 --- a/src/api/java/appeng/api/features/IPlayerRegistry.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.entity.player.EntityPlayer; - -import com.mojang.authlib.GameProfile; - - -/** - * Maintains a save specific list of userids and username combinations this greatly simplifies storage internally and - * gives a common place to look up and get IDs for the security framework. - */ -public interface IPlayerRegistry -{ - - /** - * @param gameProfile user game profile - * - * @return user id of a username. - */ - int getID( GameProfile gameProfile ); - - /** - * @param player player - * - * @return user id of a player entity. - */ - int getID( EntityPlayer player ); - - /** - * @param playerID to be found player id - * - * @return PlayerEntity, or null if the player could not be found. - */ - EntityPlayer findPlayer( int playerID ); -} diff --git a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java b/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java deleted file mode 100644 index ef50b809..00000000 --- a/src/api/java/appeng/api/features/IRecipeHandlerRegistry.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import appeng.api.recipes.ICraftHandler; -import appeng.api.recipes.IRecipeHandler; -import appeng.api.recipes.ISubItemResolver; - - -public interface IRecipeHandlerRegistry -{ - - /** - * Add a new Recipe Handler to the parser. - * - * MUST BE CALLED IN PRE-INIT - * - * @param name name of crafthandler - * @param handler class of crafthandler - */ - void addNewCraftHandler( String name, Class handler ); - - /** - * Add a new resolver to the parser. - * - * MUST BE CALLED IN PRE-INIT - * - * @param sir sub item resolver - */ - void addNewSubItemResolver( ISubItemResolver sir ); - - /** - * @param name name of crafting handler - * - * @return A recipe handler by name, returns null on failure. - */ - ICraftHandler getCraftHandlerFor( String name ); - - /** - * @return a new recipe handler, which can be used to parse, and read recipe files. - */ - IRecipeHandler createNewRecipehandler(); - - /** - * resolve sub items by name. - * - * @param nameSpace namespace of item - * @param itemName full name of item - * - * @return ResolverResult or ResolverResultSet - */ - Object resolveItem( String nameSpace, String itemName ); -} diff --git a/src/api/java/appeng/api/features/IRegistryContainer.java b/src/api/java/appeng/api/features/IRegistryContainer.java deleted file mode 100644 index 9b3a7e10..00000000 --- a/src/api/java/appeng/api/features/IRegistryContainer.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import appeng.api.movable.IMovableRegistry; -import appeng.api.networking.IGridCacheRegistry; -import appeng.api.storage.ICellRegistry; -import appeng.api.storage.IExternalStorageRegistry; - - -/** - * @author AlgorithmX2 - * @author thatsIch - * @version rv2 - * @since rv0 - */ -public interface IRegistryContainer -{ - - /** - * Use the movable registry to white list your tiles. - */ - IMovableRegistry movable(); - - /** - * Add new Grid Caches for use during run time, only use during loading phase. - */ - IGridCacheRegistry gridCache(); - - /** - * Add additional storage bus handlers to improve interplay with mod blocks that contains special inventories that - * function unlike vanilla chests. AE uses this internally for barrels, DSU's, quantum chests, AE Networks and more. - */ - IExternalStorageRegistry externalStorage(); - - /** - * Add additional special comparison functionality, AE Uses this internally for Bees. - */ - ISpecialComparisonRegistry specialComparison(); - - /** - * Lets you register your items as wireless terminals - */ - IWirelessTermRegistry wireless(); - - /** - * Allows you to register new cell types, these will function in drives - */ - ICellRegistry cell(); - - /** - * Manage grinder recipes via API - */ - IGrinderRegistry grinder(); - - /** - * Manage inscriber recipes via API - */ - IInscriberRegistry inscriber(); - - /** - * get access to the locatable registry - */ - ILocatableRegistry locatable(); - - /** - * get access to the p2p tunnel registry. - */ - IP2PTunnelRegistry p2pTunnel(); - - /** - * get access to the ammo registry. - */ - IMatterCannonAmmoRegistry matterCannon(); - - /** - * get access to the player registry - */ - IPlayerRegistry players(); - - /** - * get access to the ae2 recipe api - */ - IRecipeHandlerRegistry recipes(); - - /** - * get access to the world-gen api. - */ - IWorldGen worldgen(); -} diff --git a/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java b/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java deleted file mode 100644 index c55bf175..00000000 --- a/src/api/java/appeng/api/features/ISpecialComparisonRegistry.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.item.ItemStack; - - -/** - * A Registry of any special comparison handlers for AE To use. - */ -public interface ISpecialComparisonRegistry -{ - - /** - * return TheHandler or null. - * - * @param stack item - * - * @return a handler it found for a specific item - */ - IItemComparison getSpecialComparison( ItemStack stack ); - - /** - * Register a new special comparison function with AE. - * - * @param prov comparison provider - */ - void addComparisonProvider( IItemComparisonProvider prov ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/features/IWirelessTermHandler.java b/src/api/java/appeng/api/features/IWirelessTermHandler.java deleted file mode 100644 index eebfceda..00000000 --- a/src/api/java/appeng/api/features/IWirelessTermHandler.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import appeng.api.util.IConfigManager; - - -/** - * A handler for a wireless terminal. - */ -public interface IWirelessTermHandler extends INetworkEncodable -{ - - /** - * @param is wireless terminal - * - * @return true, if usePower, hasPower, etc... can be called for the provided item - */ - boolean canHandle( ItemStack is ); - - /** - * use an amount of power, in AE units - * - * @param amount is in AE units ( 5 per MJ ), if you return false, the item should be dead and return false for - * hasPower - * @param is wireless terminal - * - * @return true if wireless terminal uses power - */ - boolean usePower( EntityPlayer player, double amount, ItemStack is ); - - /** - * gets the power status of the item. - * - * @param is wireless terminal - * - * @return returns true if there is any power left. - */ - boolean hasPower( EntityPlayer player, double amount, ItemStack is ); - - /** - * Return the config manager for the wireless terminal. - * - * @param is wireless terminal - * - * @return config manager of wireless terminal - */ - IConfigManager getConfigManager( ItemStack is ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/features/IWirelessTermRegistry.java b/src/api/java/appeng/api/features/IWirelessTermRegistry.java deleted file mode 100644 index afab1201..00000000 --- a/src/api/java/appeng/api/features/IWirelessTermRegistry.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - - -/** - * Registration record for a Custom Cell handler. - */ -public interface IWirelessTermRegistry -{ - - /** - * add this handler to the list of other wireless handler. - * - * @param handler wireless handler - */ - void registerWirelessHandler( IWirelessTermHandler handler ); - - /** - * @param is item which might have a handler - * - * @return true if there is a handler for this item - */ - boolean isWirelessTerminal( ItemStack is ); - - /** - * @param is item with handler - * - * @return a register handler for the item in question, or null if there - * isn't one - */ - IWirelessTermHandler getWirelessTerminalHandler( ItemStack is ); - - /** - * opens the wireless terminal gui, the wireless terminal item, must be in - * the active slot on the tool bar. - */ - void openWirelessTerminalGui( ItemStack item, World w, EntityPlayer player ); -} diff --git a/src/api/java/appeng/api/features/IWorldGen.java b/src/api/java/appeng/api/features/IWorldGen.java deleted file mode 100644 index 8e5a9c73..00000000 --- a/src/api/java/appeng/api/features/IWorldGen.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.features; - - -import net.minecraft.world.World; -import net.minecraft.world.WorldProvider; - - -public interface IWorldGen -{ - - void disableWorldGenForProviderID( WorldGenType type, Class provider ); - - void enableWorldGenForDimension( WorldGenType type, int dimID ); - - void disableWorldGenForDimension( WorldGenType type, int dimID ); - - boolean isWorldGenEnabled( WorldGenType type, World w ); - - enum WorldGenType - { - CertusQuartz, ChargedCertusQuartz, Meteorites - } -} diff --git a/src/api/java/appeng/api/features/InscriberProcessType.java b/src/api/java/appeng/api/features/InscriberProcessType.java deleted file mode 100644 index 70aaa9f7..00000000 --- a/src/api/java/appeng/api/features/InscriberProcessType.java +++ /dev/null @@ -1,15 +0,0 @@ -package appeng.api.features; - - -public enum InscriberProcessType -{ - /** - * uses the optionals as catalyst - */ - Inscribe, - - /** - * spends the optionals - */ - Press -} diff --git a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java b/src/api/java/appeng/api/implementations/ICraftingPatternItem.java deleted file mode 100644 index 6524f6cc..00000000 --- a/src/api/java/appeng/api/implementations/ICraftingPatternItem.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations; - - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import appeng.api.networking.crafting.ICraftingPatternDetails; - - -/** - * Implemented on {@link Item} - */ -public interface ICraftingPatternItem -{ - - /** - * Access Details about a pattern - * - * @param is pattern - * @param w crafting world - * - * @return details of pattern - */ - ICraftingPatternDetails getPatternForItem( ItemStack is, World w ); -} diff --git a/src/api/java/appeng/api/implementations/IPowerChannelState.java b/src/api/java/appeng/api/implementations/IPowerChannelState.java deleted file mode 100644 index ee558792..00000000 --- a/src/api/java/appeng/api/implementations/IPowerChannelState.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations; - - -/** - * This is intended for use on the client side to provide details to WAILA. - */ -public interface IPowerChannelState -{ - - /** - * @return true if the part/tile is powered. - */ - boolean isPowered(); - - /** - * @return true if the part/tile isActive - */ - boolean isActive(); -} diff --git a/src/api/java/appeng/api/implementations/IUpgradeableHost.java b/src/api/java/appeng/api/implementations/IUpgradeableHost.java deleted file mode 100644 index bbc728e1..00000000 --- a/src/api/java/appeng/api/implementations/IUpgradeableHost.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations; - - -import net.minecraft.tileentity.TileEntity; - -import appeng.api.config.Upgrades; -import appeng.api.implementations.tiles.ISegmentedInventory; -import appeng.api.util.IConfigurableObject; - - -public interface IUpgradeableHost extends IConfigurableObject, ISegmentedInventory -{ - - /** - * determine how many of an upgrade are installed. - */ - int getInstalledUpgrades( Upgrades u ); - - /** - * the tile... - * - * @return tile entity - */ - TileEntity getTile(); -} diff --git a/src/api/java/appeng/api/implementations/TransitionResult.java b/src/api/java/appeng/api/implementations/TransitionResult.java deleted file mode 100644 index e9896874..00000000 --- a/src/api/java/appeng/api/implementations/TransitionResult.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations; - - -/** - * Defines the result of performing a transition from the world into a storage - * cell, if its possible, and what the energy usage is. - */ -public class TransitionResult -{ - public final boolean success; - public final double energyUsage; - - public TransitionResult( boolean _success, double power ) - { - this.success = _success; - this.energyUsage = power; - } -} diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java deleted file mode 100644 index 269eea2a..00000000 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItem.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.guiobjects; - - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - - -/** - * Implemented on Item objects, to return objects used to manage, and interact - * with the contents. - */ -public interface IGuiItem -{ - - IGuiItemObject getGuiObject( ItemStack is, World world, int x, int y, int z ); -} diff --git a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java b/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java deleted file mode 100644 index 34218739..00000000 --- a/src/api/java/appeng/api/implementations/guiobjects/IGuiItemObject.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.guiobjects; - - -import net.minecraft.item.ItemStack; - - -public interface IGuiItemObject -{ - - ItemStack getItemStack(); -} diff --git a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java b/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java deleted file mode 100644 index 4e0dc958..00000000 --- a/src/api/java/appeng/api/implementations/guiobjects/INetworkTool.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.guiobjects; - - -import net.minecraft.inventory.IInventory; - -import appeng.api.networking.IGridHost; - - -/** - * Obtained via {@link IGuiItem} getGuiObject - */ -public interface INetworkTool extends IInventory, IGuiItemObject -{ - - IGridHost getGridHost(); // null for most purposes. -} diff --git a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java b/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java deleted file mode 100644 index 7a80a00b..00000000 --- a/src/api/java/appeng/api/implementations/guiobjects/IPortableCell.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.guiobjects; - - -import appeng.api.networking.energy.IEnergySource; -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; - - -/** - * Obtained via {@link IGuiItem} getGuiObject - */ -public interface IPortableCell extends ITerminalHost, IMEMonitor, IEnergySource, IGuiItemObject -{ - -} diff --git a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java b/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java deleted file mode 100644 index 0ca4ff49..00000000 --- a/src/api/java/appeng/api/implementations/items/IAEItemPowerStorage.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.item.ItemStack; - -import appeng.api.config.AccessRestriction; -import appeng.api.networking.energy.IAEPowerStorage; - - -/** - * Basically the same as {@link IAEPowerStorage}, but for items. - */ -public interface IAEItemPowerStorage -{ - - /** - * Inject amt, power into the device, it will store what it can, and return - * the amount unable to be stored. - * - * @return amount unable to be stored - */ - double injectAEPower( ItemStack is, double amt ); - - /** - * Attempt to extract power from the device, it will extract what it can and - * return it. - * - * @param amt to be extracted power from device - * - * @return what it could extract - */ - double extractAEPower( ItemStack is, double amt ); - - /** - * @return the current maximum power ( this can change :P ) - */ - double getAEMaxPower( ItemStack is ); - - /** - * @return the current AE Power Level, this may exceed getMEMaxPower() - */ - double getAECurrentPower( ItemStack is ); - - /** - * Control the power flow by telling what the network can do, either add? or - * subtract? or both! - * - * @return access restriction of network - */ - AccessRestriction getPowerFlow( ItemStack is ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/implementations/items/IAEWrench.java b/src/api/java/appeng/api/implementations/items/IAEWrench.java deleted file mode 100644 index 27ad96d2..00000000 --- a/src/api/java/appeng/api/implementations/items/IAEWrench.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - - -/** - * Implemented on AE's wrench(s) as a substitute for if BC's API is not - * available. - */ -public interface IAEWrench -{ - - /** - * Check if the wrench can be used. - * - * @param player wrenching player - * @param x x pos of wrenched block - * @param y y pos of wrenched block - * @param z z pos of wrenched block - * - * @return true if wrench can be used - */ - boolean canWrench( ItemStack wrench, EntityPlayer player, int x, int y, int z ); -} diff --git a/src/api/java/appeng/api/implementations/items/IBiometricCard.java b/src/api/java/appeng/api/implementations/items/IBiometricCard.java deleted file mode 100644 index c37f6d0c..00000000 --- a/src/api/java/appeng/api/implementations/items/IBiometricCard.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import java.util.EnumSet; - -import net.minecraft.item.ItemStack; - -import com.mojang.authlib.GameProfile; - -import appeng.api.config.SecurityPermissions; -import appeng.api.features.IPlayerRegistry; -import appeng.api.networking.security.ISecurityRegistry; - - -public interface IBiometricCard -{ - - /** - * Set the {@link GameProfile} to null, to clear it. - */ - void setProfile( ItemStack itemStack, GameProfile username ); - - /** - * @return {@link GameProfile} of the player encoded on this card, or a blank string. - */ - GameProfile getProfile( ItemStack is ); - - /** - * @param itemStack card - * - * @return the full list of permissions encoded on the card. - */ - EnumSet getPermissions( ItemStack itemStack ); - - /** - * Check if a permission is encoded on the card. - * - * @param permission card - * - * @return true if this permission is set on the card. - */ - boolean hasPermission( ItemStack is, SecurityPermissions permission ); - - /** - * remove a permission from the item stack. - * - * @param itemStack card - * @param permission to be removed permission - */ - void removePermission( ItemStack itemStack, SecurityPermissions permission ); - - /** - * add a permission to the item stack. - * - * @param itemStack card - * @param permission to be added permission - */ - void addPermission( ItemStack itemStack, SecurityPermissions permission ); - - /** - * lets you handle submission of security values on the card for custom behavior. - * - * @param registry security registry - * @param pr player registry - * @param is card - */ - void registerPermissions( ISecurityRegistry registry, IPlayerRegistry pr, ItemStack is ); -} diff --git a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java b/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java deleted file mode 100644 index 489e2b89..00000000 --- a/src/api/java/appeng/api/implementations/items/IGrowableCrystal.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.item.ItemStack; - - -public interface IGrowableCrystal -{ - - ItemStack triggerGrowth( ItemStack is ); - - float getMultiplier( Block blk, Material mat ); -} diff --git a/src/api/java/appeng/api/implementations/items/IItemGroup.java b/src/api/java/appeng/api/implementations/items/IItemGroup.java deleted file mode 100644 index 3d3f8cc0..00000000 --- a/src/api/java/appeng/api/implementations/items/IItemGroup.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import java.util.Set; - -import net.minecraft.item.ItemStack; - - -/** - * Lets you specify the name of the group of items this falls under. - */ -public interface IItemGroup -{ - - /** - * returning null, is the same as not implementing the interface at all. - * - * @param is item - * - * @return an unlocalized string to use for the items group name. - */ - String getUnlocalizedGroupName( Set otherItems, ItemStack is ); -} diff --git a/src/api/java/appeng/api/implementations/items/IMemoryCard.java b/src/api/java/appeng/api/implementations/items/IMemoryCard.java deleted file mode 100644 index 587e005f..00000000 --- a/src/api/java/appeng/api/implementations/items/IMemoryCard.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - - -/** - * Memory Card API - * - * AE's Memory Card Item Class implements this interface. - */ -public interface IMemoryCard -{ - - /** - * Configures the data stored on the memory card, the SettingsName, will be - * localized when displayed. - * - * @param is item - * @param SettingsName unlocalized string that represents the tile entity. - * @param data may contain a String called "tooltip" which is is a - * unlocalized string displayed after the settings name, optional - * but can be used to add details to the card for later. - */ - void setMemoryCardContents( ItemStack is, String SettingsName, NBTTagCompound data ); - - /** - * returns the settings name provided by a previous call to - * setMemoryCardContents, or "AppEng.GuiITooltip.Blank" if there was no - * previous call to setMemoryCardContents. - * - * @param is item - * - * @return setting name - */ - String getSettingsName( ItemStack is ); - - /** - * @param is item - * - * @return the NBT Data previously saved by setMemoryCardContents, or an - * empty NBTCompound - */ - NBTTagCompound getData( ItemStack is ); - - /** - * notify the user of a outcome related to the memory card. - * - * @param player that used the card. - * @param msg which message to send. - */ - void notifyUser( EntityPlayer player, MemoryCardMessages msg ); -} diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java deleted file mode 100644 index 1c0f89bf..00000000 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import appeng.api.implementations.TransitionResult; -import appeng.api.util.WorldCoord; - - -/** - * Implemented on a {@link Item} - */ -public interface ISpatialStorageCell -{ - - /** - * @param is spatial storage cell - * - * @return true if this item is a spatial storage cell - */ - boolean isSpatialStorage( ItemStack is ); - - /** - * @param is spatial storage cell - * - * @return the maximum size of the spatial storage cell along any given axis - */ - int getMaxStoredDim( ItemStack is ); - - /** - * @param is spatial storage cell - * - * @return the world for this cell - */ - World getWorld( ItemStack is ); - - /** - * get the currently stored size. - * - * @param is spatial storage cell - * - * @return size of spatial - */ - WorldCoord getStoredSize( ItemStack is ); - - /** - * Minimum coordinates in its world for the storage cell. - * - * @param is spatial storage cell - * - * @return minimum coordinate of dimension - */ - WorldCoord getMin( ItemStack is ); - - /** - * Maximum coordinates in its world for the storage cell. - * - * @param is spatial storage cell - * - * @return maximum coordinate of dimension - */ - WorldCoord getMax( ItemStack is ); - - /** - * Perform a spatial swap with the contents of the cell, and the world. - * - * @param is spatial storage cell - * @param w world of spatial - * @param min min coord - * @param max max coord - * @param doTransition transition - * - * @return result of transition - */ - TransitionResult doSpatialTransition( ItemStack is, World w, WorldCoord min, WorldCoord max, boolean doTransition ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/implementations/items/IStorageCell.java b/src/api/java/appeng/api/implementations/items/IStorageCell.java deleted file mode 100644 index 814b830a..00000000 --- a/src/api/java/appeng/api/implementations/items/IStorageCell.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.item.ItemStack; - -import appeng.api.storage.ICellWorkbenchItem; -import appeng.api.storage.data.IAEItemStack; - - -/** - * Any item which implements this can be treated as an IMEInventory via - * Util.getCell / Util.isCell It automatically handles the internals and NBT - * data, which is both nice, and bad for you! - * - * Good cause it means you don't have to do anything, bad because you have - * little to no control over it. - * - * The standard AE implementation only provides 1-63 Types - */ -public interface IStorageCell extends ICellWorkbenchItem -{ - - /** - * It wont work if the return is not a multiple of 8. - * The limit is ({@link Integer#MAX_VALUE} + 1) / 8. - * - * @param cellItem item - * - * @return number of bytes - */ - int getBytes( ItemStack cellItem ); - - /** - * Determines the number of bytes used for any type included on the cell. - * - * @param cellItem item - * - * @return number of bytes - * - * @deprecated use {@link IStorageCell#getBytesPerType(ItemStack)} - */ - @Deprecated - int BytePerType( ItemStack cellItem ); - - /** - * Determines the number of bytes used for any type included on the cell. - * - * @param cellItem item - * - * @return number of bytes - */ - int getBytesPerType( ItemStack cellItem ); - - /** - * Must be between 1 and 63, indicates how many types you want to store on - * the item. - * - * @param cellItem item - * - * @return number of types - */ - int getTotalTypes( ItemStack cellItem ); - - /** - * Allows you to fine tune which items are allowed on a given cell, if you - * don't care, just return false; As the handler for this type of cell is - * still the default cells, the normal AE black list is also applied. - * - * @param cellItem item - * @param requestedAddition requested addition - * - * @return true to preventAdditionOfItem - */ - boolean isBlackListed( ItemStack cellItem, IAEItemStack requestedAddition ); - - /** - * Allows you to specify if this storage cell can be stored inside other - * storage cells, only set this for special items like the matter cannon - * that are not general purpose storage. - * - * @return true if the storage cell can be stored inside other storage - * cells, this is generally false, except for certain situations - * such as the matter cannon. - */ - boolean storableInStorageCell(); - - /** - * Allows an item to selectively enable or disable its status as a storage - * cell. - * - * @param i item - * - * @return if the ItemStack should behavior as a storage cell. - */ - boolean isStorageCell( ItemStack i ); - - /** - * @return drain in ae/t this storage cell will use. - */ - double getIdleDrain(); -} diff --git a/src/api/java/appeng/api/implementations/items/IStorageComponent.java b/src/api/java/appeng/api/implementations/items/IStorageComponent.java deleted file mode 100644 index b1958f9f..00000000 --- a/src/api/java/appeng/api/implementations/items/IStorageComponent.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - - -/** - * Implemented on a {@link Item} - */ -public interface IStorageComponent -{ - - /** - * This isn't necessarily the same as if you make a storage cell out of it, - * but all of AE's default cells do it that way, its currently only used for - * the condenser. - * - * @param is item - * - * @return number of bytes - */ - int getBytes( ItemStack is ); - - /** - * Just true or false for the item stack. - * - * @param is item - * - * @return true if item is a storage component - */ - boolean isStorageComponent( ItemStack is ); -} diff --git a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java b/src/api/java/appeng/api/implementations/items/IUpgradeModule.java deleted file mode 100644 index 0b06911e..00000000 --- a/src/api/java/appeng/api/implementations/items/IUpgradeModule.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -import net.minecraft.item.ItemStack; - -import appeng.api.config.Upgrades; - - -public interface IUpgradeModule -{ - - /** - * @param itemstack item with potential upgrades - * - * @return null, or a valid upgrade type. - */ - Upgrades getType( ItemStack itemstack ); -} diff --git a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java b/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java deleted file mode 100644 index 01621314..00000000 --- a/src/api/java/appeng/api/implementations/items/MemoryCardMessages.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.items; - - -/** - * Status Results for use with {@link IMemoryCard} - */ -public enum MemoryCardMessages -{ - INVALID_MACHINE, SETTINGS_LOADED, SETTINGS_SAVED, SETTINGS_CLEARED -} diff --git a/src/api/java/appeng/api/implementations/parts/IPartCable.java b/src/api/java/appeng/api/implementations/parts/IPartCable.java deleted file mode 100644 index 0e4347aa..00000000 --- a/src/api/java/appeng/api/implementations/parts/IPartCable.java +++ /dev/null @@ -1,88 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.parts; - - -import java.util.EnumSet; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.networking.IGridHost; -import appeng.api.parts.BusSupport; -import appeng.api.parts.IPart; -import appeng.api.parts.IPartHost; -import appeng.api.util.AECableType; -import appeng.api.util.AEColor; - - -/** - * Implemented on the {@link IPart}s cable objects that can be placed at {@link ForgeDirection}.UNKNOWN in - * {@link IPartHost}s - */ -public interface IPartCable extends IPart, IGridHost -{ - - /** - * does this cable support buses? - */ - BusSupport supportsBuses(); - - /** - * @return the current color of the cable. - */ - AEColor getCableColor(); - - /** - * @return the Cable type. - */ - AECableType getCableConnectionType(); - - /** - * Change the color of the cable, this should cost a small amount of dye, or something. - * - * @param newColor new color - * - * @return if the color change was successful. - */ - boolean changeColor( AEColor newColor, EntityPlayer who ); - - /** - * Change sides on the cables node. - * - * Called by AE, do not invoke. - * - * @param sides sides of cable - */ - void setValidSides( EnumSet sides ); - - /** - * used to tests if a cable connects to neighbors visually. - * - * @param side neighbor side - * - * @return true if this side is currently connects to an external block. - */ - boolean isConnected( ForgeDirection side ); -} diff --git a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java b/src/api/java/appeng/api/implementations/parts/IPartMonitor.java deleted file mode 100644 index 8b788e84..00000000 --- a/src/api/java/appeng/api/implementations/parts/IPartMonitor.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.parts; - - -import appeng.api.networking.IGridHost; -import appeng.api.parts.IPart; - - -/** - * Implemented by all screen like parts provided by AE. - */ -public interface IPartMonitor extends IPart, IGridHost -{ - - /** - * @return if the device is online you should check this before providing - * any other information. - */ - boolean isPowered(); -} diff --git a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java b/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java deleted file mode 100644 index 9bdfe650..00000000 --- a/src/api/java/appeng/api/implementations/parts/IPartStorageMonitor.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.parts; - - -import appeng.api.networking.IGridHost; -import appeng.api.parts.IPart; -import appeng.api.storage.data.IAEStack; -import appeng.api.util.INetworkToolAgent; - - -/** - * The Storage monitor is a {@link IPart} located on the sides of a IPartHost - */ -public interface IPartStorageMonitor extends IPartMonitor, IPart, IGridHost, INetworkToolAgent -{ - - /** - * @return the item being displayed on the storage monitor, in AEStack Form, can be either a IAEItemStack or an - * IAEFluidStack the quantity is important remember to use getStackSize() on the IAEStack, and not on the - * FluidStack/ItemStack acquired from it. - */ - IAEStack getDisplayed(); - - /** - * @return the current locked state of the Storage Monitor - */ - boolean isLocked(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java b/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java deleted file mode 100644 index 0be1d003..00000000 --- a/src/api/java/appeng/api/implementations/tiles/IChestOrDrive.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import appeng.api.networking.IGridHost; -import appeng.api.storage.ICellContainer; -import appeng.api.util.IOrientable; - - -public interface IChestOrDrive extends ICellContainer, IGridHost, IOrientable -{ - - /** - * @return how many slots are available. Chest has 1, Drive has 10. - */ - int getCellCount(); - - /** - * 0 - cell is missing. - * - * 1 - green, - * - * 2 - orange, - * - * 3 - red - * - * @param slot slot index - * - * @return status of the slot, one of the above indices. - */ - int getCellStatus( int slot ); - - /** - * @return if the device is online you should check this before providing any other information. - */ - boolean isPowered(); - - /** - * @param slot slot index - * - * @return is the cell currently blinking to show activity. - */ - boolean isCellBlinking( int slot ); -} diff --git a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java b/src/api/java/appeng/api/implementations/tiles/IColorableTile.java deleted file mode 100644 index 365a3474..00000000 --- a/src/api/java/appeng/api/implementations/tiles/IColorableTile.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.util.AEColor; - - -public interface IColorableTile -{ - - AEColor getColor(); - - boolean recolourBlock( ForgeDirection side, AEColor colour, EntityPlayer who ); -} diff --git a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java b/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java deleted file mode 100644 index 53ca92b2..00000000 --- a/src/api/java/appeng/api/implementations/tiles/ICraftingMachine.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import net.minecraft.inventory.InventoryCrafting; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.networking.crafting.ICraftingPatternDetails; - - -public interface ICraftingMachine -{ - - /** - * inserts a crafting plan, and the necessary items into the crafting machine. - * - * @param patternDetails details of pattern - * @param table crafting table - * @param ejectionDirection ejection direction - * - * @return if it was accepted, all or nothing. - */ - boolean pushPattern( ICraftingPatternDetails patternDetails, InventoryCrafting table, ForgeDirection ejectionDirection ); - - /** - * check if the crafting machine is accepting pushes via pushPattern, if this is false, all calls to push will fail, - * you can try inserting into the inventory instead. - * - * @return true, if pushPattern can complete, if its false push will always be false. - */ - boolean acceptsPlans(); -} diff --git a/src/api/java/appeng/api/implementations/tiles/ICrankable.java b/src/api/java/appeng/api/implementations/tiles/ICrankable.java deleted file mode 100644 index 787ec6d7..00000000 --- a/src/api/java/appeng/api/implementations/tiles/ICrankable.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * Crank/Crankable API, - * - * Tiles that Implement this can receive power, from the crank, and have the - * crank placed on them. - * - * Tiles that access other tiles that implement this method can act as Cranks. - * - * This interface must be implemented by a tile entity. - */ -public interface ICrankable -{ - - /** - * Test if the crank can turn, return false if there is no work to be done. - * - * @return if crank should be allowed to turn. - */ - boolean canTurn(); - - /** - * The crank has completed one turn. - */ - void applyTurn(); - - /** - * @return true if the crank can attach on the given side. - */ - boolean canCrankAttach( ForgeDirection directionToCrank ); -} diff --git a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java b/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java deleted file mode 100644 index 9d8a9c29..00000000 --- a/src/api/java/appeng/api/implementations/tiles/ICrystalGrowthAccelerator.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -public interface ICrystalGrowthAccelerator -{ - - boolean isPowered(); -} diff --git a/src/api/java/appeng/api/implementations/tiles/IMEChest.java b/src/api/java/appeng/api/implementations/tiles/IMEChest.java deleted file mode 100644 index bbe957a9..00000000 --- a/src/api/java/appeng/api/implementations/tiles/IMEChest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import appeng.api.networking.energy.IEnergySource; - - -public interface IMEChest extends IChestOrDrive, ITileStorageMonitorable, IEnergySource -{ - -} diff --git a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java b/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java deleted file mode 100644 index c73a8a53..00000000 --- a/src/api/java/appeng/api/implementations/tiles/ISegmentedInventory.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import net.minecraft.inventory.IInventory; - - -public interface ISegmentedInventory -{ - - /** - * Access an internal inventory, note, not all inventories contain real items, some may be ghost items, and treating - * them a real inventories will result in duplication. - * - * @param name inventory name - * - * @return inventory with inventory name - */ - IInventory getInventoryByName( String name ); -} diff --git a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java b/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java deleted file mode 100644 index 09419f10..00000000 --- a/src/api/java/appeng/api/implementations/tiles/ITileStorageMonitorable.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.IStorageMonitorable; - - -/** - * Implemented on inventories that can share their inventories with other networks, best example, ME Interface. - */ -public interface ITileStorageMonitorable -{ - - IStorageMonitorable getMonitorable( ForgeDirection side, BaseActionSource src ); -} diff --git a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java b/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java deleted file mode 100644 index 4a81ae12..00000000 --- a/src/api/java/appeng/api/implementations/tiles/IViewCellStorage.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import net.minecraft.inventory.IInventory; - - -public interface IViewCellStorage -{ - - /** - * should contains at least 5 slot, the first 5 - * - * @return inventory with at least 5 slot - */ - IInventory getViewCellStorage(); -} diff --git a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java b/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java deleted file mode 100644 index 038bc52d..00000000 --- a/src/api/java/appeng/api/implementations/tiles/IWirelessAccessPoint.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.implementations.tiles; - - -import appeng.api.networking.IGrid; -import appeng.api.networking.security.IActionHost; -import appeng.api.util.DimensionalCoord; - - -public interface IWirelessAccessPoint extends IActionHost -{ - - /** - * @return location of WAP - */ - DimensionalCoord getLocation(); - - /** - * @return max range for this WAP - */ - double getRange(); - - /** - * @return can you use this WAP? - */ - boolean isActive(); - - /** - * @return grid of linked WAP - */ - IGrid getGrid(); -} diff --git a/src/api/java/appeng/api/integration/IBeeComparison.java b/src/api/java/appeng/api/integration/IBeeComparison.java deleted file mode 100644 index 677e82ce..00000000 --- a/src/api/java/appeng/api/integration/IBeeComparison.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.integration; - - -/** - * An interface to get access to the individual settings for AE's Internal Bee - * Comparison handler. - * - * Assessable via: ( IBeeComparison ) - * IAEItemStack.getTagCompound().getSpecialComparison() - * - * If you don't have the forestry API, just delete this file when using the API. - */ -public interface IBeeComparison -{ - - /** - * @return the Forestry IIndividual for this comparison object - cast this to a IIndividual if you want to use it. - */ - Object getIndividual(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/movable/IMovableHandler.java b/src/api/java/appeng/api/movable/IMovableHandler.java deleted file mode 100644 index 01c98f7b..00000000 --- a/src/api/java/appeng/api/movable/IMovableHandler.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.movable; - - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - - -public interface IMovableHandler -{ - - /** - * if you return true from this, your saying you can handle the class, not - * that single entity, you cannot opt out of single entities. - * - * @param myClass tile entity class - * @param tile tile entity - * - * @return true if it can handle moving - */ - boolean canHandle( Class myClass, TileEntity tile ); - - /** - * request that the handler move the the tile from its current location to - * the new one. the tile has already been invalidated, and the blocks have - * already been fully moved. - * - * Potential Example: - * - *
-	 * {@code
-	 * Chunk c = world.getChunkFromBlockCoords( x, z ); c.setChunkBlockTileEntity( x
-	 * & 0xF, y + y, z & 0xF, tile );
-	 *
-	 * if ( c.isChunkLoaded ) { world.addTileEntity( tile ); world.markBlockForUpdate( x,
-	 * y, z ); }
-	 * }
-	 * 
- * - * @param tile to be moved tile - * @param world world of tile - * @param x x coord of tile - * @param y y coord of tile - * @param z z coord of tile - */ - void moveTile( TileEntity tile, World world, int x, int y, int z ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/movable/IMovableRegistry.java b/src/api/java/appeng/api/movable/IMovableRegistry.java deleted file mode 100644 index be11050b..00000000 --- a/src/api/java/appeng/api/movable/IMovableRegistry.java +++ /dev/null @@ -1,124 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.movable; - - -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; - - -/** - * Used to determine if a tile is marked as movable, a block will be considered movable, if... - * - * 1. The Tile or its super classes have been white listed with whiteListTileEntity. - * - * 2. The Tile has been register with the IMC ( which basically calls whiteListTileEntity. ) - * - * 3. The Tile implements IMovableTile 4. A IMovableHandler is register that returns canHandle = true for the Tile - * Entity Class - * - * IMC Example: FMLInterModComms.sendMessage( "appliedenergistics2", "movabletile", "appeng.common.AppEngTile" ); - * - * The movement process is as follows, - * - * 1. IMovableTile.prepareToMove() or TileEntity.invalidate() depending on your opt-in method. 2. The tile will be - * removed from the world. 3. Its world, coordinates will be changed. *** this can be overridden with a IMovableHandler - * *** 4. It will then be re-added to the world, or a new world. 5. TileEntity.validate() 6. IMovableTile.doneMoving ( - * if you implemented IMovableTile ) - * - * Please note, this is a 100% white list only feature, I will never opt in any non-vanilla, non-AE blocks. If you do - * not want to support your tiles being moved, you don't have to do anything. - * - * I appreciate anyone that takes the effort to get their tiles to work with this system to create a better use - * experience. - * - * If you need a build of deobf build of AE for testing, do not hesitate to ask. - */ -public interface IMovableRegistry -{ - - /** - * Black list a block from movement, please only use this to prevent exploits. - * - * You can also use the IMC, FMLInterModComms.sendMessage( "appliedenergistics2", "whitelist-spatial", - * "appeng.common.AppEngTile" ); - * - * @param blk block - */ - void blacklistBlock( Block blk ); - - /** - * White list your tile entity with the registry. - * - * You can also use the IMC, FMLInterModComms.sendMessage( "appliedenergistics2", "blacklist-block-spatial", new - * ItemStack(...) ); - * - * If you tile is handled with IMovableHandler or IMovableTile you do not need to white list it. - */ - void whiteListTileEntity( Class c ); - - /** - * @param te to be moved tile entity - * - * @return true if the tile has accepted your request to move it - */ - boolean askToMove( TileEntity te ); - - /** - * tells the tile you are done moving it. - * - * @param te moved tile entity - */ - void doneMoving( TileEntity te ); - - /** - * add a new handler movable handler. - * - * @param handler moving handler - */ - void addHandler( IMovableHandler handler ); - - /** - * handlers are used to perform movement, this allows you to override AE's internal version. - * - * only valid after askToMove(...) = true - * - * @param te tile entity - * - * @return moving handler of tile entity - */ - IMovableHandler getHandler( TileEntity te ); - - /** - * @return a copy of the default handler - */ - IMovableHandler getDefaultHandler(); - - /** - * @param blk block - * - * @return true if this block is blacklisted - */ - boolean isBlacklisted( Block blk ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/movable/IMovableTile.java b/src/api/java/appeng/api/movable/IMovableTile.java deleted file mode 100644 index feaaff28..00000000 --- a/src/api/java/appeng/api/movable/IMovableTile.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.movable; - - -/** - * You can implement this, or use the IMovableRegistry to white list your tile, - * please see the registry for more information. - */ -public interface IMovableTile -{ - - /** - * notification that your block will be moved, called instead of invalidate, - * return false to prevent movement. - * - * @return false to prevent movement - */ - boolean prepareToMove(); - - /** - * notification that your block was moved, called after validate. - */ - void doneMoving(); -} diff --git a/src/api/java/appeng/api/networking/GridFlags.java b/src/api/java/appeng/api/networking/GridFlags.java deleted file mode 100644 index b698fb93..00000000 --- a/src/api/java/appeng/api/networking/GridFlags.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -/** - * Various flags to determine network node behavior. - */ -public enum GridFlags -{ - /** - * import/export buses, terminals, and other devices that use network features, will use this setting. - */ - REQUIRE_CHANNEL, - - /** - * P2P ME tunnels use this setting. - */ - COMPRESSED_CHANNEL, - - /** - * cannot carry channels over this node. - */ - CANNOT_CARRY, - - /** - * Used by P2P Tunnels to prevent tunnels from tunneling recursively. - */ - CANNOT_CARRY_COMPRESSED, - - /** - * This node can transmit 32 signals, this should only apply to Tier2 Cable, P2P Tunnels, and Quantum Network - * Bridges. - */ - DENSE_CAPACITY, - - /** - * This block is part of a multiblock, used in conjunction with REQUIRE_CHANNEL, and {@link IGridMultiblock} see this - * interface for details. - */ - MULTIBLOCK, - - /** - * Indicates which path might be preferred, this only matters if two routes of equal length exist, ad only changes - * the order they are processed in. - */ - PREFERRED -} diff --git a/src/api/java/appeng/api/networking/GridNotification.java b/src/api/java/appeng/api/networking/GridNotification.java deleted file mode 100644 index b53188d7..00000000 --- a/src/api/java/appeng/api/networking/GridNotification.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -public enum GridNotification -{ - /** - * the visible connections for this node have changed, useful for cable. - */ - ConnectionsChanged, -} diff --git a/src/api/java/appeng/api/networking/IGrid.java b/src/api/java/appeng/api/networking/IGrid.java deleted file mode 100644 index d06ba8d7..00000000 --- a/src/api/java/appeng/api/networking/IGrid.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import appeng.api.networking.events.MENetworkEvent; -import appeng.api.util.IReadOnlyCollection; - - -/** - * Gives you access to Grid based information. - * - * Don't Implement. - */ -public interface IGrid -{ - - /** - * Get Access to various grid modules - * - * @param iface face - * - * @return the IGridCache you requested. - */ - C getCache( Class iface ); - - /** - * Post an event into the network event bus. - * - * @param ev - event to post - * - * @return returns ev back to original poster - */ - MENetworkEvent postEvent( MENetworkEvent ev ); - - /** - * Post an event into the network event bus, but direct it at a single node. - * - * @param ev event to post - * - * @return returns ev back to original poster - */ - MENetworkEvent postEventTo( IGridNode node, MENetworkEvent ev ); - - /** - * get a list of the diversity of classes, you can use this to better detect which machines your interested in, - * rather then iterating the entire grid to test them. - * - * @return IReadOnlyCollection of all available host types (Of Type IGridHost). - */ - IReadOnlyCollection> getMachinesClasses(); - - /** - * Get machines on the network. - * - * @param gridHostClass class of the grid host - * - * @return IMachineSet of all nodes belonging to hosts of specified class. - */ - IMachineSet getMachines( Class gridHostClass ); - - /** - * @return IReadOnlyCollection for all nodes on the network, node visitors are preferred. - */ - IReadOnlyCollection getNodes(); - - /** - * @return true if the last node has been removed from the grid. - */ - boolean isEmpty(); - - /** - * @return the node considered the pivot point of the grid. - */ - IGridNode getPivot(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/networking/IGridBlock.java b/src/api/java/appeng/api/networking/IGridBlock.java deleted file mode 100644 index 89bc8c69..00000000 --- a/src/api/java/appeng/api/networking/IGridBlock.java +++ /dev/null @@ -1,115 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import java.util.EnumSet; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.parts.IPart; -import appeng.api.util.AEColor; -import appeng.api.util.DimensionalCoord; - - -/** - * An Implementation is required to create your node for IGridHost - * - * Implement for use with IGridHost - */ -public interface IGridBlock -{ - - /** - * how much power to drain per tick as part of idle network usage. - * - * if the value of this changes, you must post a MENetworkPowerIdleChange - * - * @return ae/t to use. - */ - double getIdlePowerUsage(); - - /** - * Various flags that AE uses to modify basic behavior for various parts of the network. - * - * @return Set of flags for this IGridBlock - */ - EnumSet getFlags(); - - /** - * generally speaking you will return true for this, the one exception is buses, or worm holes where the node - * represents something that isn't a real connection in the world, but rather one represented internally to the - * block. - * - * @return if the world can connect to this node, and the node can connect to the world. - */ - boolean isWorldAccessible(); - - /** - * @return current location of this node - */ - DimensionalCoord getLocation(); - - /** - * @return Transparent, or a valid color, NULL IS NOT A VALID RETURN - */ - AEColor getGridColor(); - - /** - * Notifies your IGridBlock that changes were made to your connections - */ - void onGridNotification( GridNotification notification ); - - /** - * Update Blocks network/connection/booting status. grid, - * - * @param grid grid - * @param channelsInUse used channels - */ - void setNetworkStatus( IGrid grid, int channelsInUse ); - - /** - * Determine which sides of the block can be connected too, only used when isWorldAccessible returns true, not used - * for {@link IPart} implementations. - */ - EnumSet getConnectableSides(); - - /** - * @return the IGridHost for the node, this will be an IGridPart or a TileEntity generally speaking. - */ - IGridHost getMachine(); - - /** - * called when the grid for the node has changed, the general grid state should not be trusted at this point. - */ - void gridChanged(); - - /** - * Determines what item stack is used to render this node in the GUI. - * - * @return the render item stack to use to render this node, null is valid, and will not show this node. - */ - ItemStack getMachineRepresentation(); -} diff --git a/src/api/java/appeng/api/networking/IGridCache.java b/src/api/java/appeng/api/networking/IGridCache.java deleted file mode 100644 index 142f5e07..00000000 --- a/src/api/java/appeng/api/networking/IGridCache.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -/** - * Allows you to create a network wise service, AE2 uses these for providing - * item, spatial, and tunnel services. - * - * Any Class that implements this, should have a public default constructor that - * takes a single argument of type IGrid. - */ -public interface IGridCache -{ - - /** - * Called each tick for the network, allows you to have active network wide - * behaviors. - */ - void onUpdateTick(); - - /** - * inform your cache, that a machine was removed from the grid. - * - * Important: Do not trust the grids state in this method, interact only - * with the node you are passed, if you need to manage other grid - * information, do it on the next updateTick. - * - * @param gridNode removed from that grid - * @param machine to be removed machine - */ - void removeNode( IGridNode gridNode, IGridHost machine ); - - /** - * informs you cache that a machine was added to the grid. - * - * Important: Do not trust the grids state in this method, interact only - * with the node you are passed, if you need to manage other grid - * information, do it on the next updateTick. - * - * @param gridNode added to grid node - * @param machine to be added machine - */ - void addNode( IGridNode gridNode, IGridHost machine ); - - /** - * Called when a grid splits into two grids, AE will call a split as it - * Iteratively processes changes. The destination should receive half, and - * the current cache should receive half. - * - * @param destinationStorage storage which receives half of old grid - */ - void onSplit( IGridStorage destinationStorage ); - - /** - * Called when two grids merge into one, AE will call a join as it - * Iteratively processes changes. Use this method to incorporate all the - * data from the source into your cache. - * - * @param sourceStorage old storage - */ - void onJoin( IGridStorage sourceStorage ); - - /** - * Called when saving changes, - * - * @param destinationStorage storage - */ - void populateGridStorage( IGridStorage destinationStorage ); -} diff --git a/src/api/java/appeng/api/networking/IGridCacheRegistry.java b/src/api/java/appeng/api/networking/IGridCacheRegistry.java deleted file mode 100644 index b54df8da..00000000 --- a/src/api/java/appeng/api/networking/IGridCacheRegistry.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import java.util.HashMap; - - -/** - * A registry of grid caches to extend grid functionality. - */ -public interface IGridCacheRegistry -{ - - /** - * Register a new grid cache for use during operation, must be called during the loading phase. - * - * @param iface grid cache class - */ - void registerGridCache( Class iface, Class implementation ); - - /** - * requests a new INSTANCE of a grid cache for use, used internally - * - * @param grid grid - * - * @return a new HashMap of IGridCaches from the registry, called from IGrid when constructing a new grid. - */ - HashMap, IGridCache> createCacheInstance( IGrid grid ); -} diff --git a/src/api/java/appeng/api/networking/IGridConnection.java b/src/api/java/appeng/api/networking/IGridConnection.java deleted file mode 100644 index 6958dedf..00000000 --- a/src/api/java/appeng/api/networking/IGridConnection.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * Access to AE's internal grid connections. - * - * Messing with connection is generally completely unnecessary, you should be able to just use IGridNode.updateState() - * to have AE manage them for you. - * - * Don't Implement. - */ -public interface IGridConnection -{ - - /** - * lets you get the opposing node of the connection by passing your own node. - * - * @param gridNode current grid node - * - * @return the IGridNode which represents the opposite side of the connection. - */ - IGridNode getOtherSide( IGridNode gridNode ); - - /** - * determine the direction of the connection based on your node. - * - * @param gridNode current grid node - * - * @return the direction of the connection, only valid for in world connections. - */ - ForgeDirection getDirection( IGridNode gridNode ); - - /** - * by destroying a connection you may create new grids, and trigger un-expected behavior, you should only destroy - * connections if you created them. - */ - void destroy(); - - /** - * @return node A - */ - IGridNode a(); - - /** - * @return node B - */ - IGridNode b(); - - /** - * @return if the connection is invisible this returns false - */ - boolean hasDirection(); - - /** - * @return how many channels pass over this connections. - */ - int getUsedChannels(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java b/src/api/java/appeng/api/networking/IGridConnectionVisitor.java deleted file mode 100644 index 1842589e..00000000 --- a/src/api/java/appeng/api/networking/IGridConnectionVisitor.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -public interface IGridConnectionVisitor extends IGridVisitor -{ - - /** - * Called for each connection on the network. - * - * @param n the connection. - */ - void visitConnection( IGridConnection n ); -} diff --git a/src/api/java/appeng/api/networking/IGridHost.java b/src/api/java/appeng/api/networking/IGridHost.java deleted file mode 100644 index 3fea9285..00000000 --- a/src/api/java/appeng/api/networking/IGridHost.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.parts.IPart; -import appeng.api.util.AECableType; - - -/** - * Implement to create a networked {@link TileEntity} or {@link IPart} must - * be implemented for a part, or tile entity to become part of a grid. - */ -public interface IGridHost -{ - - /** - * get the grid node for a particular side of a block, you can return null, - * by returning a valid node later and calling updateState, you can join the - * Grid when your block is ready. - * - * @param dir feel free to ignore this, most blocks will use the same node - * for every side. - * - * @return a new IGridNode, create these with - * AEApi.INSTANCE().createGridNode( MyIGridBlock ) - */ - IGridNode getGridNode( ForgeDirection dir ); - - /** - * Determines how cables render when they connect to this block. Priority is - * Smart > Covered > Glass - * - * @param dir direction - */ - AECableType getCableConnectionType( ForgeDirection dir ); - - /** - * break this host, its violating security rules, just break your block, or part. - */ - void securityBreak(); -} diff --git a/src/api/java/appeng/api/networking/IGridMultiblock.java b/src/api/java/appeng/api/networking/IGridMultiblock.java deleted file mode 100644 index 7c3844bb..00000000 --- a/src/api/java/appeng/api/networking/IGridMultiblock.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import java.util.Iterator; - - -/** - * An extension of IGridBlock, only means something when your getFlags() contains REQUIRE_CHANNEL, when done properly it - * will call the method to get a list of all related nodes and give each of them a channel simultaneously for the entire - * set. This means your entire Multiblock can work with a single channel, instead of one channel per block. - */ -public interface IGridMultiblock extends IGridBlock -{ - - /** - * Used to acquire a list of all nodes that are part of the multiblock. - * - * @return an iterator that will iterate all the nodes for the multiblock. ( read-only iterator expected. ) - */ - Iterator getMultiblockNodes(); -} diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java deleted file mode 100644 index a95f79c2..00000000 --- a/src/api/java/appeng/api/networking/IGridNode.java +++ /dev/null @@ -1,163 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import java.util.EnumSet; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.IAppEngApi; -import appeng.api.util.IReadOnlyCollection; - - -/** - * Gives you a view into your Nodes connections and information. - * - * updateState, getGrid, destroy are required to implement a proper IGridHost. - * - * Don't Implement; Acquire from {@link IAppEngApi}.createGridNode - */ -public interface IGridNode -{ - - /** - * lets you walk the grid stating at the current node using a IGridVisitor, generally not needed, please use only if - * required. - * - * @param visitor visitor - */ - void beginVisit( IGridVisitor visitor ); - - /** - * inform the node that your IGridBlock has changed its internal state, and force the node to update. - * - * ALWAYS make sure that your tile entity is in the world, and has its node properly saved to be returned from the - * host before updating state, - * - * If your entity is not in the world, or if you IGridHost returns a different node for the same side you will - * likely crash the game. - */ - void updateState(); - - /** - * get the machine represented by the node. - * - * @return grid host - */ - IGridHost getMachine(); - - /** - * get the grid for the node, this can change at a moments notice. - * - * @return grid - */ - IGrid getGrid(); - - /** - * By destroying your node, you destroy any connections, and its existence in the grid, use in invalidate, or - * onChunkUnload - */ - void destroy(); - - /** - * @return the world the node is located in - */ - World getWorld(); - - /** - * @return a set of the connected sides, UNKNOWN represents an invisible connection - */ - EnumSet getConnectedSides(); - - /** - * lets you iterate a nodes connections - * - * @return grid connections - */ - IReadOnlyCollection getConnections(); - - /** - * @return the IGridBlock for this node - */ - IGridBlock getGridBlock(); - - /** - * Reflects the networks status, returns true only if the network is powered, and the network is not booting, this - * also takes into account channels. - * - * @return true if is Network node active, and participating. - */ - boolean isActive(); - - /** - * this should be called for each node you create, if you have a nodeData compound to load from, you can store all - * your nods on a single compound using name. - * - * Important: You must call this before updateState. - * - * @param name nbt name - * @param nodeData to be loaded data - */ - void loadFromNBT( String name, NBTTagCompound nodeData ); - - /** - * this should be called for each node you maintain, you can save all your nodes to the same tag with different - * names, if you fail to complete the load / save procedure, network state may be lost between game load/saves. - * - * @param name nbt name - * @param nodeData to be saved data - */ - void saveToNBT( String name, NBTTagCompound nodeData ); - - /** - * @return if the node's channel requirements are currently met, use this for display purposes, use isActive for - * status. - */ - boolean meetsChannelRequirements(); - - /** - * see if this node has a certain flag - * - * @param flag flags - * - * @return true if has flag - */ - boolean hasFlag( GridFlags flag ); - - /** - * @return the ownerID this represents the person who placed the node. - */ - int getPlayerID(); - - /** - * tell the node who was responsible for placing it, failure to do this may result in in-compatibility with the - * security system. Called instead of loadFromNBT when initially placed, once set never required again, the value is saved with the Node NBT. - * - * @param playerID new player id - */ - void setPlayerID( int playerID ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/networking/IGridStorage.java b/src/api/java/appeng/api/networking/IGridStorage.java deleted file mode 100644 index 0f9e9b7b..00000000 --- a/src/api/java/appeng/api/networking/IGridStorage.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import net.minecraft.nbt.NBTTagCompound; - - -public interface IGridStorage -{ - - /** - * @return an NBTTagCompound that can be read, and written too. - */ - NBTTagCompound dataObject(); - - /** - * @return the id for this grid storage object, used internally - */ - long getID(); -} diff --git a/src/api/java/appeng/api/networking/IGridVisitor.java b/src/api/java/appeng/api/networking/IGridVisitor.java deleted file mode 100644 index 41ac4f47..00000000 --- a/src/api/java/appeng/api/networking/IGridVisitor.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -/** - * Simple Visitor pattern access to network nodes. - */ -public interface IGridVisitor -{ - - /** - * Called for each node on the network. - * - * By returning false your informing the host to stop visiting nodes beyond the current node. - * - * @param n the current node. - * - * @return true to continue visiting nodes beyond this node. - */ - boolean visitNode( IGridNode n ); -} diff --git a/src/api/java/appeng/api/networking/IMachineSet.java b/src/api/java/appeng/api/networking/IMachineSet.java deleted file mode 100644 index 7d57b52c..00000000 --- a/src/api/java/appeng/api/networking/IMachineSet.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking; - - -import appeng.api.util.IReadOnlyCollection; - - -public interface IMachineSet extends IReadOnlyCollection -{ - - /** - * @return the machine class for this set. - */ - Class getMachineClass(); -} diff --git a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java b/src/api/java/appeng/api/networking/crafting/CraftingItemList.java deleted file mode 100644 index c84c275d..00000000 --- a/src/api/java/appeng/api/networking/crafting/CraftingItemList.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -public enum CraftingItemList -{ - ALL, STORAGE, ACTIVE, PENDING -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java b/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java deleted file mode 100644 index 5dbc40e8..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingCPU.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.storage.data.IAEItemStack; - - -public interface ICraftingCPU extends IBaseMonitor -{ - - /** - * @return true if the CPU currently has a job. - */ - boolean isBusy(); - - /** - * @return the action source for the CPU. - */ - BaseActionSource getActionSource(); - - /** - * @return the available storage in bytes - */ - long getAvailableStorage(); - - /** - * @return the number of co-processors in the CPU. - */ - int getCoProcessors(); - - /** - * @return an empty string or the name of the cpu. - */ - String getName(); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java b/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java deleted file mode 100644 index 096b7226..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingCallback.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -public interface ICraftingCallback -{ - - /** - * this call back is synchronized with the world you passed. - * - * @param job - final job - */ - void calculationComplete( ICraftingJob job ); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java deleted file mode 100644 index 74fec564..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingGrid.java +++ /dev/null @@ -1,106 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import java.util.concurrent.Future; - -import net.minecraft.world.World; - -import com.google.common.collect.ImmutableCollection; -import com.google.common.collect.ImmutableSet; - -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridCache; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.data.IAEItemStack; - - -public interface ICraftingGrid extends IGridCache -{ - - /** - * @param whatToCraft requested craft - * @param world crafting world - * @param slot slot index - * @param details pattern details - * - * @return a collection of crafting patterns for the item in question. - */ - ImmutableCollection getCraftingFor( IAEItemStack whatToCraft, ICraftingPatternDetails details, int slot, World world ); - - /** - * Begin calculating a crafting job. - * - * @param world crafting world - * @param grid network - * @param actionSrc source - * @param craftWhat result - * @param callback callback - * -- optional - * - * @return a future which will at an undetermined point in the future get you the {@link ICraftingJob} do not wait - * on this, your be waiting forever. - */ - Future beginCraftingJob( World world, IGrid grid, BaseActionSource actionSrc, IAEItemStack craftWhat, ICraftingCallback callback ); - - /** - * Submit the job to the Crafting system for processing. - * - * @param job - the crafting job from beginCraftingJob - * @param requestingMachine - a machine if its being requested via automation, may be null. - * @param target - can be null - * @param prioritizePower - if cpu is null, this determine if the system should prioritize power, or if it should find the lower - * end cpus, automatic processes generally should pick lower end cpus. - * @param src - the action source to use when starting the job, this will be used for extracting items, should - * usually be the same as the one provided to beginCraftingJob. - * - * @return null ( if failed ) or an {@link ICraftingLink} other wise, if you send requestingMachine you need to - * properly keep track of this and handle the nbt saving and loading of the object as well as the - * {@link ICraftingRequester} methods. if you send null, this object should be discarded after verifying the - * return state. - */ - ICraftingLink submitJob( ICraftingJob job, ICraftingRequester requestingMachine, ICraftingCPU target, boolean prioritizePower, BaseActionSource src ); - - /** - * @return list of all the crafting cpus on the grid - */ - ImmutableSet getCpus(); - - /** - * @param what to be requested item - * - * @return true if the item can be requested via a crafting emitter. - */ - boolean canEmitFor( IAEItemStack what ); - - /** - * is this item being crafted? - * - * @param aeStackInSlot item being crafted - * - * @return true if it is being crafting - */ - boolean isRequesting( IAEItemStack aeStackInSlot ); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java b/src/api/java/appeng/api/networking/crafting/ICraftingJob.java deleted file mode 100644 index 55901230..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingJob.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; - - -public interface ICraftingJob -{ - - /** - * @return if this job is a simulation, simulations cannot be submitted and only represent 1 possible future - * crafting job with fake items. - */ - boolean isSimulation(); - - /** - * @return total number of bytes to process this job. - */ - long getByteTotal(); - - /** - * Populates the plan list with stack size, and requestable values that represent the stored, and crafting job - * contents respectively. - * - * @param plan plan - */ - void populatePlan( IItemList plan ); - - /** - * @return the final output of the job. - */ - IAEItemStack getOutput(); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java b/src/api/java/appeng/api/networking/crafting/ICraftingLink.java deleted file mode 100644 index b3976724..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingLink.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import net.minecraft.nbt.NBTTagCompound; - - -public interface ICraftingLink -{ - - /** - * @return true if the job was canceled. - */ - boolean isCanceled(); - - /** - * @return true if the job was completed. - */ - boolean isDone(); - - /** - * cancels the job. - */ - void cancel(); - - /** - * @return true if this link was generated without a requesting machine, such as a player generated request. - */ - boolean isStandalone(); - - /** - * write the link to an NBT Tag - * - * @param tag to be written data - */ - void writeToNBT( NBTTagCompound tag ); - - /** - * @return the crafting ID for this link. - */ - String getCraftingID(); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java b/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java deleted file mode 100644 index 3cb7da31..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingMedium.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import net.minecraft.inventory.InventoryCrafting; - - -/** - * A place to send Items for crafting purposes, this is considered part of AE's External crafting system. - */ -public interface ICraftingMedium -{ - - /** - * instruct a medium to create the item represented by the pattern+details, the items on the table, and where if - * possible the output should be directed. - * - * @param patternDetails details - * @param table crafting table - * - * @return if the pattern was successfully pushed. - */ - boolean pushPattern( ICraftingPatternDetails patternDetails, InventoryCrafting table ); - - /** - * @return if this is false, the crafting engine will refuse to send new jobs to this medium. - */ - boolean isBusy(); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java b/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java deleted file mode 100644 index 7a4b2419..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingPatternDetails.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -import appeng.api.implementations.ICraftingPatternItem; -import appeng.api.storage.data.IAEItemStack; - - -/** - * do not implement provided by {@link ICraftingPatternItem} - * - * caching this INSTANCE will increase performance of validation and checks. - */ -public interface ICraftingPatternDetails -{ - - /** - * @return source item. - */ - ItemStack getPattern(); - - /** - * @param slotIndex specific slot index - * @param itemStack item in slot - * @param world crafting world - * - * @return if an item can be used in the specific slot for this pattern. - */ - boolean isValidItemForSlot( int slotIndex, ItemStack itemStack, World world ); - - /** - * @return if this pattern is a crafting pattern ( work bench ) - */ - boolean isCraftable(); - - /** - * @return a list of the inputs, will include nulls. - */ - IAEItemStack[] getInputs(); - - /** - * @return a list of the inputs, will be clean - */ - IAEItemStack[] getCondensedInputs(); - - /** - * @return a list of the outputs, will be clean - */ - IAEItemStack[] getCondensedOutputs(); - - /** - * @return a list of the outputs, will include nulls. - */ - IAEItemStack[] getOutputs(); - - /** - * @return if this pattern is enabled to support substitutions. - */ - boolean canSubstitute(); - - /** - * Allow using this INSTANCE of the pattern details to preform the crafting action with performance enhancements. - * - * @param craftingInv inventory - * @param world crafting world - * - * @return the crafted ( work bench ) item. - */ - ItemStack getOutput( InventoryCrafting craftingInv, World world ); - - /** - * Get the priority of this pattern - * - * @return the priority of this pattern - */ - int getPriority(); - - /** - * Set the priority the of this pattern. - * - * @param priority priority of pattern - */ - void setPriority( int priority ); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java b/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java deleted file mode 100644 index 79f89d44..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingProvider.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import appeng.api.networking.events.MENetworkCraftingPatternChange; - - -/** - * Allows a IGridHost to provide crafting patterns to the network, post a {@link MENetworkCraftingPatternChange} to tell - * AE2 to update. - */ -public interface ICraftingProvider extends ICraftingMedium -{ - - /** - * called when the network is looking for possible crafting jobs. - * - * @param craftingTracker crafting helper - */ - void provideCrafting( ICraftingProviderHelper craftingTracker ); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java b/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java deleted file mode 100644 index ba666de9..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingProviderHelper.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import appeng.api.storage.data.IAEItemStack; - - -/** - * Passed to a ICraftingProvider as a interface to manipulate the available crafting jobs. - */ -public interface ICraftingProviderHelper -{ - - /** - * Add new Pattern to AE's crafting cache. - */ - void addCraftingOption( ICraftingMedium medium, ICraftingPatternDetails api ); - - /** - * Set an item can Emitable - */ - void setEmitable( IAEItemStack what ); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java deleted file mode 100644 index 171ff348..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingRequester.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import com.google.common.collect.ImmutableSet; - -import appeng.api.config.Actionable; -import appeng.api.networking.security.IActionHost; -import appeng.api.storage.data.IAEItemStack; - - -public interface ICraftingRequester extends IActionHost -{ - - /** - * called when the host is added to the grid, and should return all crafting links it poses so they can be connected - * with the cpu that hosts the job. - * - * @return set of jobs, or an empty list. - */ - ImmutableSet getRequestedJobs(); - - /** - * items are injected into the requester as they are completed, any items that cannot be taken, or are unwanted can - * be returned. - * - * @param items item - * @param mode action mode - * - * @return unwanted item - */ - IAEItemStack injectCraftedItems( ICraftingLink link, IAEItemStack items, Actionable mode ); - - /** - * called when the job changes from in progress, to either complete, or canceled. - * - * after this call the crafting link is "dead" and should be discarded. - */ - void jobStateChange( ICraftingLink link ); -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java deleted file mode 100644 index 727f2f56..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcher.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import java.util.Collection; - -import appeng.api.storage.data.IAEStack; - - -public interface ICraftingWatcher extends Collection -{ - -} diff --git a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java b/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java deleted file mode 100644 index ed6f6f9c..00000000 --- a/src/api/java/appeng/api/networking/crafting/ICraftingWatcherHost.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.crafting; - - -import appeng.api.storage.data.IAEItemStack; - - -public interface ICraftingWatcherHost -{ - - /** - * provides the ICraftingWatcher for this host, for the current network, is called when the hot changes networks. - * You do not need to clear your old watcher, its already been removed by the time this gets called. - * - * @param newWatcher crafting watcher for this host - */ - void updateWatcher( ICraftingWatcher newWatcher ); - - /** - * Called when a crafting status changes. - * - * @param craftingGrid current crafting grid - * @param what change - */ - void onRequestChange( ICraftingGrid craftingGrid, IAEItemStack what ); -} diff --git a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java b/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java deleted file mode 100644 index 938c61ce..00000000 --- a/src/api/java/appeng/api/networking/energy/IAEPowerStorage.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.energy; - - -import appeng.api.config.AccessRestriction; -import appeng.api.config.Actionable; - - -/** - * Used to access information about AE's various power accepting blocks for monitoring purposes. - */ -public interface IAEPowerStorage extends IEnergySource -{ - - /** - * Inject amt, power into the device, it will store what it can, and return the amount unable to be stored. - * - * @param amt to be injected amount - * @param mode action mode - * - * @return amount of power which was unable to be stored - */ - double injectAEPower( double amt, Actionable mode ); - - /** - * @return the current maximum power ( this can change :P ) - */ - double getAEMaxPower(); - - /** - * @return the current AE Power Level, this may exceed getMEMaxPower() - */ - double getAECurrentPower(); - - /** - * Checked on network reset to see if your block can be used as a public power storage ( use getPowerFlow to control - * the behavior ) - * - * @return true if it can be used as a public power storage - */ - boolean isAEPublicPowerStorage(); - - /** - * Control the power flow by telling what the network can do, either add? or subtract? or both! - * - * @return access restriction what the network can do - */ - AccessRestriction getPowerFlow(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java b/src/api/java/appeng/api/networking/energy/IEnergyGrid.java deleted file mode 100644 index fe6483a9..00000000 --- a/src/api/java/appeng/api/networking/energy/IEnergyGrid.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.energy; - - -import appeng.api.config.Actionable; -import appeng.api.networking.IGridCache; -import appeng.api.networking.events.MENetworkPowerStatusChange; - - -/** - * AE's Power system. - */ -public interface IEnergyGrid extends IGridCache, IEnergySource, IEnergyGridProvider -{ - - /** - * @return the current calculated idle energy drain each tick, is used internally to drain power for each tick. - */ - double getIdlePowerUsage(); - - /** - * @return the average power drain over the past 10 ticks, includes idle usage during this time, and all use of - * extractPower. - */ - double getAvgPowerUsage(); - - /** - * @return the average energy injected into the system per tick, for the last 10 ticks. - */ - double getAvgPowerInjection(); - - /** - * AE maintains an idle draw of power separate from active power draw, it condenses this into a single operation - * that determines the networks "powered state" if the network is considered off-line, your machines should not - * function. - * - * {@link MENetworkPowerStatusChange} events are posted when this value changes if you need to be notified of the - * change, most machines can simply test the value when they operate. - * - * @return if the network is powered or not. - */ - boolean isNetworkPowered(); - - /** - * AE will accept any power, and store it, to maintain sanity please don't send more then 10,000 at a time. - * - * IMPORTANT: Network power knows no bounds, for less spamy power flow, networks can store more then their allotted - * storage, however, it should be kept to a minimum, to help with this, this method returns the networks current - * OVERFLOW, this is not energy you can store some where else, its already stored in the network, you can extract it - * if you want, however it it owned by the network, this is different then IAEEnergyStore - * - * Another important note, is that if a network that had overflow is deleted, its power is gone, this is one of the - * reasons why keeping overflow to a minimum is important. - * - * @param amt power to inject into the network - * @param mode should the action be simulated or performed? - * - * @return the amount of power that the network has OVER the limit. - */ - double injectPower( double amt, Actionable mode ); - - /** - * this is should be considered an estimate, and not relied upon for real calculations. - * - * @return estimated available power. - */ - double getStoredPower(); - - /** - * this is should be considered an estimate, and not relied upon for real calculations. - * - * @return estimated available power. - */ - double getMaxStoredPower(); - - /** - * Calculation will be capped at maxRequired, this improves performance by limiting the number of nodes needed to - * calculate the demand. - * - * @return Amount of power required to charge the grid, in AE. - */ - double getEnergyDemand( double maxRequired ); -} diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java deleted file mode 100644 index b24af8e3..00000000 --- a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.energy; - - -import java.util.Set; - -import appeng.api.config.Actionable; - - -/** - * internal use only. - */ -public interface IEnergyGridProvider -{ - /** - * internal use only - */ - double extractAEPower( double amt, Actionable mode, Set seen ); - - /** - * internal use only - */ - double injectAEPower( double amt, Actionable mode, Set seen ); - - /** - * internal use only - */ - double getEnergyDemand( double d, Set seen ); -} diff --git a/src/api/java/appeng/api/networking/energy/IEnergySource.java b/src/api/java/appeng/api/networking/energy/IEnergySource.java deleted file mode 100644 index b1b8ac85..00000000 --- a/src/api/java/appeng/api/networking/energy/IEnergySource.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.energy; - - -import appeng.api.config.Actionable; -import appeng.api.config.PowerMultiplier; - - -public interface IEnergySource -{ - - /** - * Extract power from the network. - * - * @param amt extracted power - * @param mode should the action be simulated or performed? - * - * @return returns extracted power. - */ - double extractAEPower( double amt, Actionable mode, PowerMultiplier usePowerMultiplier ); -} diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java deleted file mode 100644 index 5543df6d..00000000 --- a/src/api/java/appeng/api/networking/energy/IEnergyWatcher.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.energy; - - -import java.util.Collection; - - -public interface IEnergyWatcher extends Collection -{ - -} diff --git a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java b/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java deleted file mode 100644 index 5f5237f0..00000000 --- a/src/api/java/appeng/api/networking/energy/IEnergyWatcherHost.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.energy; - - -public interface IEnergyWatcherHost -{ - - /** - * provides the IEnergyWatcher for this host, for the current network, is called when the hot changes networks. You - * do not need to clear your old watcher, its already been removed by the time this gets called. - * - * @param newWatcher new watcher - */ - void updateWatcher( IEnergyWatcher newWatcher ); - - /** - * Called when a threshold is crossed. - * - * @param energyGrid grid - */ - void onThresholdPass( IEnergyGrid energyGrid ); -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java deleted file mode 100644 index febd9802..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkBootingStatusChange.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridNode; - - -/** - * Posted by the network when the booting status of the network goes up - * or down, the change is reflected via {@link IGridNode}.isActive() - * - * Note: Most machines just need to check {@link IGridNode}.isActive() - */ -public class MENetworkBootingStatusChange extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java b/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java deleted file mode 100644 index 42cb405f..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkCellArrayUpdate.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -/** - * Posted by storage devices to inform AE to refresh its storage structure. - * - * This is done in cases such as a storage cell being removed or added to a - * drive. - * - * you do not need to send this event when your node is added / removed from the - * grid. - */ -public class MENetworkCellArrayUpdate extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java deleted file mode 100644 index 1ddee58d..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkChannelChanged.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridNode; - - -/** - * Posted by storage devices to inform AE the channel cache that the included node has changed its mind about its - * channel requirements. - */ -public class MENetworkChannelChanged extends MENetworkEvent -{ - - public final IGridNode node; - - public MENetworkChannelChanged( IGridNode n ) - { - this.node = n; - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java b/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java deleted file mode 100644 index cb2566f4..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkChannelsChanged.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridHost; - - -/** - * Posted to the {@link IGridHost} when the channels on the node connections are altered. - * - * Never posted IGridCaches. - */ -public class MENetworkChannelsChanged extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java b/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java deleted file mode 100644 index 040a3d4a..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkControllerChange.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -/** - * Event posted when the networks controller state changes, this can be from no - * controller to 1 controller, or any time the network changes from conflicted - * to not conflicted. - */ -public class MENetworkControllerChange extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java deleted file mode 100644 index 34a95c64..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkCraftingCpuChange.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridNode; - - -public class MENetworkCraftingCpuChange extends MENetworkEvent -{ - - public final IGridNode node; - - public MENetworkCraftingCpuChange( IGridNode n ) - { - this.node = n; - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java b/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java deleted file mode 100644 index 8e064265..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkCraftingPatternChange.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.ICraftingProvider; - - -public class MENetworkCraftingPatternChange extends MENetworkEvent -{ - - public final ICraftingProvider provider; - public final IGridNode node; - - public MENetworkCraftingPatternChange( ICraftingProvider p, IGridNode n ) - { - this.provider = p; - this.node = n; - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkEvent.java b/src/api/java/appeng/api/networking/events/MENetworkEvent.java deleted file mode 100644 index 638f6332..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkEvent.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGrid; - - -/** - * Part of AE's Event Bus. - * - * Posted via {@link IGrid}.postEvent or {@link IGrid}.postEventTo - */ -public class MENetworkEvent -{ - - private int visited = 0; - private boolean canceled = false; - - /** - * Call to prevent AE from posting the event to any further objects. - */ - public void cancel() - { - this.canceled = true; - } - - /** - * called by AE after each object is called to cancel any future calls. - * - * @return true to cancel future calls - */ - public boolean isCanceled() - { - return this.canceled; - } - - /** - * the number of objects that were visited by the event. - * - * @return number of visitors - */ - public int getVisitedObjects() - { - return this.visited; - } - - /** - * Called by AE after iterating the event subscribers. - * - * @param v current number of visitors - */ - public void setVisitedObjects( int v ) - { - this.visited = v; - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java b/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java deleted file mode 100644 index 198f5306..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkEventSubscribe.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -import appeng.api.networking.IGridCache; -import appeng.api.networking.IGridHost; - - -/** - * Usable on any {@link IGridHost}, or {@link IGridCache} - */ -@Retention( RetentionPolicy.RUNTIME ) -public @interface MENetworkEventSubscribe -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java b/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java deleted file mode 100644 index 1fddaa8a..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkPostCacheConstruction.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -/** - * Posted after all the caches are available, but before the grid is fully - * constructed, can be used to perform cross cache construction processes. - */ -public class MENetworkPostCacheConstruction extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java deleted file mode 100644 index 5af71e2c..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerIdleChange.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridNode; - - -/** - * Implementers of a IGridBlock must post this event when your getIdlePowerUsage - * starts returning a new value, if you do not post this event the network will - * not change the idle draw. - * - * you do not need to send this event when your node is added / removed from the grid. - */ -public class MENetworkPowerIdleChange extends MENetworkEvent -{ - - public final IGridNode node; - - public MENetworkPowerIdleChange( IGridNode nodeThatChanged ) - { - this.node = nodeThatChanged; - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java deleted file mode 100644 index ed7ed4bc..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerStatusChange.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridNode; -import appeng.api.networking.energy.IEnergyGrid; - - -/** - * Posted by the network when the power status of the network goes up or down, - * the change is reflected via the {@link IEnergyGrid}.isNetworkPowered() or via - * {@link IGridNode}.isActive() - * - * Note: Most machines just need to check {@link IGridNode}.isActive() - */ -public class MENetworkPowerStatusChange extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java b/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java deleted file mode 100644 index 932a05bf..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkPowerStorage.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.energy.IAEPowerStorage; - - -/** - * informs the network, that a {@link IAEPowerStorage} block that had either run, - * out of power, or was full, is no longer in that state. - * - * failure to post this event when your {@link IAEPowerStorage} changes state will - * result in your block not charging, or not-discharging. - * - * you do not need to send this event when your node is added / removed from the grid. - */ -public class MENetworkPowerStorage extends MENetworkEvent -{ - - public final IAEPowerStorage storage; - public final PowerEventType type; - - public MENetworkPowerStorage( IAEPowerStorage t, PowerEventType y ) - { - this.storage = t; - this.type = y; - } - - public enum PowerEventType - { - /** - * informs the network this tile is ready to receive power again. - */ - REQUEST_POWER, - - /** - * informs the network this tile is ready to provide power again. - */ - PROVIDE_POWER - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java b/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java deleted file mode 100644 index 968d8475..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkSecurityChange.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -/** - * Posted by the security framework when permissions change - */ -public class MENetworkSecurityChange extends MENetworkEvent -{ - -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java b/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java deleted file mode 100644 index 82a2a7ba..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkSpatialEvent.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.networking.IGridHost; - - -/** - * An event that is posted whenever a spatial IO is active, called for IGridCache - */ -public class MENetworkSpatialEvent extends MENetworkEvent -{ - public final IGridHost host; - public final double spatialEnergyUsage; - - /** - * @param SpatialIO ( INSTANCE of the SpatialIO block ) - * @param EnergyUsage ( the amount of energy that the SpatialIO uses) - */ - public MENetworkSpatialEvent( IGridHost SpatialIO, double EnergyUsage ) - { - this.host = SpatialIO; - this.spatialEnergyUsage = EnergyUsage; - } -} diff --git a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java b/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java deleted file mode 100644 index e83fa826..00000000 --- a/src/api/java/appeng/api/networking/events/MENetworkStorageEvent.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.events; - - -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.StorageChannel; - - -/** - * posted by the network when the networks Storage Changes, you can use the currentItems list to check levels, and - * update status. - * - * this is the least useful method of getting info about changes in the network. - * - * Do not modify the list or its contents in anyway. - */ -public class MENetworkStorageEvent extends MENetworkEvent -{ - - public final IMEMonitor monitor; - public final StorageChannel channel; - - public MENetworkStorageEvent( IMEMonitor o, StorageChannel chan ) - { - this.monitor = o; - this.channel = chan; - } -} diff --git a/src/api/java/appeng/api/networking/pathing/ControllerState.java b/src/api/java/appeng/api/networking/pathing/ControllerState.java deleted file mode 100644 index 0bb0e5e1..00000000 --- a/src/api/java/appeng/api/networking/pathing/ControllerState.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.pathing; - - -public enum ControllerState -{ - /** - * No controller blocks are present in the network. - */ - NO_CONTROLLER, - - /** - * Controller rules followed, booting enabled. - */ - CONTROLLER_ONLINE, - - /** - * Controller rules not followed, lock up while booting. - */ - CONTROLLER_CONFLICT -} diff --git a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java b/src/api/java/appeng/api/networking/pathing/IPathingGrid.java deleted file mode 100644 index f9a592ee..00000000 --- a/src/api/java/appeng/api/networking/pathing/IPathingGrid.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.pathing; - - -import appeng.api.networking.IGridCache; - - -public interface IPathingGrid extends IGridCache -{ - - /** - * @return true if the network is in its booting stage - */ - boolean isNetworkBooting(); - - /** - * @return the controller state of the network, useful if you want to - * require a controller for a feature. - */ - ControllerState getControllerState(); - - /** - * trigger a network reset, booting, path-finding and all. - */ - void repath(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/networking/security/BaseActionSource.java b/src/api/java/appeng/api/networking/security/BaseActionSource.java deleted file mode 100644 index bfaa66a2..00000000 --- a/src/api/java/appeng/api/networking/security/BaseActionSource.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -public class BaseActionSource -{ - - public boolean isPlayer() - { - return false; - } - - public boolean isMachine() - { - return false; - } -} diff --git a/src/api/java/appeng/api/networking/security/IActionHost.java b/src/api/java/appeng/api/networking/security/IActionHost.java deleted file mode 100644 index 90c056d8..00000000 --- a/src/api/java/appeng/api/networking/security/IActionHost.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; - - -public interface IActionHost extends IGridHost -{ - - /** - * Used to for calculating security rules, you must supply a node from your - * IGridHost for the security test, this should be the primary node for the - * machine, unless the action is preformed by a non primary node. - * - * @return the the gridnode that actions from this IGridHost are preformed - * by. - */ - IGridNode getActionableNode(); -} diff --git a/src/api/java/appeng/api/networking/security/ISecurityGrid.java b/src/api/java/appeng/api/networking/security/ISecurityGrid.java deleted file mode 100644 index 3a54590c..00000000 --- a/src/api/java/appeng/api/networking/security/ISecurityGrid.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -import net.minecraft.entity.player.EntityPlayer; - -import appeng.api.config.SecurityPermissions; -import appeng.api.networking.IGridCache; - - -public interface ISecurityGrid extends IGridCache -{ - - /** - * @return true if a security provider is in the network ( and only 1 ) - */ - boolean isAvailable(); - - /** - * Check if a player has permissions. - * - * @param player to be checked player - * @param perm checked permissions - * - * @return true if the player has permissions. - */ - boolean hasPermission( EntityPlayer player, SecurityPermissions perm ); - - /** - * Check if a player has permissions. - * - * @param playerID id of player - * @param perm checked permissions - * - * @return true if the player has permissions. - */ - boolean hasPermission( int playerID, SecurityPermissions perm ); - - /** - * @return PlayerID of the admin, or owner, this is the person who placed the security block. - */ - int getOwner(); -} diff --git a/src/api/java/appeng/api/networking/security/ISecurityProvider.java b/src/api/java/appeng/api/networking/security/ISecurityProvider.java deleted file mode 100644 index 049d2e64..00000000 --- a/src/api/java/appeng/api/networking/security/ISecurityProvider.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -import java.util.EnumSet; -import java.util.HashMap; - -import appeng.api.config.SecurityPermissions; - - -/** - * Implemented on Security Terminal to interface with security cache. - */ -public interface ISecurityProvider -{ - - /** - * used to represent the security key for the network, should be based on a unique timestamp. - * - * @return unique key. - */ - long getSecurityKey(); - - /** - * Push permission data into security cache. - * - * @param playerPerms player permissions - */ - void readPermissions( HashMap> playerPerms ); - - /** - * @return is security on or off? - */ - boolean isSecurityEnabled(); - - /** - * @return player ID for who placed the security provider. - */ - int getOwner(); -} diff --git a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java b/src/api/java/appeng/api/networking/security/ISecurityRegistry.java deleted file mode 100644 index a2e9ef37..00000000 --- a/src/api/java/appeng/api/networking/security/ISecurityRegistry.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -import java.util.EnumSet; - -import appeng.api.config.SecurityPermissions; - - -/** - * Used by vanilla Security Terminal to post biometric data into the security cache. - */ -public interface ISecurityRegistry -{ - - /** - * Submit Permissions into the register. - * - * @param PlayerID player id - * @param permissions permissions of player - */ - void addPlayer( int PlayerID, EnumSet permissions ); -} diff --git a/src/api/java/appeng/api/networking/security/MachineSource.java b/src/api/java/appeng/api/networking/security/MachineSource.java deleted file mode 100644 index a01b5474..00000000 --- a/src/api/java/appeng/api/networking/security/MachineSource.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -public class MachineSource extends BaseActionSource -{ - - public final IActionHost via; - - public MachineSource( IActionHost v ) - { - this.via = v; - } - - @Override - public boolean isMachine() - { - return true; - } -} diff --git a/src/api/java/appeng/api/networking/security/PlayerSource.java b/src/api/java/appeng/api/networking/security/PlayerSource.java deleted file mode 100644 index 49442bc1..00000000 --- a/src/api/java/appeng/api/networking/security/PlayerSource.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.security; - - -import net.minecraft.entity.player.EntityPlayer; - - -public class PlayerSource extends BaseActionSource -{ - - public final EntityPlayer player; - public final IActionHost via; - - public PlayerSource( EntityPlayer p, IActionHost v ) - { - this.player = p; - this.via = v; - } - - @Override - public boolean isPlayer() - { - return true; - } -} diff --git a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java b/src/api/java/appeng/api/networking/spatial/ISpatialCache.java deleted file mode 100644 index d70b9bda..00000000 --- a/src/api/java/appeng/api/networking/spatial/ISpatialCache.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.spatial; - - -import appeng.api.networking.IGridCache; -import appeng.api.util.DimensionalCoord; - - -public interface ISpatialCache extends IGridCache -{ - - /** - * @return true if a region is defined at all, it doesn't have to be valid, but all points must be in the same world. - */ - boolean hasRegion(); - - /** - * @return true if the region defined is valid according to all rules. - */ - boolean isValidRegion(); - - /** - * @return the minimum anchor point for the spatial region. - */ - DimensionalCoord getMin(); - - /** - * @return the maximum anchor point for the spatial region. - */ - DimensionalCoord getMax(); - - /** - * @return how many AE units are required to preform the activation - */ - long requiredPower(); - - /** - * @return current 100% - 0% efficiency. - */ - float currentEfficiency(); -} diff --git a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java b/src/api/java/appeng/api/networking/storage/IBaseMonitor.java deleted file mode 100644 index 2d906ee3..00000000 --- a/src/api/java/appeng/api/networking/storage/IBaseMonitor.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.storage; - - -import appeng.api.storage.IMEMonitorHandlerReceiver; -import appeng.api.storage.data.IAEStack; - - -public interface IBaseMonitor -{ - - /** - * add a new Listener to the monitor, be sure to properly remove yourself when your done. - */ - void addListener( IMEMonitorHandlerReceiver l, Object verificationToken ); - - /** - * remove a Listener to the monitor. - */ - void removeListener( IMEMonitorHandlerReceiver l ); -} diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcher.java b/src/api/java/appeng/api/networking/storage/IStackWatcher.java deleted file mode 100644 index 9d99a39d..00000000 --- a/src/api/java/appeng/api/networking/storage/IStackWatcher.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.storage; - - -import java.util.Collection; - -import appeng.api.storage.data.IAEStack; - - -public interface IStackWatcher extends Collection -{ - -} diff --git a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java b/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java deleted file mode 100644 index f2a9f3dc..00000000 --- a/src/api/java/appeng/api/networking/storage/IStackWatcherHost.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.storage; - - -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.StorageChannel; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; - - -public interface IStackWatcherHost -{ - - /** - * provides the IStackWatcher for this host, for the current network, is called when the hot changes networks. You - * do not need to clear your old watcher, its already been removed by the time this gets called. - * - * @param newWatcher stack watcher - */ - void updateWatcher( IStackWatcher newWatcher ); - - /** - * Called when a watched item changes amounts. - * - * @param o changed item list - * @param fullStack old stack - * @param diffStack new stack - * @param src action source - * @param chan storage channel - */ - void onStackChange( IItemList o, IAEStack fullStack, IAEStack diffStack, BaseActionSource src, StorageChannel chan ); -} diff --git a/src/api/java/appeng/api/networking/storage/IStorageGrid.java b/src/api/java/appeng/api/networking/storage/IStorageGrid.java deleted file mode 100644 index 31e8277f..00000000 --- a/src/api/java/appeng/api/networking/storage/IStorageGrid.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.storage; - - -import appeng.api.networking.IGridCache; -import appeng.api.networking.IGridHost; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.ICellContainer; -import appeng.api.storage.ICellProvider; -import appeng.api.storage.IStorageMonitorable; -import appeng.api.storage.StorageChannel; -import appeng.api.storage.data.IAEStack; - - -/** - * Common base class for item / fluid storage caches. - */ -public interface IStorageGrid extends IGridCache, IStorageMonitorable -{ - - /** - * Used to inform the network of alterations to the storage system that fall outside of the standard Network - * operations, Examples, ME Chest inputs from the world, or a Storage Bus detecting modifications made to the chest - * by an outside force. - * - * Expects the input to have either a negative or a positive stack size to correspond to the injection, or - * extraction operation. - * - * @param input injected items - */ - void postAlterationOfStoredItems( StorageChannel chan, Iterable input, BaseActionSource src ); - - /** - * Used to add a cell provider to the storage system - * - * THIS IT NOT FOR USE {@link IGridHost} THAT PROVIDE {@link ICellContainer} - those are automatically handled by - * the storage system. - * - * @param cc to be added cell provider - */ - void registerCellProvider( ICellProvider cc ); - - /** - * remove a provider added with addCellContainer - */ - void unregisterCellProvider( ICellProvider cc ); -} diff --git a/src/api/java/appeng/api/networking/ticking/IGridTickable.java b/src/api/java/appeng/api/networking/ticking/IGridTickable.java deleted file mode 100644 index 5e2bd2a5..00000000 --- a/src/api/java/appeng/api/networking/ticking/IGridTickable.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.ticking; - - -import appeng.api.networking.IGridNode; - - -/** - * Implement on IGridHosts which want to use AE's Network Ticking Feature. - */ -public interface IGridTickable -{ - - /** - * Important note regarding IGridTickables with more then one one node, - * - * If your IGridHost hosts multiple nodes, it may be on multiple grids, or - * its node may be present on the same grid multiple times, this is as - * designed, however if you choose to use the grid to tick these Hosts you - * must be aware that they they should probably pick a single node to tick - * for, and not tick for each node. - * - */ - - /** - * You can return null, if you wish to tick using MC's ticking mechanism, or - * you can return a valid TickingRequest to tell AE a guide for which type - * of responsiveness your device wants. - * - * this will be called for your tile any time your tile changes grids, this - * can happen at any time, so if your using the sleep feature you may wish - * to preserve your sleep, in the result of this method. or you can simply - * reset it. - * - * @return null or a valid new TickingRequest - */ - TickingRequest getTickingRequest( IGridNode node ); - - /** - * AE lets you adjust your tick rate based on the results of your tick, if - * your block as accomplished work you may wish to increase the ticking - * speed, if your block is idle you may wish to slow it down. - * - * Its up to you. - * - * Note: this is never called if you return null from getTickingRequest. - * - * @param TicksSinceLastCall the number of world ticks that were skipped since your last - * tick, you can use this to adjust speed of processing or adjust - * your tick rate. - * - * @return tick rate adjustment. - */ - TickRateModulation tickingRequest( IGridNode node, int TicksSinceLastCall ); -} diff --git a/src/api/java/appeng/api/networking/ticking/ITickManager.java b/src/api/java/appeng/api/networking/ticking/ITickManager.java deleted file mode 100644 index 6c5d7de8..00000000 --- a/src/api/java/appeng/api/networking/ticking/ITickManager.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.ticking; - - -import appeng.api.networking.IGridCache; -import appeng.api.networking.IGridNode; - - -/** - * The network tick manager. - */ -public interface ITickManager extends IGridCache -{ - - /** - * immediately sets the node to tick, only valid if your node is marked as "Alertable" in its TickingRequest - * - * Sleeping Devices Still Alertable, when your tile is alerted its new status is determined by the result of its - * tick. - * - * @param node gridnode - */ - boolean alertDevice( IGridNode node ); - - /** - * disables ticking for your device. - * - * @param node gridnode - * - * @return if the call was successful. - */ - boolean sleepDevice( IGridNode node ); - - /** - * enables ticking for your device, undoes a sleepDevice call. - * - * @param node gridnode - * - * @return if the call was successful. - */ - boolean wakeDevice( IGridNode node ); -} diff --git a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java b/src/api/java/appeng/api/networking/ticking/TickRateModulation.java deleted file mode 100644 index 35e83b92..00000000 --- a/src/api/java/appeng/api/networking/ticking/TickRateModulation.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.ticking; - - -public enum TickRateModulation -{ - /** - * same as idle, but also puts the node to sleep. - */ - SLEEP, - - /** - * set tick rate to maximum. - */ - IDLE, - - /** - * decrease the tick rate marginally. - */ - SLOWER, - - /** - * continue at current rate. - */ - SAME, - - /** - * increase the tick rate marginally. - */ - FASTER, - - /** - * changes the tick rate to the minimum tick rate. - */ - URGENT -} diff --git a/src/api/java/appeng/api/networking/ticking/TickingRequest.java b/src/api/java/appeng/api/networking/ticking/TickingRequest.java deleted file mode 100644 index 6a94f252..00000000 --- a/src/api/java/appeng/api/networking/ticking/TickingRequest.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.networking.ticking; - - -/** - * Describes how your tiles ticking is executed. - */ -public class TickingRequest -{ - - /** - * the minimum number of ticks that must pass between ticks. - * - * Valid Values are : 1+ - * - * Suggested is 5-20 - */ - public final int minTickRate; - - /** - * the maximum number of ticks that can pass between ticks, if this value is - * exceeded the tile must tick. - * - * Valid Values are 1+ - * - * Suggested is 20-40 - */ - public final int maxTickRate; - - /** - * Determines the current expected state of your node, if your node expects - * to be sleeping, then return true. - */ - public final boolean isSleeping; - - /** - * True only if you call {@link ITickManager}.alertDevice( IGridNode ); - */ - public final boolean canBeAlerted; - - public TickingRequest( int min, int max, boolean sleep, boolean alertable ) - { - this.minTickRate = min; - this.maxTickRate = max; - this.isSleeping = sleep; - this.canBeAlerted = alertable; - } -} diff --git a/src/api/java/appeng/api/package-info.java b/src/api/java/appeng/api/package-info.java deleted file mode 100644 index a49bfd44..00000000 --- a/src/api/java/appeng/api/package-info.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -@API( apiVersion = "rv2", owner = "appliedenergistics2", provides = "appliedenergistics2|API" ) package appeng.api; - - -import cpw.mods.fml.common.API; - diff --git a/src/api/java/appeng/api/parts/BusSupport.java b/src/api/java/appeng/api/parts/BusSupport.java deleted file mode 100644 index 03c54de4..00000000 --- a/src/api/java/appeng/api/parts/BusSupport.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -public enum BusSupport -{ - CABLE, - - DENSE_CABLE, - - NO_PARTS -} diff --git a/src/api/java/appeng/api/parts/CableRenderMode.java b/src/api/java/appeng/api/parts/CableRenderMode.java deleted file mode 100644 index abe5e707..00000000 --- a/src/api/java/appeng/api/parts/CableRenderMode.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -public enum CableRenderMode -{ - Standard( false ), - - CableView( true ); - - public final boolean transparentFacades; - public final boolean opaqueFacades; - - CableRenderMode( boolean hideFacades ) - { - this.transparentFacades = hideFacades; - this.opaqueFacades = !hideFacades; - } -} diff --git a/src/api/java/appeng/api/parts/IAlphaPassItem.java b/src/api/java/appeng/api/parts/IAlphaPassItem.java deleted file mode 100644 index f6bccaec..00000000 --- a/src/api/java/appeng/api/parts/IAlphaPassItem.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import net.minecraft.item.ItemStack; - - -public interface IAlphaPassItem -{ - - /** - * Extend, and return true to enable a second pass for your parts in the bus rendering pipe line. - * - * @param is item - * - * @return true to enable a second pass for your parts in the bus rendering pipe line. - */ - boolean useAlphaPass( ItemStack is ); -} diff --git a/src/api/java/appeng/api/parts/IBoxProvider.java b/src/api/java/appeng/api/parts/IBoxProvider.java deleted file mode 100644 index a03230ef..00000000 --- a/src/api/java/appeng/api/parts/IBoxProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -public interface IBoxProvider -{ - - /** - * add your collision information to the the list. - * - * @param boxes collision boxes - */ - void getBoxes( IPartCollisionHelper boxes ); -} diff --git a/src/api/java/appeng/api/parts/IFacadeContainer.java b/src/api/java/appeng/api/parts/IFacadeContainer.java deleted file mode 100644 index 386e5f7b..00000000 --- a/src/api/java/appeng/api/parts/IFacadeContainer.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import java.io.IOException; - -import io.netty.buffer.ByteBuf; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * Used Internally. - * - * not intended for implementation. - */ -public interface IFacadeContainer -{ - - /** - * Attempts to add the {@link IFacadePart} to the given side. - * - * @return true if the facade as successfully added. - */ - boolean addFacade( IFacadePart a ); - - /** - * Removed the facade on the given side, or does nothing. - */ - void removeFacade( IPartHost host, ForgeDirection side ); - - /** - * @return the {@link IFacadePart} for a given side, or null. - */ - IFacadePart getFacade( ForgeDirection s ); - - /** - * rotate the facades left. - */ - void rotateLeft(); - - /** - * write nbt data - * - * @param data to be written data - */ - void writeToNBT( NBTTagCompound data ); - - /** - * read from stream - * - * @param data to be read data - * - * @return true if it was readable - * - * @throws IOException - */ - boolean readFromStream( ByteBuf data ) throws IOException; - - /** - * read from NBT - * - * @param data to be read data - */ - void readFromNBT( NBTTagCompound data ); - - /** - * write to stream - * - * @param data to be written data - * - * @throws IOException - */ - void writeToStream( ByteBuf data ) throws IOException; - - /** - * @return true if there are no facades. - */ - boolean isEmpty(); -} diff --git a/src/api/java/appeng/api/parts/IFacadePart.java b/src/api/java/appeng/api/parts/IFacadePart.java deleted file mode 100644 index 9d70b6aa..00000000 --- a/src/api/java/appeng/api/parts/IFacadePart.java +++ /dev/null @@ -1,102 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.Entity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - - -/** - * Used Internally. - * - * not intended for implementation. - */ -public interface IFacadePart -{ - - /** - * used to save the part. - */ - ItemStack getItemStack(); - - /** - * used to collide, and pick the part - * - * @param ch collision helper - * @param e colliding entity - */ - void getBoxes( IPartCollisionHelper ch, Entity e ); - - /** - * render the part. - * - * @param x x pos of part - * @param y y pos of part - * @param z z pos of part - * @param instance render helper - * @param renderer renderer - * @param fc face container - * @param busBounds bounding box - * @param renderStilt if to render stilt - */ - @SideOnly( Side.CLIENT ) - void renderStatic( int x, int y, int z, IPartRenderHelper instance, RenderBlocks renderer, IFacadeContainer fc, AxisAlignedBB busBounds, boolean renderStilt ); - - /** - * render the part in inventory. - * - * @param instance render helper - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderInventory( IPartRenderHelper instance, RenderBlocks renderer ); - - /** - * @return side the facade is in - */ - ForgeDirection getSide(); - - /** - * @return the box for the face of the facade - */ - AxisAlignedBB getPrimaryBox(); - - Item getItem(); - - int getItemDamage(); - - boolean isBC(); - - void setThinFacades( boolean useThinFacades ); - - boolean isTransparent(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/parts/IPart.java b/src/api/java/appeng/api/parts/IPart.java deleted file mode 100644 index add472c8..00000000 --- a/src/api/java/appeng/api/parts/IPart.java +++ /dev/null @@ -1,300 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import java.io.IOException; -import java.util.List; -import java.util.Random; - -import io.netty.buffer.ByteBuf; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.IIcon; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import appeng.api.networking.IGridNode; - - -public interface IPart extends IBoxProvider -{ - - /** - * get an ItemStack that represents the bus, should contain the settings for whatever, can also be used in - * conjunction with removePart to take a part off and drop it or something. - * - * This is used to drop the bus, and to save the bus, when saving the bus, wrenched is false, and writeToNBT will be - * called to save important details about the part, if the part is wrenched include in your NBT Data any settings - * you might want to keep around, you can restore those settings when constructing your part. - * - * @param type , what kind of ItemStack to return? - * - * @return item of part - */ - ItemStack getItemStack( PartItemStack type ); - - /** - * render item form for inventory, or entity. - * - * GL Available - * - * @param rh helper - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderInventory( IPartRenderHelper rh, RenderBlocks renderer ); - - /** - * render world renderer ( preferred ) - * - * GL is NOT Available - * - * @param x x coord - * @param y y coord - * @param z z coord - * @param rh helper - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderStatic( int x, int y, int z, IPartRenderHelper rh, RenderBlocks renderer ); - - /** - * render TESR. - * - * GL Available - * - * @param x x coord - * @param y y coord - * @param z z coord - * @param rh helper - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderDynamic( double x, double y, double z, IPartRenderHelper rh, RenderBlocks renderer ); - - /** - * @return the Block sheet icon used when rendering the breaking particles, return null to use the ItemStack - * texture. - */ - @SideOnly( Side.CLIENT ) - IIcon getBreakingTexture(); - - /** - * return true only if your part require dynamic rendering, must be consistent. - * - * @return true to enable renderDynamic - */ - boolean requireDynamicRender(); - - /** - * @return if the bus has a solid side, and you can place random stuff on it like torches or levers - */ - boolean isSolid(); - - /** - * @return true if this part can connect to redstone ( also MFR Rednet ) - */ - boolean canConnectRedstone(); - - /** - * Write the part information for saving, the part will be saved with getItemStack(false) and this method will be - * called after to load settings, inventory or other values from the world. - * - * @param data to be written nbt data - */ - void writeToNBT( NBTTagCompound data ); - - /** - * Read the previously written NBT Data. this is the mirror for writeToNBT - * - * @param data to be read nbt data - */ - void readFromNBT( NBTTagCompound data ); - - /** - * @return get the amount of light produced by the bus - */ - int getLightLevel(); - - /** - * does this part act like a ladder? - * - * @param entity climbing entity - * - * @return true if entity can climb - */ - boolean isLadder( EntityLivingBase entity ); - - /** - * a block around the bus's host has been changed. - */ - void onNeighborChanged(); - - /** - * @return output redstone on facing side - */ - int isProvidingStrongPower(); - - /** - * @return output redstone on facing side - */ - int isProvidingWeakPower(); - - /** - * write data to bus packet. - * - * @param data to be written data - * - * @throws IOException - */ - void writeToStream( ByteBuf data ) throws IOException; - - /** - * read data from bus packet. - * - * @param data to be read data - * - * @return true will re-draw the part. - * - * @throws IOException - */ - boolean readFromStream( ByteBuf data ) throws IOException; - - /** - * get the Grid Node for the Bus, be sure your IGridBlock is NOT isWorldAccessible, if it is your going to cause - * crashes. - * - * or null if you don't have a grid node. - * - * @return grid node - */ - IGridNode getGridNode(); - - /** - * called when an entity collides with the bus. - * - * @param entity colliding entity - */ - void onEntityCollision( Entity entity ); - - /** - * called when your part is being removed from the world. - */ - void removeFromWorld(); - - /** - * called when your part is being added to the world. - */ - void addToWorld(); - - /** - * used for tunnels. - * - * @return a grid node that represents the external facing side, these must be isWorldAccessible with the correct - * faces marked as external - */ - IGridNode getExternalFacingNode(); - - /** - * called by the Part host to keep your part informed. - * - * @param host part side - * @param tile tile entity of part - */ - void setPartHostInfo( ForgeDirection side, IPartHost host, TileEntity tile ); - - /** - * Called when you right click the part, very similar to Block.onActivateBlock - * - * @param player right clicking player - * @param pos position of block - * - * @return if your activate method performed something. - */ - boolean onActivate( EntityPlayer player, Vec3 pos ); - - /** - * Called when you right click the part, very similar to Block.onActivateBlock - * - * @param player shift right clicking player - * @param pos position of block - * - * @return if your activate method performed something, you should use false unless you really need it. - */ - boolean onShiftActivate( EntityPlayer player, Vec3 pos ); - - /** - * Add drops to the items being dropped into the world, if your item stores its contents when wrenched use the - * wrenched boolean to control what data is saved vs dropped when it is broken. - * - * @param drops item drops if wrenched - * @param wrenched control flag for wrenched vs broken - */ - void getDrops( List drops, boolean wrenched ); - - /** - * @return 0 - 8, reasonable default 3-4, this controls the cable connection to the node. - */ - int cableConnectionRenderTo(); - - /** - * same as Block.randomDisplayTick, for but parts. - * - * @param world world of block - * @param x x coord of block - * @param y y coord of block - * @param z z coord of block - * @param r random - */ - void randomDisplayTick( World world, int x, int y, int z, Random r ); - - /** - * Called when placed in the world by a player, this happens before addWorld. - * - * @param player placing player - * @param held held item - * @param side placing side - */ - void onPlacement( EntityPlayer player, ItemStack held, ForgeDirection side ); - - /** - * Used to determine which parts can be placed on what cables. - * - * @param what placed part - * - * @return true if the part can be placed on this support. - */ - boolean canBePlacedOn( BusSupport what ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/parts/IPartCollisionHelper.java b/src/api/java/appeng/api/parts/IPartCollisionHelper.java deleted file mode 100644 index f790a5d5..00000000 --- a/src/api/java/appeng/api/parts/IPartCollisionHelper.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import net.minecraftforge.common.util.ForgeDirection; - - -public interface IPartCollisionHelper -{ - - /** - * add a collision box, expects 0.0 - 16.0 block coords. - * - * No complaints about the size, I like using pixels :P - * - * @param minX minimal x collision - * @param minY minimal y collision - * @param minZ minimal z collision - * @param maxX maximal x collision - * @param maxY maximal y collision - * @param maxZ maximal z collision - */ - void addBox( double minX, double minY, double minZ, double maxX, double maxY, double maxZ ); - - /** - * @return east in world space. - */ - ForgeDirection getWorldX(); - - /** - * @return up in world space. - */ - ForgeDirection getWorldY(); - - /** - * @return forward in world space. - */ - ForgeDirection getWorldZ(); - - /** - * @return true if this test is to get the BB Collision information. - */ - boolean isBBCollision(); -} diff --git a/src/api/java/appeng/api/parts/IPartHelper.java b/src/api/java/appeng/api/parts/IPartHelper.java deleted file mode 100644 index 2487d8c5..00000000 --- a/src/api/java/appeng/api/parts/IPartHelper.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - - -public interface IPartHelper -{ - - /** - * Register a new layer with the part layer system, this allows you to write - * an in between between tile entities and parts. - * - * AE By Default includes, - * - * 1. ISidedInventory ( and by extension IInventory. ) - * - * 2. IFluidHandler Forge Fluids - * - * 3. IPowerEmitter BC Power output. - * - * 4. IPowerReceptor BC Power input. - * - * 5. IEnergySink IC2 Power input. - * - * 6. IEnergySource IC2 Power output. - * - * 7. IPipeConnection BC Pipe Connections - * - * As long as a valid layer is registered for a interface you can simply - * implement that interface on a part get implement it. - * - * @return true on success, false on failure, usually a error will be logged - * as well. - */ - boolean registerNewLayer( String string, String layerInterface ); - - /** - * Register IBusItem with renderer - */ - void setItemBusRenderer( IPartItem i ); - - /** - * use in use item, to try and place a IBusItem - * - * @param is ItemStack of an item which implements {@link IPartItem} - * @param x x pos of part - * @param y y pos of part - * @param z z pos of part - * @param side side which the part should be on - * @param player player placing part - * @param world part in world - * - * @return true if placing was successful - */ - boolean placeBus( ItemStack is, int x, int y, int z, int side, EntityPlayer player, World world ); - - /** - * @return the render mode - */ - CableRenderMode getCableRenderMode(); -} diff --git a/src/api/java/appeng/api/parts/IPartHost.java b/src/api/java/appeng/api/parts/IPartHost.java deleted file mode 100644 index 4242dc81..00000000 --- a/src/api/java/appeng/api/parts/IPartHost.java +++ /dev/null @@ -1,182 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import java.util.Set; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.Vec3; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.util.AEColor; -import appeng.api.util.DimensionalCoord; - - -/** - * Implemented on AE's TileEntity or AE's FMP Part. - * - * Do Not Implement - */ -public interface IPartHost -{ - - /** - * @return the facade container - */ - IFacadeContainer getFacadeContainer(); - - /** - * Test if you can add a part to the specified side of the Part Host, {@link ForgeDirection}.UNKNOWN is used to - * represent the cable in the middle. - * - * @param part to be added part - * @param side part placed onto side - * - * @return returns false if the part cannot be added. - */ - boolean canAddPart( ItemStack part, ForgeDirection side ); - - /** - * try to add a new part to the specified side, returns false if it failed to be added. - * - * @param is new part - * @param side onto side - * @param owner with owning player - * - * @return null if the item failed to add, the side it was placed on other wise ( may different for cables, - * {@link ForgeDirection}.UNKNOWN ) - */ - ForgeDirection addPart( ItemStack is, ForgeDirection side, EntityPlayer owner ); - - /** - * Get part by side ( center is {@link ForgeDirection}.UNKNOWN ) - * - * @param side side of part - * - * @return the part located on the specified side, or null if there is no part. - */ - IPart getPart( ForgeDirection side ); - - /** - * removes the part on the side, this doesn't drop it or anything, if you don't do something with it, its just - * "gone" and its never coming back; think about it. - * - * if you want to drop the part you must request it prior to removing it. - * - * @param side side of part - * @param suppressUpdate - used if you need to replace a part's INSTANCE, without really removing it first. - */ - void removePart( ForgeDirection side, boolean suppressUpdate ); - - /** - * something changed, might want to send a packet to clients to update state. - */ - void markForUpdate(); - - /** - * @return the physical location of the part host in the universe. - */ - DimensionalCoord getLocation(); - - /** - * @return the tile entity for the host, this can either be an FMP tile, or a AE tile - */ - TileEntity getTile(); - - /** - * @return the color of the host type ( this is determined by the middle cable. ) if no cable is present, it returns - * {@link AEColor} .Transparent other wise it returns the color of the cable in the center. - */ - AEColor getColor(); - - /** - * destroys the part container, for internal use. - */ - void clearContainer(); - - /** - * Used to test for FMP microblock blocking internally. - * - * @return returns if microblocks are blocking this cable path. - */ - boolean isBlocked( ForgeDirection side ); - - /** - * finds the part located at the position ( pos must be relative, not global ) - * - * @param pos part position - * - * @return a new SelectedPart, this is never null. - */ - SelectedPart selectPart( Vec3 pos ); - - /** - * can be used by parts to trigger the tile or part to save. - */ - void markForSave(); - - /** - * part of the {@link LayerBase} - */ - void partChanged(); - - /** - * get the redstone state of host on this side, this value is cached internally. - * - * @param side side of part - * - * @return true of the part host is receiving redstone from an external source. - */ - boolean hasRedstone( ForgeDirection side ); - - /** - * returns false if this block contains any parts or facades, true other wise. - */ - boolean isEmpty(); - - /** - * @return a mutable list of flags you can adjust to track state. - */ - Set getLayerFlags(); - - /** - * remove host from world... - */ - void cleanup(); - - /** - * notify neighbors uf updated status. - */ - void notifyNeighbors(); - - /** - * true if the tile is in the world, other wise false. - * - * @return true if tile is in world - */ - boolean isInWorld(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java deleted file mode 100644 index dc755477..00000000 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import net.minecraft.item.ItemStack; - -//@formatter:off - - -/** - * This is a pretty basic requirement, once you implement the interface, and createPartFromItemStack - * - * you must register your bus with the Bus renderer, using AEApi.INSTANCE().partHelper().setItemBusRenderer( this ); - * - * then simply add these two methods, which tell MC to use the Block Textures, and call AE's Bus Placement Code. - * - *
- * 
- * {@literal @}Override
- * {@literal @}SideOnly(Side.CLIENT)
- * public int getSpriteNumber()
- * {
- *     return 0;
- * }
- *
- * {@literal @}Override
- * public boolean onItemUse(ItemStack is, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
- * {
- *     return AEApi.INSTANCE().partHelper().placeBus( is, x, y, z, side, player, world );
- * }
- * 
- * 
- */ -public interface IPartItem -{ - - /** - * create a new part INSTANCE, from the item stack. - * - * @param is item - * - * @return part from item - */ - IPart createPartFromItemStack( ItemStack is ); -} diff --git a/src/api/java/appeng/api/parts/IPartRenderHelper.java b/src/api/java/appeng/api/parts/IPartRenderHelper.java deleted file mode 100644 index b02e5456..00000000 --- a/src/api/java/appeng/api/parts/IPartRenderHelper.java +++ /dev/null @@ -1,203 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import java.util.EnumSet; - -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.util.IIcon; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - - -public interface IPartRenderHelper -{ - - /** - * sets the Render Helpers Block Bounds. 0.0 - 16.0 block coords. - * - * No complaints about the size, I like using pixels :P - * - * @param minX minimal x bound - * @param minY minimal y bound - * @param minZ minimal z bound - * @param maxX maximal x bound - * @param maxY maximal y bound - * @param maxZ maximal z bound - */ - void setBounds( float minX, float minY, float minZ, float maxX, float maxY, float maxZ ); - - /** - * static renderer - * - * render a single face. - * - * @param x x coord of part - * @param y y coord of part - * @param z z coord of part - * @param ico icon of part - * @param face direction its facing - * @param renderer renderer of part - */ - @SideOnly( Side.CLIENT ) - void renderFace( int x, int y, int z, IIcon ico, ForgeDirection face, RenderBlocks renderer ); - - /** - * static renderer - * - * render a box with a cut out box in the center. - * - * @param x x pos of part - * @param y y pos of part - * @param z z pos of part - * @param ico icon of part - * @param face face of part - * @param edgeThickness thickness of the edge - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderFaceCutout( int x, int y, int z, IIcon ico, ForgeDirection face, float edgeThickness, RenderBlocks renderer ); - - /** - * static renderer - * - * render a block of specified bounds. - * - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderBlock( int x, int y, int z, RenderBlocks renderer ); - - /** - * render a single face in inventory renderer. - * - * @param IIcon icon of part - * @param direction face of part - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderInventoryFace( IIcon IIcon, ForgeDirection direction, RenderBlocks renderer ); - - /** - * render a box in inventory renderer. - * - * @param renderer renderer - */ - @SideOnly( Side.CLIENT ) - void renderInventoryBox( RenderBlocks renderer ); - - /** - * inventory, and static renderer. - * - * set unique icons for each side of the block. - * - * @param down down face - * @param up up face - * @param north north face - * @param south south face - * @param west west face - * @param east east face - */ - void setTexture( IIcon down, IIcon up, IIcon north, IIcon south, IIcon west, IIcon east ); - - /** - * inventory, and static renderer. - * - * set all sides to a single IIcon. - * - * @param ico to be set icon - */ - void setTexture( IIcon ico ); - - /** - * configure the color multiplier for the inventory renderer. - * - * @param whiteVariant color multiplier - */ - void setInvColor( int whiteVariant ); - - /** - * @return the block used for rendering, might need it for some reason... - */ - Block getBlock(); - - /** - * @return the east vector in world directions, rather then renderer - */ - ForgeDirection getWorldX(); - - /** - * @return the up vector in world directions, rather then renderer. - */ - ForgeDirection getWorldY(); - - /** - * @return the forward vector in world directions, rather then renderer. - */ - ForgeDirection getWorldZ(); - - /** - * Pre-Calculates default lighting for the part, call this before using the render helper to render anything else to - * get simplified, but faster lighting for more then one block. - * - * Only worth it if you render more then 1 block. - */ - ISimplifiedBundle useSimplifiedRendering( int x, int y, int z, IBoxProvider p, ISimplifiedBundle sim ); - - /** - * disables, useSimplifiedRendering. - */ - void normalRendering(); - - /** - * render a block using the current renderer state. - * - * @param x x pos of part - * @param y y pos of part - * @param z z pos of part - * @param renderer renderer of part - */ - void renderBlockCurrentBounds( int x, int y, int z, RenderBlocks renderer ); - - /** - * allow you to enable your part to render during the alpha pass or the standard pass. - * - * @param pass render pass - */ - void renderForPass( int pass ); - - /** - * Set which faces to render, remember to set back to ALL when you are done. - * - * @param complementOf sides to render - */ - void setFacesToRender( EnumSet complementOf ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/parts/ISimplifiedBundle.java b/src/api/java/appeng/api/parts/ISimplifiedBundle.java deleted file mode 100644 index ad16791f..00000000 --- a/src/api/java/appeng/api/parts/ISimplifiedBundle.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -public interface ISimplifiedBundle -{ - -} diff --git a/src/api/java/appeng/api/parts/LayerBase.java b/src/api/java/appeng/api/parts/LayerBase.java deleted file mode 100644 index 91ca0f00..00000000 --- a/src/api/java/appeng/api/parts/LayerBase.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import java.util.Set; - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * All Layers must extends this, this get part implementation is provided to interface with the parts, however a real - * implementation will be used at runtime. - */ -public abstract class LayerBase extends TileEntity // implements IPartHost -{ - - /** - * Grants access for the layer to the parts of the host. - * - * This Method looks silly, that is because its not used at runtime, a real implementation will be used instead. - * - * @param side side of part - * - * @return the part for the requested side. - */ - public IPart getPart( ForgeDirection side ) - { - return null; // place holder. - } - - /** - * called when the parts change in the container, YOU MUST CALL super.PartChanged(); - */ - public void notifyNeighbors() - { - } - - /** - * called when the parts change in the container, YOU MUST CALL super.PartChanged(); - */ - public void partChanged() - { - } - - /** - * @return a mutable list of flags you can adjust to track state. - */ - public Set getLayerFlags() - { - return null; // place holder. - } - - public void markForSave() - { - // something! - } -} diff --git a/src/api/java/appeng/api/parts/LayerFlags.java b/src/api/java/appeng/api/parts/LayerFlags.java deleted file mode 100644 index af04459b..00000000 --- a/src/api/java/appeng/api/parts/LayerFlags.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -public enum LayerFlags -{ - - IC2_ENET - -} diff --git a/src/api/java/appeng/api/parts/PartItemStack.java b/src/api/java/appeng/api/parts/PartItemStack.java deleted file mode 100644 index 795dd491..00000000 --- a/src/api/java/appeng/api/parts/PartItemStack.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -public enum PartItemStack -{ - Pick, - - Break, - - Wrench, - - Network, - - World -} diff --git a/src/api/java/appeng/api/parts/SelectedPart.java b/src/api/java/appeng/api/parts/SelectedPart.java deleted file mode 100644 index c5ec7f2f..00000000 --- a/src/api/java/appeng/api/parts/SelectedPart.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.parts; - - -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * Reports a selected part from th IPartHost - */ -public class SelectedPart -{ - - /** - * selected part. - */ - public final IPart part; - - /** - * facade part. - */ - public final IFacadePart facade; - - /** - * side the part is mounted too, or {@link ForgeDirection}.UNKNOWN for cables. - */ - public final ForgeDirection side; - - public SelectedPart() - { - this.part = null; - this.facade = null; - this.side = ForgeDirection.UNKNOWN; - } - - public SelectedPart( IPart part, ForgeDirection side ) - { - this.part = part; - this.facade = null; - this.side = side; - } - - public SelectedPart( IFacadePart facade, ForgeDirection side ) - { - this.part = null; - this.facade = facade; - this.side = side; - } -} diff --git a/src/api/java/appeng/api/recipes/ICraftHandler.java b/src/api/java/appeng/api/recipes/ICraftHandler.java deleted file mode 100644 index 66f44277..00000000 --- a/src/api/java/appeng/api/recipes/ICraftHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -import java.util.List; - -import appeng.api.exceptions.MissingIngredientError; -import appeng.api.exceptions.RecipeError; -import appeng.api.exceptions.RegistrationError; - - -public interface ICraftHandler -{ - - /** - * Called when your recipe handler receives a newly parsed list of inputs/outputs. - * - * @param input parsed inputs - * @param output parsed outputs - * - * @throws RecipeError - */ - void setup( List> input, List> output ) throws RecipeError; - - /** - * called when all recipes are parsed, and your required to register your recipe. - * - * @throws RegistrationError - * @throws MissingIngredientError - */ - void register() throws RegistrationError, MissingIngredientError; -} diff --git a/src/api/java/appeng/api/recipes/IIngredient.java b/src/api/java/appeng/api/recipes/IIngredient.java deleted file mode 100644 index 2878022d..00000000 --- a/src/api/java/appeng/api/recipes/IIngredient.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -import net.minecraft.item.ItemStack; - -import appeng.api.exceptions.MissingIngredientError; -import appeng.api.exceptions.RegistrationError; - - -public interface IIngredient -{ - - /** - * Acquire a single input stack for the current recipe, if more then one ItemStack is possible a - * RegistrationError exception will be thrown, ignore these and let the system handle the error. - * - * @return a single ItemStack for the recipe handler. - * - * @throws RegistrationError - * @throws MissingIngredientError - */ - ItemStack getItemStack() throws RegistrationError, MissingIngredientError; - - /** - * Acquire a list of all the input stacks for the current recipe, this is for handlers that support - * multiple inputs per slot. - * - * @return an array of ItemStacks for the recipe handler. - * - * @throws RegistrationError - * @throws MissingIngredientError - */ - ItemStack[] getItemStackSet() throws RegistrationError, MissingIngredientError; - - /** - * If you wish to support air, you must test before getting the ItemStack, or ItemStackSet - * - * @return true if this slot contains no ItemStack, this is passed as "_" - */ - boolean isAir(); - - /** - * @return The Name Space of the item. Prefer getItemStack or getItemStackSet - */ - String getNameSpace(); - - /** - * @return The Name of the item. Prefer getItemStack or getItemStackSet - */ - String getItemName(); - - /** - * @return The Damage Value of the item. Prefer getItemStack or getItemStackSet - */ - int getDamageValue(); - - /** - * @return The Damage Value of the item. Prefer getItemStack or getItemStackSet - */ - int getQty(); - - /** - * Bakes the lists in for faster runtime look-ups. - * - * @throws MissingIngredientError - * @throws RegistrationError - */ - void bake() throws RegistrationError, MissingIngredientError; -} diff --git a/src/api/java/appeng/api/recipes/IRecipeHandler.java b/src/api/java/appeng/api/recipes/IRecipeHandler.java deleted file mode 100644 index 5c7b32e0..00000000 --- a/src/api/java/appeng/api/recipes/IRecipeHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -/** - * Represents the AE2 Recipe Loading/Reading Class - */ -public interface IRecipeHandler -{ - - /** - * Call when you want to read recipes in from a file based on a loader - * - * @param loader recipe loader - * @param path path of file - */ - void parseRecipes( IRecipeLoader loader, String path ); - - /** - * this loads the read recipes into minecraft, should be called in Init. - */ - void injectRecipes(); -} diff --git a/src/api/java/appeng/api/recipes/IRecipeLoader.java b/src/api/java/appeng/api/recipes/IRecipeLoader.java deleted file mode 100644 index 0e05c745..00000000 --- a/src/api/java/appeng/api/recipes/IRecipeLoader.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -import java.io.BufferedReader; - - -public interface IRecipeLoader -{ - - BufferedReader getFile( String s ) throws Exception; -} diff --git a/src/api/java/appeng/api/recipes/ISubItemResolver.java b/src/api/java/appeng/api/recipes/ISubItemResolver.java deleted file mode 100644 index 3e9c473a..00000000 --- a/src/api/java/appeng/api/recipes/ISubItemResolver.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -public interface ISubItemResolver -{ - /** - * @param namespace namespace of sub item - * @param fullName name of sub item - * - * @return either a ResolveResult, or a ResolverResultSet - */ - Object resolveItemByName( String namespace, String fullName ); -} diff --git a/src/api/java/appeng/api/recipes/ResolverResult.java b/src/api/java/appeng/api/recipes/ResolverResult.java deleted file mode 100644 index 879efab5..00000000 --- a/src/api/java/appeng/api/recipes/ResolverResult.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -import net.minecraft.nbt.NBTTagCompound; - - -public class ResolverResult -{ - - public final String itemName; - public final int damageValue; - public final NBTTagCompound compound; - - public ResolverResult( String name, int damage ) - { - this.itemName = name; - this.damageValue = damage; - this.compound = null; - } - - public ResolverResult( String name, int damage, NBTTagCompound data ) - { - this.itemName = name; - this.damageValue = damage; - this.compound = data; - } -} diff --git a/src/api/java/appeng/api/recipes/ResolverResultSet.java b/src/api/java/appeng/api/recipes/ResolverResultSet.java deleted file mode 100644 index 884b0f10..00000000 --- a/src/api/java/appeng/api/recipes/ResolverResultSet.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.recipes; - - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.item.ItemStack; - - -public class ResolverResultSet -{ - - public final String name; - public final List results; - - public ResolverResultSet( String myName, ItemStack... set ) - { - this.results = Arrays.asList( set ); - this.name = myName; - } -} diff --git a/src/api/java/appeng/api/storage/ICellContainer.java b/src/api/java/appeng/api/storage/ICellContainer.java deleted file mode 100644 index 4445dd3e..00000000 --- a/src/api/java/appeng/api/storage/ICellContainer.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.networking.security.IActionHost; - - -/** - * Represents an {@link appeng.api.networking.IGridHost} that contributes to storage, such as a ME Chest, or ME Drive. - */ -public interface ICellContainer extends IActionHost, ICellProvider, ISaveProvider -{ - - /** - * tell the Cell container that this slot should blink, the slot number is relative to the - * - * @param slot slot index - */ - void blinkCell( int slot ); -} diff --git a/src/api/java/appeng/api/storage/ICellHandler.java b/src/api/java/appeng/api/storage/ICellHandler.java deleted file mode 100644 index e2207c9f..00000000 --- a/src/api/java/appeng/api/storage/ICellHandler.java +++ /dev/null @@ -1,123 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import appeng.api.implementations.tiles.IChestOrDrive; - - -/** - * Registration record for {@link ICellRegistry} - */ -public interface ICellHandler -{ - - /** - * return true if the provided item is handled by your cell handler. ( AE May choose to skip this method, and just - * request a handler ) - * - * @param is to be checked item - * - * @return return true, if getCellHandler will not return null. - */ - boolean isCell( ItemStack is ); - - /** - * If you cannot handle the provided item, return null - * - * @param is a storage cell item. - * @param host anytime the contents of your storage cell changes it should use this to request a save, please - * note, this value can be null. - * @param channel the storage channel requested. - * - * @return a new IMEHandler for the provided item - */ - IMEInventoryHandler getCellInventory( ItemStack is, ISaveProvider host, StorageChannel channel ); - - /** - * @return the ME Chest texture for light pixels this storage cell type, should be 10x10 with 3px of transparent - * padding on a 16x16 texture, null is valid if your cell cannot be used in the ME Chest. refer to the - * assets for examples. - */ - @SideOnly( Side.CLIENT ) - IIcon getTopTexture_Light(); - - /** - * @return the ME Chest texture for medium pixels this storage cell type, should be 10x10 with 3px of transparent - * padding on a 16x16 texture, null is valid if your cell cannot be used in the ME Chest. refer to the - * assets for examples. - */ - @SideOnly( Side.CLIENT ) - IIcon getTopTexture_Medium(); - - /** - * @return the ME Chest texture for dark pixels this storage cell type, should be 10x10 with 3px of transparent - * padding on a 16x16 texture, null is valid if your cell cannot be used in the ME Chest. refer to the - * assets for examples. - */ - @SideOnly( Side.CLIENT ) - IIcon getTopTexture_Dark(); - - /** - * Called when the storage cell is planed in an ME Chest and the user tries to open the terminal side, if your item - * is not available via ME Chests simply tell the user they can't use it, or something, other wise you should open - * your gui and display the cell to the user. - * - * @param player player opening chest gui - * @param chest to be opened chest - * @param cellHandler cell handler - * @param inv inventory handler - * @param is item - * @param chan storage channel - */ - void openChestGui( EntityPlayer player, IChestOrDrive chest, ICellHandler cellHandler, IMEInventoryHandler inv, ItemStack is, StorageChannel chan ); - - /** - * 0 - cell is missing. - * - * 1 - green, ( usually means available room for types or items. ) - * - * 2 - orange, ( usually means available room for items, but not types. ) - * - * 3 - red, ( usually means the cell is 100% full ) - * - * @param is the cell item. ( use the handler for any details you can ) - * @param handler the handler for the cell is provides for reference, you can cast this to your handler. - * - * @return get the status of the cell based on its contents. - */ - int getStatusForCell( ItemStack is, IMEInventory handler ); - - /** - * @return the ae/t to drain for this storage cell inside a chest/drive. - */ - double cellIdleDrain( ItemStack is, IMEInventory handler ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/ICellInventory.java b/src/api/java/appeng/api/storage/ICellInventory.java deleted file mode 100644 index 13494b8d..00000000 --- a/src/api/java/appeng/api/storage/ICellInventory.java +++ /dev/null @@ -1,121 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import appeng.api.config.FuzzyMode; -import appeng.api.storage.data.IAEItemStack; - - -public interface ICellInventory extends IMEInventory -{ - - /** - * @return the item stack of this storage cell. - */ - ItemStack getItemStack(); - - /** - * @return idle cost for this Storage Cell - */ - double getIdleDrain(); - - /** - * @return fuzzy setting - */ - FuzzyMode getFuzzyMode(); - - /** - * @return access configured list - */ - IInventory getConfigInventory(); - - /** - * @return access installed upgrades. - */ - IInventory getUpgradesInventory(); - - /** - * @return How many bytes are used for each type? - */ - int getBytesPerType(); - - /** - * @return true if a new item type can be added. - */ - boolean canHoldNewItem(); - - /** - * @return total byte storage. - */ - long getTotalBytes(); - - /** - * @return how many bytes are free. - */ - long getFreeBytes(); - - /** - * @return how many bytes are in use. - */ - long getUsedBytes(); - - /** - * @return max number of types. - */ - long getTotalItemTypes(); - - /** - * @return how many items are stored. - */ - long getStoredItemCount(); - - /** - * @return how many items types are currently stored. - */ - long getStoredItemTypes(); - - /** - * @return how many item types remain. - */ - long getRemainingItemTypes(); - - /** - * @return how many more items can be stored. - */ - long getRemainingItemCount(); - - /** - * @return how many items can be added without consuming another byte. - */ - int getUnusedItemCount(); - - /** - * @return the status number for this drive. - */ - int getStatusForCell(); -} diff --git a/src/api/java/appeng/api/storage/ICellInventoryHandler.java b/src/api/java/appeng/api/storage/ICellInventoryHandler.java deleted file mode 100644 index 3f1e77ad..00000000 --- a/src/api/java/appeng/api/storage/ICellInventoryHandler.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.config.IncludeExclude; -import appeng.api.storage.data.IAEItemStack; - - -public interface ICellInventoryHandler extends IMEInventoryHandler -{ - - /** - * @return get access to the Cell Inventory. - */ - ICellInventory getCellInv(); - - boolean isPreformatted(); - - boolean isFuzzy(); - - IncludeExclude getIncludeExcludeMode(); -} diff --git a/src/api/java/appeng/api/storage/ICellProvider.java b/src/api/java/appeng/api/storage/ICellProvider.java deleted file mode 100644 index af849bf4..00000000 --- a/src/api/java/appeng/api/storage/ICellProvider.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import java.util.List; - - -/** - * Allows you to provide cells via non IGridHosts directly to the storage system, drives, and similar features should go - * though {@link ICellContainer} and be automatically handled by the storage system. - */ -public interface ICellProvider -{ - - /** - * Inventory of the tile for use with ME, should always return an valid list, never NULL. - * - * You must return the correct Handler for the correct channel, if your handler returns a IAEItemStack handler, for - * a Fluid Channel stuffs going to explode, same with the reverse. - * - * @return a valid list of handlers, NEVER NULL - */ - List getCellArray( StorageChannel channel ); - - /** - * the storage's priority. - * - * Positive and negative are supported - */ - int getPriority(); -} diff --git a/src/api/java/appeng/api/storage/ICellRegistry.java b/src/api/java/appeng/api/storage/ICellRegistry.java deleted file mode 100644 index 406bfd22..00000000 --- a/src/api/java/appeng/api/storage/ICellRegistry.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import net.minecraft.item.ItemStack; - -import appeng.api.IAppEngApi; - - -/** - * Storage Cell Registry, used for specially implemented cells, if you just want to make a item act like a cell, or new - * cell with different bytes, then you should probably consider IStorageCell instead its considerably simpler. - * - * Do not Implement, obtained via {@link IAppEngApi}.getCellRegistry() - */ -public interface ICellRegistry -{ - - /** - * Register a new handler. - * - * @param handler cell handler - */ - void addCellHandler( ICellHandler handler ); - - /** - * return true, if you can get a InventoryHandler for the item passed. - * - * @param is to be checked item - * - * @return true if the provided item, can be handled by a handler in AE, ( AE May choose to skip this and just get - * the handler instead. ) - */ - boolean isCellHandled( ItemStack is ); - - /** - * get the handler, for the requested type. - * - * @param is to be checked item - * - * @return the handler registered for this item type. - */ - ICellHandler getHandler( ItemStack is ); - - /** - * returns an IMEInventoryHandler for the provided item. - * - * @param is item with inventory handler - * @param host can be null, or the hosting tile / part. - * @param chan the storage channel to request the handler for. - * - * @return new IMEInventoryHandler, or null if there isn't one. - */ - IMEInventoryHandler getCellInventory( ItemStack is, ISaveProvider host, StorageChannel chan ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java b/src/api/java/appeng/api/storage/ICellWorkbenchItem.java deleted file mode 100644 index 668095c6..00000000 --- a/src/api/java/appeng/api/storage/ICellWorkbenchItem.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; - -import appeng.api.config.FuzzyMode; - - -public interface ICellWorkbenchItem -{ - - /** - * if this return false, the item will not be treated as a cell, and cannot be inserted into the work bench. - * - * @param is item - * - * @return true if the item should be editable in the cell workbench. - */ - boolean isEditable( ItemStack is ); - - /** - * used to edit the upgrade slots on your cell, should have a capacity of 0-24, you are also responsible for - * implementing the valid checks, and any storage/usage of them. - * - * onInventoryChange will be called when saving is needed. - */ - IInventory getUpgradesInventory( ItemStack is ); - - /** - * Used to extract, or mirror the contents of the work bench onto the cell. - * - * - This should have exactly 63 slots, any more, or less might cause issues. - * - * onInventoryChange will be called when saving is needed. - */ - IInventory getConfigInventory( ItemStack is ); - - /** - * @return the current fuzzy status. - */ - FuzzyMode getFuzzyMode( ItemStack is ); - - /** - * sets the setting on the cell. - */ - void setFuzzyMode( ItemStack is, FuzzyMode fzMode ); -} diff --git a/src/api/java/appeng/api/storage/IExternalStorageHandler.java b/src/api/java/appeng/api/storage/IExternalStorageHandler.java deleted file mode 100644 index 484864a3..00000000 --- a/src/api/java/appeng/api/storage/IExternalStorageHandler.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.networking.security.BaseActionSource; - - -/** - * A Registration Record for {@link IExternalStorageRegistry} - */ -public interface IExternalStorageHandler -{ - - /** - * if this can handle the provided inventory, return true. ( Generally skipped by AE, and it just calls getInventory - * ) - * - * @param te to be handled tile entity - * @param mySrc source - * - * @return true, if it can get a handler via getInventory - */ - boolean canHandle( TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource mySrc ); - - /** - * if this can handle the given inventory, return the a IMEInventory implementing class for it, if not return null - * - * please note that if your inventory changes and requires polling, you must use an {@link IMEMonitor} instead of an - * {@link IMEInventory} failure to do so will result in invalid item counts and reporting of the inventory. - * - * @param te to be handled tile entity - * @param d direction - * @param channel channel - * @param src source - * - * @return The Handler for the inventory - */ - IMEInventory getInventory( TileEntity te, ForgeDirection d, StorageChannel channel, BaseActionSource src ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java b/src/api/java/appeng/api/storage/IExternalStorageRegistry.java deleted file mode 100644 index 127c7b5a..00000000 --- a/src/api/java/appeng/api/storage/IExternalStorageRegistry.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -import appeng.api.IAppEngApi; -import appeng.api.networking.security.BaseActionSource; - - -/** - * A Registry of External Storage handlers. - * - * Do not implement obtain via {@link IAppEngApi}.registries().getExternalStorageRegistry() - */ -public interface IExternalStorageRegistry -{ - - /** - * A registry for StorageBus interactions - * - * @param esh storage handler - */ - void addExternalStorageInterface( IExternalStorageHandler esh ); - - /** - * @param te tile entity - * @param opposite direction - * @param channel channel - * @param mySrc source - * - * @return the handler for a given tile / forge direction - */ - IExternalStorageHandler getHandler( TileEntity te, ForgeDirection opposite, StorageChannel channel, BaseActionSource mySrc ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/IMEInventory.java b/src/api/java/appeng/api/storage/IMEInventory.java deleted file mode 100644 index 58ff46c6..00000000 --- a/src/api/java/appeng/api/storage/IMEInventory.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.config.Actionable; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; - - -/** - * AE's Equivalent to IInventory, used to reading contents, and manipulating contents of ME Inventories. - * - * Implementations should COMPLETELY ignore stack size limits from an external view point, Meaning that you can inject - * Integer.MAX_VALUE items and it should work as defined, or be able to extract Integer.MAX_VALUE and have it work as - * defined, Translations to MC's max stack size are external to the AE API. - * - * If you want to request a stack of an item, you should should determine that prior to requesting the stack from the - * inventory. - */ -public interface IMEInventory -{ - - /** - * Store new items, or simulate the addition of new items into the ME Inventory. - * - * @param input item to add. - * @param type action type - * @param src action source - * - * @return returns the number of items not added. - */ - StackType injectItems( StackType input, Actionable type, BaseActionSource src ); - - /** - * Extract the specified item from the ME Inventory - * - * @param request item to request ( with stack size. ) - * @param mode simulate, or perform action? - * - * @return returns the number of items extracted, null - */ - StackType extractItems( StackType request, Actionable mode, BaseActionSource src ); - - /** - * request a full report of all available items, storage. - * - * @param out the IItemList the results will be written too - * - * @return returns same list that was passed in, is passed out - */ - IItemList getAvailableItems( IItemList out ); - - /** - * @return the type of channel your handler should be part of - */ - StorageChannel getChannel(); -} diff --git a/src/api/java/appeng/api/storage/IMEInventoryHandler.java b/src/api/java/appeng/api/storage/IMEInventoryHandler.java deleted file mode 100644 index f7740917..00000000 --- a/src/api/java/appeng/api/storage/IMEInventoryHandler.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.config.AccessRestriction; -import appeng.api.storage.data.IAEStack; - - -/** - * Thin logic layer that can be swapped with different IMEInventory implementations, used to handle features related to - * storage, that are Separate from the storage medium itself. - * - * @param - */ -public interface IMEInventoryHandler extends IMEInventory -{ - - /** - * determine if items can be injected/extracted. - * - * @return the access - */ - AccessRestriction getAccess(); - - /** - * determine if a particular item is prioritized for this inventory handler, if it is, then it will be added to this - * inventory prior to any non-prioritized inventories. - * - * @param input - item that might be added - * - * @return if its prioritized - */ - boolean isPrioritized( StackType input ); - - /** - * determine if an item can be accepted and stored. - * - * @param input - item that might be added - * - * @return if the item can be added - */ - boolean canAccept( StackType input ); - - /** - * determine what the priority of the inventory is. - * - * @return the priority, zero is default, positive and negative are supported. - */ - int getPriority(); - - /** - * pass back value for blinkCell. - * - * @return the slot index for the cell that this represents in the storage unit, the method on the - * {@link ICellContainer} will be called with this value, only trust the return value of this method if you - * are the implementer of this. - */ - int getSlot(); - - /** - * AE Uses a two pass placement system, the first pass checks contents and tries to find a place where the item - * belongs, however in some cases you can save processor time, or require that the second, or first pass is simply - * ignored, this allows you to do that. - * - * @param i - pass number ( 1 or 2 ) - * - * @return true, if this inventory is valid for this pass. - */ - boolean validForPass( int i ); -} diff --git a/src/api/java/appeng/api/storage/IMEMonitor.java b/src/api/java/appeng/api/storage/IMEMonitor.java deleted file mode 100644 index 752691e2..00000000 --- a/src/api/java/appeng/api/storage/IMEMonitor.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; - - -public interface IMEMonitor extends IMEInventoryHandler, IBaseMonitor -{ - - /** - * This method is discouraged when accessing data via a IMEMonitor - */ - @Override - @Deprecated - IItemList getAvailableItems( IItemList out ); - - /** - * Get access to the full item list of the network, preferred over {@link IMEInventory} .getAvailableItems(...) - * - * @return full storage list. - */ - IItemList getStorageList(); -} diff --git a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java b/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java deleted file mode 100644 index 30bbb745..00000000 --- a/src/api/java/appeng/api/storage/IMEMonitorHandlerReceiver.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.storage.data.IAEStack; - - -public interface IMEMonitorHandlerReceiver -{ - - /** - * return true if this object should remain as a listener. - * - * @param verificationToken to be checked object - * - * @return true if object should remain as a listener - */ - boolean isValid( Object verificationToken ); - - /** - * called when changes are made to the Monitor, but only if listener is still valid. - * - * @param change done change - */ - void postChange( IBaseMonitor monitor, Iterable change, BaseActionSource actionSource ); - - /** - * called when the list updates its contents, this is mostly for handling power events. - */ - void onListUpdate(); -} diff --git a/src/api/java/appeng/api/storage/ISaveProvider.java b/src/api/java/appeng/api/storage/ISaveProvider.java deleted file mode 100644 index 7c046826..00000000 --- a/src/api/java/appeng/api/storage/ISaveProvider.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -public interface ISaveProvider -{ - - void saveChanges( IMEInventory cellInventory ); -} diff --git a/src/api/java/appeng/api/storage/IStorageHelper.java b/src/api/java/appeng/api/storage/IStorageHelper.java deleted file mode 100644 index c75eac22..00000000 --- a/src/api/java/appeng/api/storage/IStorageHelper.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import java.io.IOException; - -import io.netty.buffer.ByteBuf; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.fluids.FluidStack; - -import appeng.api.networking.crafting.ICraftingLink; -import appeng.api.networking.crafting.ICraftingRequester; -import appeng.api.networking.energy.IEnergySource; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; - - -public interface IStorageHelper -{ - - /** - * load a crafting link from nbt data. - * - * @param data to be loaded data - * - * @return crafting link - */ - ICraftingLink loadCraftingLink( NBTTagCompound data, ICraftingRequester req ); - - /** - * @param is An ItemStack - * - * @return a new INSTANCE of {@link IAEItemStack} from a MC {@link ItemStack} - */ - IAEItemStack createItemStack( ItemStack is ); - - /** - * @param is A FluidStack - * - * @return a new INSTANCE of {@link IAEFluidStack} from a Forge {@link FluidStack} - */ - IAEFluidStack createFluidStack( FluidStack is ); - - /** - * @return a new INSTANCE of {@link IItemList} for items - */ - IItemList createItemList(); - - /** - * @return a new INSTANCE of {@link IItemList} for fluids - */ - IItemList createFluidList(); - - /** - * Read a AE Item Stack from a byte stream, returns a AE item stack or null. - * - * @param input to be loaded data - * - * @return item based of data - * - * @throws IOException if file could not be read - */ - IAEItemStack readItemFromPacket( ByteBuf input ) throws IOException; - - /** - * Read a AE Fluid Stack from a byte stream, returns a AE fluid stack or null. - * - * @param input to be loaded data - * - * @return fluid based on data - * - * @throws IOException if file could not be written - */ - IAEFluidStack readFluidFromPacket( ByteBuf input ) throws IOException; - - /** - * use energy from energy, to remove request items from cell, at the request of src. - * - * @param energy to be drained energy source - * @param cell cell of requested items - * @param request requested items - * @param src action source - * - * @return items that successfully extracted. - */ - IAEItemStack poweredExtraction( IEnergySource energy, IMEInventory cell, IAEItemStack request, BaseActionSource src ); - - /** - * use energy from energy, to inject input items into cell, at the request of src - * - * @param energy to be added energy source - * @param cell injected cell - * @param input to be injected items - * @param src action source - * - * @return items that failed to insert. - */ - IAEItemStack poweredInsert( IEnergySource energy, IMEInventory cell, IAEItemStack input, BaseActionSource src ); -} diff --git a/src/api/java/appeng/api/storage/IStorageMonitorable.java b/src/api/java/appeng/api/storage/IStorageMonitorable.java deleted file mode 100644 index 3a832c5f..00000000 --- a/src/api/java/appeng/api/storage/IStorageMonitorable.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.implementations.tiles.ITileStorageMonitorable; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; - - -/** - * represents the internal behavior of a {@link ITileStorageMonitorable} use it to get this value for a tile, or part. - * - * never check a tile for this, always go though ITileStorageMonitorable if you wish to use this interface. - */ -public interface IStorageMonitorable -{ - - /** - * Access the item inventory for the monitorable storage. - */ - IMEMonitor getItemInventory(); - - /** - * Access the fluid inventory for the monitorable storage. - */ - IMEMonitor getFluidInventory(); -} diff --git a/src/api/java/appeng/api/storage/ITerminalHost.java b/src/api/java/appeng/api/storage/ITerminalHost.java deleted file mode 100644 index f802b6d6..00000000 --- a/src/api/java/appeng/api/storage/ITerminalHost.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.util.IConfigurableObject; - - -public interface ITerminalHost extends IStorageMonitorable, IConfigurableObject -{ - -} diff --git a/src/api/java/appeng/api/storage/MEMonitorHandler.java b/src/api/java/appeng/api/storage/MEMonitorHandler.java deleted file mode 100644 index fb14960a..00000000 --- a/src/api/java/appeng/api/storage/MEMonitorHandler.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map.Entry; - -import com.google.common.collect.ImmutableList; - -import appeng.api.config.AccessRestriction; -import appeng.api.config.Actionable; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; - - -/** - * Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of - * listeners. - * - * @param - */ -public class MEMonitorHandler implements IMEMonitor -{ - - private final IMEInventoryHandler internalHandler; - private final IItemList cachedList; - private final HashMap, Object> listeners = new HashMap, Object>(); - - protected boolean hasChanged = true; - - public MEMonitorHandler( IMEInventoryHandler t ) - { - this.internalHandler = t; - this.cachedList = (IItemList) t.getChannel().createList(); - } - - public MEMonitorHandler( IMEInventoryHandler t, StorageChannel chan ) - { - this.internalHandler = t; - this.cachedList = (IItemList) chan.createList(); - } - - @Override - public void addListener( IMEMonitorHandlerReceiver l, Object verificationToken ) - { - this.listeners.put( l, verificationToken ); - } - - @Override - public void removeListener( IMEMonitorHandlerReceiver l ) - { - this.listeners.remove( l ); - } - - @Override - public StackType injectItems( StackType input, Actionable mode, BaseActionSource src ) - { - if( mode == Actionable.SIMULATE ) - { - return this.getHandler().injectItems( input, mode, src ); - } - return this.monitorDifference( input.copy(), this.getHandler().injectItems( input, mode, src ), false, src ); - } - - protected IMEInventoryHandler getHandler() - { - return this.internalHandler; - } - - private StackType monitorDifference( IAEStack original, StackType leftOvers, boolean extraction, BaseActionSource src ) - { - StackType diff = (StackType) original.copy(); - - if( extraction ) - { - diff.setStackSize( leftOvers == null ? 0 : -leftOvers.getStackSize() ); - } - else if( leftOvers != null ) - { - diff.decStackSize( leftOvers.getStackSize() ); - } - - if( diff.getStackSize() != 0 ) - { - this.postChangesToListeners( ImmutableList.of( diff ), src ); - } - - return leftOvers; - } - - protected void postChangesToListeners( Iterable changes, BaseActionSource src ) - { - this.notifyListenersOfChange( changes, src ); - } - - protected void notifyListenersOfChange( Iterable diff, BaseActionSource src ) - { - this.hasChanged = true;// need to update the cache. - Iterator, Object>> i = this.getListeners(); - while( i.hasNext() ) - { - Entry, Object> o = i.next(); - IMEMonitorHandlerReceiver receiver = o.getKey(); - if( receiver.isValid( o.getValue() ) ) - { - receiver.postChange( this, diff, src ); - } - else - { - i.remove(); - } - } - } - - protected Iterator, Object>> getListeners() - { - return this.listeners.entrySet().iterator(); - } - - @Override - public StackType extractItems( StackType request, Actionable mode, BaseActionSource src ) - { - if( mode == Actionable.SIMULATE ) - { - return this.getHandler().extractItems( request, mode, src ); - } - return this.monitorDifference( request.copy(), this.getHandler().extractItems( request, mode, src ), true, src ); - } - - @Override - public StorageChannel getChannel() - { - return this.getHandler().getChannel(); - } - - @Override - public AccessRestriction getAccess() - { - return this.getHandler().getAccess(); - } @Override - public IItemList getStorageList() - { - if( this.hasChanged ) - { - this.hasChanged = false; - this.cachedList.resetStatus(); - return this.getAvailableItems( this.cachedList ); - } - - return this.cachedList; - } - - @Override - public boolean isPrioritized( StackType input ) - { - return this.getHandler().isPrioritized( input ); - } - - @Override - public boolean canAccept( StackType input ) - { - return this.getHandler().canAccept( input ); - } @Override - public IItemList getAvailableItems( IItemList out ) - { - return this.getHandler().getAvailableItems( out ); - } - - @Override - public int getPriority() - { - return this.getHandler().getPriority(); - } - - @Override - public int getSlot() - { - return this.getHandler().getSlot(); - } - - @Override - public boolean validForPass( int i ) - { - return this.getHandler().validForPass( i ); - } - - - - -} diff --git a/src/api/java/appeng/api/storage/StorageChannel.java b/src/api/java/appeng/api/storage/StorageChannel.java deleted file mode 100644 index e0bd3789..00000000 --- a/src/api/java/appeng/api/storage/StorageChannel.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage; - - -import appeng.api.AEApi; -import appeng.api.storage.data.IAEFluidStack; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IAEStack; -import appeng.api.storage.data.IItemList; - - -public enum StorageChannel -{ - /** - * AE2's Default Storage. - */ - ITEMS( IAEItemStack.class ), - - /** - * AE2's Fluid Based Storage ( mainly added to better support ExtraCells ) - */ - FLUIDS( IAEFluidStack.class ); - - public final Class type; - - StorageChannel( Class t ) - { - this.type = t; - } - - public IItemList createList() - { - if( this == ITEMS ) - { - return AEApi.instance().storage().createItemList(); - } - else - { - return AEApi.instance().storage().createFluidList(); - } - } -} diff --git a/src/api/java/appeng/api/storage/data/IAEFluidStack.java b/src/api/java/appeng/api/storage/data/IAEFluidStack.java deleted file mode 100644 index b33bfa62..00000000 --- a/src/api/java/appeng/api/storage/data/IAEFluidStack.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage.data; - - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; - - -/** - * An alternate version of FluidStack for AE to keep tabs on things easier, and - * to support larger storage. stackSizes of getFluidStack will be capped. - * - * You may hold on to these if you want, just make sure you let go of them when - * your not using them. - * - * Don't Implement. - * - * Construct with Util.createFluidStack( FluidStack ) - */ -public interface IAEFluidStack extends IAEStack -{ - - /** - * creates a standard Forge FluidStack for the fluid. - * - * @return new FluidStack - */ - FluidStack getFluidStack(); - - /** - * Combines two IAEItemStacks via addition. - * - * @param option , to add to the current one. - */ - @Override - void add( IAEFluidStack option ); - - /** - * create a AE Fluid clone. - * - * @return the copy. - */ - @Override - IAEFluidStack copy(); - - /** - * quick way to get access to the Forge Fluid Definition. - * - * @return fluid definition - */ - Fluid getFluid(); -} diff --git a/src/api/java/appeng/api/storage/data/IAEItemStack.java b/src/api/java/appeng/api/storage/data/IAEItemStack.java deleted file mode 100644 index 3da0fdb5..00000000 --- a/src/api/java/appeng/api/storage/data/IAEItemStack.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage.data; - - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - - -/** - * An alternate version of ItemStack for AE to keep tabs on things easier, and to support larger storage. stackSizes of - * getItemStack will be capped. - * - * You may hold on to these if you want, just make sure you let go of them when your not using them. - * - * Don't Implement. - * - * Construct with Util.createItemStack( ItemStack ) - */ -public interface IAEItemStack extends IAEStack -{ - - /** - * creates a standard MC ItemStack for the item. - * - * @return new ItemStack - */ - ItemStack getItemStack(); - - /** - * is there NBT Data for this item? - * - * @return if there is - */ - boolean hasTagCompound(); - - /** - * Combines two IAEItemStacks via addition. - * - * @param option to add to the current one. - */ - @Override - void add( IAEItemStack option ); - - /** - * create a AE Item clone - * - * @return the copy - */ - @Override - IAEItemStack copy(); - - /** - * quick way to get access to the MC Item Definition. - * - * @return item definition - */ - Item getItem(); - - /** - * @return the items damage value - */ - int getItemDamage(); - - /** - * Compare the Ore Dictionary ID for this to another item. - */ - boolean sameOre( IAEItemStack is ); - - /** - * compare the item/damage/nbt of the stack. - * - * @param otherStack to be compared item - * - * @return true if it is the same type (same item, damage, nbt) - */ - boolean isSameType( IAEItemStack otherStack ); - - /** - * compare the item/damage/nbt of the stack. - * - * @param stored to be compared item - * - * @return true if it is the same type (same item, damage, nbt) - */ - boolean isSameType( ItemStack stored ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/data/IAEStack.java b/src/api/java/appeng/api/storage/data/IAEStack.java deleted file mode 100644 index e1db8a0f..00000000 --- a/src/api/java/appeng/api/storage/data/IAEStack.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage.data; - - -import java.io.IOException; - -import io.netty.buffer.ByteBuf; - -import net.minecraft.nbt.NBTTagCompound; - -import appeng.api.config.FuzzyMode; -import appeng.api.storage.StorageChannel; - - -public interface IAEStack -{ - - /** - * add two stacks together - * - * @param is added item - */ - void add( StackType is ); - - /** - * number of items in the stack. - * - * @return basically ItemStack.stackSize - */ - long getStackSize(); - - /** - * changes the number of items in the stack. - * - * @param stackSize , ItemStack.stackSize = N - */ - StackType setStackSize( long stackSize ); - - /** - * Same as getStackSize, but for requestable items. ( LP ) - * - * @return basically itemStack.stackSize but for requestable items. - */ - long getCountRequestable(); - - /** - * Same as setStackSize, but for requestable items. ( LP ) - * - * @return basically itemStack.stackSize = N but for setStackSize items. - */ - StackType setCountRequestable( long countRequestable ); - - /** - * true, if the item can be crafted. - * - * @return true, if it can be crafted. - */ - boolean isCraftable(); - - /** - * change weather the item can be crafted. - * - * @param isCraftable can item be crafted - */ - StackType setCraftable( boolean isCraftable ); - - /** - * clears, requestable, craftable, and stack sizes. - */ - StackType reset(); - - /** - * returns true, if the item can be crafted, requested, or extracted. - * - * @return isThisRecordMeaningful - */ - boolean isMeaningful(); - - /** - * Adds more to the stack size... - * - * @param i additional stack size - */ - void incStackSize( long i ); - - /** - * removes some from the stack size. - */ - void decStackSize( long i ); - - /** - * adds items to the requestable - * - * @param i increased amount of requested items - */ - void incCountRequestable( long i ); - - /** - * removes items from the requestable - * - * @param i decreased amount of requested items - */ - void decCountRequestable( long i ); - - /** - * write to a NBTTagCompound. - * - * @param i to be written data - */ - void writeToNBT( NBTTagCompound i ); - - /** - * Compare stacks using precise logic. - * - * a IAEItemStack to another AEItemStack or a ItemStack. - * - * or - * - * IAEFluidStack, FluidStack - * - * @param obj compared object - * - * @return true if they are the same. - */ - @Override - boolean equals( Object obj ); - - /** - * compare stacks using fuzzy logic - * - * a IAEItemStack to another AEItemStack or a ItemStack. - * - * @param st stacks - * @param mode used fuzzy mode - * - * @return true if two stacks are equal based on AE Fuzzy Comparison. - */ - boolean fuzzyComparison( Object st, FuzzyMode mode ); - - /** - * Slower for disk saving, but smaller/more efficient for packets. - * - * @param data to be written data - * - * @throws IOException - */ - void writeToPacket( ByteBuf data ) throws IOException; - - /** - * Clone the Item / Fluid Stack - * - * @return a new Stack, which is copied from the original. - */ - StackType copy(); - - /** - * create an empty stack. - * - * @return a new stack, which represents an empty copy of the original. - */ - StackType empty(); - - /** - * obtain the NBT Data for the item. - * - * @return nbt data - */ - IAETagCompound getTagCompound(); - - /** - * @return true if the stack is a {@link IAEItemStack} - */ - boolean isItem(); - - /** - * @return true if the stack is a {@link IAEFluidStack} - */ - boolean isFluid(); - - /** - * @return ITEM or FLUID - */ - StorageChannel getChannel(); -} diff --git a/src/api/java/appeng/api/storage/data/IAETagCompound.java b/src/api/java/appeng/api/storage/data/IAETagCompound.java deleted file mode 100644 index bd4b57b8..00000000 --- a/src/api/java/appeng/api/storage/data/IAETagCompound.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage.data; - - -import net.minecraft.nbt.NBTTagCompound; - -import appeng.api.features.IItemComparison; - - -/** - * Don't cast this... either compare with it, or copy it. - * - * Don't Implement. - */ -public interface IAETagCompound -{ - - /** - * @return a copy ( the copy will not be a IAETagCompound, it will be a NBTTagCompound ) - */ - NBTTagCompound getNBTTagCompoundCopy(); - - /** - * compare to other NBTTagCompounds or IAETagCompounds - * - * @param a compared object - * - * @return true, if they are the same. - */ - @Override - boolean equals( Object a ); - - /** - * @return the special comparison for this tag - */ - IItemComparison getSpecialComparison(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/data/IItemContainer.java b/src/api/java/appeng/api/storage/data/IItemContainer.java deleted file mode 100644 index 049a52f8..00000000 --- a/src/api/java/appeng/api/storage/data/IItemContainer.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage.data; - - -import java.util.Collection; - -import appeng.api.config.FuzzyMode; - - -/** - * Represents a list of items in AE. - * - * Don't Implement. - * - * Construct with Util.createItemList() - */ -public interface IItemContainer -{ - - /** - * add a stack to the list, this will merge the stack with an item already in the list if found. - * - * @param option added stack - */ - void add( StackType option ); // adds stack as is - - /** - * @param i compared item - * - * @return a stack equivalent to the stack passed in, but with the correct stack size information, or null if its - * not present - */ - StackType findPrecise( StackType i ); - - /** - * @param input compared item - * - * @return a list of relevant fuzzy matched stacks - */ - Collection findFuzzy( StackType input, FuzzyMode fuzzy ); - - /** - * @return true if there are no items in the list - */ - boolean isEmpty(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/storage/data/IItemList.java b/src/api/java/appeng/api/storage/data/IItemList.java deleted file mode 100644 index 113ad87f..00000000 --- a/src/api/java/appeng/api/storage/data/IItemList.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.storage.data; - - -import java.util.Iterator; - - -/** - * Represents a list of items in AE. - * - * Don't Implement. - * - * Construct with Util.createItemList() - */ -public interface IItemList extends IItemContainer, Iterable -{ - - /** - * add a stack to the list stackSize is used to add to stackSize, this will merge the stack with an item already in - * the list if found. - * - * @param option stacktype option - */ - void addStorage( StackType option ); // adds a stack as stored - - /** - * add a stack to the list as craftable, this will merge the stack with an item already in the list if found. - * - * @param option stacktype option - */ - void addCrafting( StackType option ); - - /** - * add a stack to the list, stack size is used to add to requestable, this will merge the stack with an item already - * in the list if found. - * - * @param option stacktype option - */ - void addRequestable( StackType option ); // adds a stack as requestable - - /** - * @return the first item in the list - */ - StackType getFirstItem(); - - /** - * @return the number of items in the list - */ - int size(); - - /** - * allows you to iterate the list. - */ - @Override - Iterator iterator(); - - /** - * resets stack sizes to 0. - */ - void resetStatus(); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/util/AECableType.java b/src/api/java/appeng/api/util/AECableType.java deleted file mode 100644 index 5d6f3464..00000000 --- a/src/api/java/appeng/api/util/AECableType.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -public enum AECableType -{ - /** - * No Cable present. - */ - NONE, - - /** - * Connections to this block should render as glass. - */ - GLASS, - - /** - * Connections to this block should render as covered. - */ - COVERED, - - /** - * Connections to this block should render as smart. - */ - SMART, - - /** - * Dense Cable, represents a tier 2 block that can carry 32 channels. - */ - DENSE, - -} diff --git a/src/api/java/appeng/api/util/AEColor.java b/src/api/java/appeng/api/util/AEColor.java deleted file mode 100644 index 61c7f9c8..00000000 --- a/src/api/java/appeng/api/util/AEColor.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.util.StatCollector; - - -/** - * List of all colors supported by AE, their names, and various colors for display. - * - * Should be the same order as Dyes, excluding Transparent. - */ -public enum AEColor -{ - - White( "gui.appliedenergistics2.White", 0xBEBEBE, 0xDBDBDB, 0xFAFAFA ), - - Orange( "gui.appliedenergistics2.Orange", 0xF99739, 0xFAAE44, 0xF4DEC3 ), - - Magenta( "gui.appliedenergistics2.Magenta", 0x821E82, 0xB82AB8, 0xC598C8 ), - - LightBlue( "gui.appliedenergistics2.LightBlue", 0x628DCB, 0x82ACE7, 0xD8F6FF ), - - Yellow( "gui.appliedenergistics2.Yellow", 0xFFF7AA, 0xF8FF4A, 0xFFFFE8 ), - - Lime( "gui.appliedenergistics2.Lime", 0x7CFF4A, 0xBBFF51, 0xE7F7D7 ), - - Pink( "gui.appliedenergistics2.Pink", 0xDC8DB5, 0xF8B5D7, 0xF7DEEB ), - - Gray( "gui.appliedenergistics2.Gray", 0x7C7C7C, 0xA0A0A0, 0xC9C9C9 ), - - LightGray( "gui.appliedenergistics2.LightGray", 0x9D9D9D, 0xCDCDCD, 0xEFEFEF ), - - Cyan( "gui.appliedenergistics2.Cyan", 0x2F9BA5, 0x51AAC6, 0xAEDDF4 ), - - Purple( "gui.appliedenergistics2.Purple", 0x8230B2, 0xA453CE, 0xC7A3CC ), - - Blue( "gui.appliedenergistics2.Blue", 0x2D29A0, 0x514AFF, 0xDDE6FF ), - - Brown( "gui.appliedenergistics2.Brown", 0x724E35, 0xB7967F, 0xE0D2C8 ), - - Green( "gui.appliedenergistics2.Green", 0x45A021, 0x60E32E, 0xE3F2E3 ), - - Red( "gui.appliedenergistics2.Red", 0xA50029, 0xFF003C, 0xFFE6ED ), - - Black( "gui.appliedenergistics2.Black", 0x2B2B2B, 0x565656, 0x848484 ), - - Transparent( "gui.appliedenergistics2.Fluix", 0x1B2344, 0x895CA8, 0xD7BBEC ); - - public static final List VALID_COLORS = Arrays.asList( White, Orange, Magenta, LightBlue, Yellow, Lime, Pink, Gray, LightGray, Cyan, Purple, Blue, Brown, Green, Red, Black ); - - /** - * Unlocalized name for color. - */ - public final String unlocalizedName; - - /** - * Darkest Variant of the color, nearly black; as a RGB HEX Integer - */ - public final int blackVariant; - - /** - * The Variant of the color that is used to represent the color normally; as a RGB HEX Integer - */ - public final int mediumVariant; - - /** - * Lightest Variant of the color, nearly white; as a RGB HEX Integer - */ - public final int whiteVariant; - - AEColor( String unlocalizedName, int blackHex, int medHex, int whiteHex ) - { - this.unlocalizedName = unlocalizedName; - this.blackVariant = blackHex; - this.mediumVariant = medHex; - this.whiteVariant = whiteHex; - } - - /** - * Logic to see which colors match each other.. special handle for Transparent - */ - public boolean matches( AEColor color ) - { - return this == Transparent || color == Transparent || this == color; - } - - @Override - public String toString() - { - return StatCollector.translateToLocal( this.unlocalizedName ); - } - -} diff --git a/src/api/java/appeng/api/util/AEColoredItemDefinition.java b/src/api/java/appeng/api/util/AEColoredItemDefinition.java deleted file mode 100644 index caf292a7..00000000 --- a/src/api/java/appeng/api/util/AEColoredItemDefinition.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - - -public interface AEColoredItemDefinition -{ - - /** - * @return the {@link Block} Implementation if applicable - */ - Block block( AEColor color ); - - /** - * @return the {@link Item} Implementation if applicable - */ - Item item( AEColor color ); - - /** - * @return the {@link TileEntity} Class if applicable. - */ - Class entity( AEColor color ); - - /** - * @return an {@link ItemStack} with specified quantity of this item. - */ - ItemStack stack( AEColor color, int stackSize ); - - /** - * @param stackSize - stack size of the result. - * - * @return an array of all colors. - */ - ItemStack[] allStacks( int stackSize ); - - /** - * Compare {@link ItemStack} with this - * - * @param color compared color of item - * @param comparableItem compared item - * - * @return true if the item stack is a matching item. - */ - boolean sameAs( AEColor color, ItemStack comparableItem ); -} diff --git a/src/api/java/appeng/api/util/AEItemDefinition.java b/src/api/java/appeng/api/util/AEItemDefinition.java deleted file mode 100644 index 5ea619e4..00000000 --- a/src/api/java/appeng/api/util/AEItemDefinition.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import javax.annotation.Nullable; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.IBlockAccess; - -import appeng.api.definitions.IBlockDefinition; -import appeng.api.definitions.IComparableDefinition; -import appeng.api.definitions.IItemDefinition; -import appeng.api.definitions.ITileDefinition; - - -/** - * Gives easy access to different part of the various, items/blocks/materials in AE. - * - * @deprecated use {@link ITileDefinition} and its sub-classes - */ -@Deprecated -public interface AEItemDefinition -{ - /** - * @return the {@link Block} Implementation if applicable - * - * @deprecated use {@link IBlockDefinition#maybeBlock()} - */ - @Deprecated - @Nullable - Block block(); - - /** - * @return the {@link Item} Implementation if applicable - * - * @deprecated use {@link IItemDefinition#maybeItem()} - */ - @Deprecated - @Nullable - Item item(); - - /** - * @return the {@link TileEntity} Class if applicable. - * - * @deprecated use {@link ITileDefinition#maybeEntity()} - */ - @Deprecated - @Nullable - Class entity(); - - /** - * @return an {@link ItemStack} with specified quantity of this item. - * - * @deprecated use {@link IItemDefinition#maybeStack(int)} - */ - @Deprecated - @Nullable - ItemStack stack( int stackSize ); - - /** - * Compare {@link ItemStack} with this - * - * @param comparableItem compared item - * - * @return true if the item stack is a matching item. - * - * @deprecated use {@link IComparableDefinition#isSameAs(ItemStack)} - */ - @Deprecated - boolean sameAsStack( ItemStack comparableItem ); - - /** - * Compare Block with world. - * - * @param world world of block - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block - * - * @return if the block is placed in the world at the specific location. - * - * @deprecated use {@link IComparableDefinition#isSameAs(IBlockAccess, int, int, int)} } - */ - @Deprecated - boolean sameAsBlock( IBlockAccess world, int x, int y, int z ); -} diff --git a/src/api/java/appeng/api/util/DimensionalCoord.java b/src/api/java/appeng/api/util/DimensionalCoord.java deleted file mode 100644 index eb448360..00000000 --- a/src/api/java/appeng/api/util/DimensionalCoord.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - - -/** - * Represents a location in the Minecraft Universe - */ -public class DimensionalCoord extends WorldCoord -{ - - private final World w; - private final int dimId; - - public DimensionalCoord( DimensionalCoord s ) - { - super( s.x, s.y, s.z ); - this.w = s.w; - this.dimId = s.dimId; - } - - public DimensionalCoord( TileEntity s ) - { - super( s ); - this.w = s.getWorldObj(); - this.dimId = this.w.provider.dimensionId; - } - - public DimensionalCoord( World _w, int _x, int _y, int _z ) - { - super( _x, _y, _z ); - this.w = _w; - this.dimId = _w.provider.dimensionId; - } - - @Override - public DimensionalCoord copy() - { - return new DimensionalCoord( this ); - } - - @Override - public int hashCode() - { - return super.hashCode() ^ this.dimId; - } - - @Override - public boolean equals( Object obj ) - { - return obj instanceof DimensionalCoord && this.isEqual( (DimensionalCoord) obj ); - } - - public boolean isEqual( DimensionalCoord c ) - { - return this.x == c.x && this.y == c.y && this.z == c.z && c.w == this.w; - } - - @Override - public String toString() - { - return "dimension=" + this.dimId + ", " + super.toString(); - } - - public boolean isInWorld( World world ) - { - return this.w == world; - } - - public World getWorld() - { - return this.w; - } -} diff --git a/src/api/java/appeng/api/util/ICommonTile.java b/src/api/java/appeng/api/util/ICommonTile.java deleted file mode 100644 index ca87b4d1..00000000 --- a/src/api/java/appeng/api/util/ICommonTile.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - - -public interface ICommonTile -{ - - /** - * implemented on AE's Tile Entities, Gets a list of drops that the entity will normally drop, this doesn't include - * the block itself. - * - * @param world world of tile entity - * @param x x pos of tile entity - * @param y y pos of tile entity - * @param z z pos of tile entity - * @param drops drops of tile entity - */ - void getDrops( World world, int x, int y, int z, ArrayList drops ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/util/IConfigManager.java b/src/api/java/appeng/api/util/IConfigManager.java deleted file mode 100644 index 52df6945..00000000 --- a/src/api/java/appeng/api/util/IConfigManager.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import java.util.Set; - -import net.minecraft.nbt.NBTTagCompound; - -import appeng.api.config.Settings; - - -/** - * Used to adjust settings on an object, - * - * Obtained via {@link IConfigurableObject} - */ -public interface IConfigManager -{ - - /** - * get a list of different settings - * - * @return enum set of settings - */ - Set getSettings(); - - /** - * used to initialize the configuration manager, should be called for all settings. - * - * @param settingName name of setting - * @param defaultValue default value of setting - */ - void registerSetting( Settings settingName, Enum defaultValue ); - - /** - * Get Value of a particular setting - * - * @param settingName name of setting - * - * @return value of setting - */ - Enum getSetting( Settings settingName ); - - /** - * Change setting - * - * @param settingName to be changed setting - * @param newValue new value for setting - * - * @return changed setting - */ - Enum putSetting( Settings settingName, Enum newValue ); - - /** - * write all settings to the NBT Tag so they can be read later. - * - * @param destination to be written nbt tag - */ - void writeToNBT( NBTTagCompound destination ); - - /** - * Only works after settings have been registered - * - * @param src to be read nbt tag - */ - void readFromNBT( NBTTagCompound src ); -} diff --git a/src/api/java/appeng/api/util/IConfigurableObject.java b/src/api/java/appeng/api/util/IConfigurableObject.java deleted file mode 100644 index e25e7403..00000000 --- a/src/api/java/appeng/api/util/IConfigurableObject.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -/** - * Implemented by various Tiles or Parts in AE - */ -public interface IConfigurableObject -{ - - /** - * get the config manager for the object. - */ - IConfigManager getConfigManager(); -} diff --git a/src/api/java/appeng/api/util/INetworkToolAgent.java b/src/api/java/appeng/api/util/INetworkToolAgent.java deleted file mode 100644 index 915df02c..00000000 --- a/src/api/java/appeng/api/util/INetworkToolAgent.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import net.minecraft.util.MovingObjectPosition; - - -/** - * Implement on Tile or part to customize if the info gui opens, or an action is preformed. - */ -public interface INetworkToolAgent -{ - - boolean showNetworkInfo( MovingObjectPosition where ); -} diff --git a/src/api/java/appeng/api/util/IOrientable.java b/src/api/java/appeng/api/util/IOrientable.java deleted file mode 100644 index 4afbe44e..00000000 --- a/src/api/java/appeng/api/util/IOrientable.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * Nearly all of AE's Tile Entities implement IOrientable. - * - * and it can be used to manipulate the direction of some machines, most of these orientations are purely visual. - * - * AE also responds to Block.rotateBlock - */ -public interface IOrientable -{ - - /** - * @return true or false, if the tile rotation is meaningful, or even changeable - */ - boolean canBeRotated(); - - /** - * @return the direction the tile is facing - */ - ForgeDirection getForward(); - - /** - * @return the direction top of the tile - */ - ForgeDirection getUp(); - - /** - * Update the orientation - * - * @param Forward new forward direction - * @param Up new upwards direction - */ - void setOrientation( ForgeDirection Forward, ForgeDirection Up ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/util/IOrientableBlock.java b/src/api/java/appeng/api/util/IOrientableBlock.java deleted file mode 100644 index 8081cd81..00000000 --- a/src/api/java/appeng/api/util/IOrientableBlock.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import net.minecraft.world.IBlockAccess; - - -/** - * Implemented on many of AE's non Tile Entity Blocks as a way to get a IOrientable. - */ -public interface IOrientableBlock -{ - - /** - * @return if this block uses metadata to store its rotation. - */ - boolean usesMetadata(); - - /** - * @param world world of block - * @param x x pos of block - * @param y y pos of block - * @param z z pos of block - * - * @return a IOrientable if applicable - */ - IOrientable getOrientable( IBlockAccess world, int x, int y, int z ); -} \ No newline at end of file diff --git a/src/api/java/appeng/api/util/IReadOnlyCollection.java b/src/api/java/appeng/api/util/IReadOnlyCollection.java deleted file mode 100644 index 84e042ae..00000000 --- a/src/api/java/appeng/api/util/IReadOnlyCollection.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -public interface IReadOnlyCollection extends Iterable -{ - - /** - * @return the objects in in the set. - */ - int size(); - - /** - * @return true if there are objects in the set - */ - boolean isEmpty(); - - /** - * @return return true if the object is part of the set. - */ - boolean contains( Object node ); -} diff --git a/src/api/java/appeng/api/util/WorldCoord.java b/src/api/java/appeng/api/util/WorldCoord.java deleted file mode 100644 index d020e15d..00000000 --- a/src/api/java/appeng/api/util/WorldCoord.java +++ /dev/null @@ -1,175 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2013 AlgorithmX2 - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package appeng.api.util; - - -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * Represents a relative coordinate, either relative to another object, or - * relative to the origin of a dimension. - */ -public class WorldCoord -{ - - public int x; - public int y; - public int z; - - public WorldCoord( TileEntity s ) - { - this( s.xCoord, s.yCoord, s.zCoord ); - } - - public WorldCoord( int _x, int _y, int _z ) - { - this.x = _x; - this.y = _y; - this.z = _z; - } - - public WorldCoord subtract( ForgeDirection direction, int length ) - { - this.x -= direction.offsetX * length; - this.y -= direction.offsetY * length; - this.z -= direction.offsetZ * length; - return this; - } - - public WorldCoord add( int _x, int _y, int _z ) - { - this.x += _x; - this.y += _y; - this.z += _z; - return this; - } - - public WorldCoord subtract( int _x, int _y, int _z ) - { - this.x -= _x; - this.y -= _y; - this.z -= _z; - return this; - } - - public WorldCoord multiple( int _x, int _y, int _z ) - { - this.x *= _x; - this.y *= _y; - this.z *= _z; - return this; - } - - public WorldCoord divide( int _x, int _y, int _z ) - { - this.x /= _x; - this.y /= _y; - this.z /= _z; - return this; - } - - /** - * Will Return NULL if it's at some diagonal! - */ - public ForgeDirection directionTo( WorldCoord loc ) - { - int ox = this.x - loc.x; - int oy = this.y - loc.y; - int oz = this.z - loc.z; - - int xlen = Math.abs( ox ); - int ylen = Math.abs( oy ); - int zlen = Math.abs( oz ); - - if( loc.isEqual( this.copy().add( ForgeDirection.EAST, xlen ) ) ) - { - return ForgeDirection.EAST; - } - - if( loc.isEqual( this.copy().add( ForgeDirection.WEST, xlen ) ) ) - { - return ForgeDirection.WEST; - } - - if( loc.isEqual( this.copy().add( ForgeDirection.NORTH, zlen ) ) ) - { - return ForgeDirection.NORTH; - } - - if( loc.isEqual( this.copy().add( ForgeDirection.SOUTH, zlen ) ) ) - { - return ForgeDirection.SOUTH; - } - - if( loc.isEqual( this.copy().add( ForgeDirection.UP, ylen ) ) ) - { - return ForgeDirection.UP; - } - - if( loc.isEqual( this.copy().add( ForgeDirection.DOWN, ylen ) ) ) - { - return ForgeDirection.DOWN; - } - - return null; - } - - public boolean isEqual( WorldCoord c ) - { - return this.x == c.x && this.y == c.y && this.z == c.z; - } - - public WorldCoord add( ForgeDirection direction, int length ) - { - this.x += direction.offsetX * length; - this.y += direction.offsetY * length; - this.z += direction.offsetZ * length; - return this; - } - - public WorldCoord copy() - { - return new WorldCoord( this.x, this.y, this.z ); - } - - @Override - public int hashCode() - { - return ( this.y << 24 ) ^ this.x ^ this.z; - } - - @Override - public boolean equals( Object obj ) - { - return obj instanceof WorldCoord && this.isEqual( (WorldCoord) obj ); - } - - @Override - public String toString() - { - return "x=" + this.x + ", y=" + this.y + ", z=" + this.z; - } -} diff --git a/src/api/java/baubles/api/BaubleType.java b/src/api/java/baubles/api/BaubleType.java deleted file mode 100644 index 22349ff7..00000000 --- a/src/api/java/baubles/api/BaubleType.java +++ /dev/null @@ -1,7 +0,0 @@ -package baubles.api; - -public enum BaubleType { - RING, - AMULET, - BELT -} diff --git a/src/api/java/baubles/api/BaublesApi.java b/src/api/java/baubles/api/BaublesApi.java deleted file mode 100644 index f122e909..00000000 --- a/src/api/java/baubles/api/BaublesApi.java +++ /dev/null @@ -1,41 +0,0 @@ -package baubles.api; - -import java.lang.reflect.Method; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import cpw.mods.fml.common.FMLLog; - -/** - * @author Azanor - */ -public class BaublesApi -{ - static Method getBaubles; - - /** - * Retrieves the baubles inventory for the supplied player - */ - public static IInventory getBaubles(EntityPlayer player) - { - IInventory ot = null; - - try - { - if(getBaubles == null) - { - Class fake = Class.forName("baubles.common.lib.PlayerHandler"); - getBaubles = fake.getMethod("getPlayerBaubles", EntityPlayer.class); - } - - ot = (IInventory) getBaubles.invoke(null, player); - } - catch(Exception ex) - { - FMLLog.warning("[Baubles API] Could not invoke baubles.common.lib.PlayerHandler method getPlayerBaubles"); - } - - return ot; - } - -} diff --git a/src/api/java/baubles/api/IBauble.java b/src/api/java/baubles/api/IBauble.java deleted file mode 100644 index ccc3683f..00000000 --- a/src/api/java/baubles/api/IBauble.java +++ /dev/null @@ -1,45 +0,0 @@ -package baubles.api; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * This interface should be extended by items that can be worn in bauble slots - * - * @author Azanor - */ - -public interface IBauble { - - /** - * This method return the type of bauble this is. - * Type is used to determine the slots it can go into. - */ - public BaubleType getBaubleType(ItemStack itemstack); - - /** - * This method is called once per tick if the bauble is being worn by a player - */ - public void onWornTick(ItemStack itemstack, EntityLivingBase player); - - /** - * This method is called when the bauble is equipped by a player - */ - public void onEquipped(ItemStack itemstack, EntityLivingBase player); - - /** - * This method is called when the bauble is unequipped by a player - */ - public void onUnequipped(ItemStack itemstack, EntityLivingBase player); - - /** - * can this bauble be placed in a bauble slot - */ - public boolean canEquip(ItemStack itemstack, EntityLivingBase player); - - /** - * Can this bauble be removed from a bauble slot - */ - public boolean canUnequip(ItemStack itemstack, EntityLivingBase player); -} diff --git a/src/api/java/baubles/api/package-info.java b/src/api/java/baubles/api/package-info.java deleted file mode 100644 index 497a7dd5..00000000 --- a/src/api/java/baubles/api/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -@API(owner = "Baubles", apiVersion = "1.0.1.10", provides = "Baubles|API") -package baubles.api; - -import cpw.mods.fml.common.API; - diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java deleted file mode 100644 index 5c73621e..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/IStorageDrawersApi.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api; - -import com.jaquadro.minecraft.storagedrawers.api.pack.IPackBlockFactory; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRecipeHandlerRegistry; -import com.jaquadro.minecraft.storagedrawers.api.registry.IRenderRegistry; -import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaRegistry; - -public interface IStorageDrawersApi -{ - /** - * Recipe handlers are used to make custom recipes compatible with compacting drawers. - */ - IRecipeHandlerRegistry recipeHandlerRegistry (); - - IRenderRegistry renderRegistry (); - - IWailaRegistry wailaRegistry (); - - IPackBlockFactory packFactory (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java deleted file mode 100644 index 70a15174..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/StorageDrawersApi.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api; - -/** - * Entry point for the public API. - */ -public class StorageDrawersApi -{ - private static IStorageDrawersApi instance; - - /** - * API entry point. - * - * @return The {@link IStorageDrawersApi} instance or null if the API or Storage Drawers is unavailable. - */ - public static IStorageDrawersApi instance () { - if (instance == null) { - try { - Class classApi = Class.forName( "com.jaquadro.minecraft.storagedrawers.core.Api" ); - instance = (IStorageDrawersApi) classApi.getField("instance").get(null); - } - catch (Throwable t) { - return null; - } - } - - return instance; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java deleted file mode 100644 index f5dca193..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.event; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; -import cpw.mods.fml.common.eventhandler.Event; - -/** - * This event is called when a drawer has been bound to a new item. This is - * and opportunity for mods to cache extended data with the drawer. - * - * This event is also called when the drawer is changed to empty. - */ -public class DrawerPopulatedEvent extends Event -{ - public final IDrawer drawer; - - public DrawerPopulatedEvent (IDrawer drawer) { - this.drawer = drawer; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java deleted file mode 100644 index 47396c79..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IDrawerInventory.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.inventory; - -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; - -public interface IDrawerInventory extends ISidedInventory -{ - /** - * Gets a drawer's group slot index from an IInventory slot index. - * - * @param inventorySlot An IInventory slot index returned from getInventorySlot. - */ - int getDrawerSlot (int inventorySlot); - - /** - * Gets an IInventory slot index suitable for operations for the given type. - * - * @param drawerSlot The index of the drawer within its group. - * @param type The type of IInventory slot to return an index for. - */ - int getInventorySlot (int drawerSlot, SlotType type); - - /** - * Gets the type associated with a given IInventory slot index. - * - * @param inventorySlot An IInventory slot index returned from getInventorySlot. - */ - SlotType getInventorySlotType (int inventorySlot); - - boolean canInsertItem (int slot, ItemStack stack); - - boolean canExtractItem (int slot, ItemStack stack); - - boolean syncInventoryIfNeeded (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java deleted file mode 100644 index 71f55e3d..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/IInventoryAdapter.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.inventory; - -import net.minecraft.item.ItemStack; - -public interface IInventoryAdapter -{ - ItemStack getInventoryStack (SlotType slotType); - - void setInStack (ItemStack stack); - - void setOutStack (ItemStack stack); - - void syncInventory (); - - boolean syncInventoryIfNeeded (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java deleted file mode 100644 index dbb002ed..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/inventory/SlotType.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.inventory; - -/** - * Classifies different IInventory slots according to how they should be used. - */ -public enum SlotType -{ - /** An inventory slot for input-only operations; stack sizes artificially held low. */ - INPUT, - - /** An inventory slot for output-only operations; stack sizes artificially held high. */ - OUTPUT; - - public static final SlotType[] values = values(); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java deleted file mode 100644 index 502e46f3..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockConfiguration.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum BlockConfiguration -{ - BasicFull1(BlockType.Drawers, 1, false), - BasicFull2(BlockType.Drawers, 2, false), - BasicFull4(BlockType.Drawers, 4, false), - BasicHalf2(BlockType.Drawers, 2, true), - BasicHalf4(BlockType.Drawers, 4, true), - - SortingFull1(BlockType.DrawersSorting, 1, false), - SortingFull2(BlockType.DrawersSorting, 2, false), - SortingFull4(BlockType.DrawersSorting, 4, false), - SortingHalf2(BlockType.DrawersSorting, 2, true), - SortingHalf4(BlockType.DrawersSorting, 4, true), - - Trim(BlockType.Trim, 0, false); - - private final BlockType type; - private final int drawerCount; - private final boolean halfDepth; - - BlockConfiguration (BlockType type, int count, boolean half) { - this.type = type; - this.drawerCount = count; - this.halfDepth = half; - } - - public BlockType getBlockType () { - return type; - } - - public int getDrawerCount () { - return drawerCount; - } - - public boolean isHalfDepth () { - return halfDepth; - } - - public static BlockConfiguration by (BlockType type, int drawerCount, boolean halfDepth) { - for (BlockConfiguration config : values()) { - if (config.type == type && config.drawerCount == drawerCount && config.halfDepth == halfDepth) - return config; - } - - return null; - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java deleted file mode 100644 index 9487f6cd..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/BlockType.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum BlockType -{ - Drawers, - DrawersSorting, - Trim -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java deleted file mode 100644 index d6ffe1f5..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackBlockFactory.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemBlock; - -public interface IPackBlockFactory -{ - Block createBlock (BlockConfiguration blockConfig, IPackDataResolver dataResolver); - - void registerBlock (Block block, String name); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java deleted file mode 100644 index bc9627bc..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/IPackDataResolver.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import net.minecraft.creativetab.CreativeTabs; - -public interface IPackDataResolver -{ - String getPackModID (); - - String getBlockName (BlockConfiguration blockConfig); - - CreativeTabs getCreativeTabs (BlockType type); - - boolean isValidMetaValue (int meta); - - String getUnlocalizedName (int meta); - - String getTexturePath (TextureType type, int meta); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java deleted file mode 100644 index 212f2471..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/StandardDataResolver.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -import net.minecraft.creativetab.CreativeTabs; - -public class StandardDataResolver implements IPackDataResolver -{ - private String modID; - private String[] unlocalizedNames; - private CreativeTabs creativeTab; - - public StandardDataResolver (String modID, String[] unlocalizedNames) { - this.modID = modID; - this.unlocalizedNames = unlocalizedNames; - } - - public StandardDataResolver (String modID, String[] unlocalizedNames, CreativeTabs creativeTab) { - this(modID, unlocalizedNames); - this.creativeTab = creativeTab; - } - - @Override - public String getPackModID () { - return modID; - } - - protected String makeBlockName (String name) { - return getPackModID().toLowerCase() + "." + name; - } - - @Override - public String getBlockName (BlockConfiguration blockConfig) { - switch (blockConfig.getBlockType()) { - case Drawers: - case DrawersSorting: - if (blockConfig.getDrawerCount() == 1) - return makeBlockName("fullDrawers1"); - if (blockConfig.getDrawerCount() == 2 && !blockConfig.isHalfDepth()) - return makeBlockName("fullDrawers2"); - if (blockConfig.getDrawerCount() == 4 && !blockConfig.isHalfDepth()) - return makeBlockName("fullDrawers4"); - if (blockConfig.getDrawerCount() == 2 && blockConfig.isHalfDepth()) - return makeBlockName("halfDrawers2"); - if (blockConfig.getDrawerCount() == 4 && blockConfig.isHalfDepth()) - return makeBlockName("halfDrawers4"); - break; - case Trim: - return makeBlockName("trim"); - } - return null; - } - - @Override - public CreativeTabs getCreativeTabs (BlockType type) { - return creativeTab; - } - - @Override - public boolean isValidMetaValue (int meta) { - if (meta < 0 || meta >= unlocalizedNames.length) - return false; - - return unlocalizedNames != null && unlocalizedNames[meta] != null; - } - - @Override - public String getUnlocalizedName (int meta) { - if (!isValidMetaValue(meta)) - return null; - - return unlocalizedNames[meta]; - } - - protected String getBaseTexturePath () { - return getPackModID() + ":"; - } - - protected String getTextureMetaName (int meta) { - return getUnlocalizedName(meta); - } - - @Override - public String getTexturePath (TextureType type, int meta) { - switch (type) { - case Front1: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_front_1"; - case Front2: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_front_2"; - case Front4: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_front_4"; - case Side: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_side"; - case SideSort: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_sort"; - case SideVSplit: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_side_v"; - case SideHSplit: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_side_h"; - case TrimBorder: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_trim"; - case TrimBlock: - return getBaseTexturePath() + "drawers_" + getTextureMetaName(meta) + "_side"; - default: - return ""; - } - } -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java deleted file mode 100644 index e1c9eb08..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/pack/TextureType.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.pack; - -public enum TextureType -{ - Front1, - Front2, - Front4, - Side, - SideSort, - SideVSplit, - SideHSplit, - TrimBorder, - TrimBlock -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java deleted file mode 100644 index a7432b2b..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IIngredientHandler.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import net.minecraft.item.ItemStack; - -/** - * Ingredient handlers are used to get ItemStacks from ingredients in custom IRecipe implementations. If you have - * registered an IRecipeHandler that returns lists of objects that aren't ItemStacks, then you will need to - * implement an ingredient handler for those objects. - */ -public interface IIngredientHandler -{ - /** - * Gets an ItemStack from an object that represents an ingredient in an IRecipe. - * - * @param object An ingredient object. - * @return An ItemStack for the given ingredient. - */ - ItemStack getItemStack (Object object); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java deleted file mode 100644 index d4311ea8..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import net.minecraft.item.crafting.IRecipe; - -import java.util.List; - -/** - * Recipe handlers are used by compacting drawers to find more-compressed forms of blocks and items. If your recipe - * to craft compressed items is a custom IRecipe implementation, you will need to register a handler for it. - */ -public interface IRecipeHandler -{ - /** - * Get the recipe ingredient list as an array of objects (usually used for shaped recipes). - * If your array does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. - * - * If you would prefer to return a List, return null in this method and implement {@link #getInputAsList}. - * - * @param recipe An instance of a custom {@link IRecipe}. - * @return An array of ItemStacks or objects with a registered {@link IIngredientHandler}. - */ - Object[] getInputAsArray (IRecipe recipe); - - /** - * Get the recipe ingredient list as a list of objects (usually used for shapeless recipes). - * If your list does not contain ItemStack objects, you will need to register an {@link IIngredientHandler} to - * get an ItemStack from them. - * - * If you would prefer to return an array, return null in this method and implement {@link #getInputAsArray}. - * - * @param recipe An instance of a custom {@link IRecipe}. - * @return A list of ItemStacks or objects with a registered {@link IIngredientHandler}. - */ - List getInputAsList (IRecipe recipe); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java deleted file mode 100644 index b83d5347..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRecipeHandlerRegistry.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -public interface IRecipeHandlerRegistry -{ - void registerRecipeHandler (Class clazz, IRecipeHandler handler); - - void registerIngredientHandler (Class clazz, IIngredientHandler handler); - - IRecipeHandler getRecipeHandler (Class clazz); - - IIngredientHandler getIngredientHandler (Class clazz); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java deleted file mode 100644 index cfa4543a..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IRenderRegistry.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.render.IRenderLabel; - -public interface IRenderRegistry -{ - void registerPreLabelRenderHandler (IRenderLabel renderHandler); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java deleted file mode 100644 index a4ee9874..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaRegistry.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -public interface IWailaRegistry -{ - void registerTooltipHandler (IWailaTooltipHandler handler); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java deleted file mode 100644 index d0f3328c..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/registry/IWailaTooltipHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.registry; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; - -public interface IWailaTooltipHandler -{ - String transformItemName (IDrawer drawer, String defaultName); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java deleted file mode 100644 index 500030aa..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/render/IRenderLabel.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.render; - -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; -import net.minecraft.tileentity.TileEntity; - -public interface IRenderLabel -{ - void render (TileEntity tileEntity, IDrawerGroup drawerGroup, int slot, float brightness, float partialTickTime); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java deleted file mode 100644 index c88556c0..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawer.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -public interface IDrawer -{ - /** - * Gets an ItemStack of size 1 representing the type, metadata, and tags of the stored items. - * The returned ItemStack should not be modified for any reason. Make a copy if you need to store or modify it. - */ - ItemStack getStoredItemPrototype (); - - /** - * Gets an ItemStack initialized to the number of items stored in this drawer. - * The returned ItemStack is guaranteed to be a new copy and can be used for any purpose. Does not affect drawer contents. - */ - ItemStack getStoredItemCopy (); - - /** - * Sets the type of the stored item and initializes it to the given amount. Any existing item will be replaced. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of the item to store. - * @param amount The amount to initialize the stored item count to. - */ - void setStoredItem (ItemStack itemPrototype, int amount); - - /** - * Gets the number of items stored in this drawer. - */ - int getStoredItemCount (); - - /** - * Sets the number of items stored in this drawer. Triggers syncing of inventories and client data. - * Setting a drawer's count to 0 may also result in the item type being cleared, depending in implementation. - * - * @param amount The new amount of items stored in this drawer. - */ - void setStoredItemCount (int amount); - - /** - * Gets the maximum number of items that can be stored in this drawer. - * This value will vary depending on the max stack size of the stored item type. - */ - int getMaxCapacity (); - - /** - * Gets the maximum number of items that could be stored in this drawer if it held the given item. - * - * @param itemPrototype The item type to query. - */ - int getMaxCapacity (ItemStack itemPrototype); - - /** - * Gets the number of items that could still be added to this drawer before it is full. - */ - int getRemainingCapacity (); - - /** - * Gets the max stack size of the item type stored in this drawer. Convenience method. - */ - int getStoredItemStackSize (); - - /** - * Gets whether or not an item of the given type and data can be stored in this drawer. - * - * Stack size and available capacity are not considered. For drawers that are not empty, this - * method can allow ore-dictionary compatible items to be accepted into the drawer, as defined by what - * the drawer considers to be an equivalent item. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. - */ - boolean canItemBeStored (ItemStack itemPrototype); - - /** - * Gets whether or not an item of the given type and data can be extracted from this drawer. - * - * This is intended to allow outbound ore-dictionary conversions of compatible items, as defined by what - * the drawer considers to be an equivalent item. - * - * @param itemPrototype An ItemStack representing the type, metadata, and tags of an item. - */ - boolean canItemBeExtracted (ItemStack itemPrototype); - - /** - * Gets whether or not the drawer has items. - * A drawer set with an item type and 0 count is not considered empty. - */ - boolean isEmpty (); - - /** - * Gets auxiliary data that has been associated with this drawer. - * - * @param key The key used to identify the data. - * @return An opaque object that was previously stored. - */ - Object getExtendedData (String key); - - /** - * Stores auxiliary data with this drawer, mainly for use in integration. - * @param key The key to identify the data with. - * @param data The data to store. - */ - void setExtendedData (String key, Object data); - - void writeToNBT (NBTTagCompound tag); - - void readFromNBT (NBTTagCompound tag); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java deleted file mode 100644 index 1f1eefef..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroup.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import com.jaquadro.minecraft.storagedrawers.api.inventory.IDrawerInventory; - -public interface IDrawerGroup -{ - /** - * Gets the number of drawers contained within this group. - */ - int getDrawerCount (); - - /** - * Gets the drawer at the given slot within this group. - */ - IDrawer getDrawer (int slot); - - /** - * Gets whether the drawer in the given slot is usable. - */ - boolean isDrawerEnabled (int slot); - - IDrawerInventory getDrawerInventory (); - - boolean markDirtyIfNeeded (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java deleted file mode 100644 index bd8a0ea7..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IDrawerGroupInteractive.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -public interface IDrawerGroupInteractive extends IDrawerGroup -{ - ItemStack takeItemsFromSlot (int slot, int count); - - int putItemsIntoSlot (int slot, ItemStack stack, int count); - - int interactPutCurrentItemIntoSlot (int slot, EntityPlayer player); - - int interactPutCurrentInventoryIntoSlot (int slot, EntityPlayer player); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java deleted file mode 100644 index bd87a808..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/IFractionalDrawer.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -/** - * Represents a drawer with items that are a fractional component of another item within the drawer group. Compacting - * Drawers are a primary example of this drawer type. - */ -public interface IFractionalDrawer extends IDrawer -{ - /** - * Gets the storage ratio between the held item and the most compressed item within the drawer group. - * - * For example, most ingots have a conversion rate of 9 compared to metal blocks, and nuggets a rate of 81. - * Actual conversion rates are implementation-defined. - */ - int getConversionRate (); - - /** - * Gets the number of items left in the drawer if the maximum number of equivalent compressed items had been removed. - * The equivalency is determined by the next compression tier, and not necessarily the conversion rate. - */ - int getStoredItemRemainder (); - - /** - * Gets whether or not the stored item represents the smallest granularity of material that can be stored within - * the drawer group. - */ - boolean isSmallestUnit (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java deleted file mode 100644 index fba20d40..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/INetworked.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage; - -public interface INetworked -{ -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java deleted file mode 100644 index 7645c83a..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/ILockable.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface ILockable -{ - /** - * Gets whether or not a drawer or group is locked for the given lock attribute. - */ - boolean isLocked (LockAttribute attr); - - /** - * Gets whether or not the lock state can be changed for the given lock attribute. - * If this method returns false, isLocked may still return true. - */ - boolean canLock (LockAttribute attr); - - /** - * Sets the lock state of a drawer or group for the given lock attribute. - * If canLock returns false, this is a no-op. - */ - void setLocked (LockAttribute attr, boolean isLocked); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java deleted file mode 100644 index b7f0bf03..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IShroudable.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IShroudable -{ - /** - * Gets whether or not the drawer has the shrouded attribute. - * The shrouded attribute instructs the drawer to not render its item label. - */ - boolean isShrouded (); - - /** - * Sets whether or not the drawer is currently shrouded. - * @return false if the operation is not supported, true otherwise. - */ - boolean setIsShrouded (boolean state); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java deleted file mode 100644 index 9fc58063..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/IVoidable.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -public interface IVoidable -{ - /** - * Gets whether or not the drawer has a voiding attribute. - */ - boolean isVoid (); -} diff --git a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java b/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java deleted file mode 100644 index cb726b41..00000000 --- a/src/api/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/LockAttribute.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; - -import java.util.EnumSet; - -public enum LockAttribute -{ - LOCK_POPULATED, - LOCK_EMPTY; - - public int getFlagValue () { - return 1 << ordinal(); - } - - public static int getBitfield (EnumSet attributes) { - int value = 0; - if (attributes == null) - return value; - - for (LockAttribute attr : attributes) - value |= attr.getFlagValue(); - - return value; - } - - public static EnumSet getEnumSet (int bitfield) { - if (bitfield == 0) - return null; - - EnumSet set = EnumSet.noneOf(LockAttribute.class); - for (LockAttribute attr : values()) { - if ((bitfield & attr.getFlagValue()) != 0) - set.add(attr); - } - - return set; - } -} diff --git a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java b/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java deleted file mode 100644 index 9b8833d2..00000000 --- a/src/api/java/dan200/computercraft/api/ComputerCraftAPI.java +++ /dev/null @@ -1,265 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api; - -import dan200.computercraft.api.filesystem.IMount; -import dan200.computercraft.api.filesystem.IWritableMount; -import dan200.computercraft.api.media.IMediaProvider; -import dan200.computercraft.api.peripheral.IPeripheralProvider; -import dan200.computercraft.api.redstone.IBundledRedstoneProvider; -import dan200.computercraft.api.turtle.ITurtleUpgrade; -import net.minecraft.world.World; - -import java.lang.reflect.Method; - -/** - * The static entry point to the ComputerCraft API. - * Members in this class must be called after mod_ComputerCraft has been initialised, - * but may be called before it is fully loaded. - */ -public final class ComputerCraftAPI -{ - /** - * Creates a numbered directory in a subfolder of the save directory for a given world, and returns that number.
- * Use in conjuction with createSaveDirMount() to create a unique place for your peripherals or media items to store files.
- * @param world The world for which the save dir should be created. This should be the serverside world object. - * @param parentSubPath The folder path within the save directory where the new directory should be created. eg: "computercraft/disk" - * @return The numerical value of the name of the new folder, or -1 if the folder could not be created for some reason.
- * eg: if createUniqueNumberedSaveDir( world, "computer/disk" ) was called returns 42, then "computer/disk/42" is now available for writing. - * @see #createSaveDirMount(World, String, long) - */ - public static int createUniqueNumberedSaveDir( World world, String parentSubPath ) - { - findCC(); - if( computerCraft_createUniqueNumberedSaveDir != null ) - { - try { - return ((Integer)computerCraft_createUniqueNumberedSaveDir.invoke( null, world, parentSubPath )).intValue(); - } catch (Exception e){ - // It failed - } - } - return -1; - } - - /** - * Creates a file system mount that maps to a subfolder of the save directory for a given world, and returns it.
- * Use in conjuction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a folder from the - * users save directory onto a computers file system.
- * @param world The world for which the save dir can be found. This should be the serverside world object. - * @param subPath The folder path within the save directory that the mount should map to. eg: "computer/disk/42".
- * Use createUniqueNumberedSaveDir() to create a new numbered folder to use. - * @param capacity The ammount of data that can be stored in the directory before it fills up, in bytes. - * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable() - * to mount this on a Computers' file system. - * @see #createUniqueNumberedSaveDir(World, String) - * @see dan200.computercraft.api.peripheral.IComputerAccess#mount(String, dan200.computercraft.api.filesystem.IMount) - * @see dan200.computercraft.api.peripheral.IComputerAccess#mountWritable(String, dan200.computercraft.api.filesystem.IWritableMount) - * @see dan200.computercraft.api.filesystem.IMount - * @see IWritableMount - */ - public static IWritableMount createSaveDirMount( World world, String subPath, long capacity ) - { - findCC(); - if( computerCraft_createSaveDirMount != null ) - { - try { - return (IWritableMount)computerCraft_createSaveDirMount.invoke( null, world, subPath, capacity ); - } catch (Exception e){ - // It failed - } - } - return null; - } - - /** - * Creates a file system mount to a resource folder, and returns it.
- * Use in conjuction with IComputerAccess.mount() or IComputerAccess.mountWritable() to mount a resource folder onto a computers file system.
- * The files in this mount will be a combination of files in the specified mod jar, and resource packs that contain resources with the same domain and path.
- * @param modClass A class in whose jar to look first for the resources to mount. Using your main mod class is recommended. eg: MyMod.class - * @param domain The domain under which to look for resources. eg: "mymod" - * @param subPath The domain under which to look for resources. eg: "mymod/lua/myfiles" - * @return The mount, or null if it could be created for some reason. Use IComputerAccess.mount() or IComputerAccess.mountWritable() - * to mount this on a Computers' file system. - * @see dan200.computercraft.api.peripheral.IComputerAccess#mount(String, dan200.computercraft.api.filesystem.IMount) - * @see dan200.computercraft.api.peripheral.IComputerAccess#mountWritable(String, IWritableMount) - * @see dan200.computercraft.api.filesystem.IMount - */ - public static IMount createResourceMount( Class modClass, String domain, String subPath ) - { - findCC(); - if( computerCraft_createResourceMount != null ) - { - try { - return (IMount)computerCraft_createResourceMount.invoke( null, modClass, domain, subPath ); - } catch (Exception e){ - // It failed - } - } - return null; - } - - /** - * Registers a peripheral handler to convert blocks into IPeripheral implementations. - * @see dan200.computercraft.api.peripheral.IPeripheral - * @see dan200.computercraft.api.peripheral.IPeripheralProvider - */ - public static void registerPeripheralProvider( IPeripheralProvider handler ) - { - findCC(); - if ( computerCraft_registerPeripheralProvider != null) - { - try { - computerCraft_registerPeripheralProvider.invoke( null, handler ); - } catch (Exception e){ - // It failed - } - } - } - - /** - * Registers a new turtle turtle for use in ComputerCraft. After calling this, - * users should be able to craft Turtles with your new turtle. It is recommended to call - * this during the load() method of your mod. - * @see dan200.computercraft.api.turtle.ITurtleUpgrade - */ - public static void registerTurtleUpgrade( ITurtleUpgrade upgrade ) - { - if( upgrade != null ) - { - findCC(); - if( computerCraft_registerTurtleUpgrade != null ) - { - try { - computerCraft_registerTurtleUpgrade.invoke( null, upgrade ); - } catch( Exception e ) { - // It failed - } - } - } - } - - /** - * Registers a bundled redstone handler to provide bundled redstone output for blocks - * @see dan200.computercraft.api.redstone.IBundledRedstoneProvider - */ - public static void registerBundledRedstoneProvider( IBundledRedstoneProvider handler ) - { - findCC(); - if( computerCraft_registerBundledRedstoneProvider != null ) - { - try { - computerCraft_registerBundledRedstoneProvider.invoke( null, handler ); - } catch (Exception e) { - // It failed - } - } - } - - /** - * If there is a Computer or Turtle at a certain position in the world, get it's bundled redstone output. - * @see dan200.computercraft.api.redstone.IBundledRedstoneProvider - * @return If there is a block capable of emitting bundled redstone at the location, it's signal (0-65535) will be returned. - * If there is no block capable of emitting bundled redstone at the location, -1 will be returned. - */ - public static int getBundledRedstoneOutput( World world, int x, int y, int z, int side ) - { - findCC(); - if( computerCraft_getDefaultBundledRedstoneOutput != null ) - { - try { - return ((Integer)computerCraft_getDefaultBundledRedstoneOutput.invoke( null, world, x, y, z, side )).intValue(); - } catch (Exception e){ - // It failed - } - } - return -1; - } - - /** - * Registers a media handler to provide IMedia implementations for Items - * @see dan200.computercraft.api.media.IMediaProvider - */ - public static void registerMediaProvider( IMediaProvider handler ) - { - findCC(); - if( computerCraft_registerMediaProvider != null ) - { - try { - computerCraft_registerMediaProvider.invoke( null, handler ); - } catch (Exception e){ - // It failed - } - } - } - - // The functions below here are private, and are used to interface with the non-API ComputerCraft classes. - // Reflection is used here so you can develop your mod in MCP without decompiling ComputerCraft and including - // it in your solution. - - private static void findCC() - { - if( !ccSearched ) { - try { - computerCraft = Class.forName( "dan200.computercraft.ComputerCraft" ); - computerCraft_createUniqueNumberedSaveDir = findCCMethod( "createUniqueNumberedSaveDir", new Class[]{ - World.class, String.class - } ); - computerCraft_createSaveDirMount = findCCMethod( "createSaveDirMount", new Class[] { - World.class, String.class, Long.TYPE - } ); - computerCraft_createResourceMount = findCCMethod( "createResourceMount", new Class[] { - Class.class, String.class, String.class - } ); - computerCraft_registerPeripheralProvider = findCCMethod( "registerPeripheralProvider", new Class[] { - IPeripheralProvider.class - } ); - computerCraft_registerTurtleUpgrade = findCCMethod( "registerTurtleUpgrade", new Class[] { - ITurtleUpgrade.class - } ); - computerCraft_registerBundledRedstoneProvider = findCCMethod( "registerBundledRedstoneProvider", new Class[] { - IBundledRedstoneProvider.class - } ); - computerCraft_getDefaultBundledRedstoneOutput = findCCMethod( "getDefaultBundledRedstoneOutput", new Class[] { - World.class, Integer.TYPE, Integer.TYPE, Integer.TYPE, Integer.TYPE - } ); - computerCraft_registerMediaProvider = findCCMethod( "registerMediaProvider", new Class[] { - IMediaProvider.class - } ); - } catch( Exception e ) { - System.out.println( "ComputerCraftAPI: ComputerCraft not found." ); - } finally { - ccSearched = true; - } - } - } - - private static Method findCCMethod( String name, Class[] args ) - { - try { - if( computerCraft != null ) - { - return computerCraft.getMethod( name, args ); - } - return null; - } catch( NoSuchMethodException e ) { - System.out.println( "ComputerCraftAPI: ComputerCraft method " + name + " not found." ); - return null; - } - } - - private static boolean ccSearched = false; - private static Class computerCraft = null; - private static Method computerCraft_createUniqueNumberedSaveDir = null; - private static Method computerCraft_createSaveDirMount = null; - private static Method computerCraft_createResourceMount = null; - private static Method computerCraft_registerPeripheralProvider = null; - private static Method computerCraft_registerTurtleUpgrade = null; - private static Method computerCraft_registerBundledRedstoneProvider = null; - private static Method computerCraft_getDefaultBundledRedstoneOutput = null; - private static Method computerCraft_registerMediaProvider = null; -} diff --git a/src/api/java/dan200/computercraft/api/filesystem/IMount.java b/src/api/java/dan200/computercraft/api/filesystem/IMount.java deleted file mode 100644 index e340496b..00000000 --- a/src/api/java/dan200/computercraft/api/filesystem/IMount.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.filesystem; - -import java.io.IOException; -import java.io.InputStream; -import java.util.List; - -/** - * Represents a read only part of a virtual filesystem that can be mounted onto a computercraft using IComputerAccess.mount(). - * Ready made implementations of this interface can be created using ComputerCraftAPI.createSaveDirMount() or ComputerCraftAPI.createResourceMount(), or you're free to implement it yourselves! - * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String) - * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(Class, String, String) - * @see dan200.computercraft.api.peripheral.IComputerAccess#mount(String, IMount) - * @see IWritableMount - */ -public interface IMount -{ - /** - * Returns whether a file with a given path exists or not. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram" - * @return true if the file exists, false otherwise - */ - public boolean exists( String path ) throws IOException; - - /** - * Returns whether a file with a given path is a directory or not. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms" - * @return true if the file exists and is a directory, false otherwise - */ - public boolean isDirectory( String path ) throws IOException; - - /** - * Returns the file names of all the files in a directory. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprograms" - * @param contents A list of strings. Add all the file names to this list - */ - public void list( String path, List contents ) throws IOException; - - /** - * Returns the size of a file with a given path, in bytes - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram" - * @return the size of the file, in bytes - */ - public long getSize( String path ) throws IOException; - - /** - * Opens a file with a given path, and returns an inputstream representing it's contents. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram" - * @return a stream representing the contents of the file - */ - public InputStream openForRead( String path ) throws IOException; -} diff --git a/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java b/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java deleted file mode 100644 index 9c3bb43d..00000000 --- a/src/api/java/dan200/computercraft/api/filesystem/IWritableMount.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.filesystem; - -import java.io.IOException; -import java.io.OutputStream; - -/** - * Represents a part of a virtual filesystem that can be mounted onto a computercraft using IComputerAccess.mount() or IComputerAccess.mountWritable(), that can also be written to. - * Ready made implementations of this interface can be created using ComputerCraftAPI.createSaveDirMount(), or you're free to implement it yourselves! - * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String) - * @see dan200.computercraft.api.peripheral.IComputerAccess#mountWritable(String, dan200.computercraft.api.filesystem.IMount) - * @see dan200.computercraft.api.filesystem.IMount - */ -public interface IWritableMount extends IMount -{ - /** - * Creates a directory at a given path inside the virtual file system. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/mynewprograms" - */ - public void makeDirectory( String path ) throws IOException; - - /** - * Deletes a directory at a given path inside the virtual file system. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myoldprograms" - */ - public void delete( String path ) throws IOException; - - /** - * Opens a file with a given path, and returns an outputstream for writing to it. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram" - * @return a stream for writing to - */ - public OutputStream openForWrite( String path ) throws IOException; - - /** - * Opens a file with a given path, and returns an outputstream for appending to it. - * @param path A file path in normalised format, relative to the mount location. ie: "programs/myprogram" - * @return a stream for writing to - */ - public OutputStream openForAppend( String path ) throws IOException; - - /** - * Get the ammount of free space on the mount, in bytes. You should decrease this value as the user writes to the mount, and write operations should fail once it reaches zero. - * @return The ammount of free space, in bytes. - */ - public long getRemainingSpace() throws IOException; -} diff --git a/src/api/java/dan200/computercraft/api/filesystem/package-info.java b/src/api/java/dan200/computercraft/api/filesystem/package-info.java deleted file mode 100644 index 02bb7ea6..00000000 --- a/src/api/java/dan200/computercraft/api/filesystem/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -@API( owner="ComputerCraft", provides="ComputerCraft|API|FileSystem", apiVersion="1.65" ) -package dan200.computercraft.api.filesystem; - -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/dan200/computercraft/api/lua/ILuaContext.java b/src/api/java/dan200/computercraft/api/lua/ILuaContext.java deleted file mode 100644 index 787a93d4..00000000 --- a/src/api/java/dan200/computercraft/api/lua/ILuaContext.java +++ /dev/null @@ -1,44 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.lua; - -/** - * An interface passed to peripherals and ILuaObjects' by computers or turtles, providing methods - * that allow the peripheral call to wait for events before returning, just like in lua. - * This is very useful if you need to signal work to be performed on the main thread, and don't want to return - * until the work has been completed. - */ -public interface ILuaContext -{ - /** - * Wait for an event to occur on the computercraft, suspending the thread until it arises. This method is exactly equivalent to os.pullEvent() in lua. - * @param filter A specific event to wait for, or null to wait for any event - * @return An object array containing the name of the event that occurred, and any event parameters - * @throws Exception If the user presses CTRL+T to terminate the current program while pullEvent() is waiting for an event, a "Terminated" exception will be thrown here. - * Do not attempt to common this exception, unless you wish to prevent termination, which is not recommended. - * @throws InterruptedException If the user shuts down or reboots the computercraft while pullEvent() is waiting for an event, InterruptedException will be thrown. This exception must not be caught or intercepted, or the computercraft will leak memory and end up in a broken state. - */ - public Object[] pullEvent( String filter ) throws LuaException, InterruptedException; - - /** - * The same as pullEvent(), except "terminated" events are ignored. Only use this if you want to prevent program termination, which is not recommended. This method is exactly equivalent to os.pullEventRaw() in lua. - * @param filter A specific event to wait for, or null to wait for any event - * @return An object array containing the name of the event that occurred, and any event parameters - * @throws InterruptedException If the user shuts down or reboots the computercraft while pullEventRaw() is waiting for an event, InterruptedException will be thrown. This exception must not be caught or intercepted, or the computercraft will leak memory and end up in a broken state. - * @see #pullEvent(String) - */ - public Object[] pullEventRaw( String filter ) throws InterruptedException; - - /** - * Yield the current coroutine with some arguments until it is resumed. This method is exactly equivalent to coroutine.yield() in lua. Use pullEvent() if you wish to wait for events. - * @param arguments An object array containing the arguments to pass to coroutine.yield() - * @return An object array containing the return values from coroutine.yield() - * @throws InterruptedException If the user shuts down or reboots the computercraft the coroutine is suspended, InterruptedException will be thrown. This exception must not be caught or intercepted, or the computercraft will leak memory and end up in a broken state. - * @see #pullEvent(String) - */ - public Object[] yield( Object[] arguments ) throws InterruptedException; -} diff --git a/src/api/java/dan200/computercraft/api/lua/ILuaObject.java b/src/api/java/dan200/computercraft/api/lua/ILuaObject.java deleted file mode 100644 index 4005bbf8..00000000 --- a/src/api/java/dan200/computercraft/api/lua/ILuaObject.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.lua; - -/** - * An interface for representing custom objects returned by IPeripheral.callMethod() calls. - * Return objects implementing this interface to expose objects with methods to lua. - */ -public interface ILuaObject -{ - /** - * Get the names of the methods that this object implements. This works the same as IPeripheral.getMethodNames(). See that method for detailed documentation. - * @see dan200.computercraft.api.peripheral.IPeripheral#getMethodNames() - */ - public String[] getMethodNames(); - - /** - * Called when a user calls one of the methods that this object implements. This works the same as IPeripheral.callMethod(). See that method for detailed documentation. - * @see dan200.computercraft.api.peripheral.IPeripheral#callMethod(dan200.computercraft.api.peripheral.IComputerAccess, ILuaContext, int, Object[]) - */ - public Object[] callMethod( ILuaContext context, int method, Object[] arguments ) throws LuaException, InterruptedException; -} diff --git a/src/api/java/dan200/computercraft/api/lua/LuaException.java b/src/api/java/dan200/computercraft/api/lua/LuaException.java deleted file mode 100644 index 29874bdc..00000000 --- a/src/api/java/dan200/computercraft/api/lua/LuaException.java +++ /dev/null @@ -1,31 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.lua; - -/** - * An exception representing an error in Lua, like that raised by the error() function - */ -public class LuaException extends Exception -{ - private final int m_level; - - public LuaException( String message ) - { - this( message, 1 ); - } - - public LuaException( String message, int level ) - { - super( message ); - m_level = level; - } - - public int getLevel() - { - return m_level; - } -} diff --git a/src/api/java/dan200/computercraft/api/lua/package-info.java b/src/api/java/dan200/computercraft/api/lua/package-info.java deleted file mode 100644 index 9ea59b6f..00000000 --- a/src/api/java/dan200/computercraft/api/lua/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -@API( owner="ComputerCraft", provides="ComputerCraft|API|Lua", apiVersion="1.65" ) -package dan200.computercraft.api.lua; - -import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/media/IMedia.java b/src/api/java/dan200/computercraft/api/media/IMedia.java deleted file mode 100644 index 637a2970..00000000 --- a/src/api/java/dan200/computercraft/api/media/IMedia.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.media; - -import dan200.computercraft.api.filesystem.IMount; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Represents an item that can be placed in a disk drive and used by a Computer. - * Implement this interface on your Item class to allow it to be used in the drive. - */ -public interface IMedia -{ - /** - * Get a string representing the label of this item. Will be called vi disk.getLabel() in lua. - * @param stack The itemstack to inspect - * @return The label. ie: "Dan's Programs" - */ - public String getLabel( ItemStack stack ); - - /** - * Set a string representing the label of this item. Will be called vi disk.setLabel() in lua. - * @param stack The itemstack to modify. - * @param label The string to set the label to. - * @return true if the label was updated, false if the label may not be modified. - */ - public boolean setLabel( ItemStack stack, String label ); - - /** - * If this disk represents an item with audio (like a record), get the readable name of the audio track. ie: "Jonathon Coulton - Still Alive" - * @param stack The itemstack to inspect. - * @return The name, or null if this item does not represent an item with audio. - */ - public String getAudioTitle( ItemStack stack ); - - /** - * If this disk represents an item with audio (like a record), get the resource name of the audio track to play. - * @param stack The itemstack to inspect. - * @return The name, or null if this item does not represent an item with audio. - */ - public String getAudioRecordName( ItemStack stack ); - - /** - * If this disk represents an item with data (like a floppy disk), get a mount representing it's contents. This will be mounted onto the filesystem of the computercraft while the media is in the disk drive. - * @param stack The itemstack to inspect. - * @param world The world in which the item and disk drive reside. - * @return The mount, or null if this item does not represent an item with data. If the IMount returned also implements IWritableMount, it will mounted using mountWritable() - * @see dan200.computercraft.api.filesystem.IMount - * @see dan200.computercraft.api.filesystem.IWritableMount - * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String, long) - * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(Class, String, String) - */ - public IMount createDataMount( ItemStack stack, World world ); -} diff --git a/src/api/java/dan200/computercraft/api/media/IMediaProvider.java b/src/api/java/dan200/computercraft/api/media/IMediaProvider.java deleted file mode 100644 index 33e53ed4..00000000 --- a/src/api/java/dan200/computercraft/api/media/IMediaProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.media; - -import net.minecraft.item.ItemStack; - -/** - * This interface is used to provide IMedia implementations for ItemStack - * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider) - */ -public interface IMediaProvider -{ - /** - * Produce an IMedia implementation from an ItemStack. - * @see dan200.computercraft.api.ComputerCraftAPI#registerMediaProvider(IMediaProvider) - * @return an IMedia implementation, or null if the item is not something you wish to handle - */ - public IMedia getMedia( ItemStack stack ); -} diff --git a/src/api/java/dan200/computercraft/api/media/package-info.java b/src/api/java/dan200/computercraft/api/media/package-info.java deleted file mode 100644 index ec0695fb..00000000 --- a/src/api/java/dan200/computercraft/api/media/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -@API( owner="ComputerCraft", provides="ComputerCraft|API|Media", apiVersion="1.65" ) -package dan200.computercraft.api.media; - -import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/package-info.java b/src/api/java/dan200/computercraft/api/package-info.java deleted file mode 100644 index 5c16faf4..00000000 --- a/src/api/java/dan200/computercraft/api/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -@API( owner="ComputerCraft", provides="ComputerCraft|API", apiVersion="1.65" ) -package dan200.computercraft.api; - -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java b/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java deleted file mode 100644 index 1c9327d2..00000000 --- a/src/api/java/dan200/computercraft/api/peripheral/IComputerAccess.java +++ /dev/null @@ -1,102 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.peripheral; - -import dan200.computercraft.api.filesystem.IMount; -import dan200.computercraft.api.filesystem.IWritableMount; - -/** - * The interface passed to peripherals by computers or turtles, providing methods - * that they can call. This should not be implemented by your classes. Do not interact - * with computers except via this interface. - */ -public interface IComputerAccess -{ - /** - * Mount a mount onto the computers' file system in a read only mode.
- * @param desiredLocation The location on the computercraft's file system where you would like the mount to be mounted. - * @param mount The mount object to mount on the computercraft. These can be obtained by calling ComputerCraftAPI.createSaveDirMount(), ComputerCraftAPI.createResourceMount() or by creating your own objects that implement the IMount interface. - * @return The location on the computercraft's file system where you the mount mounted, or null if there was already a file in the desired location. Store this value if you wish to unmount the mount later. - * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String) - * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(Class, String, String) - * @see #mountWritable(String, dan200.computercraft.api.filesystem.IWritableMount) - * @see #unmount(String) - * @see dan200.computercraft.api.filesystem.IMount - */ - public String mount( String desiredLocation, IMount mount ); - - /** - * TODO: Document me - */ - public String mount( String desiredLocation, IMount mount, String driveName ); - - /** - * Mount a mount onto the computers' file system in a writable mode.
- * @param desiredLocation The location on the computercraft's file system where you would like the mount to be mounted. - * @param mount The mount object to mount on the computercraft. These can be obtained by calling ComputerCraftAPI.createSaveDirMount() or by creating your own objects that implement the IWritableMount interface. - * @return The location on the computercraft's file system where you the mount mounted, or null if there was already a file in the desired location. Store this value if you wish to unmount the mount later. - * @see dan200.computercraft.api.ComputerCraftAPI#createSaveDirMount(World, String) - * @see dan200.computercraft.api.ComputerCraftAPI#createResourceMount(Class, String, String) - * @see #mount(String, IMount) - * @see #unmount(String) - * @see IMount - */ - public String mountWritable( String desiredLocation, IWritableMount mount ); - - /** - * TODO: Document me - */ - public String mountWritable( String desiredLocation, IWritableMount mount, String driveName ); - - /** - * Unmounts a directory previously mounted onto the computers file system by mount() or mountWritable().
- * When a directory is unmounted, it will disappear from the computers file system, and the user will no longer be able to - * access it. All directories mounted by a mount or mountWritable are automatically unmounted when the peripheral - * is attached if they have not been explicitly unmounted. - * @param location The desired location in the computers file system of the directory to unmount. - * This must be the location of a directory previously mounted by mount() or mountWritable(), as - * indicated by their return value. - * @see #mount(String, IMount) - * @see #mountWritable(String, IWritableMount) - */ - public void unmount( String location ); - - /** - * Returns the numerical ID of this computercraft.
- * This is the same number obtained by calling os.getComputerID() or running the "id" program from lua, - * and is guarunteed unique. This number will be positive. - * @return The identifier. - */ - public int getID(); - - /** - * Causes an event to be raised on this computercraft, which the computercraft can respond to by calling - * os.pullEvent(). This can be used to notify the computercraft when things happen in the world or to - * this peripheral. - * @param event A string identifying the type of event that has occurred, this will be - * returned as the first value from os.pullEvent(). It is recommended that you - * you choose a name that is unique, and recognisable as originating from your - * peripheral. eg: If your peripheral type is "button", a suitable event would be - * "button_pressed". - * @param arguments In addition to a name, you may pass an array of extra arguments to the event, that will - * be supplied as extra return values to os.pullEvent(). Objects in the array will be converted - * to lua data types in the same fashion as the return values of IPeripheral.callMethod().
- * You may supply null to indicate that no arguments are to be supplied. - * @see dan200.computercraft.api.peripheral.IPeripheral#callMethod - */ - public void queueEvent( String event, Object[] arguments ); - - /** - * Get a string, unique to the computercraft, by which the computercraft refers to this peripheral. - * For directly attached peripherals this will be "left","right","front","back",etc, but - * for peripherals attached remotely it will be different. It is good practice to supply - * this string when raising events to the computercraft, so that the computercraft knows from - * which peripheral the event came. - * @return A string unique to the computercraft, but not globally. - */ - public String getAttachmentName(); -} diff --git a/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java b/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java deleted file mode 100644 index 99396dd9..00000000 --- a/src/api/java/dan200/computercraft/api/peripheral/IPeripheral.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.peripheral; - -import dan200.computercraft.api.lua.ILuaContext; -import dan200.computercraft.api.lua.LuaException; - -/** - * The interface that defines a peripheral. This should be implemented by the - * TileEntity of any common that you wish to be interacted with by - * computercraft or turtle. - */ -public interface IPeripheral -{ - /** - * Should return a string that uniquely identifies this type of peripheral. - * This can be queried from lua by calling peripheral.getType() - * @return A string identifying the type of peripheral. - */ - public String getType(); - - /** - * Should return an array of strings that identify the methods that this - * peripheral exposes to Lua. This will be called once before each attachment, - * and should not change when called multiple times. - * @return An array of strings representing method names. - * @see #callMethod - */ - public String[] getMethodNames(); - - /** - * This is called when a lua program on an attached computercraft calls peripheral.call() with - * one of the methods exposed by getMethodNames().
- *
- * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe - * when interacting with minecraft objects. - * @param computer The interface to the computercraft that is making the call. Remember that multiple - * computers can be attached to a peripheral at once. - * @param context The context of the currently running lua thread. This can be used to wait for events - * or otherwise yield. - * @param method An integer identifying which of the methods from getMethodNames() the computercraft - * wishes to call. The integer indicates the index into the getMethodNames() table - * that corresponds to the string passed into peripheral.call() - * @param arguments An array of objects, representing the arguments passed into peripheral.call().
- * Lua values of type "string" will be represented by Object type String.
- * Lua values of type "number" will be represented by Object type Double.
- * Lua values of type "boolean" will be represented by Object type Boolean.
- * Lua values of any other type will be represented by a null object.
- * This array will be empty if no arguments are passed. - * @return An array of objects, representing values you wish to return to the lua program.
- * Integers, Doubles, Floats, Strings, Booleans and null be converted to their corresponding lua type.
- * All other types will be converted to nil.
- * You may return null to indicate no values should be returned. - * @throws Exception If you throw any exception from this function, a lua error will be raised with the - * same message as your exception. Use this to throw appropriate errors if the wrong - * arguments are supplied to your method. - * @see #getMethodNames - */ - public Object[] callMethod( IComputerAccess computer, ILuaContext context, int method, Object[] arguments ) throws LuaException, InterruptedException; - - /** - * Is called when canAttachToSide has returned true, and a computercraft is attaching to the peripheral. - * This will occur when a peripheral is placed next to an active computercraft, when a computercraft is turned on next to a peripheral, - * or when a turtle travels into a square next to a peripheral. - * Between calls to attach() and detach(), the attached computercraft can make method calls on the peripheral using peripheral.call(). - * This method can be used to keep track of which computers are attached to the peripheral, or to take action when attachment - * occurs.
- *
- * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe - * when interacting with minecraft objects. - * @param computer The interface to the computercraft that is being attached. Remember that multiple - * computers can be attached to a peripheral at once. - * @see #detach - */ - public void attach( IComputerAccess computer ); - - /** - * Is called when a computercraft is detaching from the peripheral. - * This will occur when a computercraft shuts down, when the peripheral is removed while attached to computers, - * or when a turtle moves away from a square attached to a peripheral. - * This method can be used to keep track of which computers are attached to the peripheral, or to take action when detachment - * occurs.
- *
- * Be aware that this will be called from the ComputerCraft Lua thread, and must be thread-safe - * when interacting with minecraft objects. - * @param computer The interface to the computercraft that is being detached. Remember that multiple - * computers can be attached to a peripheral at once. - * @see #detach - */ - public void detach( IComputerAccess computer ); - - /** - * TODO: Document me - */ - public boolean equals( IPeripheral other ); -} diff --git a/src/api/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java b/src/api/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java deleted file mode 100644 index aeb354f3..00000000 --- a/src/api/java/dan200/computercraft/api/peripheral/IPeripheralProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.peripheral; - -import net.minecraft.world.World; - -/** - * This interface is used to create peripheral implementations for blocks - * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider) - */ -public interface IPeripheralProvider -{ - /** - * Produce an peripheral implementation from a block location. - * @see dan200.computercraft.api.ComputerCraftAPI#registerPeripheralProvider(IPeripheralProvider) - * @return a peripheral, or null if there is not a peripheral here you'd like to handle. - */ - public IPeripheral getPeripheral( World world, int x, int y, int z, int side ); -} diff --git a/src/api/java/dan200/computercraft/api/peripheral/package-info.java b/src/api/java/dan200/computercraft/api/peripheral/package-info.java deleted file mode 100644 index c3ee6484..00000000 --- a/src/api/java/dan200/computercraft/api/peripheral/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -@API( owner="ComputerCraft", provides="ComputerCraft|API|Peripheral", apiVersion="1.65" ) -package dan200.computercraft.api.peripheral; - -import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java b/src/api/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java deleted file mode 100644 index 6d5d400d..00000000 --- a/src/api/java/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.redstone; - -import net.minecraft.world.World; - -/** - * This interface is used to provide bundled redstone output for blocks - * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider) - */ -public interface IBundledRedstoneProvider -{ - /** - * Produce an bundled redstone output from a block location. - * @see dan200.computercraft.api.ComputerCraftAPI#registerBundledRedstoneProvider(IBundledRedstoneProvider) - * @return a number in the range 0-65535 to indicate this block is providing output, or -1 if you do not wish to handle this block - */ - public int getBundledRedstoneOutput( World world, int x, int y, int z, int side ); -} diff --git a/src/api/java/dan200/computercraft/api/redstone/package-info.java b/src/api/java/dan200/computercraft/api/redstone/package-info.java deleted file mode 100644 index fa59ad32..00000000 --- a/src/api/java/dan200/computercraft/api/redstone/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -@API( owner="ComputerCraft", provides="ComputerCraft|API|Redstone", apiVersion="1.65" ) -package dan200.computercraft.api.redstone; - -import cpw.mods.fml.common.API; diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java deleted file mode 100644 index e7e96810..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleAccess.java +++ /dev/null @@ -1,156 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -import dan200.computercraft.api.lua.ILuaContext; -import dan200.computercraft.api.lua.LuaException; -import dan200.computercraft.api.peripheral.IPeripheral; -import net.minecraft.inventory.IInventory; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - -/** - * The interface passed to turtle by turtles, providing methods that they can call. - * This should not be implemented by your classes. Do not interact with turtles except via this interface and ITurtleUpgrade. - */ -public interface ITurtleAccess -{ - /** - * Returns the world in which the turtle resides. - * @return the world in which the turtle resides. - */ - public World getWorld(); - - /** - * Returns a vector containing the integer co-ordinates at which the turtle resides. - * @return a vector containing the integer co-ordinates at which the turtle resides. - */ - public ChunkCoordinates getPosition(); - - /** - * TODO: Document me - */ - public boolean teleportTo( World world, int x, int y, int z ); - - /** - * Returns a vector containing the floating point co-ordinates at which the turtle is rendered. - * This will shift when the turtle is moving. - * @param f The subframe fraction - * @return a vector containing the floating point co-ordinates at which the turtle resides. - */ - public Vec3 getVisualPosition( float f ); - - /** - * TODO: Document me - */ - public float getVisualYaw( float f ); - - /** - * Returns the world direction the turtle is currently facing. - * @return the world direction the turtle is currently facing. - */ - public int getDirection(); - - /** - * TODO: Document me - */ - public void setDirection( int dir ); - - /** - * TODO: Document me - */ - public int getSelectedSlot(); - - /** - * TODO: Document me - */ - public void setSelectedSlot( int slot ); - - /** - * TODO: Document me - */ - public IInventory getInventory(); - - /** - * TODO: Document me - */ - public boolean isFuelNeeded(); - - /** - * TODO: Document me - */ - public int getFuelLevel(); - - /** - * TODO: Document me - */ - public void setFuelLevel( int fuel ); - - /** - * TODO: Document me - */ - public int getFuelLimit(); - - /** - * Removes some fuel from the turtles fuel supply. Negative numbers can be passed in to INCREASE the fuel level of the turtle. - * @return Whether the turtle was able to consume the ammount of fuel specified. Will return false if you supply a number - * greater than the current fuel level of the turtle. - */ - public boolean consumeFuel( int fuel ); - - /** - * TODO: Document me - */ - public void addFuel( int fuel ); - - /** - * Adds a custom command to the turtles command queue. Unlike peripheral methods, these custom commands will be executed - * on the main thread, so are guaranteed to be able to access Minecraft objects safely, and will be queued up - * with the turtles standard movement and tool commands. An issued command will return an unique integer, which will - * be supplied as a parameter to a "turtle_response" event issued to the turtle after the command has completed. Look at the - * lua source code for "rom/apis/turtle" for how to build a lua wrapper around this functionality. - * @param command an object which will execute the custom command when its point in the queue is reached - * @return the objects the command returned when executed. you should probably return these to the player - * unchanged if called from a peripheral method. - * @see ITurtleCommand - */ - public Object[] executeCommand( ILuaContext context, ITurtleCommand command ) throws LuaException, InterruptedException; - - /** - * TODO: Document me - */ - public void playAnimation( TurtleAnimation animation ); - - /** - * Returns the turtle on the specified side of the turtle, if there is one. - * @return the turtle on the specified side of the turtle, if there is one. - */ - public ITurtleUpgrade getUpgrade( TurtleSide side ); - - /** - * TODO: Document me - */ - public void setUpgrade( TurtleSide side, ITurtleUpgrade upgrade ); - - /** - * Returns the peripheral created by the upgrade on the specified side of the turtle, if there is one. - * @return the peripheral created by the upgrade on the specified side of the turtle, if there is one. - */ - public IPeripheral getPeripheral( TurtleSide side ); - - /** - * TODO: Document me - */ - public NBTTagCompound getUpgradeNBTData( TurtleSide side ); - - /** - * TODO: Document me - */ - public void updateUpgradeNBTData( TurtleSide side ); -} diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java deleted file mode 100644 index a551b649..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleCommand.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -/** - * An interface for objects executing custom turtle commands, used with ITurtleAccess.issueCommand - * @see ITurtleAccess#executeCommand(dan200.computercraft.api.lua.ILuaContext,ITurtleCommand) - */ -public interface ITurtleCommand -{ - /** - * Will be called by the turtle on the main thread when it is time to execute the custom command. - * The handler should either perform the work of the command, and return success, or return - * failure with an error message to indicate the command cannot be executed at this time. - * @param turtle access to the turtle for whom the command was issued - * @return TurtleCommandResult.success() or TurtleCommandResult.failure( errorMessage ) - * @see ITurtleAccess#executeCommand(dan200.computercraft.api.lua.ILuaContext,ITurtleCommand) - * @see dan200.computercraft.api.turtle.TurtleCommandResult - */ - public TurtleCommandResult execute( ITurtleAccess turtle ); -} diff --git a/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java b/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java deleted file mode 100644 index 461d6e2b..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/ITurtleUpgrade.java +++ /dev/null @@ -1,94 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -import dan200.computercraft.api.peripheral.IPeripheral; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -/** - * The primary interface for defining an turtle for Turtles. A turtle turtle - * can either be a new tool, or a new peripheral. - * @see dan200.computercraft.api.ComputerCraftAPI#registerTurtleUpgrade( dan200.computercraft.api.turtle.ITurtleUpgrade ) - */ -public interface ITurtleUpgrade -{ - /** - * Gets a unique numerical identifier representing this type of turtle turtle. - * Like Minecraft common and item IDs, you should strive to make this number unique - * among all turtle turtle that have been released for ComputerCraft. - * The ID must be in the range 64 to 255, as the ID is stored as an 8-bit value, - * and 0-64 is reserved for future use by ComputerCraft. The turtle will - * fail registration if an already used ID is specified. - * @see dan200.computercraft.api.ComputerCraftAPI#registerTurtleUpgrade( dan200.computercraft.api.turtle.ITurtleUpgrade ) - */ - public int getUpgradeID(); - - /** - * Return a String to describe this type of turtle in turtle item names. - * Examples of built-in adjectives are "Wireless", "Mining" and "Crafty". - */ - public String getUnlocalisedAdjective(); - - /** - * Return whether this turtle adds a tool or a peripheral to the turtle. - * Currently, turtle crafting is restricted to one tool & one peripheral per turtle. - * @see TurtleUpgradeType for the differences between the two. - */ - public TurtleUpgradeType getType(); - - /** - * Return an item stack representing the type of item that a turtle must be crafted - * with to create a turtle which holds this turtle. - * Currently, turtle crafting is restricted to one tool & one peripheral per turtle. - */ - public ItemStack getCraftingItem(); - - /** - * Will only be called for Peripheral turtle. Creates a peripheral for a turtle - * being placed using this turtle. The peripheral created will be stored - * for the lifetime of the turtle, will have update() called once-per-tick, and will be - * attach'd detach'd and have methods called in the same manner as a Computer peripheral. - * - * @param turtle Access to the turtle that the peripheral is being created for. - * @param side Which side of the turtle (left or right) that the turtle resides on. - * @return The newly created peripheral. You may return null if this turtle is a Tool - * and this method is not expected to be called. - */ - public IPeripheral createPeripheral( ITurtleAccess turtle, TurtleSide side ); - - /** - * Will only be called for Tool turtle. Called when turtle.dig() or turtle.attack() is called - * by the turtle, and the tool is required to do some work. - * @param turtle Access to the turtle that the tool resides on. - * @param side Which side of the turtle (left or right) the tool resides on. - * @param verb Which action (dig or attack) the turtle is being called on to perform. - * @param direction Which world direction the action should be performed in, relative to the turtles - * position. This will either be up, down, or the direction the turtle is facing, depending on - * whether dig, digUp or digDown was called. - * @return Whether the turtle was able to perform the action, and hence whether the turtle.dig() - * or turtle.attack() lua method should return true. If true is returned, the tool will perform - * a swinging animation. You may return null if this turtle is a Peripheral - * and this method is not expected to be called. - */ - public TurtleCommandResult useTool( ITurtleAccess turtle, TurtleSide side, TurtleVerb verb, int direction ); - - /** - * Called to obtain the IIcon to be used when rendering a turtle peripheral. Needs to be a "common" - * type IIcon for now, as there is no way to determine which texture sheet an IIcon is from by the - * IIcon itself. - * @param turtle Access to the turtle that the peripheral resides on. - * @param side Which side of the turtle (left or right) the peripheral resides on. - * @return The IIcon that you wish to be used to render your turtle peripheral. - */ - public IIcon getIcon( ITurtleAccess turtle, TurtleSide side ); - - /** - * TODO: Document me - */ - public void update( ITurtleAccess turtle, TurtleSide side ); -} diff --git a/src/api/java/dan200/computercraft/api/turtle/TurtleAnimation.java b/src/api/java/dan200/computercraft/api/turtle/TurtleAnimation.java deleted file mode 100644 index b907e624..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/TurtleAnimation.java +++ /dev/null @@ -1,21 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -public enum TurtleAnimation -{ - None, - MoveForward, - MoveBack, - MoveUp, - MoveDown, - TurnLeft, - TurnRight, - SwingLeftTool, - SwingRightTool, - Wait, -} diff --git a/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java b/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java deleted file mode 100644 index f0f26fd0..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/TurtleCommandResult.java +++ /dev/null @@ -1,73 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -public final class TurtleCommandResult -{ - private static final TurtleCommandResult s_success = new TurtleCommandResult( true, null, null ); - private static final TurtleCommandResult s_emptyFailure = new TurtleCommandResult( false, null, null ); - - public static TurtleCommandResult success() - { - return success( null ); - } - - public static TurtleCommandResult success( Object[] results ) - { - if( results == null || results.length == 0 ) - { - return s_success; - } - else - { - return new TurtleCommandResult( true, null, results ); - } - } - - public static TurtleCommandResult failure() - { - return failure( null ); - } - - public static TurtleCommandResult failure( String errorMessage ) - { - if( errorMessage == null ) - { - return s_emptyFailure; - } - else - { - return new TurtleCommandResult( false, errorMessage, null ); - } - } - - private final boolean m_success; - private final String m_errorMessage; - private final Object[] m_results; - - private TurtleCommandResult( boolean success, String errorMessage, Object[] results ) - { - m_success = success; - m_errorMessage = errorMessage; - m_results = results; - } - - public boolean isSuccess() - { - return m_success; - } - - public String getErrorMessage() - { - return m_errorMessage; - } - - public Object[] getResults() - { - return m_results; - } -} diff --git a/src/api/java/dan200/computercraft/api/turtle/TurtleSide.java b/src/api/java/dan200/computercraft/api/turtle/TurtleSide.java deleted file mode 100644 index e125d801..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/TurtleSide.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -/** - * An enum representing the two sides of the turtle that a turtle turtle might reside. - */ -public enum TurtleSide -{ - /** - * The turtles left side (where the pickaxe usually is on a Wireless Mining Turtle) - */ - Left, - - /** - * The turtles right side (where the modem usually is on a Wireless Mining Turtle) - */ - Right, -} diff --git a/src/api/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java b/src/api/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java deleted file mode 100644 index ef84ee9b..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/TurtleUpgradeType.java +++ /dev/null @@ -1,27 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -/** - * An enum representing the two different types of turtle that an ITurtleUpgrade - * implementation can add to a turtle. - * @see ITurtleUpgrade - */ -public enum TurtleUpgradeType -{ - /** - * A tool is rendered as an item on the side of the turtle, and responds to the turtle.dig() - * and turtle.attack() methods (Such as pickaxe or sword on Mining and Melee turtles). - */ - Tool, - - /** - * A peripheral adds a special peripheral which is attached to the side of the turtle, - * and can be interacted with the peripheral API (Such as the modem on Wireless Turtles). - */ - Peripheral, -} diff --git a/src/api/java/dan200/computercraft/api/turtle/TurtleVerb.java b/src/api/java/dan200/computercraft/api/turtle/TurtleVerb.java deleted file mode 100644 index 3a8fb092..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/TurtleVerb.java +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This file is part of the public ComputerCraft API - http://www.computercraft.info - * Copyright Daniel Ratcliffe, 2011-2014. This API may be redistributed unmodified and in full only. - * For help using the API, and posting your mods, visit the forums at computercraft.info. - */ - -package dan200.computercraft.api.turtle; - -/** - * An enum representing the two different actions that an ITurtleUpgrade of type - * Tool may be called on to perform by a turtle. - * @see ITurtleUpgrade - * @see ITurtleUpgrade#useTool - */ -public enum TurtleVerb -{ - /** - * The turtle called turtle.dig(), turtle.digUp() or turtle.digDown() - */ - Dig, - - /** - * The turtle called turtle.attack(), turtle.attackUp() or turtle.attackDown() - */ - Attack, -} diff --git a/src/api/java/dan200/computercraft/api/turtle/package-info.java b/src/api/java/dan200/computercraft/api/turtle/package-info.java deleted file mode 100644 index 13a832fc..00000000 --- a/src/api/java/dan200/computercraft/api/turtle/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API( owner="ComputerCraft", provides="ComputerCraft|API|Turtle", apiVersion="1.65" ) -package dan200.computercraft.api.turtle; - -import cpw.mods.fml.common.API; diff --git a/src/api/java/mekanism/api/Chunk3D.java b/src/api/java/mekanism/api/Chunk3D.java deleted file mode 100644 index f469d5db..00000000 --- a/src/api/java/mekanism/api/Chunk3D.java +++ /dev/null @@ -1,118 +0,0 @@ -package mekanism.api; - -import net.minecraft.entity.Entity; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; - -/** - * Chunk3D - an integer-based way to keep track of and perform operations on chunks in a Minecraft-based environment. This also takes - * in account the dimension the chunk is in. - * @author aidancbrady - * - */ -public class Chunk3D -{ - public int dimensionId; - - public int xCoord; - public int zCoord; - - /** - * Creates a Chunk3D object from the given x and z coordinates, as well as a dimension. - * @param x - chunk x location - * @param z - chunk z location - * @param dimension - the dimension this Chunk3D is in - */ - public Chunk3D(int x, int z, int dimension) - { - xCoord = x; - zCoord = z; - - dimensionId = dimension; - } - - /** - * Creates a Chunk3D from an entity based on it's location and dimension. - * @param entity - the entity to get the Chunk3D object from - */ - public Chunk3D(Entity entity) - { - xCoord = ((int)entity.posX) >> 4; - zCoord = ((int)entity.posZ) >> 4; - - dimensionId = entity.dimension; - } - - /** - * Creates a Chunk3D from a Coord4D based on it's coordinates and dimension. - * @param coord - the Coord4D object to get this Chunk3D from - */ - public Chunk3D(Coord4D coord) - { - xCoord = coord.xCoord >> 4; - zCoord = coord.zCoord >> 4; - - dimensionId = coord.dimensionId; - } - - /** - * Whether or not this chunk exists in the given world. - * @param world - the world to check in - * @return if the chunk exists - */ - public boolean exists(World world) - { - return world.getChunkProvider().chunkExists(xCoord, zCoord); - } - - /** - * Gets a Chunk object corresponding to this Chunk3D's coordinates. - * @param world - the world to get the Chunk object from - * @return the corresponding Chunk object - */ - public Chunk getChunk(World world) - { - return world.getChunkFromChunkCoords(xCoord, zCoord); - } - - /** - * Returns this Chunk3D in the Minecraft-based ChunkCoordIntPair format. - * @return this Chunk3D as a ChunkCoordIntPair - */ - public ChunkCoordIntPair toPair() - { - return new ChunkCoordIntPair(xCoord, zCoord); - } - - @Override - public Coord4D clone() - { - return new Coord4D(xCoord, zCoord, dimensionId); - } - - @Override - public String toString() - { - return "[Chunk3D: " + xCoord + ", " + zCoord + ", dim=" + dimensionId + "]"; - } - - @Override - public boolean equals(Object obj) - { - return obj instanceof Chunk3D && - ((Chunk3D)obj).xCoord == xCoord && - ((Chunk3D)obj).zCoord == zCoord && - ((Chunk3D)obj).dimensionId == dimensionId; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + xCoord; - code = 31 * code + zCoord; - code = 31 * code + dimensionId; - return code; - } -} diff --git a/src/api/java/mekanism/api/Coord4D.java b/src/api/java/mekanism/api/Coord4D.java deleted file mode 100644 index 1bda3815..00000000 --- a/src/api/java/mekanism/api/Coord4D.java +++ /dev/null @@ -1,402 +0,0 @@ -package mekanism.api; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; - -import io.netty.buffer.ByteBuf; - -/** - * Coord4D - an integer-based way to keep track of and perform operations on blocks in a Minecraft-based environment. This also takes - * in account the dimension the coordinate is in. - * @author aidancbrady - * - */ -public class Coord4D -{ - public int xCoord; - public int yCoord; - public int zCoord; - - public int dimensionId; - - /** - * Creates a Coord4D WITHOUT a dimensionId. Don't use unless absolutely necessary. - * @param x - x coordinate - * @param y - y coordinate - * @param z - z coordinate - */ - public Coord4D(int x, int y, int z) - { - xCoord = x; - yCoord = y; - zCoord = z; - - dimensionId = 0; - } - - /** - * Creates a Coord4D from an entity's position, rounded down. - * @param entity - entity to create the Coord4D from - */ - public Coord4D(Entity entity) - { - xCoord = (int)entity.posX; - yCoord = (int)entity.posY; - zCoord = (int)entity.posZ; - - dimensionId = entity.worldObj.provider.dimensionId; - } - - /** - * Creates a Coord4D from the defined x, y, z, and dimension values. - * @param x - x coordinate - * @param y - y coordinate - * @param z - z coordinate - * @param dimension - dimension ID - */ - public Coord4D(int x, int y, int z, int dimension) - { - xCoord = x; - yCoord = y; - zCoord = z; - - dimensionId = dimension; - } - - /** - * Gets the metadata of the block representing this Coord4D. - * @param world - world this Coord4D is in - * @return the metadata of this Coord4D's block - */ - public int getMetadata(IBlockAccess world) - { - return world.getBlockMetadata(xCoord, yCoord, zCoord); - } - - /** - * Gets the TileEntity of the block representing this Coord4D. - * @param world - world this Coord4D is in - * @return the TileEntity of this Coord4D's block - */ - public TileEntity getTileEntity(IBlockAccess world) - { - if(world instanceof World && !exists((World)world)) - { - return null; - } - - return world.getTileEntity(xCoord, yCoord, zCoord); - } - - /** - * Gets the Block value of the block representing this Coord4D. - * @param world - world this Coord4D is in - * @return the Block value of this Coord4D's block - */ - public Block getBlock(IBlockAccess world) - { - if(world instanceof World && !exists((World)world)) - { - return null; - } - - return world.getBlock(xCoord, yCoord, zCoord); - } - - /** - * Writes this Coord4D's data to an NBTTagCompound. - * @param nbtTags - tag compound to write to - * @return the tag compound with this Coord4D's data - */ - public NBTTagCompound write(NBTTagCompound nbtTags) - { - nbtTags.setInteger("x", xCoord); - nbtTags.setInteger("y", yCoord); - nbtTags.setInteger("z", zCoord); - nbtTags.setInteger("dimensionId", dimensionId); - - return nbtTags; - } - - /** - * Writes this Coord4D's data to an ArrayList for packet transfer. - * @param data - the ArrayList to add the data to - */ - public void write(ArrayList data) - { - data.add(xCoord); - data.add(yCoord); - data.add(zCoord); - data.add(dimensionId); - } - - /** - * Writes this Coord4D's data to a ByteBuf for packet transfer. - * @param dataStream - the ByteBuf to add the data to - */ - public void write(ByteBuf dataStream) - { - dataStream.writeInt(xCoord); - dataStream.writeInt(yCoord); - dataStream.writeInt(zCoord); - dataStream.writeInt(dimensionId); - } - - /** - * Translates this Coord4D by the defined x, y, and z values. - * @param x - x value to translate - * @param y - y value to translate - * @param z - z value to translate - * @return translated Coord4D - */ - public Coord4D translate(int x, int y, int z) - { - xCoord += x; - yCoord += y; - zCoord += z; - - return this; - } - - /** - * Creates and returns a new Coord4D translated to the defined offsets of the side. - * @param side - side to translate this Coord4D to - * @return translated Coord4D - */ - public Coord4D getFromSide(ForgeDirection side) - { - return getFromSide(side, 1); - } - - /** - * Creates and returns a new Coord4D translated to the defined offsets of the side by the defined amount. - * @param side - side to translate this Coord4D to - * @param amount - how far to translate this Coord4D - * @return translated Coord4D - */ - public Coord4D getFromSide(ForgeDirection side, int amount) - { - return new Coord4D(xCoord+(side.offsetX*amount), yCoord+(side.offsetY*amount), zCoord+(side.offsetZ*amount), dimensionId); - } - - public ItemStack getStack(IBlockAccess world) - { - Block block = getBlock(world); - - if(block == null || block == Blocks.air) - { - return null; - } - - return new ItemStack(block, 1, getMetadata(world)); - } - - /** - * Returns a new Coord4D from a defined TileEntity's xCoord, yCoord and zCoord values. - * @param tileEntity - TileEntity at the location that will represent this Coord4D - * @return the Coord4D object from the TileEntity - */ - public static Coord4D get(TileEntity tileEntity) - { - return new Coord4D(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord, tileEntity.getWorldObj().provider.dimensionId); - } - - /** - * Returns a new Coord4D from a tag compound. - * @param data - tag compound to read from - * @return the Coord4D from the tag compound - */ - public static Coord4D read(NBTTagCompound tag) - { - return new Coord4D(tag.getInteger("x"), tag.getInteger("y"), tag.getInteger("z"), tag.getInteger("id")); - } - - /** - * Returns a new Coord4D from a ByteBuf. - * @param dataStream - data input to read from - * @return the Coord4D from the data input - */ - public static Coord4D read(ByteBuf dataStream) - { - return new Coord4D(dataStream.readInt(), dataStream.readInt(), dataStream.readInt(), dataStream.readInt()); - } - - /** - * Creates and returns a new Coord4D with values representing the difference between the defined Coord4D - * @param other - the Coord4D to subtract from this - * @return a Coord4D representing the distance between the defined Coord4D - */ - public Coord4D difference(Coord4D other) - { - return new Coord4D(xCoord-other.xCoord, yCoord-other.yCoord, zCoord-other.zCoord, dimensionId); - } - - /** - * A method used to find the ForgeDirection represented by the distance of the defined Coord4D. Most likely won't have many - * applicable uses. - * @param other - Coord4D to find the side difference of - * @return ForgeDirection representing the side the defined relative Coord4D is on to this - */ - public ForgeDirection sideDifference(Coord4D other) - { - Coord4D diff = difference(other); - - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) - { - if(side.offsetX == diff.xCoord && side.offsetY == diff.yCoord && side.offsetZ == diff.zCoord) - { - return side; - } - } - - return ForgeDirection.UNKNOWN; - } - - /** - * Gets the distance to a defined Coord4D. - * @param obj - the Coord4D to find the distance to - * @return the distance to the defined Coord4D - */ - public int distanceTo(Coord4D obj) - { - int subX = xCoord - obj.xCoord; - int subY = yCoord - obj.yCoord; - int subZ = zCoord - obj.zCoord; - return (int)MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ); - } - - /** - * Whether or not the defined side of this Coord4D is visible. - * @param side - side to check - * @param world - world this Coord4D is in - * @return - */ - public boolean sideVisible(ForgeDirection side, IBlockAccess world) - { - return world.isAirBlock(xCoord+side.offsetX, yCoord+side.offsetY, zCoord+side.offsetZ); - } - - /** - * Gets a TargetPoint with the defined range from this Coord4D with the appropriate coordinates and dimension ID. - * @param range - the range the packet can be sent in of this Coord4D - * @return TargetPoint relative to this Coord4D - */ - public TargetPoint getTargetPoint(double range) - { - return new TargetPoint(dimensionId, xCoord, yCoord, zCoord, range); - } - - /** - * Steps this Coord4D in the defined side's offset without creating a new value. - * @param side - side to step towards - * @return this Coord4D - */ - public Coord4D step(ForgeDirection side) - { - return translate(side.offsetX, side.offsetY, side.offsetZ); - } - - /** - * Whether or not the chunk this Coord4D is in exists and is loaded. - * @param world - world this Coord4D is in - * @return the chunk of this Coord4D - */ - public boolean exists(World world) - { - return world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4); - } - - /** - * Gets the chunk this Coord4D is in. - * @param world - world this Coord4D is in - * @return the chunk of this Coord4D - */ - public Chunk getChunk(World world) - { - return world.getChunkFromBlockCoords(xCoord, zCoord); - } - - /** - * Gets the Chunk3D object with chunk coordinates correlating to this Coord4D's location - * @return Chunk3D with correlating chunk coordinates. - */ - public Chunk3D getChunk3D() - { - return new Chunk3D(this); - } - - /** - * Whether or not the block this Coord4D represents is an air block. - * @param world - world this Coord4D is in - * @return if this Coord4D is an air block - */ - public boolean isAirBlock(IBlockAccess world) - { - return world.isAirBlock(xCoord, yCoord, zCoord); - } - - /** - * Whether or not this block this Coord4D represents is replaceable. - * @param world - world this Coord4D is in - * @return if this Coord4D is replaceable - */ - public boolean isReplaceable(IBlockAccess world) - { - return getBlock(world).isReplaceable(world, xCoord, yCoord, zCoord); - } - - /** - * Gets a bounding box that contains the area this Coord4D would take up in a world. - * @return this Coord4D's bounding box - */ - public AxisAlignedBB getBoundingBox() - { - return AxisAlignedBB.getBoundingBox(xCoord, yCoord, zCoord, xCoord+1, yCoord+1, zCoord+1); - } - - @Override - public Coord4D clone() - { - return new Coord4D(xCoord, yCoord, zCoord, dimensionId); - } - - @Override - public String toString() - { - return "[Coord4D: " + xCoord + ", " + yCoord + ", " + zCoord + ", dim=" + dimensionId + "]"; - } - - @Override - public boolean equals(Object obj) - { - return obj instanceof Coord4D && - ((Coord4D)obj).xCoord == xCoord && - ((Coord4D)obj).yCoord == yCoord && - ((Coord4D)obj).zCoord == zCoord && - ((Coord4D)obj).dimensionId == dimensionId; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + xCoord; - code = 31 * code + yCoord; - code = 31 * code + zCoord; - code = 31 * code + dimensionId; - return code; - } -} \ No newline at end of file diff --git a/src/api/java/mekanism/api/EnumColor.java b/src/api/java/mekanism/api/EnumColor.java deleted file mode 100644 index df9ba743..00000000 --- a/src/api/java/mekanism/api/EnumColor.java +++ /dev/null @@ -1,112 +0,0 @@ -package mekanism.api; - -import net.minecraft.util.StatCollector; - -/** - * Simple color enum for adding colors to in-game GUI strings of text. - * @author AidanBrady - * - */ -public enum EnumColor -{ - BLACK("\u00a70", "black", "Black", new int[] {0, 0, 0}, 0), - DARK_BLUE("\u00a71", "darkBlue", "Blue", new int[] {0, 0, 170}, 4), - DARK_GREEN("\u00a72", "darkGreen", "Green", new int[] {0, 170, 0}, 2), - DARK_AQUA("\u00a73", "darkAqua", "Cyan", new int[] {0, 255, 255}, 6), - DARK_RED("\u00a74", "darkRed", null, new int[] {170, 0, 0}, -1), - PURPLE("\u00a75", "purple", "Purple", new int[] {170, 0, 170}, 5), - ORANGE("\u00a76", "orange", "Orange", new int[] {255, 170, 0}, 14), - GREY("\u00a77", "grey", "LightGray", new int[] {170, 170, 170}, 7), - DARK_GREY("\u00a78", "darkGrey", "Gray", new int[] {85, 85, 85}, 8), - INDIGO("\u00a79", "indigo", "LightBlue", new int[] {85, 85, 255}, 12), - BRIGHT_GREEN("\u00a7a", "brightGreen", "Lime", new int[] {85, 255, 85}, 10), - AQUA("\u00a7b", "aqua", null, new int[] {85, 255, 255}, -1), - RED("\u00a7c", "red", "Red", new int[] {255, 0, 0}, 1), - PINK("\u00a7d", "pink", "Magenta", new int[] {255, 85, 255}, 13), - YELLOW("\u00a7e", "yellow", "Yellow", new int[] {255, 255, 85}, 11), - WHITE("\u00a7f", "white", "White", new int[] {255, 255, 255}, 15), - //Extras for dye-completeness - BROWN("\u00a76", "brown", "Brown", new int[] {150, 75, 0}, 3), - BRIGHT_PINK("\u00a7d", "brightPink", "Pink", new int[] {255, 192, 203}, 9); - - public static EnumColor[] DYES = new EnumColor[] {BLACK, RED, DARK_GREEN, BROWN, DARK_BLUE, PURPLE, DARK_AQUA, GREY, DARK_GREY, BRIGHT_PINK, BRIGHT_GREEN, YELLOW, INDIGO, PINK, ORANGE, WHITE}; - - /** The color code that will be displayed */ - public final String code; - - public final int[] rgbCode; - - public final int mcMeta; - - /** A friendly name of the color. */ - public String unlocalizedName; - - public String dyeName; - - private EnumColor(String s, String n, String dye, int[] rgb, int meta) - { - code = s; - unlocalizedName = n; - dyeName = dye; - rgbCode = rgb; - mcMeta = meta; - } - - /** - * Gets the localized name of this color by translating the unlocalized name. - * @return localized name - */ - public String getLocalizedName() - { - return StatCollector.translateToLocal("color." + unlocalizedName); - } - - public String getDyeName() - { - return StatCollector.translateToLocal("dye." + unlocalizedName); - } - - public String getOreDictName() - { - return dyeName; - } - - /** - * Gets the name of this color with it's color prefix code. - * @return the color's name and color prefix - */ - public String getName() - { - return code + getLocalizedName(); - } - - public String getDyedName() - { - return code + getDyeName(); - } - - /** - * Gets the 0-1 of this color's RGB value by dividing by 255 (used for OpenGL coloring). - * @param index - R:0, G:1, B:2 - * @return the color value - */ - public float getColor(int index) - { - return (float)rgbCode[index]/255F; - } - - /** - * Gets the value of this color mapped to MC in-game item colors present in dyes and wool. - * @return mc meta value - */ - public int getMetaValue() - { - return mcMeta; - } - - @Override - public String toString() - { - return code; - } -} diff --git a/src/api/java/mekanism/api/IClientTicker.java b/src/api/java/mekanism/api/IClientTicker.java deleted file mode 100644 index 22889737..00000000 --- a/src/api/java/mekanism/api/IClientTicker.java +++ /dev/null @@ -1,8 +0,0 @@ -package mekanism.api; - -public interface IClientTicker -{ - public void clientTick(); - - public boolean needsTicks(); -} diff --git a/src/api/java/mekanism/api/IConfigurable.java b/src/api/java/mekanism/api/IConfigurable.java deleted file mode 100644 index 512fabf4..00000000 --- a/src/api/java/mekanism/api/IConfigurable.java +++ /dev/null @@ -1,27 +0,0 @@ -package mekanism.api; - -import net.minecraft.entity.player.EntityPlayer; - -/** - * Implement this in your TileEntity class if your block can be modified by a Configurator. - * @author aidancbrady - * - */ -public interface IConfigurable -{ - /** - * Called when a player shift-right clicks this block with a Configurator. - * @param player - the player who clicked the block - * @param side - the side the block was clicked on - * @return whether or not an action was performed - */ - public boolean onSneakRightClick(EntityPlayer player, int side); - - /** - * Called when a player right clicks this block with a Configurator. - * @param player - the player who clicked the block - * @param side - the side the block was clicked on - * @return whether or not an action was performed - */ - public boolean onRightClick(EntityPlayer player, int side); -} diff --git a/src/api/java/mekanism/api/IFilterAccess.java b/src/api/java/mekanism/api/IFilterAccess.java deleted file mode 100644 index abdcf29a..00000000 --- a/src/api/java/mekanism/api/IFilterAccess.java +++ /dev/null @@ -1,31 +0,0 @@ -package mekanism.api; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * Implement this in your TileEntity class if you wish for Mekanism filters to be able to store any of their - * information. - * @author aidancbrady - * - */ -public interface IFilterAccess -{ - /** - * Collects the TileEntity's filter card data into the parameterized NBTTagCompound. - * @param nbtTags - the NBTTagCompound of the filter card ItemStack - * @return the NBTTagCompound that now contains the TileEntity's filter card data - */ - public NBTTagCompound getFilterData(NBTTagCompound nbtTags); - - /** - * Retrieves the TileEntity's data contained in the filter card based on the given NBTTagCompopund. - * @param nbtTags - the NBTTagCompound of the filter card ItemStack - */ - public void setFilterData(NBTTagCompound nbtTags); - - /** - * A String name of this TileEntity that will be displayed as the type of data on the filter card. - * @return the String name of this TileEntity - */ - public String getDataType(); -} diff --git a/src/api/java/mekanism/api/IHeatTransfer.java b/src/api/java/mekanism/api/IHeatTransfer.java deleted file mode 100644 index da682e11..00000000 --- a/src/api/java/mekanism/api/IHeatTransfer.java +++ /dev/null @@ -1,28 +0,0 @@ -package mekanism.api; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IHeatTransfer -{ - /**The value of the zero point of our temperature scale in kelvin*/ - public static final double AMBIENT_TEMP = 300; - - /**The heat transfer coefficient for air*/ - public static final double AIR_INVERSE_COEFFICIENT = 10000; - - public double getTemp(); - - public double getInverseConductionCoefficient(); - - public double getInsulationCoefficient(ForgeDirection side); - - public void transferHeatTo(double heat); - - public double[] simulateHeat(); - - public double applyTemperatureChange(); - - public boolean canConnectHeat(ForgeDirection side); - - public IHeatTransfer getAdjacent(ForgeDirection side); -} diff --git a/src/api/java/mekanism/api/IMekWrench.java b/src/api/java/mekanism/api/IMekWrench.java deleted file mode 100644 index 6ac4b052..00000000 --- a/src/api/java/mekanism/api/IMekWrench.java +++ /dev/null @@ -1,8 +0,0 @@ -package mekanism.api; - -import net.minecraft.entity.player.EntityPlayer; - -public interface IMekWrench -{ - public boolean canUseWrench(EntityPlayer player, int x, int y, int z); -} diff --git a/src/api/java/mekanism/api/ISalinationSolar.java b/src/api/java/mekanism/api/ISalinationSolar.java deleted file mode 100644 index 20e3e1ec..00000000 --- a/src/api/java/mekanism/api/ISalinationSolar.java +++ /dev/null @@ -1,11 +0,0 @@ -package mekanism.api; - -/** - * Implement this class in a TileEntity if you wish for it to be able to heat up a Salination Plant. - * @author aidancbrady - * - */ -public interface ISalinationSolar -{ - public boolean seesSun(); -} diff --git a/src/api/java/mekanism/api/ItemRetriever.java b/src/api/java/mekanism/api/ItemRetriever.java deleted file mode 100644 index c2820f0b..00000000 --- a/src/api/java/mekanism/api/ItemRetriever.java +++ /dev/null @@ -1,112 +0,0 @@ -package mekanism.api; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -/** - * Use this class's 'getItem()' method to retrieve ItemStacks from the 'Mekanism' - * class. - * @author AidanBrady - * - */ -public final class ItemRetriever -{ - /** The 'MekanismItems' class that items are retrieved from. */ - private static Class MekanismItems; - - /** The 'MekanismBlocks' class that blocks are retrieved from. */ - private static Class MekanismBlocks; - - /** - * Attempts to retrieve an ItemStack of an item with the declared identifier. - * - * Mekanism identifiers follow an easy-to-remember pattern. All identifiers - * are identical to the String returned by 'getItemName().' None include spaces, - * and all start with a capital letter. The name that shows up in-game can be - * stripped down to identifier form by removing spaces and all non-alphabetic - * characters (,./'=-_). Below is an example: - * - * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy"); - * - * Note that for items or blocks that have specific metadata you will need to create - * a new ItemStack with that specified value, as this will only return an ItemStack - * with the meta value '0.' - * - * Make sure you run this in or after FMLPostInitializationEvent runs, because most - * items are registered when FMLInitializationEvent runs. However, some items ARE - * registered later in order to hook into other mods. In a rare circumstance you may - * have to add "after:Mekanism" in the @Mod 'dependencies' annotation. - * - * @param identifier - a String to be searched in the 'MekanismItems' class - * @return an ItemStack of the declared identifier, otherwise null. - */ - public static ItemStack getItem(String identifier) - { - try { - if(MekanismItems == null) - { - MekanismItems = Class.forName("mekanism.common.MekanismItems"); - } - - Object ret = MekanismItems.getField(identifier).get(null); - - if(ret instanceof Item) - { - return new ItemStack((Item)ret, 1); - } - else { - return null; - } - } catch(Exception e) { - System.err.println("Error retrieving item with identifier '" + identifier + "': " + e.getMessage()); - return null; - } - } - - /** - * Attempts to retrieve an ItemStack of a block with the declared identifier. - * - * Mekanism identifiers follow an easy-to-remember pattern. All identifiers - * are identical to the String returned by 'getItemName().' None include spaces, - * and all start with a capital letter. The name that shows up in-game can be - * stripped down to identifier form by removing spaces and all non-alphabetic - * characters (,./'=-_). Below is an example: - * - * ItemStack enrichedAlloy = ItemRetriever.getItem("EnrichedAlloy"); - * - * Note that for items or blocks that have specific metadata you will need to create - * a new ItemStack with that specified value, as this will only return an ItemStack - * with the meta value '0.' - * - * Make sure you run this in or after FMLPostInitializationEvent runs, because most - * items are registered when FMLInitializationEvent runs. However, some items ARE - * registered later in order to hook into other mods. In a rare circumstance you may - * have to add "after:Mekanism" in the @Mod 'dependencies' annotation. - * - * @param identifier - a String to be searched in the 'MekanismBlocks' class - * @return an ItemStack of the declared identifier, otherwise null. - */ - public static ItemStack getBlock(String identifier) - { - try { - if(MekanismBlocks == null) - { - MekanismBlocks = Class.forName("mekanism.common.MekanismBlocks"); - } - - Object ret = MekanismBlocks.getField(identifier).get(null); - - if(ret instanceof Block) - { - return new ItemStack((Block)ret, 1); - } - else { - return null; - } - } catch(Exception e) { - System.err.println("Error retrieving block with identifier '" + identifier + "': " + e.getMessage()); - return null; - } - } -} diff --git a/src/api/java/mekanism/api/MekanismAPI.java b/src/api/java/mekanism/api/MekanismAPI.java deleted file mode 100644 index abdd6da5..00000000 --- a/src/api/java/mekanism/api/MekanismAPI.java +++ /dev/null @@ -1,50 +0,0 @@ -package mekanism.api; - -import java.util.HashSet; -import java.util.Set; - -import mekanism.api.util.BlockInfo; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import cpw.mods.fml.common.eventhandler.Event; - -public class MekanismAPI -{ - //Add a BlockInfo value here if you don't want a certain block to be picked up by cardboard boxes - private static Set cardboardBoxIgnore = new HashSet(); - - /** Mekanism debug mode */ - public static boolean debug = false; - - public static boolean isBlockCompatible(Item item, int meta) - { - for(BlockInfo i : cardboardBoxIgnore) - { - if(i.block == Block.getBlockFromItem(item) && (i.meta == OreDictionary.WILDCARD_VALUE || i.meta == meta)) - { - return false; - } - } - - return true; - } - - public static void addBoxBlacklist(Block block, int meta) - { - cardboardBoxIgnore.add(new BlockInfo(block, meta)); - } - - public static void removeBoxBlacklist(Block block, int meta) - { - cardboardBoxIgnore.remove(new BlockInfo(block, meta)); - } - - public static Set getBoxIgnore() - { - return cardboardBoxIgnore; - } - - public static class BoxBlacklistEvent extends Event {} -} diff --git a/src/api/java/mekanism/api/MekanismConfig.java b/src/api/java/mekanism/api/MekanismConfig.java deleted file mode 100644 index ae49eb2b..00000000 --- a/src/api/java/mekanism/api/MekanismConfig.java +++ /dev/null @@ -1,134 +0,0 @@ -package mekanism.api; - -import java.util.HashMap; -import java.util.Map; - -import mekanism.api.util.UnitDisplayUtils.EnergyType; -import mekanism.api.util.UnitDisplayUtils.TempType; - -public class MekanismConfig -{ - public static class general - { - public static boolean updateNotifications = true; - public static boolean controlCircuitOreDict = true; - public static boolean logPackets = false; - public static boolean dynamicTankEasterEgg = false; - public static boolean voiceServerEnabled = true; - public static boolean cardboardSpawners = true; - public static boolean enableWorldRegeneration = true; - public static boolean creativeOverrideElectricChest = true; - public static boolean spawnBabySkeletons = true; - public static int obsidianTNTBlastRadius = 12; - public static int osmiumPerChunk = 12; - public static int copperPerChunk = 16; - public static int tinPerChunk = 14; - public static int saltPerChunk = 2; - public static int obsidianTNTDelay = 100; - public static int UPDATE_DELAY = 10; - public static int VOICE_PORT = 36123; - public static int maxUpgradeMultiplier = 10; - public static int userWorldGenVersion = 0; - public static double ENERGY_PER_REDSTONE = 10000; - public static int ETHENE_BURN_TIME = 40; - public static double DISASSEMBLER_USAGE = 10; - public static EnergyType activeType = EnergyType.J; - public static TempType tempUnit = TempType.K; - public static double TO_IC2; - public static double TO_TE; - public static double FROM_H2; - public static double FROM_IC2; - public static double FROM_TE; - public static int laserRange; - public static double laserEnergyNeededPerHardness; - public static double minerSilkMultiplier = 6; - public static boolean blacklistIC2; - public static boolean blacklistRF; - public static boolean destroyDisabledBlocks; - public static boolean enableAmbientLighting; - public static int ambientLightingLevel; - public static boolean prefilledPortableTanks; - public static double armoredJetpackDamageRatio; - public static int armoredJetpackDamageMax; - public static boolean aestheticWorldDamage; - public static boolean opsBypassRestrictions; - public static double solarEvaporationSpeed; - } - - public static class client - { - public static boolean enablePlayerSounds = true; - public static boolean enableMachineSounds = true; - public static boolean fancyUniversalCableRender = true; - public static boolean holidays = true; - public static float baseSoundVolume = 1F; - public static boolean machineEffects = true; - public static boolean oldTransmitterRender = false; - public static boolean replaceSoundsWhenResuming = true; - public static boolean renderCTM = true; - } - - public static class machines - { - private static Map config = new HashMap(); - - public static boolean isEnabled(String type) - { - return config.get(type) != null && config.get(type); - } - - public static void setEntry(String type, boolean enabled) - { - config.put(type, enabled); - } - } - - public static class usage - { - public static double enrichmentChamberUsage; - public static double osmiumCompressorUsage; - public static double combinerUsage; - public static double crusherUsage; - public static double factoryUsage; - public static double metallurgicInfuserUsage; - public static double purificationChamberUsage; - public static double energizedSmelterUsage; - public static double digitalMinerUsage; - public static double electricPumpUsage; - public static double rotaryCondensentratorUsage; - public static double oxidationChamberUsage; - public static double chemicalInfuserUsage; - public static double chemicalInjectionChamberUsage; - public static double precisionSawmillUsage; - public static double chemicalDissolutionChamberUsage; - public static double chemicalWasherUsage; - public static double chemicalCrystallizerUsage; - public static double seismicVibratorUsage; - public static double pressurizedReactionBaseUsage; - public static double fluidicPlenisherUsage; - public static double laserUsage; - public static double gasCentrifugeUsage; - public static double heavyWaterElectrolysisUsage; - } - - public static class generators - { - public static double advancedSolarGeneration; - public static double bioGeneration; - public static double heatGeneration; - public static double heatGenerationLava; - public static double heatGenerationNether; - public static double solarGeneration; - - public static double windGenerationMin; - public static double windGenerationMax; - - public static int windGenerationMinY; - public static int windGenerationMaxY; - } - - public static class tools - { - public static double armorSpawnRate; - } -} diff --git a/src/api/java/mekanism/api/Pos3D.java b/src/api/java/mekanism/api/Pos3D.java deleted file mode 100644 index 1e22afcd..00000000 --- a/src/api/java/mekanism/api/Pos3D.java +++ /dev/null @@ -1,282 +0,0 @@ -package mekanism.api; - -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.util.Vec3; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Pos3D - a way of performing operations on objects in a three dimensional environment. - * @author aidancbrady - * - */ -public class Pos3D -{ - public double xPos; - public double yPos; - public double zPos; - - public Pos3D() - { - this(0, 0, 0); - } - - public Pos3D(Vec3 vec) - { - xPos = vec.xCoord; - yPos = vec.yCoord; - zPos = vec.zCoord; - } - - public Pos3D(double x, double y, double z) - { - xPos = x; - yPos = y; - zPos = z; - } - - public Pos3D(Coord4D coord) - { - xPos = coord.xCoord; - yPos = coord.yCoord; - zPos = coord.zCoord; - } - - /** - * Creates a Pos3D with an entity's posX, posY, and posZ values. - * @param entity - entity to create the Pos3D from - */ - public Pos3D(Entity entity) - { - this(entity.posX, entity.posY, entity.posZ); - } - - /** - * Creates a Pos3D with a TileEntity's xCoord, yCoord and zCoord values. - * @param tileEntity - TileEntity to create the Pos3D from - */ - public Pos3D(TileEntity tileEntity) - { - this(tileEntity.xCoord, tileEntity.yCoord, tileEntity.zCoord); - } - - /** - * Creates and returns a Pos3D with values representing the difference between this and the Pos3D in the parameters. - * @param pos - Pos3D to subtract - * @return difference of the two Pos3Ds - */ - public Pos3D diff(Pos3D pos) - { - return new Pos3D(xPos-pos.xPos, yPos-pos.yPos, zPos-pos.zPos); - } - - /** - * Creates a new Pos3D from the motion of an entity. - * @param entity - * @return - */ - public static Pos3D fromMotion(Entity entity) - { - return new Pos3D(entity.motionX, entity.motionY, entity.motionZ); - } - - /** - * Centres a block-derived Pos3D - */ - public Pos3D centre() - { - return translate(0.5, 0.5, 0.5); - } - - /** - * Translates this Pos3D by the defined values. - * @param x - amount to translate on the x axis - * @param y - amount to translate on the y axis - * @param z - amount to translate on the z axis - * @return the translated Pos3D - */ - public Pos3D translate(double x, double y, double z) - { - xPos += x; - yPos += y; - zPos += z; - - return this; - } - - /** - * Performs the same operation as translate(x, y, z), but with a Pos3D value instead. - * @param pos - Pos3D value to translate by - * @return translated Pos3D - */ - public Pos3D translate(Pos3D pos) - { - return translate(pos.xPos, pos.yPos, pos.zPos); - } - - /** - * Performs the same operation as translate(x, y, z), but by a set amount in a ForgeDirection - */ - public Pos3D translate(ForgeDirection direction, double amount) - { - return translate(direction.offsetX * amount, direction.offsetY * amount, direction.offsetZ * amount); - } - - /** - * Performs the same operation as translate(x, y, z), but by a set amount in a ForgeDirection - */ - public Pos3D translateExcludingSide(ForgeDirection direction, double amount) - { - if(direction.offsetX == 0) xPos += amount; - if(direction.offsetY == 0) yPos += amount; - if(direction.offsetZ == 0) zPos += amount; - - return this; - } - - /** - * Returns the distance between this and the defined Pos3D. - * @param pos - the Pos3D to find the distance to - * @return the distance between this and the defined Pos3D - */ - public double distance(Pos3D pos) - { - double subX = xPos - pos.xPos; - double subY = yPos - pos.yPos; - double subZ = zPos - pos.zPos; - return MathHelper.sqrt_double(subX * subX + subY * subY + subZ * subZ); - } - - /** - * Rotates this Pos3D by the defined yaw value. - * @param yaw - yaw to rotate by - * @return rotated Pos3D - */ - public Pos3D rotateYaw(double yaw) - { - double yawRadians = Math.toRadians(yaw); - - double x = xPos; - double z = zPos; - - if(yaw != 0) - { - xPos = x * Math.cos(yawRadians) - z * Math.sin(yawRadians); - zPos = z * Math.cos(yawRadians) + x * Math.sin(yawRadians); - } - - return this; - } - - public Pos3D rotatePitch(double pitch) - { - double pitchRadians = Math.toRadians(pitch); - - double y = yPos; - double z = zPos; - - if(pitch != 0) - { - yPos = y * Math.cos(pitchRadians) - z * Math.sin(pitchRadians); - zPos = z * Math.cos(pitchRadians) + y * Math.sin(pitchRadians); - } - - return this; - } - - public Pos3D rotate(double yaw, double pitch) - { - double yawRadians = Math.toRadians(yaw); - double pitchRadians = Math.toRadians(pitch); - - double x = xPos; - double y = yPos; - double z = zPos; - - xPos = x * Math.cos(yawRadians) - z * Math.sin(yawRadians); - yPos = y * Math.cos(pitchRadians) - z * Math.sin(pitchRadians); - zPos = (z * Math.cos(yawRadians) + x * Math.sin(yawRadians)) * (z * Math.cos(pitchRadians) + y * Math.sin(pitchRadians)); - - return this; - } - - public Pos3D multiply(Pos3D pos) - { - xPos *= pos.xPos; - yPos *= pos.yPos; - zPos *= pos.zPos; - - return this; - } - - /** - * Scales this Pos3D by the defined x, y, an z values. - * @param x - x value to scale by - * @param y - y value to scale by - * @param z - z value to scale by - * @return scaled Pos3D - */ - public Pos3D scale(double x, double y, double z) - { - xPos *= x; - yPos *= y; - zPos *= z; - - return this; - } - - /** - * Performs the same operation as scale(x, y, z), but with a value representing all three dimensions. - * @param scale - value to scale by - * @return scaled Pos3D - */ - public Pos3D scale(double scale) - { - return scale(scale, scale, scale); - } - - public static AxisAlignedBB getAABB(Pos3D pos1, Pos3D pos2) - { - return AxisAlignedBB.getBoundingBox( - Math.min(pos1.xPos, pos2.xPos), - Math.min(pos1.yPos, pos2.yPos), - Math.min(pos1.zPos, pos2.zPos), - Math.max(pos1.xPos, pos2.xPos), - Math.max(pos1.yPos, pos2.yPos), - Math.max(pos1.zPos, pos2.zPos) - ); - } - - @Override - public Pos3D clone() - { - return new Pos3D(xPos, yPos, zPos); - } - - @Override - public String toString() - { - return "[Pos3D: " + xPos + ", " + yPos + ", " + zPos + "]"; - } - - @Override - public boolean equals(Object obj) - { - return obj instanceof Pos3D && - ((Pos3D)obj).xPos == xPos && - ((Pos3D)obj).yPos == yPos && - ((Pos3D)obj).zPos == zPos; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + new Double(xPos).hashCode(); - code = 31 * code + new Double(yPos).hashCode(); - code = 31 * code + new Double(zPos).hashCode(); - return code; - } -} diff --git a/src/api/java/mekanism/api/Range4D.java b/src/api/java/mekanism/api/Range4D.java deleted file mode 100644 index 40905a66..00000000 --- a/src/api/java/mekanism/api/Range4D.java +++ /dev/null @@ -1,114 +0,0 @@ -package mekanism.api; - -import net.minecraft.entity.player.EntityPlayer; -import cpw.mods.fml.common.FMLCommonHandler; - -public class Range4D -{ - public int dimensionId; - - public int xMin; - public int yMin; - public int zMin; - public int xMax; - public int yMax; - public int zMax; - - public Range4D(int minX, int minY, int minZ, int maxX, int maxY, int maxZ, int dimension) - { - xMin = minX; - yMin = minY; - zMin = minZ; - xMax = maxX; - yMax = maxY; - zMax = maxZ; - - dimensionId = dimension; - } - - public Range4D(Chunk3D chunk) - { - xMin = chunk.xCoord*16; - yMin = 0; - zMin = chunk.zCoord*16; - xMax = xMin+16; - yMax = 255; - zMax = zMin+16; - - dimensionId = chunk.dimensionId; - } - - public Range4D(Coord4D coord) - { - xMin = coord.xCoord; - yMin = coord.yCoord; - zMin = coord.zCoord; - - xMax = coord.xCoord+1; - yMax = coord.yCoord+1; - zMax = coord.zCoord+1; - - dimensionId = coord.dimensionId; - } - - public static Range4D getChunkRange(EntityPlayer player) - { - int radius = FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().getViewDistance(); - - return new Range4D(new Chunk3D(player)).expandChunks(radius); - } - - public Range4D expandChunks(int chunks) - { - xMin -= chunks*16; - xMax += chunks*16; - zMin -= chunks*16; - zMax += chunks*16; - - return this; - } - - public boolean intersects(Range4D range) - { - return (xMax+1 - 1.E-05D > range.xMin) && (range.xMax+1 - 1.E-05D > xMin) && (yMax+1 - 1.E-05D > range.yMin) && (range.yMax+1 - 1.E-05D > yMin) && (zMax+1 - 1.E-05D > range.zMin) && (range.zMax+1 - 1.E-05D > zMin); - } - - @Override - public Range4D clone() - { - return new Range4D(xMin, yMin, zMin, xMax, yMax, zMax, dimensionId); - } - - @Override - public String toString() - { - return "[Range4D: " + xMin + ", " + yMin + ", " + zMin + ", " + xMax + ", " + yMax + ", " + zMax + ", dim=" + dimensionId + "]"; - } - - @Override - public boolean equals(Object obj) - { - return obj instanceof Range4D && - ((Range4D)obj).xMin == xMin && - ((Range4D)obj).yMin == yMin && - ((Range4D)obj).zMin == zMin && - ((Range4D)obj).xMax == xMax && - ((Range4D)obj).yMax == yMax && - ((Range4D)obj).zMax == zMax && - ((Range4D)obj).dimensionId == dimensionId; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + xMin; - code = 31 * code + yMin; - code = 31 * code + zMin; - code = 31 * code + xMax; - code = 31 * code + yMax; - code = 31 * code + zMax; - code = 31 * code + dimensionId; - return code; - } -} diff --git a/src/api/java/mekanism/api/TabProxy.java b/src/api/java/mekanism/api/TabProxy.java deleted file mode 100644 index c562c024..00000000 --- a/src/api/java/mekanism/api/TabProxy.java +++ /dev/null @@ -1,42 +0,0 @@ -package mekanism.api; - -import net.minecraft.creativetab.CreativeTabs; - -/** - * Class used to indirectly reference the Mekanism creative tab. - * @author AidanBrady - * - */ -public final class TabProxy -{ - /** The 'Mekanism' class where the tab instance is stored. */ - public static Class Mekanism; - - /** - * Attempts to get the Mekanism creative tab instance from the 'Mekanism' class. Will return - * the tab if the mod is loaded, but otherwise will return the defined 'preferred' creative tab. This way - * you don't need to worry about NPEs! - * @return Mekanism creative tab if can, otherwise preferred tab - */ - public static CreativeTabs tabMekanism(CreativeTabs preferred) - { - try { - if(Mekanism == null) - { - Mekanism = Class.forName("mekanism.common.Mekanism"); - } - - Object ret = Mekanism.getField("tabMekanism").get(null); - - if(ret instanceof CreativeTabs) - { - return (CreativeTabs)ret; - } - - return preferred; - } catch(Exception e) { - System.err.println("Error retrieving Mekanism creative tab."); - return preferred; - } - } -} diff --git a/src/api/java/mekanism/api/energy/EnergizedItemManager.java b/src/api/java/mekanism/api/energy/EnergizedItemManager.java deleted file mode 100644 index 165bdf60..00000000 --- a/src/api/java/mekanism/api/energy/EnergizedItemManager.java +++ /dev/null @@ -1,60 +0,0 @@ -package mekanism.api.energy; - -import net.minecraft.item.ItemStack; - -public class EnergizedItemManager -{ - /** - * Discharges an IEnergizedItem with the defined amount of energy. - * @param itemStack - ItemStack to discharge - * @param amount - amount of energy to discharge from the item, usually the total amount of energy needed in a TileEntity - * @return amount of energy discharged - */ - public static double discharge(ItemStack itemStack, double amount) - { - if(itemStack != null) - { - if(itemStack.getItem() instanceof IEnergizedItem) - { - IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem(); - - if(energizedItem.canSend(itemStack)) - { - double energyToUse = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getEnergy(itemStack), amount)); - energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) - energyToUse); - - return energyToUse; - } - } - } - - return 0; - } - - /** - * Charges an IEnergizedItem with the defined amount of energy. - * @param itemStack - ItemStack to charge - * @param amount - amount of energy to charge the item with, usually the total amount of energy stored in a TileEntity - * @return amount of energy charged - */ - public static double charge(ItemStack itemStack, double amount) - { - if(itemStack != null) - { - if(itemStack.getItem() instanceof IEnergizedItem) - { - IEnergizedItem energizedItem = (IEnergizedItem)itemStack.getItem(); - - if(energizedItem.canReceive(itemStack)) - { - double energyToSend = Math.min(energizedItem.getMaxTransfer(itemStack), Math.min(energizedItem.getMaxEnergy(itemStack) - energizedItem.getEnergy(itemStack), amount)); - energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) + energyToSend); - - return energyToSend; - } - } - } - - return 0; - } -} diff --git a/src/api/java/mekanism/api/energy/EnergyStack.java b/src/api/java/mekanism/api/energy/EnergyStack.java deleted file mode 100644 index 3f576218..00000000 --- a/src/api/java/mekanism/api/energy/EnergyStack.java +++ /dev/null @@ -1,14 +0,0 @@ -package mekanism.api.energy; - -/** - * Created by ben on 27/03/15. - */ -public class EnergyStack -{ - public double amount; - - public EnergyStack(double newAmount) - { - amount = newAmount; - } -} diff --git a/src/api/java/mekanism/api/energy/ICableOutputter.java b/src/api/java/mekanism/api/energy/ICableOutputter.java deleted file mode 100644 index 015379c0..00000000 --- a/src/api/java/mekanism/api/energy/ICableOutputter.java +++ /dev/null @@ -1,18 +0,0 @@ -package mekanism.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this if your TileEntity is capable of outputting energy to cables, overriding Mekanism's default implementation. - * @author AidanBrady - * - */ -public interface ICableOutputter -{ - /** - * Whether or not this block can output to a cable on a specific side. - * @param side - side to check - * @return if the block can output - */ - public boolean canOutputTo(ForgeDirection side); -} diff --git a/src/api/java/mekanism/api/energy/IEnergizedItem.java b/src/api/java/mekanism/api/energy/IEnergizedItem.java deleted file mode 100644 index b6725459..00000000 --- a/src/api/java/mekanism/api/energy/IEnergizedItem.java +++ /dev/null @@ -1,59 +0,0 @@ -package mekanism.api.energy; - -import net.minecraft.item.ItemStack; - -/** - * Implement this in an item's class if it should be able to store electricity. - * @author aidancbrady - * - */ -public interface IEnergizedItem -{ - /** - * Gets and returns the amount of energy stored in this item. - * @param itemStack - the ItemStack to check - * @return energy stored - */ - public double getEnergy(ItemStack itemStack); - - /** - * Sets this item's stored energy value to a new amount. - * @param itemStack - the ItemStack who's energy value is to be change - * @param amount - new amount of energy - */ - public void setEnergy(ItemStack itemStack, double amount); - - /** - * Gets and returns this item's maximum amount of energy that can be stored. - * @param itemStack - the ItemStack to check - * @return maximum energy - */ - public double getMaxEnergy(ItemStack itemStack); - - /** - * Gets and returns how much energy this item can transfer to and from charging slots. - * @param itemStack - the ItemStack to check - * @return transfer amount - */ - public double getMaxTransfer(ItemStack itemStack); - - /** - * Gets and returns whether or not this item can receive energy from a charging slot. - * @param itemStack - the ItemStack to check - * @return if the item can receive energy - */ - public boolean canReceive(ItemStack itemStack); - - /** - * Gets and returns whether or not this item can send energy to a charging slot. - * @param itemStack - the ItemStack to check - * @return if the item can send energy - */ - public boolean canSend(ItemStack itemStack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemStack); -} diff --git a/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java b/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java deleted file mode 100644 index 53edc68e..00000000 --- a/src/api/java/mekanism/api/energy/IStrictEnergyAcceptor.java +++ /dev/null @@ -1,25 +0,0 @@ -package mekanism.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this if your TileEntity can accept energy at a floating-point double value from Universal Cables. - * @author AidanBrady - * - */ -public interface IStrictEnergyAcceptor extends IStrictEnergyStorage -{ - /** - * Transfer a certain amount of energy to this acceptor. - * @param amount - amount to transfer - * @return energy used - */ - public double transferEnergyToAcceptor(ForgeDirection side, double amount); - - /** - * Whether or not this tile entity accepts energy from a certain side. - * @param side - side to check - * @return if tile entity accepts energy - */ - public boolean canReceiveEnergy(ForgeDirection side); -} diff --git a/src/api/java/mekanism/api/energy/IStrictEnergyStorage.java b/src/api/java/mekanism/api/energy/IStrictEnergyStorage.java deleted file mode 100644 index fd560fa1..00000000 --- a/src/api/java/mekanism/api/energy/IStrictEnergyStorage.java +++ /dev/null @@ -1,27 +0,0 @@ -package mekanism.api.energy; - -/** - * Mekanism-specific energy storage for TileEntities, already implemented in IStrictEnergyAcceptor. - * @author aidancbrady - * - */ -public interface IStrictEnergyStorage -{ - /** - * Gets the amount of energy this TileEntity is currently storing. - * @return stored energy - */ - public double getEnergy(); - - /** - * Sets the amount of stored energy of this TileEntity to a new amount. - * @param energy - new energy value - */ - public void setEnergy(double energy); - - /** - * Gets the maximum amount of energy this TileEntity can store. - * @return maximum energy - */ - public double getMaxEnergy(); -} diff --git a/src/api/java/mekanism/api/energy/package-info.java b/src/api/java/mekanism/api/energy/package-info.java deleted file mode 100644 index 8f3d3716..00000000 --- a/src/api/java/mekanism/api/energy/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|energy") -package mekanism.api.energy; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/gas/Gas.java b/src/api/java/mekanism/api/gas/Gas.java deleted file mode 100644 index f05be52c..00000000 --- a/src/api/java/mekanism/api/gas/Gas.java +++ /dev/null @@ -1,221 +0,0 @@ -package mekanism.api.gas; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidRegistry; - -/** - * Gas - a class used to set specific properties of gasses when used or seen in-game. - * @author aidancbrady - * - */ -public class Gas -{ - private String name; - - private String unlocalizedName; - - private Fluid fluid; - - private IIcon icon; - - private boolean visible = true; - - private boolean from_fluid = false; - - /** - * Creates a new Gas object with a defined name or key value. - * @param s - name or key to associate this Gas with - */ - public Gas(String s) - { - unlocalizedName = name = s; - } - - /** - * Creates a new Gas object that corresponds to the given Fluid - */ - public Gas(Fluid f) - { - unlocalizedName = name = f.getName(); - icon = f.getStillIcon(); - fluid = f; - from_fluid = true; - } - - /** - * Gets the name (key) of this Gas. This is NOT a translated or localized display name. - * @return this Gas's name or key - */ - public String getName() - { - return name; - } - - /** - * Whether or not this is a visible gas. - * @return if this gas is visible - */ - public boolean isVisible() - { - return visible; - } - - /** - * Sets this gas's "visible" state to a new value. Setting it to 'false' will treat this gas as an internal gas, and it will not be displayed or accessed by other mods. - * @param v - new visible state - * @return this Gas object - */ - public Gas setVisible(boolean v) - { - visible = v; - - return this; - } - - /** - * Gets the unlocalized name of this Gas. - * @return this Gas's unlocalized name - */ - public String getUnlocalizedName() - { - return "gas." + unlocalizedName; - } - - /** - * Translates this Gas's unlocalized name and returns it as localized. - * @return this Gas's localized name - */ - public String getLocalizedName() - { - return StatCollector.translateToLocal(getUnlocalizedName()); - } - - /** - * Sets the unlocalized name of this Gas. - * @param s - unlocalized name to set - * @return this Gas object - */ - public Gas setUnlocalizedName(String s) - { - unlocalizedName = s; - - return this; - } - - /** - * Gets the IIcon associated with this Gas. - * @return associated IIcon - */ - public IIcon getIcon() - { - if(from_fluid) - { - return this.getFluid().getIcon(); - } - - return icon; - } - - /** - * Sets this gas's icon. - * @param i - IIcon to associate with this Gas - * @return this Gas object - */ - public Gas setIcon(IIcon i) - { - icon = i; - - if(hasFluid()) - { - fluid.setIcons(getIcon()); - } - - from_fluid = false; - - return this; - } - - /** - * Gets the ID associated with this gas. - * @return the associated gas ID - */ - public int getID() - { - return GasRegistry.getGasID(this); - } - - /** - * Writes this Gas to a defined tag compound. - * @param nbtTags - tag compound to write this Gas to - * @return the tag compound this gas was written to - */ - public NBTTagCompound write(NBTTagCompound nbtTags) - { - nbtTags.setString("gasName", getName()); - - return nbtTags; - } - - /** - * Returns the Gas stored in the defined tag compound. - * @param nbtTags - tag compound to get the Gas from - * @return Gas stored in the tag compound - */ - public static Gas readFromNBT(NBTTagCompound nbtTags) - { - if(nbtTags == null || nbtTags.hasNoTags()) - { - return null; - } - - return GasRegistry.getGas(nbtTags.getString("gasName")); - } - - /** - * Whether or not this Gas has an associated fluid. - * @return if this gas has a fluid - */ - public boolean hasFluid() - { - return fluid != null; - } - - /** - * Gets the fluid associated with this Gas. - * @return fluid associated with this gas - */ - public Fluid getFluid() - { - return fluid; - } - - /** - * Registers a new fluid out of this Gas or gets one from the FluidRegistry. - * @return this Gas object - */ - public Gas registerFluid() - { - if(fluid == null) - { - if(FluidRegistry.getFluid(getName()) == null) - { - fluid = new Fluid(getName()).setGaseous(true); - FluidRegistry.registerFluid(fluid); - } - else { - fluid = FluidRegistry.getFluid(getName()); - } - } - - return this; - } - - @Override - public String toString() - { - return name; - } -} diff --git a/src/api/java/mekanism/api/gas/GasNetwork.java b/src/api/java/mekanism/api/gas/GasNetwork.java deleted file mode 100644 index 207c587c..00000000 --- a/src/api/java/mekanism/api/gas/GasNetwork.java +++ /dev/null @@ -1,364 +0,0 @@ -package mekanism.api.gas; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.EnumSet; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import com.google.common.collect.Lists; - -import mekanism.api.Coord4D; -import mekanism.api.transmitters.DynamicNetwork; -import mekanism.api.transmitters.IGridTransmitter; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; - -/** - * A DynamicNetwork extension created specifically for the transfer of Gasses. By default this is server-only, but if ticked on - * the client side and if it's posted events are handled properly, it has the capability to visually display gasses network-wide. - * @author aidancbrady - * - */ -public class GasNetwork extends DynamicNetwork -{ - public int transferDelay = 0; - - public boolean didTransfer; - public boolean prevTransfer; - - public float gasScale; - - public Gas refGas; - - public GasStack buffer; - public int prevStored; - - public int prevTransferAmount = 0; - - public GasNetwork() {} - - public GasNetwork(Collection networks) - { - for(GasNetwork net : networks) - { - if(net != null) - { - if(FMLCommonHandler.instance().getEffectiveSide().isClient()) - { - if(net.refGas != null && net.gasScale > gasScale) - { - gasScale = net.gasScale; - refGas = net.refGas; - buffer = net.buffer; - - net.gasScale = 0; - net.refGas = null; - net.buffer = null; - } - } else - { - if(net.buffer != null) - { - if(buffer == null) - { - buffer = net.buffer.copy(); - } else - { - if(buffer.isGasEqual(net.buffer)) - { - buffer.amount += net.buffer.amount; - } - else if(net.buffer.amount > buffer.amount) - { - buffer = net.buffer.copy(); - } - - } - - net.buffer = null; - } - } - - adoptTransmittersAndAcceptorsFrom(net); - net.deregister(); - } - } - - gasScale = getScale(); - - register(); - } - - @Override - public void absorbBuffer(IGridTransmitter transmitter) - { - Object b = transmitter.getBuffer(); - - if(!(b instanceof GasStack) || ((GasStack)b).getGas() == null || ((GasStack)b).amount == 0) - { - return; - } - - GasStack gas = (GasStack)b; - - if(buffer == null || buffer.getGas() == null || buffer.amount == 0) - { - buffer = gas.copy(); - return; - } - - //TODO better multiple buffer impl - if(buffer.isGasEqual(gas)) - { - buffer.amount += gas.amount; - } - - gas.amount = 0; - } - - @Override - public void clampBuffer() - { - if(buffer != null && buffer.amount > getCapacity()) - { - buffer.amount = capacity; - } - } - - public int getGasNeeded() - { - return getCapacity()-(buffer != null ? buffer.amount : 0); - } - - public int tickEmit(GasStack stack) - { - List availableAcceptors = Lists.newArrayList(); - - availableAcceptors.addAll(getAcceptors(stack.getGas())); - - Collections.shuffle(availableAcceptors); - - int toSend = stack.amount; - int prevSending = toSend; - - if(!availableAcceptors.isEmpty()) - { - int divider = availableAcceptors.size(); - int remaining = toSend % divider; - int sending = (toSend-remaining)/divider; - - for(IGasHandler acceptor : availableAcceptors) - { - int currentSending = sending; - EnumSet sides = acceptorDirections.get(Coord4D.get((TileEntity)acceptor)); - - if(remaining > 0) - { - currentSending++; - remaining--; - } - - for(ForgeDirection side : sides) - { - int prev = toSend; - - toSend -= acceptor.receiveGas(side, new GasStack(stack.getGas(), currentSending), true); - - if(toSend < prev) - { - break; - } - } - } - } - - int sent = prevSending-toSend; - - if(sent > 0 && FMLCommonHandler.instance().getEffectiveSide().isServer()) - { - didTransfer = true; - transferDelay = 2; - } - - return sent; - } - - public int emit(GasStack stack, boolean doTransfer) - { - if(buffer != null && buffer.getGas() != stack.getGas()) - { - return 0; - } - - int toUse = Math.min(getGasNeeded(), stack.amount); - - if(doTransfer) - { - if(buffer == null) - { - buffer = stack.copy(); - buffer.amount = toUse; - } - else { - buffer.amount += toUse; - } - } - - return toUse; - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - { - prevTransferAmount = 0; - - if(transferDelay == 0) - { - didTransfer = false; - } - else { - transferDelay--; - } - - int stored = buffer != null ? buffer.amount : 0; - - if(stored != prevStored) - { - needsUpdate = true; - } - - prevStored = stored; - - if(didTransfer != prevTransfer || needsUpdate) - { - MinecraftForge.EVENT_BUS.post(new GasTransferEvent(this, buffer, didTransfer)); - needsUpdate = false; - } - - prevTransfer = didTransfer; - - if(buffer != null) - { - prevTransferAmount = tickEmit(buffer); - buffer.amount -= prevTransferAmount; - - if(buffer.amount <= 0) - { - buffer = null; - } - } - } - } - - @Override - public void clientTick() - { - super.clientTick(); - - gasScale = Math.max(gasScale, getScale()); - - if(didTransfer && gasScale < 1) - { - gasScale = Math.max(getScale(), Math.min(1, gasScale+0.02F)); - } - else if(!didTransfer && gasScale > 0) - { - gasScale = Math.max(getScale(), Math.max(0, gasScale-0.02F)); - - if(gasScale == 0) - { - buffer = null; - } - } - } - - @Override - public Set getAcceptors(Object data) - { - Gas type = (Gas)data; - Set toReturn = new HashSet(); - - if(FMLCommonHandler.instance().getEffectiveSide().isClient()) - { - return toReturn; - } - - for(Coord4D coord : possibleAcceptors.keySet()) - { - EnumSet sides = acceptorDirections.get(coord); - TileEntity tile = coord.getTileEntity(getWorld()); - - if(!(tile instanceof IGasHandler) || sides == null || sides.isEmpty()) - { - continue; - } - - IGasHandler acceptor = (IGasHandler)tile; - - for(ForgeDirection side : sides) - { - if(acceptor != null && acceptor.canReceiveGas(side, type)) - { - toReturn.add(acceptor); - break; - } - } - } - - return toReturn; - } - - public static class GasTransferEvent extends Event - { - public final GasNetwork gasNetwork; - - public final GasStack transferType; - public final boolean didTransfer; - - public GasTransferEvent(GasNetwork network, GasStack type, boolean did) - { - gasNetwork = network; - transferType = type; - didTransfer = did; - } - } - - public float getScale() - { - return Math.min(1, (buffer == null || getCapacity() == 0 ? 0 : (float)buffer.amount/getCapacity())); - } - - @Override - public String toString() - { - return "[GasNetwork] " + transmitters.size() + " transmitters, " + possibleAcceptors.size() + " acceptors."; - } - - @Override - public String getNeededInfo() - { - return Integer.toString(getGasNeeded()); - } - - @Override - public String getStoredInfo() - { - return buffer != null ? buffer.getGas().getLocalizedName() + " (" + buffer.amount + ")" : "None"; - } - - @Override - public String getFlowInfo() - { - return Integer.toString(prevTransferAmount) + "/t"; - } -} diff --git a/src/api/java/mekanism/api/gas/GasRegistry.java b/src/api/java/mekanism/api/gas/GasRegistry.java deleted file mode 100644 index 25db9667..00000000 --- a/src/api/java/mekanism/api/gas/GasRegistry.java +++ /dev/null @@ -1,113 +0,0 @@ -package mekanism.api.gas; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraftforge.fluids.Fluid; - -public class GasRegistry -{ - private static ArrayList registeredGasses = new ArrayList(); - - /** - * Register a new gas into GasRegistry. - * @param gas - Gas to register - * @return the gas that has been registered, pulled right out of GasRegistry - */ - public static Gas register(Gas gas) - { - if(gas == null) - { - return null; - } - - registeredGasses.add(gas); - - return getGas(gas.getName()); - } - - /** - * Gets the gas associated with the defined ID. - * @param id - ID to check - * @return gas associated with defined ID - */ - public static Gas getGas(int id) - { - if(id == -1) - { - return null; - } - - return registeredGasses.get(id); - } - - /** - * Gets the gas associated with the defined fluid. - * @param f - fluid to check - * @return the gas associated with the fluid - */ - public static Gas getGas(Fluid f) - { - for(Gas gas : getRegisteredGasses()) - { - if(gas.hasFluid() && gas.getFluid() == f) - { - return gas; - } - } - - return null; - } - - /** - * Whether or not GasRegistry contains a gas with the specified name - * @param name - name to check - * @return if GasRegistry contains a gas with the defined name - */ - public static boolean containsGas(String name) - { - return getGas(name) != null; - } - - /** - * Gets the list of all gasses registered in GasRegistry. - * @return a cloned list of all registered gasses - */ - public static List getRegisteredGasses() - { - return (List)registeredGasses.clone(); - } - - /** - * Gets the gas associated with the specified name. - * @param name - name of the gas to get - * @return gas associated with the name - */ - public static Gas getGas(String name) - { - for(Gas gas : registeredGasses) - { - if(gas.getName().toLowerCase().equals(name.toLowerCase())) - { - return gas; - } - } - - return null; - } - - /** - * Gets the gas ID of a specified gas. - * @param gas - gas to get the ID from - * @return gas ID - */ - public static int getGasID(Gas gas) - { - if(gas == null || !containsGas(gas.getName())) - { - return -1; - } - - return registeredGasses.indexOf(gas); - } -} diff --git a/src/api/java/mekanism/api/gas/GasStack.java b/src/api/java/mekanism/api/gas/GasStack.java deleted file mode 100644 index 05e5ae68..00000000 --- a/src/api/java/mekanism/api/gas/GasStack.java +++ /dev/null @@ -1,132 +0,0 @@ -package mekanism.api.gas; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * GasStack - a specified amount of a defined Gas with certain properties. - * @author aidancbrady - * - */ -public class GasStack -{ - private Gas type; - - public int amount; - - /** - * Creates a new GasStack with a defined gas ID and quantity. - * @param id - gas ID to associate this GasStack to, will perform a GasRegistry lookup in the constructor - * @param quantity - amount of gas to be referenced in this GasStack - */ - public GasStack(int id, int quantity) - { - type = GasRegistry.getGas(id); - amount = quantity; - } - - /** - * Creates a new GasStack with a defined Gas type and quantity. - * @param gas - gas type of the stack - * @param quantity - amount of gas to be referenced in this GasStack - */ - public GasStack(Gas gas, int quantity) - { - type = gas; - amount = quantity; - } - - private GasStack() {} - - /** - * Gets the Gas type of this GasStack. - * @return this GasStack's Gas type - */ - public Gas getGas() - { - return type; - } - - public GasStack withAmount(int newAmount) - { - amount = newAmount; - - return this; - } - - /** - * Writes this GasStack to a defined tag compound. - * @param nbtTags - tag compound to write to - * @return tag compound with this GasStack's data - */ - public NBTTagCompound write(NBTTagCompound nbtTags) - { - type.write(nbtTags); - nbtTags.setInteger("amount", amount); - - return nbtTags; - } - - /** - * Reads this GasStack's data from a defined tag compound. - * @param nbtTags - tag compound to read from - */ - public void read(NBTTagCompound nbtTags) - { - type = Gas.readFromNBT(nbtTags); - amount = nbtTags.getInteger("amount"); - } - - /** - * Returns the GasStack stored in the defined tag compound, or null if it doesn't exist. - * @param nbtTags - tag compound to read from - * @return GasStack stored in the tag compound - */ - public static GasStack readFromNBT(NBTTagCompound nbtTags) - { - if(nbtTags == null || nbtTags.hasNoTags()) - { - return null; - } - - GasStack stack = new GasStack(); - stack.read(nbtTags); - - if(stack.getGas() == null || stack.amount <= 0) - { - return null; - } - - return stack; - } - - /** - * Returns a copied form of this GasStack. - * @return copied GasStack - */ - public GasStack copy() - { - return new GasStack(type, amount); - } - - /** - * Whether or not this GasStack's gas type is equal to the other defined GasStack. - * @param stack - GasStack to check - * @return if the GasStacks contain the same gas type - */ - public boolean isGasEqual(GasStack stack) - { - return stack != null && getGas() == stack.getGas(); - } - - @Override - public String toString() - { - return "[" + type + ", " + amount + "]"; - } - - @Override - public int hashCode() - { - return type == null ? 0 : type.getID(); - } -} diff --git a/src/api/java/mekanism/api/gas/GasTank.java b/src/api/java/mekanism/api/gas/GasTank.java deleted file mode 100644 index a5d4c20b..00000000 --- a/src/api/java/mekanism/api/gas/GasTank.java +++ /dev/null @@ -1,252 +0,0 @@ -package mekanism.api.gas; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * An optional way of managing and/or storing gasses. Would be very useful in TileEntity and Entity gas storage. - * @author aidancbrady - * - */ -public class GasTank -{ - public GasStack stored; - - private int maxGas; - - private GasTank() {} - - /** - * Creates a tank with a defined capacity. - * @param max - the maximum amount of gas this GasTank can hold - */ - public GasTank(int max) - { - maxGas = max; - } - - /** - * Sets this tank's GasStack value to a new value. Will cap the amount to this GasTank's capacity. - * @param stack - value to set this tank's GasStack value to - */ - public void setGas(GasStack stack) - { - stored = stack; - - if(stored != null) - { - stored.amount = Math.min(getMaxGas(), stored.amount); - } - } - - /** - * Draws a specified amount of gas out of this tank. - * @param amount - amount to draw - * @param doDraw - if the gas should actually be removed from this tank - * @return gas taken from this GasTank as a GasStack value - */ - public GasStack draw(int amount, boolean doDraw) - { - if(stored == null || amount <= 0) - { - return null; - } - - GasStack ret = new GasStack(getGas().getGas(), Math.min(getStored(), amount)); - - if(ret.amount > 0) - { - if(doDraw) - { - stored.amount -= ret.amount; - - if(stored.amount <= 0) - { - stored = null; - } - } - - return ret; - } - - return null; - } - - /** - * Adds a specified amount of gas to this tank. - * @param amount - the GasStack for this tank to receive - * @param doReceive - if the gas should actually be added to this tank - * @return the amount of gas accepted by this tank - */ - public int receive(GasStack amount, boolean doReceive) - { - if(amount == null || (stored != null && !(stored.amount != getMaxGas() && stored.isGasEqual(amount)))) - { - return 0; - } - - int toFill = Math.min(getMaxGas()-getStored(), amount.amount); - - if(doReceive) - { - if(stored == null) - { - stored = amount.copy().withAmount(getStored()+toFill); - } - else { - stored.amount = Math.min(getMaxGas(), getStored()+amount.amount); - } - } - - return toFill; - } - - /** - * If this GasTank can receive the specified type of gas. Will return false if this tank does not need anymore gas. - * @param gas - gas to check - * @return if this GasTank can accept the defined gas - */ - public boolean canReceive(Gas gas) - { - if(getNeeded() == 0 || stored != null && (gas != null && gas != stored.getGas())) - { - return false; - } - - return true; - } - - /** - * If this GasTank can receive the specified type of gas. Will return TRUE if this tank does not need anymore gas. - * @param gas - gas to check - * @return if this GasTank can accept the defined gas - */ - public boolean canReceiveType(Gas gas) - { - if(stored != null && (gas != null && gas != stored.getGas())) - { - return false; - } - - return true; - } - - /** - * If this GasTank can be drawn of the specified type of gas. Will return false if this tank does not contain any gas. - * @param gas - gas to check - * @return if this GasTank can be drawn of the defined gas - */ - public boolean canDraw(Gas gas) - { - if(stored == null || (gas != null && gas != stored.getGas())) - { - return false; - } - - return true; - } - - /** - * Gets the amount of gas needed by this GasTank. - * @return - */ - public int getNeeded() - { - return getMaxGas()-getStored(); - } - - /** - * Gets the maximum amount of gas this tank can hold. - * @return - max gas - */ - public int getMaxGas() - { - return maxGas; - } - - /** - * Sets the maximum amount of gas this tank can hold - */ - public void setMaxGas(int capacity) - { - maxGas = capacity; - } - - /** - * Gets the GasStack held by this GasTank. - * @return - GasStakc held by this tank - */ - public GasStack getGas() - { - return stored; - } - - /** - * Gets the type of gas currently stored in this GasTank. - * @return gas type contained - */ - public Gas getGasType() - { - return stored != null ? stored.getGas() : null; - } - - /** - * Gets the amount of gas stored by this GasTank. - * @return amount of gas stored - */ - public int getStored() - { - return stored != null ? stored.amount : 0; - } - - /** - * Writes this tank to a defined tag compound. - * @param nbtTags - tag compound to write to - * @return tag compound with this tank's data - */ - public NBTTagCompound write(NBTTagCompound nbtTags) - { - if(stored != null && stored.getGas() != null) - { - nbtTags.setTag("stored", stored.write(new NBTTagCompound())); - } - - nbtTags.setInteger("maxGas", maxGas); - - return nbtTags; - } - - /** - * Reads this tank's data from a defined tag compound. - * @param nbtTags - tag compound to read from - */ - public void read(NBTTagCompound nbtTags) - { - if(nbtTags.hasKey("stored")) - { - stored = GasStack.readFromNBT(nbtTags.getCompoundTag("stored")); - } - - if(nbtTags.hasKey("maxGas") && nbtTags.getInteger("maxGas") != 0) - { - maxGas = nbtTags.getInteger("maxGas"); - } - } - - /** - * Returns the tank stored in the defined tag compound, or null if it doesn't exist. - * @param nbtTags - tag compound to read from - * @return tank stored in the tag compound - */ - public static GasTank readFromNBT(NBTTagCompound nbtTags) - { - if(nbtTags == null || nbtTags.hasNoTags()) - { - return null; - } - - GasTank tank = new GasTank(); - tank.read(nbtTags); - - return tank; - } -} diff --git a/src/api/java/mekanism/api/gas/GasTransmission.java b/src/api/java/mekanism/api/gas/GasTransmission.java deleted file mode 100644 index c043eb8c..00000000 --- a/src/api/java/mekanism/api/gas/GasTransmission.java +++ /dev/null @@ -1,181 +0,0 @@ -package mekanism.api.gas; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -import mekanism.api.Coord4D; -import mekanism.api.transmitters.ITransmitterTile; -import mekanism.api.transmitters.TransmissionType; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * A handy class containing several utilities for efficient gas transfer. - * @author AidanBrady - * - */ -public final class GasTransmission -{ - /** - * Gets all the acceptors around a tile entity. - * @param tileEntity - center tile entity - * @return array of IGasAcceptors - */ - public static IGasHandler[] getConnectedAcceptors(TileEntity tileEntity) - { - IGasHandler[] acceptors = new IGasHandler[] {null, null, null, null, null, null}; - - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity acceptor = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - - if(acceptor instanceof IGasHandler) - { - acceptors[orientation.ordinal()] = (IGasHandler)acceptor; - } - } - - return acceptors; - } - - /** - * Gets all the tube connections around a tile entity. - * @param tileEntity - center tile entity - * @return array of ITubeConnections - */ - public static ITubeConnection[] getConnections(TileEntity tileEntity) - { - ITubeConnection[] connections = new ITubeConnection[] {null, null, null, null, null, null}; - - for(ForgeDirection orientation : ForgeDirection.VALID_DIRECTIONS) - { - TileEntity connection = Coord4D.get(tileEntity).getFromSide(orientation).getTileEntity(tileEntity.getWorldObj()); - - if(canConnect(connection, orientation)) - { - connections[orientation.ordinal()] = (ITubeConnection)connection; - } - } - - return connections; - } - - /** - * Whether or not a TileEntity can connect to a specified tile on a specified side. - * @param tileEntity - TileEntity to attempt connection to - * @param side - side to attempt connection on - * @return if this tile and side are connectable - */ - public static boolean canConnect(TileEntity tileEntity, ForgeDirection side) - { - if(tileEntity instanceof ITubeConnection && (!(tileEntity instanceof ITransmitterTile) || TransmissionType.checkTransmissionType(((ITransmitterTile)tileEntity).getTransmitter(), TransmissionType.GAS))) - { - if(((ITubeConnection)tileEntity).canTubeConnect(side.getOpposite())) - { - return true; - } - } - - return false; - } - - /** - * Removes a specified amount of gas from an IGasItem. - * @param itemStack - ItemStack of the IGasItem - * @param type - type of gas to remove from the IGasItem, null if it doesn't matter - * @param amount - amount of gas to remove from the ItemStack - * @return the GasStack removed by the IGasItem - */ - public static GasStack removeGas(ItemStack itemStack, Gas type, int amount) - { - if(itemStack != null && itemStack.getItem() instanceof IGasItem) - { - IGasItem item = (IGasItem)itemStack.getItem(); - - if(type != null && item.getGas(itemStack) != null && item.getGas(itemStack).getGas() != type || !item.canProvideGas(itemStack, type)) - { - return null; - } - - return item.removeGas(itemStack, amount); - } - - return null; - } - - /** - * Adds a specified amount of gas to an IGasItem. - * @param itemStack - ItemStack of the IGasItem - * @param stack - stack to add to the IGasItem - * @return amount of gas accepted by the IGasItem - */ - public static int addGas(ItemStack itemStack, GasStack stack) - { - if(itemStack != null && itemStack.getItem() instanceof IGasItem && ((IGasItem)itemStack.getItem()).canReceiveGas(itemStack, stack.getGas())) - { - return ((IGasItem)itemStack.getItem()).addGas(itemStack, stack.copy()); - } - - return 0; - } - - /** - * Emits gas from a central block by splitting the received stack among the sides given. - * @param sides - the list of sides to output from - * @param stack - the stack to output - * @param from - the TileEntity to output from - * @return the amount of gas emitted - */ - public static int emit(List sides, GasStack stack, TileEntity from) - { - if(stack == null) - { - return 0; - } - - List availableAcceptors = new ArrayList(); - IGasHandler[] possibleAcceptors = getConnectedAcceptors(from); - - for(int i = 0; i < possibleAcceptors.length; i++) - { - IGasHandler handler = possibleAcceptors[i]; - - if(handler != null && handler.canReceiveGas(ForgeDirection.getOrientation(i).getOpposite(), stack.getGas())) - { - availableAcceptors.add(handler); - } - } - - Collections.shuffle(availableAcceptors); - - int toSend = stack.amount; - int prevSending = toSend; - - if(!availableAcceptors.isEmpty()) - { - int divider = availableAcceptors.size(); - int remaining = toSend % divider; - int sending = (toSend-remaining)/divider; - - for(IGasHandler acceptor : availableAcceptors) - { - int currentSending = sending; - - if(remaining > 0) - { - currentSending++; - remaining--; - } - - ForgeDirection dir = ForgeDirection.getOrientation(Arrays.asList(possibleAcceptors).indexOf(acceptor)).getOpposite(); - toSend -= acceptor.receiveGas(dir, new GasStack(stack.getGas(), currentSending), true); - } - } - - return prevSending-toSend; - } -} diff --git a/src/api/java/mekanism/api/gas/IGasHandler.java b/src/api/java/mekanism/api/gas/IGasHandler.java deleted file mode 100644 index e0695231..00000000 --- a/src/api/java/mekanism/api/gas/IGasHandler.java +++ /dev/null @@ -1,47 +0,0 @@ -package mekanism.api.gas; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this if your tile entity accepts gas from an external source. - * @author AidanBrady - * - */ -public interface IGasHandler -{ - /** - * Transfer a certain amount of gas to this block. - * @param stack - gas to add - * @return gas added - */ - public int receiveGas(ForgeDirection side, GasStack stack, boolean doTransfer); - - @Deprecated - public int receiveGas(ForgeDirection side, GasStack stack); - - /** - * Draws a certain amount of gas from this block. - * @param amount - amount to draw - * @return gas drawn - */ - public GasStack drawGas(ForgeDirection side, int amount, boolean doTransfer); - - @Deprecated - public GasStack drawGas(ForgeDirection side, int amount); - - /** - * Whether or not this block can accept gas from a certain side. - * @param side - side to check - * @param type - type of gas to check - * @return if block accepts gas - */ - public boolean canReceiveGas(ForgeDirection side, Gas type); - - /** - * Whether or not this block can be drawn of gas from a certain side. - * @param side - side to check - * @param type - type of gas to check - * @return if block can be drawn of gas - */ - public boolean canDrawGas(ForgeDirection side, Gas type); -} diff --git a/src/api/java/mekanism/api/gas/IGasItem.java b/src/api/java/mekanism/api/gas/IGasItem.java deleted file mode 100644 index 9c7d3323..00000000 --- a/src/api/java/mekanism/api/gas/IGasItem.java +++ /dev/null @@ -1,81 +0,0 @@ -package mekanism.api.gas; - -import net.minecraft.item.ItemStack; - -/** - * Implement this in your item class if it can store or transfer certain gasses. - * @author AidanBrady - * - */ -public interface IGasItem -{ - /** - * Gets the rate of transfer this item can handle. - * @return - */ - public int getRate(ItemStack itemstack); - - /** - * Adds a defined amount of a certain gas to an item. - * @param itemstack - the itemstack to add gas to - * @param type - the type of gas to add - * @param amount - the amount of gas to add - * @return the gas that was accepted by the item - */ - public int addGas(ItemStack itemstack, GasStack stack); - - /** - * Removes the defined amount of a certain gas from the item. - * @param itemstack - the itemstack to remove gas from - * @param type - the type of gas to remove - * @param amount - the amount of gas to remove - * @return the gas that was removed by the item - */ - public GasStack removeGas(ItemStack itemstack, int amount); - - /** - * Whether or not this storage tank be given a specific gas. - * @param itemstack - the itemstack to check - * @param type - the type of gas the tank can possibly receive - * @return if the item be charged - */ - public boolean canReceiveGas(ItemStack itemstack, Gas type); - - /** - * Whether or not this item can give a gas receiver a certain type of gas. - * @param itemstack - the itemstack to check - * @param type - the type of gas the tank can provide - * @return if the item can provide gas - */ - public boolean canProvideGas(ItemStack itemstack, Gas type); - - /** - * Get the gas of a declared type. - * @param type - type of gas - * @param data - ItemStack parameter if necessary - * @return gas stored - */ - public GasStack getGas(ItemStack itemstack); - - /** - * Set the gas of a declared type to a new amount; - * @param type - type of gas - * @param data - ItemStack parameter if necessary - * @param amount - amount to store - */ - public void setGas(ItemStack itemstack, GasStack stack); - - /** - * Gets the maximum amount of gas this tile entity can store. - * @param type - type of gas - * @param data - ItemStack parameter if necessary - * @return maximum gas - */ - public int getMaxGas(ItemStack itemstack); - - /** - * Returns whether or not this item contains metadata-specific subtypes instead of using metadata for damage display. - * @return if the item contains metadata-specific subtypes - */ - public boolean isMetadataSpecific(ItemStack itemstack); -} diff --git a/src/api/java/mekanism/api/gas/IGasTransmitter.java b/src/api/java/mekanism/api/gas/IGasTransmitter.java deleted file mode 100644 index 57ec4c1f..00000000 --- a/src/api/java/mekanism/api/gas/IGasTransmitter.java +++ /dev/null @@ -1,10 +0,0 @@ -package mekanism.api.gas; - -import mekanism.api.transmitters.IGridTransmitter; - -import net.minecraft.tileentity.TileEntity; - -public interface IGasTransmitter extends IGridTransmitter -{ - public boolean canTransferGasToTube(TileEntity tile); -} diff --git a/src/api/java/mekanism/api/gas/ITubeConnection.java b/src/api/java/mekanism/api/gas/ITubeConnection.java deleted file mode 100644 index b669fedd..00000000 --- a/src/api/java/mekanism/api/gas/ITubeConnection.java +++ /dev/null @@ -1,18 +0,0 @@ -package mekanism.api.gas; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this if your block can connect to Pressurized Tubes. - * @author AidanBrady - * - */ -public interface ITubeConnection -{ - /** - * Whether or not a tube can connect to a certain orientation. - * @param side - orientation to check - * @return if a tube can connect - */ - public boolean canTubeConnect(ForgeDirection side); -} diff --git a/src/api/java/mekanism/api/gas/OreGas.java b/src/api/java/mekanism/api/gas/OreGas.java deleted file mode 100644 index 316169c2..00000000 --- a/src/api/java/mekanism/api/gas/OreGas.java +++ /dev/null @@ -1,38 +0,0 @@ -package mekanism.api.gas; - -import net.minecraft.util.StatCollector; - -public class OreGas extends Gas -{ - private String oreName; - private OreGas cleanGas; - - public OreGas(String s, String name) - { - super(s); - - oreName = name; - } - - public boolean isClean() - { - return getCleanGas() == null; - } - - public OreGas getCleanGas() - { - return cleanGas; - } - - public OreGas setCleanGas(OreGas gas) - { - cleanGas = gas; - - return this; - } - - public String getOreName() - { - return StatCollector.translateToLocal(oreName); - } -} diff --git a/src/api/java/mekanism/api/gas/package-info.java b/src/api/java/mekanism/api/gas/package-info.java deleted file mode 100644 index 4418451f..00000000 --- a/src/api/java/mekanism/api/gas/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|gas") -package mekanism.api.gas; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/infuse/InfuseObject.java b/src/api/java/mekanism/api/infuse/InfuseObject.java deleted file mode 100644 index a86c02f1..00000000 --- a/src/api/java/mekanism/api/infuse/InfuseObject.java +++ /dev/null @@ -1,21 +0,0 @@ -package mekanism.api.infuse; - -/** - * InfuseObject - an object associated with an ItemStack that can modify a Metallurgic Infuser's internal infuse. - * @author AidanBrady - * - */ -public class InfuseObject -{ - /** The type of infuse this item stores */ - public InfuseType type; - - /** How much infuse this item stores */ - public int stored; - - public InfuseObject(InfuseType infusion, int i) - { - type = infusion; - stored = i; - } -} diff --git a/src/api/java/mekanism/api/infuse/InfuseRegistry.java b/src/api/java/mekanism/api/infuse/InfuseRegistry.java deleted file mode 100644 index 308b9c5b..00000000 --- a/src/api/java/mekanism/api/infuse/InfuseRegistry.java +++ /dev/null @@ -1,113 +0,0 @@ -package mekanism.api.infuse; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.item.ItemStack; - -/** - * Use this class to add a new object that registers as an infuse object. - * @author AidanBrady - * - */ -public class InfuseRegistry -{ - /** The (private) map of ItemStacks and their related InfuseObjects. */ - private static Map infuseObjects = new HashMap(); - - /** The (private) map of infuse names and their corresponding InfuseTypes. */ - private static Map infuseTypes = new HashMap(); - - /** - * Registers an InfuseType into the registry. Call this in PreInit! - * @param infuse - */ - public static void registerInfuseType(InfuseType infuse) - { - if(infuseTypes.containsKey(infuse.name)) - { - return; - } - - infuseTypes.put(infuse.name, infuse); - } - - /** - * Gets an InfuseType from it's name, or null if it doesn't exist. - * @param name - the name of the InfuseType to get - * @return the name's corresponding InfuseType - */ - public static InfuseType get(String name) - { - if(name.equals("null")) - { - return null; - } - - return infuseTypes.get(name); - } - - /** - * Whether or not the registry contains a correspondent InfuseType to a name. - * @param name - the name to check - * @return if the name has a coorespondent InfuseType - */ - public static boolean contains(String name) - { - return get(name) != null; - } - - /** - * Registers a block or item that serves as an infuse object. An infuse object will store a certain type and amount of infuse, - * and will deliver this amount to the Metallurgic Infuser's buffer of infuse. The item's stack size will be decremented when - * it is placed in the Metallurgic Infuser's infuse slot, and the machine can accept the type and amount of infuse stored in the - * object. - * @param itemStack - stack the infuse object is linked to -- stack size is ignored - * @param infuseObject - the infuse object with the type and amount data - */ - public static void registerInfuseObject(ItemStack itemStack, InfuseObject infuseObject) - { - if(getObject(itemStack) != null) - { - return; - } - - infuseObjects.put(itemStack, infuseObject); - } - - /** - * Gets the InfuseObject data from an ItemStack. - * @param itemStack - the ItemStack to check - * @return the ItemStack's InfuseObject - */ - public static InfuseObject getObject(ItemStack itemStack) - { - for(Map.Entry obj : infuseObjects.entrySet()) - { - if(itemStack.isItemEqual(obj.getKey())) - { - return obj.getValue(); - } - } - - return null; - } - - /** - * Gets the private map for InfuseObjects. - * @return private InfuseObject map - */ - public static final Map getObjectMap() - { - return infuseObjects; - } - - /** - * Gets the private map for InfuseTypes. - * @return private InfuseType map - */ - public static final Map getInfuseMap() - { - return infuseTypes; - } -} diff --git a/src/api/java/mekanism/api/infuse/InfuseType.java b/src/api/java/mekanism/api/infuse/InfuseType.java deleted file mode 100644 index 1f5215cb..00000000 --- a/src/api/java/mekanism/api/infuse/InfuseType.java +++ /dev/null @@ -1,47 +0,0 @@ -package mekanism.api.infuse; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -/** - * The types of infuse currently available in Mekanism. - * @author AidanBrady - * - */ -public final class InfuseType -{ - /** The name of this infusion */ - public String name; - - /** The location of this infuse's GUI texture */ - public ResourceLocation texture; - - /** The infuse's GUI texture X offset. */ - public int texX; - - /** The infuse's GUI texture Y offset. */ - public int texY; - - /** The unlocalized name of this type. */ - public String unlocalizedName; - - public InfuseType(String s, ResourceLocation location, int x, int y) - { - name = s; - texture = location; - texX = x; - texY = y; - } - - public InfuseType setUnlocalizedName(String name) - { - unlocalizedName = name; - - return this; - } - - public String getLocalizedName() - { - return StatCollector.translateToLocal(unlocalizedName); - } -} diff --git a/src/api/java/mekanism/api/infuse/package-info.java b/src/api/java/mekanism/api/infuse/package-info.java deleted file mode 100644 index 87189968..00000000 --- a/src/api/java/mekanism/api/infuse/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|infuse") -package mekanism.api.infuse; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/lasers/ILaserReceptor.java b/src/api/java/mekanism/api/lasers/ILaserReceptor.java deleted file mode 100644 index 641f3ca0..00000000 --- a/src/api/java/mekanism/api/lasers/ILaserReceptor.java +++ /dev/null @@ -1,10 +0,0 @@ -package mekanism.api.lasers; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface ILaserReceptor -{ - public void receiveLaserEnergy(double energy, ForgeDirection side); - - public boolean canLasersDig(); -} diff --git a/src/api/java/mekanism/api/lasers/package-info.java b/src/api/java/mekanism/api/lasers/package-info.java deleted file mode 100644 index b4569374..00000000 --- a/src/api/java/mekanism/api/lasers/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|laser") -package mekanism.api.lasers; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/package-info.java b/src/api/java/mekanism/api/package-info.java deleted file mode 100644 index 2b9fcabc..00000000 --- a/src/api/java/mekanism/api/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|core") -package mekanism.api; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/reactor/IFusionReactor.java b/src/api/java/mekanism/api/reactor/IFusionReactor.java deleted file mode 100644 index 9d9d96de..00000000 --- a/src/api/java/mekanism/api/reactor/IFusionReactor.java +++ /dev/null @@ -1,66 +0,0 @@ -package mekanism.api.reactor; - -import mekanism.api.IHeatTransfer; -import mekanism.api.gas.GasTank; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidTank; - -public interface IFusionReactor extends IHeatTransfer -{ - public void addTemperatureFromEnergyInput(double energyAdded); - - public void simulate(); - - public FluidTank getWaterTank(); - - public FluidTank getSteamTank(); - - public GasTank getDeuteriumTank(); - - public GasTank getTritiumTank(); - - public GasTank getFuelTank(); - - public double getBufferedEnergy(); - - public void setBufferedEnergy(double energy); - - public double getPlasmaTemp(); - - public void setPlasmaTemp(double temp); - - public double getCaseTemp(); - - public void setCaseTemp(double temp); - - public double getBufferSize(); - - public void formMultiblock(); - - public boolean isFormed(); - - public void setInjectionRate(int rate); - - public int getInjectionRate(); - - public boolean isBurning(); - - public void setBurning(boolean burn); - - public int getMinInjectionRate(boolean active); - - public double getMaxPlasmaTemperature(boolean active); - - public double getMaxCasingTemperature(boolean active); - - public double getIgnitionTemperature(boolean active); - - public double getPassiveGeneration(boolean active, boolean current); - - public int getSteamPerTick(boolean current); - - public void updateTemperatures(); - - public ItemStack[] getInventory(); -} diff --git a/src/api/java/mekanism/api/reactor/INeutronCapture.java b/src/api/java/mekanism/api/reactor/INeutronCapture.java deleted file mode 100644 index 6171a7f7..00000000 --- a/src/api/java/mekanism/api/reactor/INeutronCapture.java +++ /dev/null @@ -1,6 +0,0 @@ -package mekanism.api.reactor; - -public interface INeutronCapture extends IReactorBlock -{ - public int absorbNeutrons(int neutrons); -} diff --git a/src/api/java/mekanism/api/reactor/IReactorBlock.java b/src/api/java/mekanism/api/reactor/IReactorBlock.java deleted file mode 100644 index b3b85188..00000000 --- a/src/api/java/mekanism/api/reactor/IReactorBlock.java +++ /dev/null @@ -1,12 +0,0 @@ -package mekanism.api.reactor; - - -public interface IReactorBlock -{ - public boolean isFrame(); - - public void setReactor(IFusionReactor reactor); - - public IFusionReactor getReactor(); - -} diff --git a/src/api/java/mekanism/api/reactor/package-info.java b/src/api/java/mekanism/api/reactor/package-info.java deleted file mode 100644 index 6a00fc69..00000000 --- a/src/api/java/mekanism/api/reactor/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|reactor") -package mekanism.api.reactor; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/recipe/RecipeHelper.java b/src/api/java/mekanism/api/recipe/RecipeHelper.java deleted file mode 100644 index 1040aa2c..00000000 --- a/src/api/java/mekanism/api/recipe/RecipeHelper.java +++ /dev/null @@ -1,319 +0,0 @@ -package mekanism.api.recipe; - -import java.lang.reflect.Method; - -import mekanism.api.gas.GasStack; -import mekanism.api.infuse.InfuseType; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -/** - * SET TO BE REMOVED NEXT MINOR MEKANISM VERSION, PLEASE USE IMC INSTEAD. - * Use this handy class to add recipes to Mekanism machinery. - * @author AidanBrady - * - */ -@Deprecated -public final class RecipeHelper -{ - /** - * Add an Enrichment Chamber recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addEnrichmentChamberRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addEnrichmentChamberRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add an Osmium Compressor recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addOsmiumCompressorRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addOsmiumCompressorRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Combiner recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addCombinerRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addCombinerRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Crusher recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addCrusherRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addCrusherRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Purification Chamber recipe. - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addPurificationChamberRecipe(ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPurificationChamberRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Oxidizer recipe. - * @param input - input ItemStack - * @param output - output GasStack - */ - public static void addChemicalOxidizerRecipe(ItemStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalOxidizerRecipe", ItemStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Infuser recipe. - * @param leftInput - left input GasStack - * @param rightInput - right input GasStack - * @param output - output GasStack - */ - public static void addChemicalInfuserRecipe(GasStack leftInput, GasStack rightInput, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalInfuserRecipe", GasStack.class, GasStack.class, GasStack.class); - m.invoke(null, leftInput, rightInput, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Precision Sawmill recipe. - * @param input - input ItemStack - * @param primaryOutput - guaranteed output - * @param secondaryOutput - possible extra output - * @param chance - probability of obtaining extra output - */ - public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput, ItemStack secondaryOutput, double chance) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class, ItemStack.class, Double.TYPE); - m.invoke(null, input, primaryOutput, secondaryOutput, chance); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Precision Sawmill recipe with no chance output - * @param input - input ItemStack - * @param primaryOutput - guaranteed output - */ - public static void addPrecisionSawmillRecipe(ItemStack input, ItemStack primaryOutput) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPrecisionSawmillRecipe", ItemStack.class, ItemStack.class); - m.invoke(null, input, primaryOutput); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Injection Chamber recipe. - * @param input - input AdvancedInput - * @param output - output ItemStack - */ - public static void addChemicalInjectionChamberRecipe(ItemStack input, String gasName, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalInjectionChamberRecipe", ItemStack.class, String.class, ItemStack.class); - m.invoke(null, input, gasName, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add an Electrolytic Separator recipe. - * @param input - input FluidStack - * @param energy - required energy - * @param leftOutput - left output GasStack - * @param rightOutput - right output GasStack - */ - public static void addElectrolyticSeparatorRecipe(FluidStack input, double energy, GasStack leftOutput, GasStack rightOutput) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addElectrolyticSeparatorRecipe", FluidStack.class, Double.TYPE, GasStack.class, GasStack.class); - m.invoke(null, input, energy, leftOutput, rightOutput); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Dissolution Chamber recipe. - * @param input - input ItemStack - * @param output - output GasStack - */ - public static void addChemicalDissolutionChamberRecipe(ItemStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalDissolutionChamberRecipe", ItemStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Washer recipe. - * @param input - input GasStack - * @param output - output GasStack - */ - public static void addChemicalWasherRecipe(GasStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalWasherRecipe", GasStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Chemical Crystallizer recipe. - * @param input - input GasStack - * @param output - output ItemStack - */ - public static void addChemicalCrystallizerRecipe(GasStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addChemicalCrystallizerRecipe", GasStack.class, ItemStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Metallurgic Infuser recipe. - * @param infuse - which Infuse to use - * @param amount - how much Infuse to use - * @param input - input ItemStack - * @param output - output ItemStack - */ - public static void addMetallurgicInfuserRecipe(InfuseType infuse, int amount, ItemStack input, ItemStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addMetallurgicInfuserRecipe", InfuseType.class, Integer.TYPE, ItemStack.class, ItemStack.class); - m.invoke(null, infuse, amount, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Pressurized Reaction Chamber recipe. - * @param inputSolid - input ItemStack - * @param inputFluid - input FluidStack - * @param inputGas - input GasStack - * @param outputSolid - output ItemStack - * @param outputGas - output GasStack - * @param extraEnergy - extra energy needed by the recipe - * @param ticks - amount of ticks it takes for this recipe to complete - */ - public static void addPRCRecipe(ItemStack inputSolid, FluidStack inputFluid, GasStack inputGas, ItemStack outputSolid, GasStack outputGas, double extraEnergy, int ticks) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addPRCRecipe", ItemStack.class, FluidStack.class, GasStack.class, ItemStack.class, GasStack.class, Double.TYPE, Integer.TYPE); - m.invoke(null, inputSolid, inputFluid, inputGas, outputSolid, outputGas, extraEnergy, ticks); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Solar Evaporation Plant recipe. - * @param input - input GasStack - * @param output - output GasStack - */ - public static void addSolarEvaporationRecipe(FluidStack input, FluidStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addSolarEvaporationRecipe", FluidStack.class, FluidStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } - - /** - * Add a Solar Neutron Activator recipe. - * @param input - input GasStack - * @param output - output GasStack - */ - public static void addSolarNeutronRecipe(GasStack input, GasStack output) - { - try { - Class recipeClass = Class.forName("mekanism.common.recipe.RecipeHandler"); - Method m = recipeClass.getMethod("addSolarEvaporationRecipe", GasStack.class, GasStack.class); - m.invoke(null, input, output); - } catch(Exception e) { - System.err.println("Error while adding recipe: " + e.getMessage()); - } - } -} diff --git a/src/api/java/mekanism/api/recipe/package-info.java b/src/api/java/mekanism/api/recipe/package-info.java deleted file mode 100644 index f166da47..00000000 --- a/src/api/java/mekanism/api/recipe/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|recipe") -package mekanism.api.recipe; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/transmitters/DynamicNetwork.java b/src/api/java/mekanism/api/transmitters/DynamicNetwork.java deleted file mode 100644 index d0320988..00000000 --- a/src/api/java/mekanism/api/transmitters/DynamicNetwork.java +++ /dev/null @@ -1,441 +0,0 @@ -package mekanism.api.transmitters; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.EnumSet; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.Map.Entry; -import java.util.Set; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import mekanism.api.Coord4D; -import mekanism.api.IClientTicker; -import mekanism.api.Range4D; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.Event; - -public abstract class DynamicNetwork> implements IClientTicker, INetworkDataHandler -{ - public LinkedHashSet> transmitters = Sets.newLinkedHashSet(); - public LinkedHashSet> transmittersToAdd = Sets.newLinkedHashSet(); - public LinkedHashSet> transmittersAdded = Sets.newLinkedHashSet(); - - public HashMap possibleAcceptors = new HashMap(); - public HashMap> acceptorDirections = new HashMap>(); - public HashMap, EnumSet> changedAcceptors = Maps.newHashMap(); - - private Set updateQueue = new LinkedHashSet(); - - protected Range4D packetRange = null; - - protected int capacity = 0; - protected double meanCapacity = 0; - - protected boolean needsUpdate = false; - protected int updateDelay = 0; - - protected boolean firstUpdate = true; - protected World worldObj = null; - - public void addNewTransmitters(Collection> newTransmitters) - { - transmittersToAdd.addAll(newTransmitters); - } - - public void commit() - { - if(!transmittersToAdd.isEmpty()) - { - for(IGridTransmitter transmitter : transmittersToAdd) - { - if(transmitter.isValid()) - { - if(worldObj == null) - { - worldObj = transmitter.world(); - } - - for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) - { - updateTransmitterOnSide(transmitter, side); - } - - transmitter.setTransmitterNetwork((N)this); - absorbBuffer(transmitter); - transmitters.add(transmitter); - } - } - - updateCapacity(); - clampBuffer(); - queueClientUpdate(Lists.newArrayList(transmittersToAdd)); - transmittersToAdd.clear(); - } - - if(!changedAcceptors.isEmpty()) - { - for(Entry, EnumSet> entry : changedAcceptors.entrySet()) - { - IGridTransmitter transmitter = entry.getKey(); - - if(transmitter.isValid()) - { - EnumSet directionsChanged = entry.getValue(); - - for(ForgeDirection side : directionsChanged) - { - updateTransmitterOnSide(transmitter, side); - } - } - } - - changedAcceptors.clear(); - } - } - - public void updateTransmitterOnSide(IGridTransmitter transmitter, ForgeDirection side) - { - A acceptor = transmitter.getAcceptor(side); - Coord4D acceptorCoord = transmitter.coord().getFromSide(side); - EnumSet directions = acceptorDirections.get(acceptorCoord); - - if(acceptor != null) - { - possibleAcceptors.put(acceptorCoord, acceptor); - - if(directions != null) - { - directions.add(side.getOpposite()); - } - else { - acceptorDirections.put(acceptorCoord, EnumSet.of(side.getOpposite())); - } - } - else { - if(directions != null) - { - directions.remove(side.getOpposite()); - - if(directions.isEmpty()) - { - possibleAcceptors.remove(acceptorCoord); - acceptorDirections.remove(acceptorCoord); - } - } - else { - possibleAcceptors.remove(acceptorCoord); - acceptorDirections.remove(acceptorCoord); - } - } - - } - - public abstract void absorbBuffer(IGridTransmitter transmitter); - - public abstract void clampBuffer(); - - public void invalidate() - { - for(IGridTransmitter transmitter : transmitters) - { - invalidateTransmitter(transmitter); - } - - transmitters.clear(); - deregister(); - } - - public void invalidateTransmitter(IGridTransmitter transmitter) - { - if(!worldObj.isRemote && transmitter.isValid()) - { - transmitter.takeShare(); - transmitter.setTransmitterNetwork(null); - TransmitterNetworkRegistry.registerOrphanTransmitter(transmitter); - } - } - - public void acceptorChanged(IGridTransmitter transmitter, ForgeDirection side) - { - EnumSet directions = changedAcceptors.get(transmitter); - - if(directions != null) - { - directions.add(side); - } - else { - changedAcceptors.put(transmitter, EnumSet.of(side)); - } - - TransmitterNetworkRegistry.registerChangedNetwork(this); - } - - public void adoptTransmittersAndAcceptorsFrom(N net) - { - for(IGridTransmitter transmitter : net.transmitters) - { - transmitter.setTransmitterNetwork((N)this); - transmitters.add(transmitter); - transmittersAdded.add(transmitter); - } - - possibleAcceptors.putAll(net.possibleAcceptors); - - for(Entry> entry : net.acceptorDirections.entrySet()) - { - Coord4D coord = entry.getKey(); - - if(acceptorDirections.containsKey(coord)) - { - acceptorDirections.get(coord).addAll(entry.getValue()); - } - else { - acceptorDirections.put(coord, entry.getValue()); - } - } - - } - - public Range4D getPacketRange() - { - if(packetRange == null) - { - return genPacketRange(); - } - - return packetRange; - } - - protected Range4D genPacketRange() - { - if(getSize() == 0) - { - deregister(); - return null; - } - - IGridTransmitter initTransmitter = transmitters.iterator().next(); - Coord4D initCoord = initTransmitter.coord(); - - int minX = initCoord.xCoord; - int minY = initCoord.yCoord; - int minZ = initCoord.zCoord; - int maxX = initCoord.xCoord; - int maxY = initCoord.yCoord; - int maxZ = initCoord.zCoord; - - for(IGridTransmitter transmitter : transmitters) - { - Coord4D coord = transmitter.coord(); - - if(coord.xCoord < minX) minX = coord.xCoord; - if(coord.yCoord < minY) minY = coord.yCoord; - if(coord.zCoord < minZ) minZ = coord.zCoord; - if(coord.xCoord > maxX) maxX = coord.xCoord; - if(coord.yCoord > maxY) maxY = coord.yCoord; - if(coord.zCoord > maxZ) maxZ = coord.zCoord; - } - - return new Range4D(minX, minY, minZ, maxX, maxY, maxZ, initTransmitter.world().provider.dimensionId); - } - - public void register() - { - if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - { - TransmitterNetworkRegistry.getInstance().registerNetwork(this); - } - else { - MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)1)); - } - } - - public void deregister() - { - transmitters.clear(); - - if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - { - TransmitterNetworkRegistry.getInstance().removeNetwork(this); - } - else { - MinecraftForge.EVENT_BUS.post(new ClientTickUpdate(this, (byte)0)); - } - } - - public int getSize() - { - return transmitters.size(); - } - - public int getAcceptorSize() - { - return possibleAcceptors.size(); - } - - public synchronized void updateCapacity() - { - updateMeanCapacity(); - capacity = (int)meanCapacity * transmitters.size(); - } - - /** - * Override this if things can have variable capacity along the network. - * @return An 'average' value of capacity. Calculate it how you will. - */ - protected synchronized void updateMeanCapacity() - { - if(transmitters.size() > 0) - { - meanCapacity = transmitters.iterator().next().getCapacity(); - } - else { - meanCapacity = 0; - } - } - - public int getCapacity() - { - return capacity; - } - - public World getWorld() - { - return worldObj; - } - - public abstract Set getAcceptors(Object data); - - public void tick() - { - onUpdate(); - } - - public void onUpdate() - { - if(FMLCommonHandler.instance().getEffectiveSide().isServer()) - { - Iterator i = updateQueue.iterator(); - - try { - while(i.hasNext()) - { - DelayQueue q = i.next(); - - if(q.delay > 0) - { - q.delay--; - } - else { - transmittersAdded.addAll(transmitters); - updateDelay = 1; - i.remove(); - } - } - } catch(Exception e) {} - - if(updateDelay > 0) - { - updateDelay--; - - if(updateDelay == 0) - { - MinecraftForge.EVENT_BUS.post(new TransmittersAddedEvent(this, firstUpdate, (Collection)transmittersAdded)); - firstUpdate = false; - transmittersAdded.clear(); - needsUpdate = true; - } - } - } - } - - @Override - public boolean needsTicks() - { - return getSize() > 0; - } - - @Override - public void clientTick() {} - - public void queueClientUpdate(Collection> newTransmitters) - { - transmittersAdded.addAll(newTransmitters); - updateDelay = 3; - } - - public static class TransmittersAddedEvent extends Event - { - public DynamicNetwork network; - public boolean newNetwork; - public Collection newTransmitters; - - public TransmittersAddedEvent(DynamicNetwork net, boolean newNet, Collection added) - { - network = net; - newNetwork = newNet; - newTransmitters = added; - } - } - - public static class ClientTickUpdate extends Event - { - public DynamicNetwork network; - public byte operation; /*0 remove, 1 add*/ - - public ClientTickUpdate(DynamicNetwork net, byte b) - { - network = net; - operation = b; - } - } - - public static class NetworkClientRequest extends Event - { - public TileEntity tileEntity; - - public NetworkClientRequest(TileEntity tile) - { - tileEntity = tile; - } - } - - public void addUpdate(EntityPlayer player) - { - updateQueue.add(new DelayQueue(player)); - } - - public static class DelayQueue - { - public EntityPlayer player; - public int delay; - - public DelayQueue(EntityPlayer p) - { - player = p; - delay = 5; - } - - @Override - public int hashCode() - { - return player.hashCode(); - } - - @Override - public boolean equals(Object o) - { - return o instanceof DelayQueue && ((DelayQueue)o).player.equals(this.player); - } - } -} diff --git a/src/api/java/mekanism/api/transmitters/IBlockableConnection.java b/src/api/java/mekanism/api/transmitters/IBlockableConnection.java deleted file mode 100644 index f6811fbe..00000000 --- a/src/api/java/mekanism/api/transmitters/IBlockableConnection.java +++ /dev/null @@ -1,10 +0,0 @@ -package mekanism.api.transmitters; - -import net.minecraftforge.common.util.ForgeDirection; - -public interface IBlockableConnection -{ - public boolean canConnectMutual(ForgeDirection side); - - public boolean canConnect(ForgeDirection side); -} diff --git a/src/api/java/mekanism/api/transmitters/IGridTransmitter.java b/src/api/java/mekanism/api/transmitters/IGridTransmitter.java deleted file mode 100644 index 254b4bb5..00000000 --- a/src/api/java/mekanism/api/transmitters/IGridTransmitter.java +++ /dev/null @@ -1,63 +0,0 @@ -package mekanism.api.transmitters; - -import java.util.Collection; - -import mekanism.api.Coord4D; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -public interface IGridTransmitter> extends ITransmitter -{ - public boolean hasTransmitterNetwork(); - - /** - * Gets the network currently in use by this transmitter segment. - * @return network this transmitter is using - */ - public N getTransmitterNetwork(); - - /** - * Sets this transmitter segment's network to a new value. - * @param network - network to set to - */ - public void setTransmitterNetwork(N network); - - public int getTransmitterNetworkSize(); - - public int getTransmitterNetworkAcceptorSize(); - - public String getTransmitterNetworkNeeded(); - - public String getTransmitterNetworkFlow(); - - public String getTransmitterNetworkBuffer(); - - public double getTransmitterNetworkCapacity(); - - public int getCapacity(); - - public World world(); - - public Coord4D coord(); - - public Coord4D getAdjacentConnectableTransmitterCoord(ForgeDirection side); - - public A getAcceptor(ForgeDirection side); - - public boolean isValid(); - - public boolean isOrphan(); - - public void setOrphan(boolean orphaned); - - public N createEmptyNetwork(); - - public N mergeNetworks(Collection toMerge); - - public N getExternalNetwork(Coord4D from); - - public void takeShare(); - - public Object getBuffer(); -} diff --git a/src/api/java/mekanism/api/transmitters/INetworkDataHandler.java b/src/api/java/mekanism/api/transmitters/INetworkDataHandler.java deleted file mode 100644 index 38cd6370..00000000 --- a/src/api/java/mekanism/api/transmitters/INetworkDataHandler.java +++ /dev/null @@ -1,10 +0,0 @@ -package mekanism.api.transmitters; - -public interface INetworkDataHandler -{ - public String getNeededInfo(); - - public String getStoredInfo(); - - public String getFlowInfo(); -} diff --git a/src/api/java/mekanism/api/transmitters/ITransmitter.java b/src/api/java/mekanism/api/transmitters/ITransmitter.java deleted file mode 100644 index cddc76a7..00000000 --- a/src/api/java/mekanism/api/transmitters/ITransmitter.java +++ /dev/null @@ -1,11 +0,0 @@ -package mekanism.api.transmitters; - -public interface ITransmitter -{ - /** - * Get the transmitter's transmission type - * - * @return TransmissionType this transmitter uses - */ - public TransmissionType getTransmissionType(); -} diff --git a/src/api/java/mekanism/api/transmitters/ITransmitterTile.java b/src/api/java/mekanism/api/transmitters/ITransmitterTile.java deleted file mode 100644 index 3940b71a..00000000 --- a/src/api/java/mekanism/api/transmitters/ITransmitterTile.java +++ /dev/null @@ -1,6 +0,0 @@ -package mekanism.api.transmitters; - -public interface ITransmitterTile> -{ - public IGridTransmitter getTransmitter(); -} diff --git a/src/api/java/mekanism/api/transmitters/TransmissionType.java b/src/api/java/mekanism/api/transmitters/TransmissionType.java deleted file mode 100644 index 7b54e9cc..00000000 --- a/src/api/java/mekanism/api/transmitters/TransmissionType.java +++ /dev/null @@ -1,80 +0,0 @@ -package mekanism.api.transmitters; - -import mekanism.api.gas.IGasTransmitter; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.StatCollector; - -public enum TransmissionType -{ - ENERGY("EnergyNetwork", "Energy"), - FLUID("FluidNetwork", "Fluids"), - GAS("GasNetwork", "Gases"), - ITEM("InventoryNetwork", "Items"), - HEAT("HeatNetwork", "Heat"); - - private String name; - private String transmission; - - private TransmissionType(String n, String t) - { - name = n; - transmission = t; - } - - public String getName() - { - return name; - } - - public String getTransmission() - { - return transmission; - } - - public String localize() - { - return StatCollector.translateToLocal("transmission." + getTransmission()); - } - - public static boolean checkTransmissionType(ITransmitter sideTile, TransmissionType type) - { - return type.checkTransmissionType(sideTile); - } - - public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type) - { - return checkTransmissionType(tile1, type, null); - } - - public static boolean checkTransmissionType(TileEntity tile1, TransmissionType type, TileEntity tile2) - { - return type.checkTransmissionType(tile1, tile2); - } - - public boolean checkTransmissionType(ITransmitter transmitter) - { - return transmitter.getTransmissionType() == this; - } - - public boolean checkTransmissionType(TileEntity sideTile, TileEntity currentTile) - { - if(sideTile instanceof ITransmitter) - { - if(((ITransmitter)sideTile).getTransmissionType() == this) - { - return true; - } - } - - if(this == GAS && currentTile instanceof IGasTransmitter) - { - if(((IGasTransmitter)currentTile).canTransferGasToTube(sideTile)) - { - return true; - } - } - - return false; - } -} \ No newline at end of file diff --git a/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java b/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java deleted file mode 100644 index 1e72b1de..00000000 --- a/src/api/java/mekanism/api/transmitters/TransmitterNetworkRegistry.java +++ /dev/null @@ -1,289 +0,0 @@ -package mekanism.api.transmitters; - -import java.util.HashMap; -import java.util.HashSet; - -import mekanism.api.Coord4D; -import mekanism.api.MekanismAPI; -import net.minecraftforge.common.util.ForgeDirection; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; - -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; -import cpw.mods.fml.relauncher.Side; - -public class TransmitterNetworkRegistry -{ - private static TransmitterNetworkRegistry INSTANCE = new TransmitterNetworkRegistry(); - private static boolean loaderRegistered = false; - - private HashSet networks = Sets.newHashSet(); - private HashSet networksToChange = Sets.newHashSet(); - - private HashSet invalidTransmitters = Sets.newHashSet(); - private HashMap orphanTransmitters = Maps.newHashMap(); - - private Logger logger = LogManager.getLogger("MekanismTransmitters"); - - public static void initiate() - { - if(!loaderRegistered) - { - loaderRegistered = true; - - FMLCommonHandler.instance().bus().register(INSTANCE); - } - } - - public static void reset() - { - getInstance().networks.clear(); - getInstance().networksToChange.clear(); - getInstance().invalidTransmitters.clear(); - getInstance().orphanTransmitters.clear(); - } - - public static void invalidateTransmitter(IGridTransmitter transmitter) - { - getInstance().invalidTransmitters.add(transmitter); - } - - public static void registerOrphanTransmitter(IGridTransmitter transmitter) - { - getInstance().orphanTransmitters.put(transmitter.coord(), transmitter); - } - - public static void registerChangedNetwork(DynamicNetwork network) - { - getInstance().networksToChange.add(network); - } - - public static TransmitterNetworkRegistry getInstance() - { - return INSTANCE; - } - - public void registerNetwork(DynamicNetwork network) - { - networks.add(network); - } - - public void removeNetwork(DynamicNetwork network) - { - if(networks.contains(network)) - { - networks.remove(network); - } - } - - @SubscribeEvent - public void onTick(ServerTickEvent event) - { - if(event.phase == Phase.END && event.side == Side.SERVER) - { - tickEnd(); - } - } - - public void tickEnd() - { - removeInvalidTransmitters(); - - assignOrphans(); - - commitChanges(); - - for(DynamicNetwork net : networks) - { - net.tick(); - } - } - - public void removeInvalidTransmitters() - { - if(MekanismAPI.debug && !invalidTransmitters.isEmpty()) - { - logger.debug("Dealing with " + invalidTransmitters.size() + " invalid Transmitters"); - } - - for(IGridTransmitter invalid : invalidTransmitters) - { - if(!invalid.isOrphan()) - { - DynamicNetwork n = invalid.getTransmitterNetwork(); - - if(n != null) - { - n.invalidate(); - } - } - } - - invalidTransmitters.clear(); - } - - public void assignOrphans() - { - if(MekanismAPI.debug && !orphanTransmitters.isEmpty()) - { - logger.debug("Dealing with " + orphanTransmitters.size() + " orphan Transmitters"); - } - - for(IGridTransmitter orphanTransmitter : orphanTransmitters.values()) - { - DynamicNetwork network = getNetworkFromOrphan(orphanTransmitter); - - if(network != null) - { - networksToChange.add(network); - network.register(); - } - } - - orphanTransmitters.clear(); - } - - public > DynamicNetwork getNetworkFromOrphan(IGridTransmitter startOrphan) - { - if(startOrphan.isValid() && startOrphan.isOrphan()) - { - OrphanPathFinder finder = new OrphanPathFinder(startOrphan); - finder.start(); - N network; - - switch(finder.networksFound.size()) - { - case 0: - if(MekanismAPI.debug) - { - logger.debug("No networks found. Creating new network"); - } - - network = startOrphan.createEmptyNetwork(); - - break; - case 1: - if(MekanismAPI.debug) - { - logger.debug("Using single found network"); - } - - network = finder.networksFound.iterator().next(); - - break; - default: - if(MekanismAPI.debug) - { - logger.debug("Merging " + finder.networksFound.size() + " networks"); - } - - network = startOrphan.mergeNetworks(finder.networksFound); - } - - network.addNewTransmitters(finder.connectedTransmitters); - - return network; - } - - return null; - } - - public void commitChanges() - { - for(DynamicNetwork network : networksToChange) - { - network.commit(); - } - - networksToChange.clear(); - } - - @Override - public String toString() - { - return "Network Registry:\n" + networks; - } - - public String[] toStrings() - { - String[] strings = new String[networks.size()]; - int i = 0; - - for(DynamicNetwork network : networks) - { - strings[i++] = network.toString(); - } - - return strings; - } - - public class OrphanPathFinder> - { - public IGridTransmitter startPoint; - - public HashSet iterated = Sets.newHashSet(); - - public HashSet> connectedTransmitters = Sets.newHashSet(); - public HashSet networksFound = Sets.newHashSet(); - - public OrphanPathFinder(IGridTransmitter start) - { - startPoint = start; - } - - public void start() - { - iterate(startPoint.coord(), ForgeDirection.UNKNOWN); - } - - public void iterate(Coord4D from, ForgeDirection fromDirection) - { - if(iterated.contains(from)) - { - return; - } - - iterated.add(from); - - if(orphanTransmitters.containsKey(from)) - { - IGridTransmitter transmitter = orphanTransmitters.get(from); - - if(transmitter.isValid() && transmitter.isOrphan()) - { - connectedTransmitters.add(transmitter); - transmitter.setOrphan(false); - - for(ForgeDirection direction : ForgeDirection.VALID_DIRECTIONS) - { - if(direction != fromDirection) - { - Coord4D directionCoord = transmitter.getAdjacentConnectableTransmitterCoord(direction); - - if(!(directionCoord == null || iterated.contains(directionCoord))) - { - iterate(directionCoord, direction.getOpposite()); - } - } - } - } - } - else { - addNetworkToIterated(from); - } - } - - public void addNetworkToIterated(Coord4D from) - { - N net = startPoint.getExternalNetwork(from); - if(net != null) networksFound.add(net); - } - } -} diff --git a/src/api/java/mekanism/api/transmitters/package-info.java b/src/api/java/mekanism/api/transmitters/package-info.java deleted file mode 100644 index 06819e74..00000000 --- a/src/api/java/mekanism/api/transmitters/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|transmitter") -package mekanism.api.transmitters; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mekanism/api/util/BlockInfo.java b/src/api/java/mekanism/api/util/BlockInfo.java deleted file mode 100644 index 2cb40d7d..00000000 --- a/src/api/java/mekanism/api/util/BlockInfo.java +++ /dev/null @@ -1,38 +0,0 @@ -package mekanism.api.util; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -public class BlockInfo -{ - public Block block; - public int meta; - - public BlockInfo(Block b, int j) - { - block = b; - meta = j; - } - - public static BlockInfo get(ItemStack stack) - { - return new BlockInfo(Block.getBlockFromItem(stack.getItem()), stack.getItemDamage()); - } - - @Override - public boolean equals(Object obj) - { - return obj instanceof BlockInfo && - ((BlockInfo)obj).block == block && - ((BlockInfo)obj).meta == meta; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + block.getUnlocalizedName().hashCode(); - code = 31 * code + meta; - return code; - } -} \ No newline at end of file diff --git a/src/api/java/mekanism/api/util/ItemInfo.java b/src/api/java/mekanism/api/util/ItemInfo.java deleted file mode 100644 index f27065b6..00000000 --- a/src/api/java/mekanism/api/util/ItemInfo.java +++ /dev/null @@ -1,38 +0,0 @@ -package mekanism.api.util; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemInfo -{ - public Item item; - public int meta; - - public ItemInfo(Item i, int j) - { - item = i; - meta = j; - } - - public static ItemInfo get(ItemStack stack) - { - return new ItemInfo(stack.getItem(), stack.getItemDamage()); - } - - @Override - public boolean equals(Object obj) - { - return obj instanceof ItemInfo && - ((ItemInfo)obj).item == item && - ((ItemInfo)obj).meta == meta; - } - - @Override - public int hashCode() - { - int code = 1; - code = 31 * code + System.identityHashCode(item); - code = 7 * code + meta; - return code; - } -} diff --git a/src/api/java/mekanism/api/util/ListUtils.java b/src/api/java/mekanism/api/util/ListUtils.java deleted file mode 100644 index e20807c5..00000000 --- a/src/api/java/mekanism/api/util/ListUtils.java +++ /dev/null @@ -1,282 +0,0 @@ -package mekanism.api.util; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - -public class ListUtils -{ - public static List inverse(List list) - { - List toReturn = new ArrayList(); - - for(int i = list.size() - 1; i >= 0; i--) - { - toReturn.add(list.get(i)); - } - - return toReturn; - } - - public static List cap(List list, int cap) - { - List toReturn = new ArrayList(); - - if(list.size() <= cap) - { - toReturn = copy(list); - } - else { - int count = 0; - - for(V obj : list) - { - count++; - - toReturn.add(obj); - - if(count == cap) - { - break; - } - } - } - - return toReturn; - } - - public static List copy(List list) - { - List toReturn = new ArrayList(); - - for(V obj : list) - { - toReturn.add(obj); - } - - return toReturn; - } - - public static List merge(List listOne, List listTwo) - { - List newList = new ArrayList(); - - for(V obj : listOne) - { - newList.add(obj); - } - - for(V obj : listTwo) - { - newList.add(obj); - } - - return newList; - } - - public static List capRemains(List list, int cap) - { - List toReturn = new ArrayList(); - - if(list.size() <= cap) - { - return toReturn; - } - else { - List inverse = inverse(list); - - int iterNeeded = list.size() - cap; - int count = 0; - - for(V obj : list) - { - count++; - - toReturn.add(obj); - - if(count == iterNeeded) - { - break; - } - } - - return toReturn; - } - } - - public static ArrayList> split(List list, int divide) - { - int remain = list.size() % divide; - int size = (list.size() - remain) / divide; - - ArrayList> toReturn = new ArrayList>(); - - for(int i = 0; i < divide; i++) - { - toReturn.add(i, new ArrayList()); - } - - for(List iterSet : toReturn) - { - List removed = new ArrayList(); - - int toAdd = size; - - if(remain > 0) - { - remain--; - toAdd++; - } - - for(V obj : list) - { - if(toAdd == 0) - { - break; - } - - iterSet.add(obj); - removed.add(obj); - toAdd--; - } - - for(V obj : removed) - { - list.remove(obj); - } - } - - return toReturn; - } - - public static V getTop(List list) - { - for(V obj : list) - { - return obj; - } - - return null; - } - - public static List asList(Set set) - { - return (List)Arrays.asList(set.toArray()); - } - - public static List asList(V... values) - { - return (List)Arrays.asList(values); - } - - public static double[] splitDouble(int size, double num) - { - double[] split = new double[size]; - - for(int i = 0; i < size; i++) - { - double remain = num%size; - double ret = (num-remain)/size; - ret += remain; - - split[i] = ret; - num -= remain; - } - - return split; - } - - public static double[] percent(double[] values) - { - double[] ret = new double[values.length]; - double total = 0; - - for(double d : values) total += d; - - for(int i = 0; i < values.length; i++) - { - ret[i] = values[i]/total; - } - - return ret; - } - - public static int[] calcPercentInt(double[] percent, int val) - { - int[] ret = new int[percent.length]; - - for(int i = 0; i < percent.length; i++) - { - ret[i] = (int)Math.round(val*percent[i]); - } - - int newTotal = 0; - for(int i : ret) newTotal += i; - - int diff = val-newTotal; - - if(diff != val) - { - for(int i = 0; i < ret.length; i++) - { - int num = ret[i]; - - if(diff < 0 && num == 0) - { - continue; - } - - if(diff > 0) - { - ret[i]++; - diff--; - } - else if(diff < 0) - { - ret[i]--; - diff++; - } - - if(diff == 0) - { - return ret; - } - } - } - - return ret; - } - - public static int[] splitInt(int size, int num) - { - int[] split = new int[size]; - - for(int i = 0; i < size; i++) - { - int remain = num%size; - int ret = (num-remain)/size; - ret += remain; - - split[i] = ret; - num -= remain; - } - - return split; - } - - public static double[] percent(int[] values) - { - double[] ret = new double[values.length]; - double total = 0; - - for(double d : values) total += d; - - for(int i = 0; i < values.length; i++) - { - ret[i] = values[i]/total; - } - - return ret; - } -} diff --git a/src/api/java/mekanism/api/util/StackUtils.java b/src/api/java/mekanism/api/util/StackUtils.java deleted file mode 100644 index b3a3aca9..00000000 --- a/src/api/java/mekanism/api/util/StackUtils.java +++ /dev/null @@ -1,253 +0,0 @@ -package mekanism.api.util; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -public final class StackUtils -{ - public static List split(ItemStack stack) - { - if(stack == null || stack.stackSize == 0) - { - return null; - } - - List ret = new ArrayList(); - - if(stack.stackSize == 1) - { - ret.add(stack); - return ret; - } - - int remain = stack.stackSize % 2; - int split = (int)((float)(stack.stackSize)/2F); - - ret.add(size(stack, split+remain)); - ret.add(size(stack, split)); - - return ret; - } - - public static Item getItem(ItemStack stack) - { - if(stack == null) - { - return null; - } - - return stack.getItem(); - } - - public static boolean diffIgnoreNull(ItemStack stack1, ItemStack stack2) - { - if(stack1 == null || stack2 == null) - { - return false; - } - - return stack1.getItem() != stack2.getItem() || stack1.getItemDamage() != stack2.getItemDamage(); - } - - public static boolean equalsWildcard(ItemStack wild, ItemStack check) - { - if(wild == null || check == null) - { - return check == wild; - } - return wild.getItem() == check.getItem() && (wild.getItemDamage() == OreDictionary.WILDCARD_VALUE || wild.getItemDamage() == check.getItemDamage()); - } - - public static boolean equalsWildcardWithNBT(ItemStack wild, ItemStack check) - { - return equalsWildcard(wild, check) && (wild.stackTagCompound == null ? check.stackTagCompound == null : (wild.stackTagCompound == check.stackTagCompound || wild.stackTagCompound.equals(check.stackTagCompound))); - } - - public static List even(ItemStack stack1, ItemStack stack2) - { - ArrayList ret = new ArrayList(); - - if(getSize(stack1) == getSize(stack2) || Math.abs(getSize(stack1)-getSize(stack2)) == 1) - { - ret.add(stack1); - ret.add(stack2); - - return ret; - } - - if(getSize(stack1) > getSize(stack2)) - { - int diff = getSize(stack1)-getSize(stack2); - - List split = split(size(stack1, diff)); - - ret.add(subtract(stack1, split.get(0))); - ret.add(add(stack2, split.get(0))); - } - else if(getSize(stack2) > getSize(stack1)) - { - int diff = getSize(stack2)-getSize(stack1); - - List split = split(size(stack2, diff)); - - ret.add(subtract(stack2, split.get(0))); - ret.add(add(stack1, split.get(0))); - } - - return ret; - } - - public static ItemStack add(ItemStack stack1, ItemStack stack2) - { - if(stack1 == null) - { - return stack2; - } - else if(stack2 == null) - { - return stack1; - } - - return size(stack1, getSize(stack1)+getSize(stack2)); - } - - public static ItemStack subtract(ItemStack stack1, ItemStack stack2) - { - if(stack1 == null) - { - return null; - } - else if(stack2 == null) - { - return stack1; - } - - return size(stack1, getSize(stack1)-getSize(stack2)); - } - - public static ItemStack size(ItemStack stack, int size) - { - if(size <= 0 || stack == null) - { - return null; - } - - ItemStack ret = stack.copy(); - ret.stackSize = size; - return ret; - } - - public static ItemStack copy(ItemStack stack) - { - if(stack == null) - { - return null; - } - - return stack.copy(); - } - - public static int getSize(ItemStack stack) - { - return stack != null ? stack.stackSize : 0; - } - - public static List getMergeRejects(ItemStack[] orig, ItemStack[] toAdd) - { - List ret = new ArrayList(); - - for(int i = 0; i < toAdd.length; i++) - { - if(toAdd[i] != null) - { - ItemStack reject = getMergeReject(orig[i], toAdd[i]); - - if(reject != null) - { - ret.add(reject); - } - } - } - - return ret; - } - - public static void merge(ItemStack[] orig, ItemStack[] toAdd) - { - for(int i = 0; i < toAdd.length; i++) - { - if(toAdd[i] != null) - { - orig[i] = merge(orig[i], toAdd[i]); - } - } - } - - public static ItemStack merge(ItemStack orig, ItemStack toAdd) - { - if(orig == null) - { - return toAdd; - } - - if(toAdd == null) - { - return orig; - } - - if(!orig.isItemEqual(toAdd) || !ItemStack.areItemStackTagsEqual(orig, toAdd)) - { - return orig; - } - - return StackUtils.size(orig, Math.min(orig.getMaxStackSize(), orig.stackSize+toAdd.stackSize)); - } - - public static ItemStack getMergeReject(ItemStack orig, ItemStack toAdd) - { - if(orig == null) - { - return null; - } - - if(toAdd == null) - { - return orig; - } - - if(!orig.isItemEqual(toAdd) || !ItemStack.areItemStackTagsEqual(orig, toAdd)) - { - return orig; - } - - int newSize = orig.stackSize+toAdd.stackSize; - - if(newSize > orig.getMaxStackSize()) - { - return StackUtils.size(orig, newSize-orig.getMaxStackSize()); - } - else { - return StackUtils.size(orig, newSize); - } - } - - public static boolean contains(ItemStack container, ItemStack contained) - { - return equalsWildcardWithNBT(contained, container) && container.stackSize >= contained.stackSize; - } - - public static int hashItemStack(ItemStack stack) - { - if(stack == null || stack.getItem() == null) - { - return -1; - } - - String name = stack.getItemDamage() == OreDictionary.WILDCARD_VALUE ? stack.getItem().getUnlocalizedName() : stack.getItem().getUnlocalizedName(stack); - return name.hashCode() << 8 | stack.getItemDamage(); - } -} diff --git a/src/api/java/mekanism/api/util/UnitDisplayUtils.java b/src/api/java/mekanism/api/util/UnitDisplayUtils.java deleted file mode 100644 index 9dd3e282..00000000 --- a/src/api/java/mekanism/api/util/UnitDisplayUtils.java +++ /dev/null @@ -1,295 +0,0 @@ -package mekanism.api.util; - -/** - * Code taken from UE and modified to fit Mekanism. - */ -public class UnitDisplayUtils -{ - public static enum ElectricUnit - { - JOULES("Joule", "J"), - REDSTONE_FLUX("Redstone Flux", "RF"), - MINECRAFT_JOULES("Minecraft Joule", "MJ"), - ELECTRICAL_UNITS("Electrical Unit", "EU"); - - public String name; - public String symbol; - - private ElectricUnit(String s, String s1) - { - name = s; - symbol = s1; - } - - public String getPlural() - { - return this == REDSTONE_FLUX ? name : name + "s"; - } - } - - public static enum TemperatureUnit - { - KELVIN("Kelvin", "K", 0, 1), - CELSIUS("Celsius", "°C", 273.15, 1), - RANKINE("Rankine", "R", 0, 9D/5D), - FAHRENHEIT("Fahrenheit", "°F", 459.67, 9D/5D), - AMBIENT("Ambient", "+STP", 300, 1); - - public String name; - public String symbol; - double zeroOffset; - double intervalSize; - - private TemperatureUnit(String s, String s1, double offset, double size) - { - name = s; - symbol = s1; - zeroOffset = offset; - intervalSize = size; - } - - public double convertFromK(double T) - { - return (T * intervalSize) - zeroOffset; - } - - public double convertToK(double T) - { - return (T + zeroOffset) / intervalSize; - } - } - - /** Metric system of measurement. */ - public static enum MeasurementUnit - { - FEMTO("Femto", "f", 0.000000000000001D), - PICO("Pico", "p", 0.000000000001D), - NANO("Nano", "n", 0.000000001D), - MICRO("Micro", "u", 0.000001D), - MILLI("Milli", "m", 0.001D), - BASE("", "", 1), - KILO("Kilo", "k", 1000D), - MEGA("Mega", "M", 1000000D), - GIGA("Giga", "G", 1000000000D), - TERA("Tera", "T", 1000000000000D), - PETA("Peta", "P", 1000000000000000D), - EXA("Exa", "E", 1000000000000000000D), - ZETTA("Zetta", "Z", 1000000000000000000000D), - YOTTA("Yotta", "Y", 1000000000000000000000000D); - - /** long name for the unit */ - public String name; - - /** short unit version of the unit */ - public String symbol; - - /** Point by which a number is consider to be of this unit */ - public double value; - - private MeasurementUnit(String s, String s1, double v) - { - name = s; - symbol = s1; - value = v; - } - - public String getName(boolean getShort) - { - if(getShort) - { - return symbol; - } - else { - return name; - } - } - - public double process(double d) - { - return d / value; - } - - public boolean above(double d) - { - return d > value; - } - - public boolean below(double d) - { - return d < value; - } - } - - /** - * Displays the unit as text. Does handle negative numbers, and will place a negative sign in - * front of the output string showing this. Use string.replace to remove the negative sign if - * unwanted - */ - public static String getDisplay(double value, ElectricUnit unit, int decimalPlaces, boolean isShort) - { - String unitName = unit.name; - String prefix = ""; - - if(value < 0) - { - value = Math.abs(value); - prefix = "-"; - } - - if(isShort) - { - unitName = unit.symbol; - } - else if(value > 1) - { - unitName = unit.getPlural(); - } - - if(value == 0) - { - return value + " " + unitName; - } - else { - for(int i = 0; i < MeasurementUnit.values().length; i++) - { - MeasurementUnit lowerMeasure = MeasurementUnit.values()[i]; - - if(lowerMeasure.below(value) && lowerMeasure.ordinal() == 0) - { - return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + " " + lowerMeasure.getName(isShort) + unitName; - } - - if(lowerMeasure.ordinal() + 1 >= MeasurementUnit.values().length) - { - return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + " " + lowerMeasure.getName(isShort) + unitName; - } - - MeasurementUnit upperMeasure = MeasurementUnit.values()[i + 1]; - - if((lowerMeasure.above(value) && upperMeasure.below(value)) || lowerMeasure.value == value) - { - return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + " " + lowerMeasure.getName(isShort) + unitName; - } - } - } - - return prefix + roundDecimals(value, decimalPlaces) + " " + unitName; - } - - public static String getDisplayShort(double value, ElectricUnit unit) - { - return getDisplay(value, unit, 2, true); - } - - public static String getDisplayShort(double value, ElectricUnit unit, int decimalPlaces) - { - return getDisplay(value, unit, decimalPlaces, true); - } - - public static String getDisplaySimple(double value, ElectricUnit unit, int decimalPlaces) - { - if(value > 1) - { - if(decimalPlaces < 1) - { - return (int)value + " " + unit.getPlural(); - } - - return roundDecimals(value, decimalPlaces) + " " + unit.getPlural(); - } - - if(decimalPlaces < 1) - { - return (int)value + " " + unit.name; - } - - return roundDecimals(value, decimalPlaces) + " " + unit.name; - } - - public static String getDisplay(double T, TemperatureUnit unit, int decimalPlaces, boolean isShort) - { - String unitName = unit.name; - String prefix = ""; - - double value = unit.convertFromK(T); - - if(value < 0) - { - value = Math.abs(value); - prefix = "-"; - } - - if(isShort) - { - unitName = unit.symbol; - } - - if(value == 0) - { - return value + (isShort ? "" : " ") + unitName; - } - else { - for(int i = 0; i < MeasurementUnit.values().length; i++) - { - MeasurementUnit lowerMeasure = MeasurementUnit.values()[i]; - - if(lowerMeasure.below(value) && lowerMeasure.ordinal() == 0) - { - return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + (isShort ? "" : " ") + lowerMeasure.getName(isShort) + unitName; - } - - if(lowerMeasure.ordinal() + 1 >= MeasurementUnit.values().length) - { - return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + (isShort ? "" : " ") + lowerMeasure.getName(isShort) + unitName; - } - - MeasurementUnit upperMeasure = MeasurementUnit.values()[i + 1]; - - if((lowerMeasure.above(value) && upperMeasure.below(value)) || lowerMeasure.value == value) - { - return prefix + roundDecimals(lowerMeasure.process(value), decimalPlaces) + (isShort ? "" : " ") + lowerMeasure.getName(isShort) + unitName; - } - } - } - - return prefix + roundDecimals(value, decimalPlaces) + (isShort ? "" : " ") + unitName; - } - - public static String getDisplayShort(double value, TemperatureUnit unit) - { - return getDisplay(value, unit, 2, true); - } - - public static String getDisplayShort(double value, TemperatureUnit unit, int decimalPlaces) - { - return getDisplay(value, unit, decimalPlaces, true); - } - - public static double roundDecimals(double d, int decimalPlaces) - { - int j = (int)(d*Math.pow(10, decimalPlaces)); - return j/Math.pow(10, decimalPlaces); - } - - public static double roundDecimals(double d) - { - return roundDecimals(d, 2); - } - - public static enum EnergyType - { - J, - RF, - EU, - MJ - } - - public static enum TempType - { - K, - C, - R, - F, - STP - } -} diff --git a/src/api/java/mekanism/api/util/package-info.java b/src/api/java/mekanism/api/util/package-info.java deleted file mode 100644 index e5253bcb..00000000 --- a/src/api/java/mekanism/api/util/package-info.java +++ /dev/null @@ -1,3 +0,0 @@ -@API(apiVersion = "8.0.0", owner = "Mekanism", provides = "MekanismAPI|util") -package mekanism.api.util; -import cpw.mods.fml.common.API; \ No newline at end of file diff --git a/src/api/java/mods/immibis/core/api/multipart/ICoverSystem.java b/src/api/java/mods/immibis/core/api/multipart/ICoverSystem.java deleted file mode 100644 index 001ee36b..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/ICoverSystem.java +++ /dev/null @@ -1,27 +0,0 @@ -package mods.immibis.core.api.multipart; - - -/** - * An object that allows extra parts to be added to multipart tiles. - * For example, you can add covers to InfiniTubes transport conduits - * because they use a MicroblockCoverSystem. - * - * This interface's existence is a bit unintuitive, but it seemed to "naturally fall out" of the design. - */ -public interface ICoverSystem extends IPartContainer { - /** - * Converts the block containing this cover system into - * a block containing only parts from this cover system, - * or to air if the cover system has no parts. - * - * Call it when, for example, all wires in a RedLogic wire block are destroyed, - * to replace it with a microblock container block if there were any microblocks - * in the wire block. - * - * TODO should this be called on the client, server or both? - * - * Note: For custom implementations, this should be capable of being called even after - * the block and tile entity are removed (and should resurrect them) - */ - public void convertToContainerBlock(); -} diff --git a/src/api/java/mods/immibis/core/api/multipart/ICoverableTile.java b/src/api/java/mods/immibis/core/api/multipart/ICoverableTile.java deleted file mode 100644 index d17d44fa..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/ICoverableTile.java +++ /dev/null @@ -1,11 +0,0 @@ -package mods.immibis.core.api.multipart; - - -/** Multipart tiles can also implement IPartContainer4 if they have their own parts (as well as cover system parts) */ -public interface ICoverableTile { - /** - * Returns an ICoverSystem object, or null if this tile does not support a cover system - * @see mods.immibis.core.api.multipart.ICoverSystem - */ - public ICoverSystem getCoverSystem(); -} diff --git a/src/api/java/mods/immibis/core/api/multipart/IMultipartRenderingBlockMarker.java b/src/api/java/mods/immibis/core/api/multipart/IMultipartRenderingBlockMarker.java deleted file mode 100644 index 7b95965d..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/IMultipartRenderingBlockMarker.java +++ /dev/null @@ -1,15 +0,0 @@ -package mods.immibis.core.api.multipart; - -import net.minecraft.client.renderer.RenderBlocks; - -/** - * If a Block class implements this, {@link IMultipartSystem#renderMultiparts(net.minecraft.world.IBlockAccess, int, int, int, net.minecraft.client.renderer.RenderBlocks)} - * will automatically be called for that block type (after the normal block renderer). - * This is implemented by a hooking {@link RenderBlocks#renderBlockByRenderType(net.minecraft.block.Block, int, int, int)}. - * - * (Instead of this, there used to be a transformer that would modify your getRenderType and use a wrapping ISBRH. - * That was unreliable, and could have affected unrelated things like mob AI, and didn't work with Railcraft, so - * it was dropped) - */ -public interface IMultipartRenderingBlockMarker { -} diff --git a/src/api/java/mods/immibis/core/api/multipart/IMultipartSystem.java b/src/api/java/mods/immibis/core/api/multipart/IMultipartSystem.java deleted file mode 100644 index 71cae502..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/IMultipartSystem.java +++ /dev/null @@ -1,65 +0,0 @@ -package mods.immibis.core.api.multipart; - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.Nonnull; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Provides methods allowing blocks to implement microblock ("covering") support. - * All of the methods in this class do nothing, but are overridden if Immibis Core is installed. - */ -public class IMultipartSystem { - - /** Immibis Core sets this to an actual implementation during load time */ - public static @Nonnull IMultipartSystem instance = new IMultipartSystem(); - - /** Call this from addCollisionBoxesToList for cover-supporting blocks. - * Returns true if the tile entity implements IPartContainer. - */ - public boolean hook_addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity entity) {return false;} - - /** Call this from getPickBlock for cover-supporting blocks. If it returns a non-null value, then return that. */ - public ItemStack hook_getPickBlock(MovingObjectPosition trace, World world, int blockX, int blockY, int blockZ, EntityPlayer player) {return null;} - - /** Call this from isSideSolid for cover-supporting blocks. If it returns true, then return true. */ - public boolean hook_isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) {return false;} - - /** Call this from addHitEffects for cover-supporting blocks. If it returns true, then return true without adding any custom effects. */ - @SideOnly(Side.CLIENT) - public boolean hook_addHitEffects(World world, MovingObjectPosition trace, EffectRenderer effectRenderer) {return false;} - - /** Call this from addDestroyEffects for cover-supporting blocks. If it returns true, then return true without adding any custom effects. */ - @SideOnly(Side.CLIENT) - public boolean hook_addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) {return false;} - - /** Call this from collisionRayTrace for cover-supporting blocks, before returning. Pass it the result you were going to return (even if that was null). */ - public MovingObjectPosition hook_collisionRayTrace(MovingObjectPosition normalResult, World world, int x, int y, int z, Vec3 src, Vec3 dst) {return normalResult;} - - /** Call this from getDrops for cover-supporting blocks, before returning. Pass it the result you were going to return. */ - public ArrayList hook_getDrops(List drops, World world, int x, int y, int z, int metadata, int fortune) {return drops instanceof ArrayList ? (ArrayList)drops : new ArrayList(drops);} - - /** Call this from your renderer's renderWorldBlock for cover-supporting blocks, before returning. - * If it returns true (indicating it rendered something), then return true. - * (Render your custom stuff regardless of what this returns) - * - * If there is a tile entity implementing ICoverableTile with a non-null cover system, it will call renderPartContainer on that. - * If there is a tile entity implementing IPartContainer, it will call renderPartContainer on that. - */ - @SideOnly(Side.CLIENT) - public boolean renderMultiparts(IBlockAccess world, int x, int y, int z, RenderBlocks renderer) {return false;} -} diff --git a/src/api/java/mods/immibis/core/api/multipart/IPartContainer.java b/src/api/java/mods/immibis/core/api/multipart/IPartContainer.java deleted file mode 100644 index 451c37d6..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/IPartContainer.java +++ /dev/null @@ -1,128 +0,0 @@ -package mods.immibis.core.api.multipart; - -import java.util.List; - -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * Contains common methods from ICoverSystem and IMultipartTile. - */ -public interface IPartContainer { - - /** - * Gets the speed at which a player breaks a part. - * See Block.getPlayerRelativeBlockHardness. - * @param ply The player. - * @param The part. - * @return The speed. - */ - float getPlayerRelativePartHardness(EntityPlayer ply, int part); - - /** - * Called when the player middle-clicks on a part. - * @param rayTrace The location under the player's crosshair. - * @param part The part number they middle-clicked on. - * @return The itemstack to pick. - */ - public ItemStack pickPart(MovingObjectPosition rayTrace, int part); - - /** - * Checks if a given face of this block is solid. - * Used to determine the result of Block.isBlockSolidOnSide. - */ - public boolean isPartContainerSideSolid(ForgeDirection side); - - /** - * Called when a player finishes breaking a part. - * @param ply The player breaking the part. - * @param subhit The part being broken. - * @param harvest Whether items/XP/etc should be dropped. - */ - public void removePartByPlayer(EntityPlayer ply, int part, boolean harvest); - - /** - * Returns the AABB of a part, in tile-local coordinates. - * Currently used for drawing the selection box. - * May return null, in which case no selection box is drawn. - * - * @param part The part ID to check. - * @return The AABB of the part, or null. - */ - public AxisAlignedBB getPartAABBFromPool(int part); - - /** - * Renders all the parts. - * @param render The render context. - * @return True if anything was rendered. - */ - @SideOnly(Side.CLIENT) - public boolean renderPartContainer(RenderBlocks render); - - /** - * Renders one part. - * @param render The render context. - * @param part The part number. - * @return True if anything was rendered. - */ - @SideOnly(Side.CLIENT) - public boolean renderPart(RenderBlocks render, int part); - - /** - * Creates particles when a part is destroyed. - * If the part number is invalid, returns false. - * Otherwise, creates particles if applicable, and returns true. - */ - @SideOnly(Side.CLIENT) - public boolean addPartDestroyEffects(int part, EffectRenderer er); - - /** - * Returns true if the given player can currently harvest the given part (using their selected item) - * @param player The player to check. - * @param part The index of the part the player is trying to harvest. - * @return True iff the player can harvest the part. - */ - public boolean canPlayerHarvestPart(EntityPlayer entityPlayer, int part); - - /** - * Adds the complete drops from this cover system to the given list. - * Note that is not normally used when breaking microblocks. - * @param drops The list to add the drops to. - * @param fortune The fortune level involved. - */ - public void getPartContainerDrops(List drops, int fortune); - - /** - * Creates particles when a part is punched. - * Returns false if anything goes wrong, which indicates to use the default particle effect. - * Otherwise, creates particles (if applicable), and returns true. - */ - @SideOnly(Side.CLIENT) - public boolean addPartHitEffects(int part, int sideHit, EffectRenderer er); - - /** - * Finds the closest intercept of the given ray with parts in this container. - * @param src The start of the ray, in world coordinates. - * @param dst The end of the ray, in world coordinates. - * @return A ray-trace result, or null if the ray does not intersect any parts. - */ - public MovingObjectPosition collisionRayTrace(Vec3 src, Vec3 dst); - - /** - * Returns all collision boxes that intersect the given mask, in world coordinates. - * @param mask The mask AABB, in world coordinates. - * @param list The list to add the returned boxes to. - * - * Used to implement Block.addCollisionBoxesToList. - */ - public void getCollidingBoundingBoxes(AxisAlignedBB mask, List list, Entity entity); -} diff --git a/src/api/java/mods/immibis/core/api/multipart/PartBreakEvent.java b/src/api/java/mods/immibis/core/api/multipart/PartBreakEvent.java deleted file mode 100644 index 3b2e3f4c..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/PartBreakEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package mods.immibis.core.api.multipart; - -import cpw.mods.fml.common.eventhandler.Cancelable; -import cpw.mods.fml.common.eventhandler.Event; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -/** - * Fired on the Forge event bus when a part finishes being broken. - * - * This is fired on both the client and server. - */ -@Cancelable -public class PartBreakEvent extends Event { - public final World world; - public final PartCoordinates coords; - public final EntityLivingBase player; - - public PartBreakEvent(World world, PartCoordinates coords, EntityLivingBase player) { - this.world = world; - this.coords = coords; - this.player = player; - } -} diff --git a/src/api/java/mods/immibis/core/api/multipart/PartCoordinates.java b/src/api/java/mods/immibis/core/api/multipart/PartCoordinates.java deleted file mode 100644 index 1a348d7c..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/PartCoordinates.java +++ /dev/null @@ -1,35 +0,0 @@ -package mods.immibis.core.api.multipart; - -public final class PartCoordinates { - public final int x, y, z, part; - public final boolean isCoverSystemPart; - public PartCoordinates(int x, int y, int z, int part, boolean isCoverSystemPart) { - this.x = x; - this.y = y; - this.z = z; - this.part = part; - this.isCoverSystemPart = isCoverSystemPart; - } - - @Override - public int hashCode() { - return ((x * 257 + y) * 257 + z) * 257 + part; - } - - @Override - public boolean equals(Object obj) { - if(obj == null) - return false; - try { - PartCoordinates o = (PartCoordinates)obj; - return x == o.x && y == o.y && z == o.z && part == o.part && isCoverSystemPart == o.isCoverSystemPart; - } catch(ClassCastException e) { - return false; - } - } - - @Override - public String toString() { - return "[" + x + "," + y + "," + z + ":" + part + "]"; - } -} diff --git a/src/api/java/mods/immibis/core/api/multipart/util/BlockMultipartBase.java b/src/api/java/mods/immibis/core/api/multipart/util/BlockMultipartBase.java deleted file mode 100644 index 25c9184a..00000000 --- a/src/api/java/mods/immibis/core/api/multipart/util/BlockMultipartBase.java +++ /dev/null @@ -1,100 +0,0 @@ -package mods.immibis.core.api.multipart.util; - - -import java.util.ArrayList; -import java.util.List; - -import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker; -import mods.immibis.core.api.multipart.IMultipartSystem; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - - -public abstract class BlockMultipartBase extends BlockContainer implements IMultipartRenderingBlockMarker { - - protected BlockMultipartBase(Material mat) { - super(mat); - - setHardness(1); // the block hardness must not be zero. - // if using IPartContainer tiles, the block hardness should be irrelevant, but still can't be zero. - } - - - - - @Override public final boolean isOpaqueCube() {return false;} - @Override public final boolean renderAsNormalBlock() {return false;} - @Override public boolean shouldSideBeRendered(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) {return true;} - - - - - - @Override - public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) { - ItemStack coverPick = IMultipartSystem.instance.hook_getPickBlock(target, world, x, y, z, player); - if(coverPick != null) - return coverPick; - - return super.getPickBlock(target, world, x, y, z, player); - } - - @Override - public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - if(IMultipartSystem.instance.hook_isSideSolid(world, x, y, z, side)) - return true; - - return super.isSideSolid(world, x, y, z, side); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addDestroyEffects(World world, int x, int y, int z, int meta, EffectRenderer effectRenderer) { - if(IMultipartSystem.instance.hook_addDestroyEffects(world, x, y, z, meta, effectRenderer)) - return true; - - return super.addDestroyEffects(world, x, y, z, meta, effectRenderer); - } - - @SideOnly(Side.CLIENT) - @Override - public boolean addHitEffects(World worldObj, MovingObjectPosition target, EffectRenderer effectRenderer) { - if(IMultipartSystem.instance.hook_addHitEffects(worldObj, target, effectRenderer)) - return true; - - return super.addHitEffects(worldObj, target, effectRenderer); - } - - @Override - public MovingObjectPosition collisionRayTrace(World world, int x, int y, int z, Vec3 src, Vec3 dst) { - return IMultipartSystem.instance.hook_collisionRayTrace(super.collisionRayTrace(world, x, y, z, src, dst), world, x, y, z, src, dst); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - @Override - public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List list, Entity entity) { - // Note: if you're implementing this yourself (instead of extending this class) you don't need to check the - // return value of hook_addCollisionBlocksToList. - // The check is to allow BlockMultipartBase to work with both multipart and normal blocks. - if(!IMultipartSystem.instance.hook_addCollisionBoxesToList(world, x, y, z, mask, list, entity)) - super.addCollisionBoxesToList(world, x, y, z, mask, list, entity); - } - - - @Override - public ArrayList getDrops(World world, int x, int y, int z, int metadata, int fortune) { - return IMultipartSystem.instance.hook_getDrops(super.getDrops(world, x, y, z, metadata, fortune), world, x, y, z, metadata, fortune); - } -} diff --git a/src/api/java/mods/immibis/core/api/util/Dir.java b/src/api/java/mods/immibis/core/api/util/Dir.java deleted file mode 100644 index 142fbd9d..00000000 --- a/src/api/java/mods/immibis/core/api/util/Dir.java +++ /dev/null @@ -1,13 +0,0 @@ -package mods.immibis.core.api.util; - -public final class Dir { - private Dir() {} - - public static final int NY = 0; - public static final int PY = 1; - public static final int NZ = 2; - public static final int PZ = 3; - public static final int NX = 4; - public static final int PX = 5; - -} diff --git a/src/api/java/mods/immibis/microblocks/api/EnumAxisPosition.java b/src/api/java/mods/immibis/microblocks/api/EnumAxisPosition.java deleted file mode 100644 index 1949ca3b..00000000 --- a/src/api/java/mods/immibis/microblocks/api/EnumAxisPosition.java +++ /dev/null @@ -1,16 +0,0 @@ -package mods.immibis.microblocks.api; - -public enum EnumAxisPosition { - Negative, - Positive, - Centre, - Span; - - public boolean touchesNegative() { - return this == Negative || this == Span; - } - - public boolean touchesPositive() { - return this == Positive || this == Span; - } -} diff --git a/src/api/java/mods/immibis/microblocks/api/EnumPartClass.java b/src/api/java/mods/immibis/microblocks/api/EnumPartClass.java deleted file mode 100644 index 859b8904..00000000 --- a/src/api/java/mods/immibis/microblocks/api/EnumPartClass.java +++ /dev/null @@ -1,10 +0,0 @@ -package mods.immibis.microblocks.api; - - -public enum EnumPartClass { - Centre, - Panel, - HollowPanel, - Strip, - Corner -} diff --git a/src/api/java/mods/immibis/microblocks/api/EnumPosition.java b/src/api/java/mods/immibis/microblocks/api/EnumPosition.java deleted file mode 100644 index 09ce9ae4..00000000 --- a/src/api/java/mods/immibis/microblocks/api/EnumPosition.java +++ /dev/null @@ -1,131 +0,0 @@ -package mods.immibis.microblocks.api; - -import static mods.immibis.microblocks.api.EnumAxisPosition.*; -import static mods.immibis.microblocks.api.EnumPositionClass.*; -import mods.immibis.core.api.util.Dir; - -public enum EnumPosition { - // DO NOT CHANGE ORDER - Ordinals are saved in NBT - // Changing order WILL break existing saves! - - Centre(EnumAxisPosition.Centre, EnumAxisPosition.Centre, EnumAxisPosition.Centre, EnumPositionClass.Centre), - FaceNX(Negative, Span, Span, Face), - FacePX(Positive, Span, Span, Face), - FaceNY(Span, Negative, Span, Face), - FacePY(Span, Positive, Span, Face), - FaceNZ(Span, Span, Negative, Face), - FacePZ(Span, Span, Positive, Face), - EdgeNXNY(Negative, Negative, Span, Edge), - EdgeNXPY(Negative, Positive, Span, Edge), - EdgePXNY(Positive, Negative, Span, Edge), - EdgePXPY(Positive, Positive, Span, Edge), - EdgeNXNZ(Negative, Span, Negative, Edge), - EdgeNXPZ(Negative, Span, Positive, Edge), - EdgePXNZ(Positive, Span, Negative, Edge), - EdgePXPZ(Positive, Span, Positive, Edge), - EdgeNYNZ(Span, Negative, Negative, Edge), - EdgeNYPZ(Span, Negative, Positive, Edge), - EdgePYNZ(Span, Positive, Negative, Edge), - EdgePYPZ(Span, Positive, Positive, Edge), - CornerNXNYNZ(Negative, Negative, Negative, Corner), - CornerNXNYPZ(Negative, Negative, Positive, Corner), - CornerNXPYNZ(Negative, Positive, Negative, Corner), - CornerNXPYPZ(Negative, Positive, Positive, Corner), - CornerPXNYNZ(Positive, Negative, Negative, Corner), - CornerPXNYPZ(Positive, Negative, Positive, Corner), - CornerPXPYNZ(Positive, Positive, Negative, Corner), - CornerPXPYPZ(Positive, Positive, Positive, Corner), - - PostX(Span, EnumAxisPosition.Centre, EnumAxisPosition.Centre, Post), - PostY(EnumAxisPosition.Centre, Span, EnumAxisPosition.Centre, Post), - PostZ(EnumAxisPosition.Centre, EnumAxisPosition.Centre, Span, Post), - - ; - - private EnumPosition(EnumAxisPosition x, EnumAxisPosition y, EnumAxisPosition z, EnumPositionClass clazz) { - this.x = x; - this.y = y; - this.z = z; - this.clazz = clazz; - } - - public final EnumAxisPosition x, y, z; - public final EnumPositionClass clazz; - - public static EnumPosition getCornerPosition(int x, int y, int z) { - if(x < 0) - if(y < 0) - if(z < 0) - return CornerNXNYNZ; - else - return CornerNXNYPZ; - else - if(z < 0) - return CornerNXPYNZ; - else - return CornerNXPYPZ; - else - if(y < 0) - if(z < 0) - return CornerPXNYNZ; - else - return CornerPXNYPZ; - else - if(z < 0) - return CornerPXPYNZ; - else - return CornerPXPYPZ; - } - - private static EnumPosition edgePositionLookup[][] = { - {null, null, EdgeNYNZ, EdgeNYPZ, EdgeNXNY, EdgePXNY}, - {null, null, EdgePYNZ, EdgePYPZ, EdgeNXPY, EdgePXPY}, - {EdgeNYNZ, EdgePYNZ, null, null, EdgeNXNZ, EdgePXNZ}, - {EdgeNYPZ, EdgePYPZ, null, null, EdgeNXPZ, EdgePXPZ}, - {EdgeNXNY, EdgeNXPY, EdgeNXNZ, EdgeNXPZ, null, null}, - {EdgePXNY, EdgePXPY, EdgePXNZ, EdgePXPZ, null, null}, - }; - - private static boolean edgeTouches(EnumPosition edge, int face) { - switch(face) { - case Dir.NX: return edge.x == EnumAxisPosition.Negative; - case Dir.PX: return edge.x == EnumAxisPosition.Positive; - case Dir.NY: return edge.y == EnumAxisPosition.Negative; - case Dir.PY: return edge.y == EnumAxisPosition.Positive; - case Dir.NZ: return edge.z == EnumAxisPosition.Negative; - case Dir.PZ: return edge.z == EnumAxisPosition.Positive; - } - throw new IllegalArgumentException("Invalid face "+face); - } - - static { - for(int a = 0; a < 6; a++) - for(int b = 0; b < 6; b++) - assert(edgePositionLookup[a][b] == null || (edgeTouches(edgePositionLookup[a][b], a) && edgeTouches(edgePositionLookup[a][b], b))); - } - - /** - * Returns the edge microblock position that intersects both the given faces. - * - * @param side1 One of the faces. - * @param side2 The other face. - * @return The matching microblock position, or null for invalid face combinations (eg +Y and -Y) - */ - public static EnumPosition getEdgePosition(int side1, int side2) { - if(side1 < 0 || side2 < 0 || side1 > 5 || side2 > 5) - return null; - return edgePositionLookup[side2][side1]; - } - - public static EnumPosition getFacePosition(int side) { - switch(side) { - case Dir.NX: return FaceNX; - case Dir.PX: return FacePX; - case Dir.NY: return FaceNY; - case Dir.PY: return FacePY; - case Dir.NZ: return FaceNZ; - case Dir.PZ: return FacePZ; - default: throw new IllegalArgumentException("Invalid direction: "+side); - } - } -} diff --git a/src/api/java/mods/immibis/microblocks/api/EnumPositionClass.java b/src/api/java/mods/immibis/microblocks/api/EnumPositionClass.java deleted file mode 100644 index cb4baba5..00000000 --- a/src/api/java/mods/immibis/microblocks/api/EnumPositionClass.java +++ /dev/null @@ -1,10 +0,0 @@ -package mods.immibis.microblocks.api; - - -public enum EnumPositionClass { - Centre, - Face, - Edge, - Corner, - Post, -} diff --git a/src/api/java/mods/immibis/microblocks/api/IMicroblockCoverSystem.java b/src/api/java/mods/immibis/microblocks/api/IMicroblockCoverSystem.java deleted file mode 100644 index 527e1145..00000000 --- a/src/api/java/mods/immibis/microblocks/api/IMicroblockCoverSystem.java +++ /dev/null @@ -1,82 +0,0 @@ -package mods.immibis.microblocks.api; - - -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.util.Collection; - -import mods.immibis.core.api.multipart.ICoverSystem; -import net.minecraft.nbt.NBTTagCompound; - -/** Not intended to be implemented outside of the Immibis's Microblocks mod. */ -public interface IMicroblockCoverSystem extends ICoverSystem, IMicroblockIntegratedTile { - /** - * Returns the position of a part. - * - * @param part The part number. - * @return The part's position, or null if it's an invalid part. - */ - @Override - EnumPosition getPartPosition(int part); - - boolean addPart(Part part); - - /** - * Returns true if tubes/cables/etc that use the centre of the block - * can connect through the specified side - ie if it is not blocked by a non-hollow cover. - */ - boolean isSideOpen(int side); - - /** - * Serializes the microblocks to a byte array. - */ - byte[] writeDescriptionBytes(); - - /** - * Unserializes the microblocks from a byte array. - */ - void readDescriptionBytes(byte[] data, int start); - - /** - * Serializes the microblocks to a DataOutput. - */ - void writeDescriptionPacket(DataOutput data) throws IOException; - - /** - * Unserializes the microblocks from a DataInput. - */ - void readDescriptionPacket(DataInput data) throws IOException; - - /** - * Serializes the microblocks to NBT. - * Data will be stored in the "ICMP" key of the given compound tag. - */ - void writeToNBT(NBTTagCompound tag); - - /** - * Unserializes the microblocks from NBT. - * Data will be read from the "ICMP" key of the given compound tag. - */ - void readFromNBT(NBTTagCompound tag); - - /** - * Returns true if there is a part in the specified position. - */ - boolean isPositionOccupied(EnumPosition pos); - - /** - * Returns all parts in this block. - */ - Collection getAllParts(); - - /** - * Checks if an edge is unused (for example, if wire connections can connect around corners through it) - * Returns the same result if face1 and face2 are swapped. - * - * @param face1 One face bordering the edge to check. - * @param face2 The other face bordering the edge to check. - * @return True if the edge is unused. - */ - public boolean isEdgeOpen(int face1, int face2); -} diff --git a/src/api/java/mods/immibis/microblocks/api/IMicroblockIntegratedTile.java b/src/api/java/mods/immibis/microblocks/api/IMicroblockIntegratedTile.java deleted file mode 100644 index 22c08811..00000000 --- a/src/api/java/mods/immibis/microblocks/api/IMicroblockIntegratedTile.java +++ /dev/null @@ -1,27 +0,0 @@ -package mods.immibis.microblocks.api; - -/** - * If you have an IMicroblockSupporterTile that is also an IPartContainer, - * you should implement this for better integration. - * - * You might, in rare circumstances, want to implement it just for isPositionOccupied, without being an IPartContainer. - */ -public interface IMicroblockIntegratedTile { - /** - * Returns the microblock position a tile-owned part mainly occupies, or null if - * unknown or the part occupies the whole block. - * Used to determine the position of new microblocks placed by the player. - * - * If this tile doesn't implement IPartContainer as well, this is never called. - * - * @param subHit The part index. - * @return The position the part occupies. - */ - public EnumPosition getPartPosition(int index); - - /** - * Returns true if the given position is occupied by the tile. - * Does not check for collisions with other positions. - */ - public boolean isPositionOccupied(EnumPosition pos); -} diff --git a/src/api/java/mods/immibis/microblocks/api/IMicroblockPermissionHandler.java b/src/api/java/mods/immibis/microblocks/api/IMicroblockPermissionHandler.java deleted file mode 100644 index ff00b764..00000000 --- a/src/api/java/mods/immibis/microblocks/api/IMicroblockPermissionHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package mods.immibis.microblocks.api; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -public interface IMicroblockPermissionHandler { - /** - * Returns true if this permission handler wants to prevent placing a microblock. - * This is called on both the client and the server. - * - * @param player The player placing a part. - * @param w The world. - * @param x The x coordinate of the microblock container block. - * @param y The y coordinate of the microblock container block. - * @param z The z coordinate of the microblock container block. - * @param p The part being placed. - */ - public boolean doesPreventPlacing(EntityPlayer player, World w, int x, int y, int z, Part p); - - /** - * Returns true if this permission handler wants to prevent breaking a microblock. - * This is called on both the client and the server. - * - * Not currently implemented. If you want to use this, get immibis to finish it. - * - * @param player The player breaking a part. - * @param w The world. - * @param x The x coordinate of the microblock container block. - * @param y The y coordinate of the microblock container block. - * @param z The z coordinate of the microblock container block. - * @param tile The microblock container tile entity. - * @param p The part being broken. - */ - public boolean doesPreventBreaking(EntityPlayer player, World w, int x, int y, int z, IMicroblockSupporterTile tile, Part p); -} diff --git a/src/api/java/mods/immibis/microblocks/api/IMicroblockSupporterTile.java b/src/api/java/mods/immibis/microblocks/api/IMicroblockSupporterTile.java deleted file mode 100644 index 2fd00a5a..00000000 --- a/src/api/java/mods/immibis/microblocks/api/IMicroblockSupporterTile.java +++ /dev/null @@ -1,27 +0,0 @@ -package mods.immibis.microblocks.api; - -import mods.immibis.core.api.multipart.ICoverableTile; - -/** - * A multipart tile that is compatible with microblocks. - * Only tile entities should implement this. - */ -public interface IMicroblockSupporterTile extends ICoverableTile { - /** - * Returns true if the tile is "in the way" of this part and will prevent it being placed. - * @param type The type of part being placed. - * @param pos The position the part is being placed in. - * @return False to prevent part placement, otherwise true. - */ - public boolean isPlacementBlocked(PartType type, EnumPosition pos); - - @Override - public IMicroblockCoverSystem getCoverSystem(); - - /** - * Called after microblocks are added or removed. - * - * You should probably at least call World.markBlockForUpdate and world.notifyBlocksOfNeighborChange. - */ - public void onMicroblocksChanged(); -} diff --git a/src/api/java/mods/immibis/microblocks/api/IMicroblockSystem.java b/src/api/java/mods/immibis/microblocks/api/IMicroblockSystem.java deleted file mode 100644 index d5919532..00000000 --- a/src/api/java/mods/immibis/microblocks/api/IMicroblockSystem.java +++ /dev/null @@ -1,48 +0,0 @@ -package mods.immibis.microblocks.api; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -public interface IMicroblockSystem { - - /** - * Creates a microblock ICoverSystem. - * @param tile The tile entity this IMicroblockCoverSystem is for. - */ - IMicroblockCoverSystem createMicroblockCoverSystem(IMicroblockSupporterTile tile); - - /** - * Allows the given block to be cut up. - * Your block must have a reasonable implementation of getBlockTextureFromSideAndMetadata. - * Part IDs will be assigned automatically based on the block ID and metadata value. - */ - void addCuttableBlock(Block block, int meta); - - /** - * Returns a part type, given its ID. - */ - PartType getPartTypeByID(int id); - - Block getMicroblockContainerBlock(); - - - /** - * Registers a custom part type. - * @throw IllegalArgumentException if the part type ID is already in use. - */ - void registerPartType(PartType type) throws IllegalArgumentException; - - - /** - * Creates an item stack of microblocks with the given part type ID and stack size. - * @throw IllegalArgumentException if there is no part type with the given ID. - */ - ItemStack partTypeIDToItemStack(int id, int stackSize) throws IllegalArgumentException; - - /** - * Gets the part ID from an item stack. - * @throw NullPointerException if stack == null - * @throw IllegalArgumentException if stack is not a stack of microblocks - */ - int itemStackToPartID(ItemStack stack) throws NullPointerException, IllegalArgumentException; -} diff --git a/src/api/java/mods/immibis/microblocks/api/IMicroblockSystem2.java b/src/api/java/mods/immibis/microblocks/api/IMicroblockSystem2.java deleted file mode 100644 index 14b57bee..00000000 --- a/src/api/java/mods/immibis/microblocks/api/IMicroblockSystem2.java +++ /dev/null @@ -1,32 +0,0 @@ -package mods.immibis.microblocks.api; - -public interface IMicroblockSystem2 extends IMicroblockSystem { - /** - * Adds a microblock permission handler. - * - * You cannot register two permission handlers with the same name. - * You are recommended to make the name start with your mod ID. - * You are recommended to make the name human readable. - * - * This method may be called from any thread at any time. - * - * @param name A name identifying this permission handler. - * @param handler The permission handler object. - * - * @throws IllegalArgumentException If name is null, handler is null, or - * a permission handler is already registered with the same name, or - * the permission handler is already registered. - */ - public void addPermissionHandler(String name, IMicroblockPermissionHandler handler); - - /** - * Removes a permission handler. - * - * This method may be called from any thread at any time. - * - * @param handler The permission handler object. - * - * @throws IllegalArgumentException If handler is null, or the permission handler is not registered. - */ - public void removePermissionHandler(IMicroblockPermissionHandler handler); -} diff --git a/src/api/java/mods/immibis/microblocks/api/MicroblockAPIUtils.java b/src/api/java/mods/immibis/microblocks/api/MicroblockAPIUtils.java deleted file mode 100644 index 84de4798..00000000 --- a/src/api/java/mods/immibis/microblocks/api/MicroblockAPIUtils.java +++ /dev/null @@ -1,70 +0,0 @@ -package mods.immibis.microblocks.api; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class MicroblockAPIUtils { - private static IMicroblockSystem cachedIMS; - private static boolean haveCachedIMS; - public static synchronized IMicroblockSystem getMicroblockSystem() { - if(!haveCachedIMS) { - try { - cachedIMS = (IMicroblockSystem)Class.forName("mods.immibis.microblocks.MicroblockSystem").getField("instance").get(null); - haveCachedIMS = true; - } catch(ClassNotFoundException e) { - cachedIMS = null; - haveCachedIMS = true; - } catch(RuntimeException e) { - throw e; - } catch(Exception e) { - throw (AssertionError)new AssertionError("should not happen").initCause(e); - } - } - return cachedIMS; - } - - public static IMicroblockCoverSystem createMicroblockCoverSystem(IMicroblockSupporterTile tile) { - IMicroblockSystem ims = getMicroblockSystem(); - return ims == null ? null : ims.createMicroblockCoverSystem(tile); - } - - public static Block getMicroblockContainerBlock() { - IMicroblockSystem ims = getMicroblockSystem(); - return ims == null ? null : ims.getMicroblockContainerBlock(); - } - - public static PartType getPartTypeByID(int i) { - IMicroblockSystem ims = getMicroblockSystem(); - return ims == null ? null : ims.getPartTypeByID(i); - } - - /** - * If there is a microblock container block at the specified coordinates, this function will save the parts in that block, - * place a new block, restore the parts, and return true. - * If there is not a microblock container block at the specified coordinates, or placing the block fails, it will - * return false. - * The new block must have a tile entity which implements IMicroblockSupporterTile and has a non-null IMicroblockCoverSystem. - */ - public static boolean mergeIntoMicroblockContainer(ItemStack itemstack, EntityPlayer entityplayer, World world, int x, int y, int z, int l, Block newBlock, int newMetadata) - { - Block microblockContainerBlock = getMicroblockContainerBlock(); - if(microblockContainerBlock == null || world.getBlock(x, y, z) != microblockContainerBlock) - return false; - - IMicroblockSupporterTile tm = (IMicroblockSupporterTile)world.getTileEntity(x, y, z); - IMicroblockCoverSystem oldCI = tm.getCoverSystem(); - if(!world.setBlock(x, y, z, newBlock, newMetadata, 2)) - return false; - - IMicroblockSupporterTile tcb = (IMicroblockSupporterTile)world.getTileEntity(x, y, z); - IMicroblockCoverSystem newCI = tcb.getCoverSystem(); - - for(Part p : oldCI.getAllParts()) - newCI.addPart(p); - - newBlock.onBlockPlacedBy(world, x, y, z, entityplayer, itemstack); - return true; - } -} diff --git a/src/api/java/mods/immibis/microblocks/api/Part.java b/src/api/java/mods/immibis/microblocks/api/Part.java deleted file mode 100644 index c29c97ea..00000000 --- a/src/api/java/mods/immibis/microblocks/api/Part.java +++ /dev/null @@ -1,100 +0,0 @@ -package mods.immibis.microblocks.api; - -import java.io.DataOutput; - -import net.minecraft.client.particle.EffectRenderer; -import net.minecraft.nbt.NBTBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class Part { - public final PartType type; - public final EnumPosition pos; - - public Part(PartType type, EnumPosition pos) { - this.type = type; - this.pos = pos; - } - - private static double getMinFromAxisPosition(EnumAxisPosition ap, double size) { - switch(ap) { - case Span: - case Negative: - return 0; - case Positive: - return 1 - size; - case Centre: - return (1 - size) / 2; - default: - throw new IllegalArgumentException("ap"); - } - } - private static double getMaxFromAxisPosition(EnumAxisPosition ap, double size) { - switch(ap) { - case Span: - case Positive: - return 1; - case Negative: - return size; - case Centre: - return (1 + size) / 2; - default: - throw new IllegalArgumentException("ap"); - } - } - - public AxisAlignedBB getBoundingBoxFromPool() { - return getBoundingBoxFromPool(pos, type.getSize()); - } - - public static AxisAlignedBB getBoundingBoxFromPool(EnumPosition pos, double size) { - double minx = getMinFromAxisPosition(pos.x, size); - double miny = getMinFromAxisPosition(pos.y, size); - double minz = getMinFromAxisPosition(pos.z, size); - double maxx = getMaxFromAxisPosition(pos.x, size); - double maxy = getMaxFromAxisPosition(pos.y, size); - double maxz = getMaxFromAxisPosition(pos.z, size); - return AxisAlignedBB.getBoundingBox(minx, miny, minz, maxx, maxy, maxz); - } - - public NBTBase writeToNBT() { - NBTTagCompound c = new NBTTagCompound(); - c.setInteger("type", type.getID()); - c.setByte("pos", (byte)pos.ordinal()); - return c; - } - - public static Part readFromNBT(NBTBase tag) { - NBTTagCompound c = (NBTTagCompound)tag; - PartType type = MicroblockAPIUtils.getMicroblockSystem().getPartTypeByID(c.getInteger("type")); - if(type == null) - return null; - EnumPosition pos = EnumPosition.values()[c.getByte("pos")]; - Part p = type.createPart(pos, c); - return p; - } - - /** - * You can override this in subclasses of Part to send extra data to clients in the description packet. - * As this data is included in every description packet, try to keep it short. - * The data is received by {@link PartType#createPart(EnumPosition, java.io.DataInput)}. - */ - public void writeExtraData(DataOutput data) { - } - - /** - * Implement this to have block destroy particles. - */ - @SideOnly(Side.CLIENT) - public void addPartDestroyEffects(IMicroblockSupporterTile tile, EffectRenderer er) { - } - - /** - * Implement this to have block hit particles. - */ - @SideOnly(Side.CLIENT) - public void addPartHitEffects(IMicroblockSupporterTile tile, int sideHit, EffectRenderer er) { - } -} diff --git a/src/api/java/mods/immibis/microblocks/api/PartType.java b/src/api/java/mods/immibis/microblocks/api/PartType.java deleted file mode 100644 index e7cc336d..00000000 --- a/src/api/java/mods/immibis/microblocks/api/PartType.java +++ /dev/null @@ -1,105 +0,0 @@ -package mods.immibis.microblocks.api; - -import java.io.DataInput; - -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderGlobal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public interface PartType { - public EnumPartClass getPartClass(); - public double getSize(); - public int getID(); - - public String getLocalizedName(ItemStack stack); - - public boolean canHarvest(EntityPlayer ply, PartClass part); - - /** - * Renders the preview of a part of this type. - * Previews are shown when the player is holding a microblock stack of this type. - * - * The modelview matrix is set so that 0,0,0 and 1,1,1 are the corners of the block to render in. - * No other OpenGL state is set - in particular blending is disabled. - * - * @param context The RenderGlobal object. - * @param pos The microblock position to render the preview at. - * @param stack The item stack the player is holding. - */ - @SideOnly(Side.CLIENT) - public void renderPreview(RenderGlobal context, EnumPosition pos, ItemStack stack); - - /** - * Renders the part as an item. - * Rendering should be centered within the box (0,0,0) to (1,1,1). - * - * @param context The RenderBlocks object. - * @param stack The item stack. - */ - @SideOnly(Side.CLIENT) - void renderPartInv(RenderBlocks context, ItemStack stack); - - /** - * Returns the item stack dropped when a part with this type is broken. - * - * @param part The part being broken. - * @param ply The player who broke the part, or null if unknown. - */ - public ItemStack getDroppedStack(Part part, EntityPlayer ply); - - /** - * @see net.minecraft.block.Block#getPlayerRelativeBlockHardness(EntityPlayer, net.minecraft.world.World, int, int, int) - */ - public float getPlayerRelativeHardness(Part part, EntityPlayer ply); - - /** - * Returns the item picked when a player middle-clicks on this part in creative. - */ - public ItemStack getPickItem(Part part); - - /** - * Renders a part with this type in the world. - * @param render The RenderBlocks object. - * @param p The part to render. - * @param x The X coordinate of the block containing the part. - * @param y The Y coordinate of the block containing the part. - * @param z The Z coordinate of the block containing the part. - * @param dontRenderSides An array of booleans corresponding to directions. - * If dontRenderSides[direction] is true, then that side should not be rendered if it touches the edge of the block space. - */ - @SideOnly(Side.CLIENT) - public void renderPartWorld(RenderBlocks render, Part p, int x, int y, int z, boolean[] dontRenderSides); - - /** - * Creates a part with this type and deserializes any extra data that you may have written in {@link Part#writeExtraData()}. - * Intended to allow mods to use custom subclasses of Part. - */ - @SideOnly(Side.CLIENT) - public Part createPart(EnumPosition pos, DataInput data); - - /** - * Creates a part with this type. - * Intended to allow mods to use custom subclasses of Part. - */ - public Part createPart(EnumPosition pos); - - /** - * Creates a part with this type and deserializes any extra data from NBT. - * Intended to allow mods to use custom subclasses of Part. - */ - public Part createPart(EnumPosition pos, NBTTagCompound c); - - /** - * Returns true if this part is completely opaque. - */ - public boolean isOpaque(); - - /** - * Returns true if this player can harvest this part. - */ - public boolean canHarvest(Part part, EntityPlayer entityPlayer); -} diff --git a/src/api/java/mods/immibis/microblocks/api/PartType2.java b/src/api/java/mods/immibis/microblocks/api/PartType2.java deleted file mode 100644 index be32d49b..00000000 --- a/src/api/java/mods/immibis/microblocks/api/PartType2.java +++ /dev/null @@ -1,8 +0,0 @@ -package mods.immibis.microblocks.api; - -public interface PartType2 extends PartType { - /** - * @return The light level emitted by this part, from 0 to 15. - */ - public int getLightLevel(); -} diff --git a/src/api/java/mods/immibis/microblocks/api/util/TileCoverableBase.java b/src/api/java/mods/immibis/microblocks/api/util/TileCoverableBase.java deleted file mode 100644 index 5dadfc7e..00000000 --- a/src/api/java/mods/immibis/microblocks/api/util/TileCoverableBase.java +++ /dev/null @@ -1,78 +0,0 @@ -package mods.immibis.microblocks.api.util; - - -import mods.immibis.microblocks.api.IMicroblockCoverSystem; -import mods.immibis.microblocks.api.IMicroblockSupporterTile; -import mods.immibis.microblocks.api.IMicroblockSystem; -import mods.immibis.microblocks.api.MicroblockAPIUtils; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; - -/** - * Convenience class for microblock supporting tiles. - * Handles creating an ICoverSystem, saving and loading it, - * and implements getCollidingBoundingBoxes and collisionRayTrace. - */ -public abstract class TileCoverableBase extends TileEntity implements IMicroblockSupporterTile { - - protected IMicroblockCoverSystem cover; - - public TileCoverableBase() { - IMicroblockSystem ims = MicroblockAPIUtils.getMicroblockSystem(); - if(ims != null) - cover = ims.createMicroblockCoverSystem(this); - } - - @Override - public void writeToNBT(NBTTagCompound tag) { - super.writeToNBT(tag); - if(cover != null) - cover.writeToNBT(tag); - } - - @Override - public Packet getDescriptionPacket() { - if(cover == null) - return null; - - NBTTagCompound tag = new NBTTagCompound(); - tag.setByteArray("C", cover.writeDescriptionBytes()); - S35PacketUpdateTileEntity p = new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, 0, tag); - return p; - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - if(cover != null) - cover.readDescriptionBytes(pkt.func_148857_g().getByteArray("C"), 0); - } - - @Override - public void readFromNBT(NBTTagCompound tag) { - super.readFromNBT(tag); - if(cover != null) - cover.readFromNBT(tag); - } - - @Override - public IMicroblockCoverSystem getCoverSystem() { - return cover; - } - - @Override - public void onMicroblocksChanged() { - worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockType()); - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - - public void convertToCoverContainerBlock() { - if(getCoverSystem() != null) - getCoverSystem().convertToContainerBlock(); - else - worldObj.setBlockToAir(xCoord, yCoord, zCoord); - } - -} diff --git a/src/api/java/mods/immibis/microblocks/api/util/TileCoverableMultipartBase.java b/src/api/java/mods/immibis/microblocks/api/util/TileCoverableMultipartBase.java deleted file mode 100644 index 7ec86ce5..00000000 --- a/src/api/java/mods/immibis/microblocks/api/util/TileCoverableMultipartBase.java +++ /dev/null @@ -1,60 +0,0 @@ -package mods.immibis.microblocks.api.util; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import mods.immibis.core.api.multipart.IPartContainer; -import mods.immibis.microblocks.api.IMicroblockIntegratedTile; - -public abstract class TileCoverableMultipartBase extends TileCoverableBase implements IPartContainer, IMicroblockIntegratedTile { - protected abstract int getNumTileOwnedParts(); - - private static MovingObjectPosition getCloserMOP(MovingObjectPosition a, MovingObjectPosition b, Vec3 src) { - if(a == null) return b; - if(b == null) return a; - - double ciDistSq = a.hitVec.squareDistanceTo(src); - double normalDistSq = b.hitVec.squareDistanceTo(src); - - return ciDistSq < normalDistSq ? a : b; - } - - @Override - public MovingObjectPosition collisionRayTrace(Vec3 src, Vec3 dst) { - MovingObjectPosition result = null; - - for(int k = 0, num = getNumTileOwnedParts(); k < num; k++) { - AxisAlignedBB partBB = getPartAABBFromPool(k); - if(partBB != null) { - partBB.offset(xCoord, yCoord, zCoord); - MovingObjectPosition intersect = partBB.calculateIntercept(src, dst); - if(intersect != null) { - intersect.subHit = k; - intersect.typeOfHit = MovingObjectPosition.MovingObjectType.BLOCK; - intersect.blockX = xCoord; - intersect.blockY = yCoord; - intersect.blockZ = zCoord; - result = getCloserMOP(result, intersect, src); - } - } - } - - return result; - } - - @Override - public void getCollidingBoundingBoxes(AxisAlignedBB mask, List list, Entity entity) { - for(int k = 0, num = getNumTileOwnedParts(); k < num; k++) { - AxisAlignedBB partBB = getPartAABBFromPool(k); - if(partBB != null) { - partBB.offset(xCoord, yCoord, zCoord); - if(partBB.intersectsWith(mask)) - list.add(partBB); - } - } - } - -} diff --git a/src/api/java/mods/railcraft/api/carts/CartTools.java b/src/api/java/mods/railcraft/api/carts/CartTools.java deleted file mode 100644 index f1dba0aa..00000000 --- a/src/api/java/mods/railcraft/api/carts/CartTools.java +++ /dev/null @@ -1,342 +0,0 @@ -package mods.railcraft.api.carts; - -import com.mojang.authlib.GameProfile; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemMinecart; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import mods.railcraft.api.core.items.IMinecartItem; -import net.minecraft.block.BlockRailBase; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.util.FakePlayerFactory; - -public abstract class CartTools { - - private static final GameProfile railcraftProfile = new GameProfile(UUID.nameUUIDFromBytes("[Railcraft]".getBytes()), "[Railcraft]"); - public static ILinkageManager linkageManager; - - /** - * Returns an instance of ILinkageManager. - * - * Will return null if Railcraft is not installed. - * - * @param world The World, may be required in the future - * @return an instance of ILinkageManager - */ - public static ILinkageManager getLinkageManager(World world) { - return linkageManager; - } - - /** - * Sets a carts owner. - * - * The is really only needed by the bukkit ports. - * - * @param cart - * @param owner - */ - public static void setCartOwner(EntityMinecart cart, EntityPlayer owner) { - setCartOwner(cart, owner.getGameProfile()); - } - - /** - * Sets a carts owner. - * - * The is really only needed by the bukkit ports. - * - * @param cart - * @param owner - */ - public static void setCartOwner(EntityMinecart cart, GameProfile owner) { - if (!cart.worldObj.isRemote) { - NBTTagCompound data = cart.getEntityData(); - if (owner.getName() != null) - data.setString("owner", owner.getName()); - if (owner.getId() != null) - data.setString("ownerId", owner.getId().toString()); - } - } - - /** - * Gets a carts owner. (player.username) - * - * The is really only needed by the bukkit ports. - * - * @param cart - * @return - */ - public static GameProfile getCartOwner(EntityMinecart cart) { - NBTTagCompound data = cart.getEntityData(); - String ownerName = "[Unknown]"; - if (data.hasKey("owner")) - ownerName = data.getString("owner"); - - UUID ownerId = null; - if (data.hasKey("ownerId")) - ownerId = UUID.fromString(data.getString("ownerId")); - return new GameProfile(ownerId, ownerName); - } - - /** - * Does the cart have a owner? - * - * The is really only needed by the bukkit ports. - * - * @param cart - * @return - */ - public static boolean doesCartHaveOwner(EntityMinecart cart) { - NBTTagCompound data = cart.getEntityData(); - return data.hasKey("owner"); - } - - /** - * Spawns a new cart entity using the provided item. - * - * The backing item must implement IMinecartItem and/or extend - * ItemMinecart. - * - * Generally Forge requires all cart items to extend ItemMinecart. - * - * @param owner The player name that should used as the owner - * @param cart An ItemStack containing a cart item, will not be changed by - * the function - * @param world The World object - * @param x x-Coord - * @param y y-Coord - * @param z z-Coord - * @return the cart placed or null if failed - * @see IMinecartItem, ItemMinecart - */ - public static EntityMinecart placeCart(GameProfile owner, ItemStack cart, WorldServer world, int x, int y, int z) { - if (cart == null) - return null; - cart = cart.copy(); - if (cart.getItem() instanceof IMinecartItem) { - IMinecartItem mi = (IMinecartItem) cart.getItem(); - return mi.placeCart(owner, cart, world, x, y, z); - } else if (cart.getItem() instanceof ItemMinecart) - try { - boolean placed = cart.getItem().onItemUse(cart, FakePlayerFactory.get(world, railcraftProfile),world, x, y, z - , 0, 0, 0, 0); - if (placed) { - List carts = getMinecartsAt(world, x, y, z, 0.3f); - if (carts.size() > 0) { - setCartOwner(carts.get(0), owner); - return carts.get(0); - } - } - } catch (Exception e) { - return null; - } - - return null; - } - - /** - * Offers an item stack to linked carts or drops it if no one wants it. - * - * @param cart - * @param stack - */ - public static void offerOrDropItem(EntityMinecart cart, ItemStack stack) { - EntityMinecart link_A = getLinkageManager(cart.worldObj).getLinkedCartA(cart); - EntityMinecart link_B = getLinkageManager(cart.worldObj).getLinkedCartB(cart); - - if (stack != null && stack.stackSize > 0 && link_A instanceof IItemTransfer) - stack = ((IItemTransfer) link_A).offerItem(cart, stack); - if (stack != null && stack.stackSize > 0 && link_B instanceof IItemTransfer) - stack = ((IItemTransfer) link_B).offerItem(cart, stack); - - if (stack != null && stack.stackSize > 0) - cart.entityDropItem(stack, 1); - } - - public static boolean isMinecartOnRailAt(World world, int i, int j, int k, float sensitivity) { - return isMinecartOnRailAt(world, i, j, k, sensitivity, null, true); - } - - public static boolean isMinecartOnRailAt(World world, int i, int j, int k, float sensitivity, Class type, boolean subclass) { - if (BlockRailBase.func_150049_b_(world, i, j, k)) - return isMinecartAt(world, i, j, k, sensitivity, type, subclass); - return false; - } - - public static boolean isMinecartOnAnySide(World world, int i, int j, int k, float sensitivity) { - return isMinecartOnAnySide(world, i, j, k, sensitivity, null, true); - } - - public static boolean isMinecartOnAnySide(World world, int i, int j, int k, float sensitivity, Class type, boolean subclass) { - List list = new ArrayList(); - for (int side = 0; side < 6; side++) { - list.addAll(getMinecartsOnSide(world, i, j, k, sensitivity, ForgeDirection.getOrientation(side))); - } - - if (type == null) - return !list.isEmpty(); - else - for (EntityMinecart cart : list) { - if ((subclass && type.isInstance(cart)) || cart.getClass() == type) - return true; - } - return false; - } - - public static boolean isMinecartAt(World world, int i, int j, int k, float sensitivity) { - return isMinecartAt(world, i, j, k, sensitivity, null, true); - } - - public static boolean isMinecartAt(World world, int i, int j, int k, float sensitivity, Class type, boolean subclass) { - List list = getMinecartsAt(world, i, j, k, sensitivity); - - if (type == null) - return !list.isEmpty(); - else - for (EntityMinecart cart : list) { - if ((subclass && type.isInstance(cart)) || cart.getClass() == type) - return true; - } - return false; - } - - public static List getMinecartsOnAllSides(World world, int i, int j, int k, float sensitivity) { - List carts = new ArrayList(); - for (int side = 0; side < 6; side++) { - carts.addAll(getMinecartsOnSide(world, i, j, k, sensitivity, ForgeDirection.getOrientation(side))); - } - - return carts; - } - - public static List getMinecartsOnAllSides(World world, int i, int j, int k, float sensitivity, Class type, boolean subclass) { - List list = new ArrayList(); - List carts = new ArrayList(); - for (int side = 0; side < 6; side++) { - list.addAll(getMinecartsOnSide(world, i, j, k, sensitivity, ForgeDirection.getOrientation(side))); - } - - for (EntityMinecart cart : list) { - if ((subclass && type.isInstance(cart)) || cart.getClass() == type) - carts.add(cart); - } - return carts; - } - - private static int getYOnSide(int y, ForgeDirection side) { - switch (side) { - case UP: - return y + 1; - case DOWN: - return y - 1; - default: - return y; - } - } - - private static int getXOnSide(int x, ForgeDirection side) { - switch (side) { - case EAST: - return x + 1; - case WEST: - return x - 1; - default: - return x; - } - } - - private static int getZOnSide(int z, ForgeDirection side) { - switch (side) { - case NORTH: - return z - 1; - case SOUTH: - return z + 1; - default: - return z; - } - } - - public static List getMinecartsOnSide(World world, int i, int j, int k, float sensitivity, ForgeDirection side) { - return getMinecartsAt(world, getXOnSide(i, side), getYOnSide(j, side), getZOnSide(k, side), sensitivity); - } - - public static boolean isMinecartOnSide(World world, int i, int j, int k, float sensitivity, ForgeDirection side) { - return getMinecartOnSide(world, i, j, k, sensitivity, side) != null; - } - - public static EntityMinecart getMinecartOnSide(World world, int i, int j, int k, float sensitivity, ForgeDirection side) { - for (EntityMinecart cart : getMinecartsOnSide(world, i, j, k, sensitivity, side)) { - return cart; - } - return null; - } - - public static boolean isMinecartOnSide(World world, int i, int j, int k, float sensitivity, ForgeDirection side, Class type, boolean subclass) { - return getMinecartOnSide(world, i, j, k, sensitivity, side, type, subclass) != null; - } - - public static T getMinecartOnSide(World world, int i, int j, int k, float sensitivity, ForgeDirection side, Class type, boolean subclass) { - for (EntityMinecart cart : getMinecartsOnSide(world, i, j, k, sensitivity, side)) { - if (type == null || (subclass && type.isInstance(cart)) || cart.getClass() == type) - return (T) cart; - } - return null; - } - - /** - * - * @param world - * @param i - * @param j - * @param k - * @param sensitivity Controls the size of the search box, ranges from - * (-inf, 0.49]. - * @return - */ - public static List getMinecartsAt(World world, int i, int j, int k, float sensitivity) { - sensitivity = Math.min(sensitivity, 0.49f); - List entities = world.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getBoundingBox(i + sensitivity, j + sensitivity, k + sensitivity, i + 1 - sensitivity, j + 1 - sensitivity, k + 1 - sensitivity)); - List carts = new ArrayList(); - for (Object o : entities) { - EntityMinecart cart = (EntityMinecart) o; - if (!cart.isDead) - carts.add((EntityMinecart) o); - } - return carts; - } - - public static List getMinecartsIn(World world, int i1, int j1, int k1, int i2, int j2, int k2) { - List entities = world.getEntitiesWithinAABB(EntityMinecart.class, AxisAlignedBB.getBoundingBox(i1, j1, k1, i2, j2, k2)); - List carts = new ArrayList(); - for (Object o : entities) { - EntityMinecart cart = (EntityMinecart) o; - if (!cart.isDead) - carts.add((EntityMinecart) o); - } - return carts; - } - - /** - * Returns the cart's "speed". It is not capped by the carts max speed, it - * instead returns the cart's "potential" speed. Used by collision and - * linkage logic. Do not use this to determine how fast a cart is currently - * moving. - * - * @param cart - * @return speed - */ - public static double getCartSpeedUncapped(EntityMinecart cart) { - return Math.sqrt(cart.motionX * cart.motionX + cart.motionZ * cart.motionZ); - } - - public static boolean cartVelocityIsLessThan(EntityMinecart cart, float vel) { - return Math.abs(cart.motionX) < vel && Math.abs(cart.motionZ) < vel; - } - -} diff --git a/src/api/java/mods/railcraft/api/carts/IItemTransfer.java b/src/api/java/mods/railcraft/api/carts/IItemTransfer.java deleted file mode 100644 index 1e0baeaf..00000000 --- a/src/api/java/mods/railcraft/api/carts/IItemTransfer.java +++ /dev/null @@ -1,65 +0,0 @@ -package mods.railcraft.api.carts; - -import net.minecraft.item.ItemStack; -import mods.railcraft.api.core.items.IStackFilter; - -/** - * This interface allows items to be passed around with out needing - * to know anything about the underlying implementation of the inventories. - * - * @author CovertJaguar - */ -public interface IItemTransfer -{ - - /** - * Offers an ItemStack to the object implementing this interface. - * This function will return null if the item is accepted in full, - * otherwise it will return whatever is rejected. - * - * @param source The Object offering the item - * @param offer The ItemStack being offered - * @return Unused or unwanted portions of offer - */ - public ItemStack offerItem(Object source, ItemStack offer); - - /** - * Requests an ItemStack from the object implementing this interface. - * It is up to the object implementing this interface to determine which - * ItemStack to return, or none at all. - * - * @param source The Object submitting the request - * @return An ItemStack to fulfill the request or null if refused. - */ - public ItemStack requestItem(Object source); - - /** - * Requests an ItemStack from the object implementing this interface - * that matches the request parameter. - * It is up to the object implementing this interface to - * determine which ItemStack to return, or none at all. - * However, if the return value is not null - * it should fulfill the following condition:
- * InvTools.isItemEqual(it.requestItem(this,request), request) == true - * - * @param source The Object submitting the request - * @param request The type of item requested - * @return An ItemStack to fulfill the request or null if refused. - */ - public ItemStack requestItem(Object source, ItemStack request); - - /** - * Requests an ItemStack from the object implementing this interface - * that matches the request parameter. - * It is up to the object implementing this interface to - * determine which ItemStack to return, or none at all. - * However, if the return value is not null - * it should fulfill the following condition:
- * IStackFilter.matches(it.requestItem(this,request), request) == true - * - * @param source The Object submitting the request - * @param request The type of item requested - * @return An ItemStack to fulfill the request or null if refused. - */ - public ItemStack requestItem(Object source, IStackFilter request); -} diff --git a/src/api/java/mods/railcraft/api/carts/ILinkableCart.java b/src/api/java/mods/railcraft/api/carts/ILinkableCart.java deleted file mode 100644 index d34f0600..00000000 --- a/src/api/java/mods/railcraft/api/carts/ILinkableCart.java +++ /dev/null @@ -1,77 +0,0 @@ -package mods.railcraft.api.carts; - -import net.minecraft.entity.item.EntityMinecart; - -/** - * This interface should be implemented by any minecart that wishes - * to change the default linkage behavior. - * It is NOT required to be able to link a cart, - * it merely gives you more control over the process. - * @author CovertJaguar - */ -public interface ILinkableCart -{ - - /** - * To disable linking altogether, return false here. - * @return True if this cart is linkable. - */ - public boolean isLinkable(); - - /** - * Check called when attempting to link carts. - * @param cart The cart that we are attempting to link with. - * @return True if we can link with this cart. - */ - public boolean canLinkWithCart(EntityMinecart cart); - - /** - * Returns true if this cart has two links - * or false if it can only link with one cart. - * @return True if two links - */ - public boolean hasTwoLinks(); - - /** - * Gets the distance at which this cart can be linked. - * This is called on both carts and added together to determine - * how close two carts need to be for a successful link. - * Default = LinkageManager.LINKAGE_DISTANCE - * @param cart The cart that you are attempting to link with. - * @return The linkage distance - */ - public float getLinkageDistance(EntityMinecart cart); - - /** - * Gets the optimal distance between linked carts. - * This is called on both carts and added together to determine - * the optimal rest distance between linked carts. - * The LinkageManager will attempt to maintain this distance - * between linked carts at all times. - * Default = LinkageManager.OPTIMAL_DISTANCE - * @param cart The cart that you are linked with. - * @return The optimal rest distance - */ - public float getOptimalDistance(EntityMinecart cart); - - /** - * Return false if linked carts have no effect on the velocity of this cart. - * Use carefully, if you link two carts that can't be adjusted, - * it will behave as if they are not linked. - * @param cart The cart doing the adjusting. - * @return Whether the cart can have its velocity adjusted. - */ - public boolean canBeAdjusted(EntityMinecart cart); - - /** - * Called upon successful link creation. - * @param cart The cart we linked with. - */ - public void onLinkCreated(EntityMinecart cart); - - /** - * Called when a link is broken (usually). - * @param cart The cart we were linked with. - */ - public void onLinkBroken(EntityMinecart cart); -} diff --git a/src/api/java/mods/railcraft/api/carts/ILinkageManager.java b/src/api/java/mods/railcraft/api/carts/ILinkageManager.java deleted file mode 100644 index dac86a46..00000000 --- a/src/api/java/mods/railcraft/api/carts/ILinkageManager.java +++ /dev/null @@ -1,120 +0,0 @@ -package mods.railcraft.api.carts; - -import java.util.UUID; -import net.minecraft.entity.item.EntityMinecart; - -/** - * The LinkageManager contains all the functions needed to link and interact - * with linked carts. - * - * To obtain an instance of this interface, call CartTools.getLinkageManager(). - * - * Each cart can up to two links. They are called Link A and Link B. Some carts - * will have only Link A, for example the Tunnel Bore. - * - * @author CovertJaguar - * @see CartTools, ILinkableCart - */ -public interface ILinkageManager { - - /** - * The default max distance at which carts can be linked, divided by 2. - */ - public static final float LINKAGE_DISTANCE = 1.25f; - /** - * The default distance at which linked carts are maintained, divided by 2. - */ - public static final float OPTIMAL_DISTANCE = 0.78f; - - /** - * Creates a link between two carts, but only if there is nothing preventing - * such a link. - * - * @param cart1 - * @param cart2 - * @return True if the link succeeded. - */ - boolean createLink(EntityMinecart cart1, EntityMinecart cart2); - - /** - * Returns the cart linked to Link A or null if nothing is currently - * occupying Link A. - * - * @param cart The cart for which to get the link - * @return The linked cart or null - */ - EntityMinecart getLinkedCartA(EntityMinecart cart); - - /** - * Returns the cart linked to Link B or null if nothing is currently - * occupying Link B. - * - * @param cart The cart for which to get the link - * @return The linked cart or null - */ - EntityMinecart getLinkedCartB(EntityMinecart cart); - - /** - * Returns true if the two carts are linked to each other. - * - * @param cart1 - * @param cart2 - * @return True if linked - */ - boolean areLinked(EntityMinecart cart1, EntityMinecart cart2); - - /** - * Breaks a link between two carts, if any link exists. - * - * @param cart1 - * @param cart2 - */ - void breakLink(EntityMinecart cart1, EntityMinecart cart2); - - /** - * Breaks all links the cart has. - * - * @param cart - */ - void breakLinks(EntityMinecart cart); - - /** - * Break only link A. - * - * @param cart - */ - void breakLinkA(EntityMinecart cart); - - /** - * Break only link B. - * - * @param cart - */ - void breakLinkB(EntityMinecart cart); - - /** - * Counts how many carts are in the train. - * - * @param cart Any cart in the train - * @return The number of carts in the train - */ - int countCartsInTrain(EntityMinecart cart); - - Iterable getCartsInTrain(EntityMinecart cart); - - /** - * Given a persistent Entity UUID, it will return a matching minecart, - * assuming one is loaded in the world. - * - * The Mapping is stored in a Map so its fairly fast. - * - * This would probably be better in CartTools, but - * Railcraft really only uses it for linking and this was the - * easiest way to expose it. - * - * @param id Persistent Entity UUID - * @return A Minecart - */ - EntityMinecart getCartFromUUID(UUID id); - -} diff --git a/src/api/java/mods/railcraft/api/carts/IMinecart.java b/src/api/java/mods/railcraft/api/carts/IMinecart.java deleted file mode 100644 index 8371fc1f..00000000 --- a/src/api/java/mods/railcraft/api/carts/IMinecart.java +++ /dev/null @@ -1,26 +0,0 @@ -package mods.railcraft.api.carts; - -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.item.ItemStack; - -/** - * Some helper functions to make interacting with carts simpler. - * - * This interface is implemented by CartBase. - * - * @author CovertJaguar - * @see CartBase - */ -public interface IMinecart { - - /** - * Returns true if the Minecart matches the item provided. Generally just - * stack.isItemEqual(cart.getCartItem()), but some carts may need more - * control (the Tank Cart for example). - * - * @param stack the Filter - * @param cart the Cart - * @return true if the item matches the cart - */ - public boolean doesCartMatchFilter(ItemStack stack, EntityMinecart cart); -} diff --git a/src/api/java/mods/railcraft/api/carts/package-info.java b/src/api/java/mods/railcraft/api/carts/package-info.java deleted file mode 100644 index 12c1a735..00000000 --- a/src/api/java/mods/railcraft/api/carts/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 CovertJaguar - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. - ******************************************************************************/ -@API(apiVersion="1.3.0", owner="RailcraftAPI|core", provides="RailcraftAPI|carts") -package mods.railcraft.api.carts; -import cpw.mods.fml.common.API; diff --git a/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java b/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java deleted file mode 100644 index bc305cd3..00000000 --- a/src/api/java/mods/railcraft/api/core/items/IMinecartItem.java +++ /dev/null @@ -1,41 +0,0 @@ -package mods.railcraft.api.core.items; - -import com.mojang.authlib.GameProfile; -import net.minecraft.entity.item.EntityMinecart; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * This interface should be implemented by any cart item, - * but it is generally optional. - * - * @author CovertJaguar - */ -public interface IMinecartItem -{ - - /** - * Controls whether this cart item can be placed by the Cart and Train Dispensers. - * - * Generally, you can ignore the placeCart() function if this returns false. - * - * @param cart - * @return true if it can be placed, false otherwise - */ - public boolean canBePlacedByNonPlayer(ItemStack cart); - - /** - * Places a cart at the specified location. - * - * Implementing this function is optional. - * - * @param owner the name of the player placing the cart or "[MyMod]" with the brackets - * @param cart An ItemStack that contains the cart - * @param world The World - * @param i x-Coord - * @param j y-Coord - * @param k z-Coord - * @return the cart placed or null if failed - */ - public EntityMinecart placeCart(GameProfile owner, ItemStack cart, World world, int i, int j, int k); -} diff --git a/src/api/java/mods/railcraft/api/core/items/IStackFilter.java b/src/api/java/mods/railcraft/api/core/items/IStackFilter.java deleted file mode 100644 index cdea3ca6..00000000 --- a/src/api/java/mods/railcraft/api/core/items/IStackFilter.java +++ /dev/null @@ -1,23 +0,0 @@ -package mods.railcraft.api.core.items; - -import java.util.HashMap; -import java.util.Map; -import net.minecraft.item.ItemStack; - -/** - * This interface is used with several of the functions in IItemTransfer - * to provide a convenient means of dealing with entire classes of items without - * having to specify each item individually. - * @author CovertJaguar - */ -public interface IStackFilter -{ - /** - * Railcraft adds the following IItemTypes during preInit: ALL, FUEL, TRACK, MINECART, BALLAST, FEED - * - * Feel free to grab them from here or define your own. - */ - public static final Map filters = new HashMap(); - - public boolean matches(ItemStack stack); -} diff --git a/src/api/java/mods/railcraft/api/core/items/package-info.java b/src/api/java/mods/railcraft/api/core/items/package-info.java deleted file mode 100644 index 616d4f4e..00000000 --- a/src/api/java/mods/railcraft/api/core/items/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 CovertJaguar - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. - ******************************************************************************/ -@API(apiVersion="1.0", owner="Railcraft", provides="RailcraftAPI|core") -package mods.railcraft.api.core.items; -import cpw.mods.fml.common.API; diff --git a/src/api/java/mods/railcraft/api/core/package-info.java b/src/api/java/mods/railcraft/api/core/package-info.java deleted file mode 100644 index a86b010f..00000000 --- a/src/api/java/mods/railcraft/api/core/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 CovertJaguar - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. - ******************************************************************************/ -@API(apiVersion="1.1", owner="Railcraft", provides="RailcraftAPI|core") -package mods.railcraft.api.core; -import cpw.mods.fml.common.API; diff --git a/src/api/java/mods/railcraft/api/package-info.java b/src/api/java/mods/railcraft/api/package-info.java deleted file mode 100644 index 74a51bf2..00000000 --- a/src/api/java/mods/railcraft/api/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/******************************************************************************* - * Copyright 2011-2014 CovertJaguar - * - * This work (the API) is licensed under the "MIT" License, see LICENSE.txt for details. - ******************************************************************************/ -@API(apiVersion="1.0", owner="Railcraft", provides="RailcraftAPI|core") -package mods.railcraft.api; -import cpw.mods.fml.common.API; diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetInfo.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetInfo.java deleted file mode 100644 index 0fc75c78..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetInfo.java +++ /dev/null @@ -1,28 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.IChatComponent; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Defines a Block that can print information about itself using the RedNet Meter. This must be implemented on your Block class. - */ -public interface IRedNetInfo -{ - /** - * This function appends information to a list provided to it. - * - * @param world Reference to the world. - * @param x X coordinate of the block. - * @param y Y coordinate of the block. - * @param z Z coordinate of the block. - * @param side The side of the block that is being queried. - * @param player Player doing the querying - this can be NULL. - * @param info The list that the information should be appended to. - */ - public void getRedNetInfo(IBlockAccess world, int x, int y, int z, - ForgeDirection side, EntityPlayer player, List info); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetInputNode.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetInputNode.java deleted file mode 100644 index a814af3c..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetInputNode.java +++ /dev/null @@ -1,52 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. - *

- * Note that when you implement this, the RedNet network makes several assumptions about your code - - * It will not clamp values to 0 <= x <= 15. This means you must be able to accept any possible integer - * without crashing, even negatives. It will also assume that calling the onInput(s)Changed() methods - * are sufficient, and will not issue block updates. In Single mode, it will call onInputChanged. - *

- * RedNet cables have their subnets indicated to the user by colored bands on the cable. - * The color of a given subnet is the same as the wool with metadata equal to the subnet number. - *

- * For reference:
- * 0:White, 1:Orange, 2:Magenta, 3:LightBlue, 4:Yellow, 5:Lime, 6:Pink, 7:Gray, - * 8:LightGray, 9:Cyan, 10:Purple, 11:Blue, 12:Brown, 13:Green, 14:Red, 15:Black - */ -public interface IRedNetInputNode extends IRedNetConnection -{ - /** - * Called when the input values to this block change. Only called if your block is connected in "All" mode. - * Do not issue a network value update from inside this method call; it will be ignored. Issue your updates - * on the next tick. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the input values are being changed on. - * @param inputValues The new set of input values. This array will be 16 elements long. Do not alter or cache. - */ - public void onInputsChanged(World world, int x, int y, int z, ForgeDirection side, int[] inputValues); - - /** - * Called when the input value to this block changes. Only called if your block is connected in "Single" mode. - * Do not issue a network value update from inside this method call; it will be ignored. Issue your updates - * on the next tick. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the input values are being changed on. - * @param inputValue The new input value - */ - public void onInputChanged(World world, int x, int y, int z, ForgeDirection side, int inputValue); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java deleted file mode 100644 index 981ce06b..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicCircuit.java +++ /dev/null @@ -1,19 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.nbt.NBTTagCompound; - -public interface IRedNetLogicCircuit -{ - public byte getInputCount(); - - public byte getOutputCount(); - - public int[] recalculateOutputValues(long worldTime, int[] inputValues); - - public String getUnlocalizedName(); - public String getInputPinLabel(int pin); - public String getOutputPinLabel(int pin); - - public void readFromNBT(NBTTagCompound tag); - public void writeToNBT(NBTTagCompound tag); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicPoint.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicPoint.java deleted file mode 100644 index dd05969e..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetLogicPoint.java +++ /dev/null @@ -1,36 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -/** - * - * @author skyboy - */ -public interface IRedNetLogicPoint -{ - /** - * - * @param out - * @return - */ - public void transformOutput(int[] out); - - /** - * - * @param out - * @return - */ - public void transformOutput(int out); - - /** - * - * @param in - * @return - */ - public int[] transformInput(int[] in); - - /** - * - * @param in - * @return - */ - public int transformInput(int in); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java deleted file mode 100644 index c9fb0bf8..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetNetworkContainer.java +++ /dev/null @@ -1,32 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * - * You should not implement this yourself. Instead, use this to look for cables to notify from your IRedNetOmniNode as this does not - * require a block update. This will be implemented on the cable's Block class. - * - */ -public interface IRedNetNetworkContainer -{ - /** - * Tells the network to recalculate all subnets. - * @param world The world this cable is in. - * @param x The x-coordinate of this cable. - * @param x The y-coordinate of this cable. - * @param x The z-coordinate of this cable. - */ - public void updateNetwork(World world, int x, int y, int z, ForgeDirection from); - - /** - * Tells the network to recalculate a specific subnet. - * @param world The world this cable is in. - * @param x The x-coordinate of this cable. - * @param x The y-coordinate of this cable. - * @param x The z-coordinate of this cable. - * @param subnet The subnet to recalculate. - */ - public void updateNetwork(World world, int x, int y, int z, int subnet, ForgeDirection from); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetOmniNode.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetOmniNode.java deleted file mode 100644 index f2bdf397..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetOmniNode.java +++ /dev/null @@ -1,22 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -/** - * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. - *

- * Note that when you implement this, the RedNet network makes several assumptions about your code - - * It will not clamp values to 0 <= x <= 15. This means you must be able to accept any possible integer - * without crashing, even negatives. It will also assume that calling the onInput(s)Changed() methods - * are sufficient, and will not issue block updates. It will never call the vanilla redstone output - * methods, and will only query the methods contained in this interface. - *

- * RedNet cables have their subnets indicated to the user by colored bands on the cable. - * The color of a given subnet is the same as the wool with metadata equal to the subnet number. - *

- * For reference:
- * 0:White, 1:Orange, 2:Magenta, 3:LightBlue, 4:Yellow, 5:Lime, 6:Pink, 7:Gray, - * 8:LightGray, 9:Cyan, 10:Purple, 11:Blue, 12:Brown, 13:Green, 14:Red, 15:Black - */ -public interface IRedNetOmniNode extends IRedNetInputNode, IRedNetOutputNode -{ - // this is merely provided for convenience -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetOutputNode.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetOutputNode.java deleted file mode 100644 index 34281875..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/IRedNetOutputNode.java +++ /dev/null @@ -1,51 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection; - -/** - * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. - *

- * Note that when you implement this, the RedNet network makes several assumptions about your code - - * It will never call the vanilla redstone output methods, querying only the methods contained in - * this interface, and will not issue block updates. - *

- * RedNet cables have their subnets indicated to the user by colored bands on the cable. - * The color of a given subnet is the same as the wool with metadata equal to the subnet number. - *

- * For reference:
- * 0:White, 1:Orange, 2:Magenta, 3:LightBlue, 4:Yellow, 5:Lime, 6:Pink, 7:Gray, - * 8:LightGray, 9:Cyan, 10:Purple, 11:Blue, 12:Brown, 13:Green, 14:Red, 15:Black - */ -public interface IRedNetOutputNode extends IRedNetConnection -{ - /** - * Returns the output values of this RedNet node. - * This array must be 16 elements long. - * Only called if your block is connected in "All" mode. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the output values are required for. - * @return The output values. - */ - public int[] getOutputValues(World world, int x, int y, int z, ForgeDirection side); - - /** - * Returns the output value of this RedNet node for a given subnet. - * Must be the same as getOutputValues(world, x, y, z, side)[subnet]. - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side the output value is required for. - * @param subnet The subnet to get the output value for (0-15). - * @return The output value. - */ - public int getOutputValue(World world, int x, int y, int z, ForgeDirection side, int subnet); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetConnection.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetConnection.java deleted file mode 100644 index 003800d8..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetConnection.java +++ /dev/null @@ -1,26 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet.connectivity; - -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Defines a Block that can connect to RedNet cables. This must be implemented on your Block class. - */ -public interface IRedNetConnection -{ - /** - * Returns the connection type of this Block. If this value must be changed - * while the block is alive, it must notify neighbors of a change. - *

- * For nodes that want to interact with rednet, - * see IRedNetInputNode, IRedNetOutputNode, and IRedNetOmniNode - * - * @param world The world this block is in. - * @param x This block's X coordinate. - * @param y This block's Y coordinate. - * @param z This block's Z coordinate. - * @param side The side that connection information is required for. - * @return The connection type. - */ - public RedNetConnectionType getConnectionType(World world, int x, int y, int z, ForgeDirection side); -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetDecorative.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetDecorative.java deleted file mode 100644 index 89de12b1..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetDecorative.java +++ /dev/null @@ -1,11 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet.connectivity; - -/** - * This must be implemented on your Block class. - *

- * RedNet cables will treat your block similar to a vanilla block that's not redstone active. - */ -public interface IRedNetDecorative -{ - -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetNoConnection.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetNoConnection.java deleted file mode 100644 index 16225a74..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedNetNoConnection.java +++ /dev/null @@ -1,13 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet.connectivity; - -/** - * This must be implemented on your Block class. - *

- * RedNet cables will not connect to your block. - *
- * This behavior can be overridden in subclasses by IRedNetConnection - */ -public interface IRedNetNoConnection -{ - -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedstoneAlike.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedstoneAlike.java deleted file mode 100644 index f3784cfb..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/IRedstoneAlike.java +++ /dev/null @@ -1,10 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet.connectivity; - -/** - * This must be implemented on your Block class. - *

- * RedNet cables will treat your block similar to a redstone dust, and subtract one from the power value. - */ -public interface IRedstoneAlike { - -} diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/RedNetConnectionType.java b/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/RedNetConnectionType.java deleted file mode 100644 index 08ba24c1..00000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/rednet/connectivity/RedNetConnectionType.java +++ /dev/null @@ -1,86 +0,0 @@ -package powercrystals.minefactoryreloaded.api.rednet.connectivity; - -import java.util.HashMap; -import java.util.Map; - -/** - * Defines how RedNet cable connects to a block - *

- * None: RedNet will never connect to this block (if this is all you want: use IRedNetNoConnection) - *

- * CableSingle: Connections will use the cable renderer with a single band, best used for whole blocks - *
- * PlateSingle: Connections will use the plate renderer with a single band, used for conveyers and rails - *

- * CableAll: Connections permit access to all 16 bands - *
- * PlateAll: Connections permit access to all 16 bands - *

- * Forced connection modes are best used for decoration blocks: RedNet will not connect normally, - * but will if the user forces it. Typically, IRedNetDecorative is desired for this instead - *

- * ForcedCableSingle: Connections permit access to a single band, only when the cable is in forced connection mode - *
- * ForcedPlateSingle: Connections permit access to a single band, only when the cable is in forced connection mode - *

- * ForcedCableAll: Connections permit access to all 16 bands, only when the cable is in forced connection mode - *
- * ForcedPlateAll: Connections permit access to all 16 bands, only when the cable is in forced connection mode - *

- * The decorative nodes are for when you want rednet to decide how to connect to your block, - * but also need to receive full updates from the network. - *

- * DecorativeSingle: Connections permit access to a single band, using standard connection logic - *
- * DecorativeAll: Connections permit access to all 16 bands, using standard connection logic - *
- * ForcedDecorativeSingle: Connections permit access to a single band, only when the cable is in forced connection mode - *
- * ForcedDecorativeAll: Connections permit access to all 16 bands, only when the cable is in forced connection mode - */ -public enum RedNetConnectionType -{ - None, // 0; 0000000 - CableSingle, // 11; 0001011 - PlateSingle, // 13; 0001101 - CableAll, // 19; 0010011 - PlateAll, // 21; 0010101 - ForcedCableSingle, // 43; 0101011 - ForcedPlateSingle, // 45; 0101101 - ForcedCableAll, // 51; 0110011 - ForcedPlateAll, // 53; 0110101 - DecorativeSingle, // NA; 0001001 - DecorativeAll, // NA; 0010001 - ForcedDecorativeSingle, // NA; 0101001 - ForcedDecorativeAll; // NA; 0110001 - - public final boolean isConnected = this.ordinal() != 0; // 0 bit (mask: 1) - public final boolean isSingleSubnet = this.name().endsWith("Single"); // 3 bit (mask: 8) - public final boolean isAllSubnets = this.name().endsWith("All"); // 4 bit (mask: 16) - public final boolean isPlate = this.name().contains("Plate"); // 2 bit (mask: 4) - public final boolean isCable = this.name().contains("Cable"); // 1 bit (mask: 2) - public final boolean isConnectionForced = this.name().startsWith("Forced"); // 5 bit (mask: 32) - public final boolean isDecorative = this.name().contains("Decorative"); - public final short flags = toFlags(isConnected, isCable, isPlate, - isSingleSubnet, isAllSubnets, isConnectionForced); - - public static final RedNetConnectionType fromFlags(short flags) - { - return connections.get(flags); - } - - private static final short toFlags(boolean ...flags) - { - short ret = 0; - for (int i = flags.length; i --> 0;) - ret |= (flags[i] ? 1 : 0) << i; - return ret; - } - - private static final Map connections = new HashMap(); - - static { - for (RedNetConnectionType type : RedNetConnectionType.values()) - connections.put(type.flags, type); - } -} diff --git a/src/api/java/thaumcraft/api/BlockCoordinates.java b/src/api/java/thaumcraft/api/BlockCoordinates.java deleted file mode 100644 index 27a28f8f..00000000 --- a/src/api/java/thaumcraft/api/BlockCoordinates.java +++ /dev/null @@ -1,108 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - -public class BlockCoordinates implements Comparable -{ - public int x; - - /** the y coordinate */ - public int y; - - /** the z coordinate */ - public int z; - - public BlockCoordinates() {} - - public BlockCoordinates(int par1, int par2, int par3) - { - this.x = par1; - this.y = par2; - this.z = par3; - } - - public BlockCoordinates(TileEntity tile) - { - this.x = tile.xCoord; - this.y = tile.yCoord; - this.z = tile.zCoord; - } - - public BlockCoordinates(BlockCoordinates par1ChunkCoordinates) - { - this.x = par1ChunkCoordinates.x; - this.y = par1ChunkCoordinates.y; - this.z = par1ChunkCoordinates.z; - } - - public boolean equals(Object par1Obj) - { - if (!(par1Obj instanceof BlockCoordinates)) - { - return false; - } - else - { - BlockCoordinates coordinates = (BlockCoordinates)par1Obj; - return this.x == coordinates.x && this.y == coordinates.y && this.z == coordinates.z ; - } - } - - public int hashCode() - { - return this.x + this.y << 8 + this.z << 16; - } - - /** - * Compare the coordinate with another coordinate - */ - public int compareWorldCoordinate(BlockCoordinates par1) - { - return this.y == par1.y ? (this.z == par1.z ? this.x - par1.x : this.z - par1.z) : this.y - par1.y; - } - - public void set(int par1, int par2, int par3, int d) - { - this.x = par1; - this.y = par2; - this.z = par3; - } - - /** - * Returns the squared distance between this coordinates and the coordinates given as argument. - */ - public float getDistanceSquared(int par1, int par2, int par3) - { - float f = (float)(this.x - par1); - float f1 = (float)(this.y - par2); - float f2 = (float)(this.z - par3); - return f * f + f1 * f1 + f2 * f2; - } - - /** - * Return the squared distance between this coordinates and the ChunkCoordinates given as argument. - */ - public float getDistanceSquaredToWorldCoordinates(BlockCoordinates par1ChunkCoordinates) - { - return this.getDistanceSquared(par1ChunkCoordinates.x, par1ChunkCoordinates.y, par1ChunkCoordinates.z); - } - - public int compareTo(Object par1Obj) - { - return this.compareWorldCoordinate((BlockCoordinates)par1Obj); - } - - public void readNBT(NBTTagCompound nbt) { - this.x = nbt.getInteger("b_x"); - this.y = nbt.getInteger("b_y"); - this.z = nbt.getInteger("b_z"); - } - - public void writeNBT(NBTTagCompound nbt) { - nbt.setInteger("b_x",x); - nbt.setInteger("b_y",y); - nbt.setInteger("b_z",z); - } - -} diff --git a/src/api/java/thaumcraft/api/IArchitect.java b/src/api/java/thaumcraft/api/IArchitect.java deleted file mode 100644 index c733af5e..00000000 --- a/src/api/java/thaumcraft/api/IArchitect.java +++ /dev/null @@ -1,27 +0,0 @@ -package thaumcraft.api; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IArchitect { - - /** - * Returns a list of blocks that should be highlighted in world. - */ - public ArrayList getArchitectBlocks(ItemStack stack, World world, - int x, int y, int z, int side, EntityPlayer player); - - /** - * which axis should be displayed. - */ - public boolean showAxis(ItemStack stack, World world, EntityPlayer player, int side, EnumAxis axis); - - public enum EnumAxis { - X, // east / west - Y, // up / down - Z; // north / south - } -} diff --git a/src/api/java/thaumcraft/api/IGoggles.java b/src/api/java/thaumcraft/api/IGoggles.java deleted file mode 100644 index 2f53d816..00000000 --- a/src/api/java/thaumcraft/api/IGoggles.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Equipped head slot items that extend this class will be able to perform most functions that - * goggles of revealing can apart from view nodes which is handled by IRevealer. - * - */ - -public interface IGoggles { - - /* - * If this method returns true things like block essentia contents will be shown. - */ - public boolean showIngamePopups(ItemStack itemstack, EntityLivingBase player); - -} diff --git a/src/api/java/thaumcraft/api/IRepairable.java b/src/api/java/thaumcraft/api/IRepairable.java deleted file mode 100644 index 48c6dff9..00000000 --- a/src/api/java/thaumcraft/api/IRepairable.java +++ /dev/null @@ -1,13 +0,0 @@ -package thaumcraft.api; - - - -/** - * @author Azanor - * Items, armor and tools with this interface can receive the Repair enchantment. - * Repairs 1 point of durability every 10 seconds (2 for repair II) - */ -public interface IRepairable { - - -} diff --git a/src/api/java/thaumcraft/api/IRepairableExtended.java b/src/api/java/thaumcraft/api/IRepairableExtended.java deleted file mode 100644 index 33827124..00000000 --- a/src/api/java/thaumcraft/api/IRepairableExtended.java +++ /dev/null @@ -1,17 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - - - -/** - * @author Azanor - * Items, armor and tools with this interface can receive the Repair enchantment. - * Repairs 1 point of durability every 10 seconds (2 for repair II) - */ -public interface IRepairableExtended extends IRepairable { - - public boolean doRepair(ItemStack stack, EntityPlayer player, int enchantlevel); - -} diff --git a/src/api/java/thaumcraft/api/IRunicArmor.java b/src/api/java/thaumcraft/api/IRunicArmor.java deleted file mode 100644 index 5dd31100..00000000 --- a/src/api/java/thaumcraft/api/IRunicArmor.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Armor or bauble slot items that implement this interface can provide runic shielding. - * Recharging, hardening, etc. is handled internally by thaumcraft. - * - */ - -public interface IRunicArmor { - - /** - * returns how much charge this item can provide. This is the base shielding value - any hardening is stored and calculated internally. - */ - public int getRunicCharge(ItemStack itemstack); - - -} diff --git a/src/api/java/thaumcraft/api/IScribeTools.java b/src/api/java/thaumcraft/api/IScribeTools.java deleted file mode 100644 index 8800fa57..00000000 --- a/src/api/java/thaumcraft/api/IScribeTools.java +++ /dev/null @@ -1,14 +0,0 @@ -package thaumcraft.api; - - -/** - * - * @author Azanor - * - * Interface used to identify scribing tool items used in research table - * - */ - -public interface IScribeTools { - -} diff --git a/src/api/java/thaumcraft/api/IVisDiscountGear.java b/src/api/java/thaumcraft/api/IVisDiscountGear.java deleted file mode 100644 index 3793ea3e..00000000 --- a/src/api/java/thaumcraft/api/IVisDiscountGear.java +++ /dev/null @@ -1,20 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; - - - - -/** - * @author Azanor - * ItemArmor with this interface will grant a discount to the vis cost of actions the wearer performs with casting wands. - * The amount returned is the percentage by which the cost is discounted. There is a built-int max discount of 50%, but - * individual items really shouldn't have a discount more than 5% - */ -public interface IVisDiscountGear { - - int getVisDiscount(ItemStack stack, EntityPlayer player, Aspect aspect); - -} diff --git a/src/api/java/thaumcraft/api/IWarpingGear.java b/src/api/java/thaumcraft/api/IWarpingGear.java deleted file mode 100644 index e7415ab7..00000000 --- a/src/api/java/thaumcraft/api/IWarpingGear.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Armor, held items or bauble slot items that implement this interface add warp when equipped or held. - * - */ - -public interface IWarpingGear { - - /** - * returns how much warp this item adds while worn or held. - */ - public int getWarp(ItemStack itemstack, EntityPlayer player); - - -} diff --git a/src/api/java/thaumcraft/api/ItemApi.java b/src/api/java/thaumcraft/api/ItemApi.java deleted file mode 100644 index 25dda282..00000000 --- a/src/api/java/thaumcraft/api/ItemApi.java +++ /dev/null @@ -1,70 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import cpw.mods.fml.common.FMLLog; - -/** - * @author Azanor - * - * This is used to gain access to the items in my mod. - * I only give some examples and it will probably still - * require a bit of work for you to get hold of everything you need. - * - */ -public class ItemApi { - - public static ItemStack getItem(String itemString, int meta) { - ItemStack item = null; - - try { - String itemClass = "thaumcraft.common.config.ConfigItems"; - Object obj = Class.forName(itemClass).getField(itemString).get(null); - if (obj instanceof Item) { - item = new ItemStack((Item) obj,1,meta); - } else if (obj instanceof ItemStack) { - item = (ItemStack) obj; - } - } catch (Exception ex) { - FMLLog.warning("[Thaumcraft] Could not retrieve item identified by: " + itemString); - } - - return item; - } - - public static ItemStack getBlock(String itemString, int meta) { - ItemStack item = null; - - try { - String itemClass = "thaumcraft.common.config.ConfigBlocks"; - Object obj = Class.forName(itemClass).getField(itemString).get(null); - if (obj instanceof Block) { - item = new ItemStack((Block) obj,1,meta); - } else if (obj instanceof ItemStack) { - item = (ItemStack) obj; - } - } catch (Exception ex) { - FMLLog.warning("[Thaumcraft] Could not retrieve block identified by: " + itemString); - } - - return item; - } - - /** - * - * Some examples - * - * Casting Wands: - * itemWandCasting - * - * Resources: - * itemEssence, itemWispEssence, itemResource, itemShard, itemNugget, - * itemNuggetChicken, itemNuggetBeef, itemNuggetPork, itemTripleMeatTreat - * - * Research: - * itemResearchNotes, itemInkwell, itemThaumonomicon - * - */ - -} diff --git a/src/api/java/thaumcraft/api/ItemRunic.java b/src/api/java/thaumcraft/api/ItemRunic.java deleted file mode 100644 index 80251f59..00000000 --- a/src/api/java/thaumcraft/api/ItemRunic.java +++ /dev/null @@ -1,21 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class ItemRunic extends Item implements IRunicArmor { - - int charge; - - public ItemRunic (int charge) - { - super(); - this.charge = charge; - } - - @Override - public int getRunicCharge(ItemStack itemstack) { - return charge; - } - -} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApi.java b/src/api/java/thaumcraft/api/ThaumcraftApi.java deleted file mode 100644 index fbf78801..00000000 --- a/src/api/java/thaumcraft/api/ThaumcraftApi.java +++ /dev/null @@ -1,588 +0,0 @@ -package thaumcraft.api; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; - -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.Item.ToolMaterial; -import net.minecraft.item.ItemArmor.ArmorMaterial; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.EnumHelper; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.InfusionEnchantmentRecipe; -import thaumcraft.api.crafting.InfusionRecipe; -import thaumcraft.api.crafting.ShapedArcaneRecipe; -import thaumcraft.api.crafting.ShapelessArcaneRecipe; -import thaumcraft.api.internal.DummyInternalMethodHandler; -import thaumcraft.api.internal.IInternalMethodHandler; -import thaumcraft.api.internal.WeightedRandomLoot; -import thaumcraft.api.research.IScanEventHandler; -import thaumcraft.api.research.ResearchCategories; -import thaumcraft.api.research.ResearchCategoryList; -import thaumcraft.api.research.ResearchItem; -import thaumcraft.api.research.ResearchPage; - - -/** - * @author Azanor - * - * - * IMPORTANT: If you are adding your own aspects to items it is a good idea to do it AFTER Thaumcraft adds its aspects, otherwise odd things may happen. - * - */ -public class ThaumcraftApi { - - //Materials - public static ToolMaterial toolMatThaumium = EnumHelper.addToolMaterial("THAUMIUM", 3, 400, 7F, 2, 22); - public static ToolMaterial toolMatVoid = EnumHelper.addToolMaterial("VOID", 4, 150, 8F, 3, 10); - public static ToolMaterial toolMatElemental = EnumHelper.addToolMaterial("THAUMIUM_ELEMENTAL", 3, 1500, 10F, 3, 18); - public static ArmorMaterial armorMatThaumium = EnumHelper.addArmorMaterial("THAUMIUM", 25, new int[] { 2, 6, 5, 2 }, 25); - public static ArmorMaterial armorMatSpecial = EnumHelper.addArmorMaterial("SPECIAL", 25, new int[] { 1, 3, 2, 1 }, 25); - public static ArmorMaterial armorMatThaumiumFortress = EnumHelper.addArmorMaterial("FORTRESS", 40, new int[] { 3, 7, 6, 3 }, 25); - public static ArmorMaterial armorMatVoid = EnumHelper.addArmorMaterial("VOID", 10, new int[] { 3, 7, 6, 3 }, 10); - public static ArmorMaterial armorMatVoidFortress = EnumHelper.addArmorMaterial("VOIDFORTRESS", 18, new int[] { 4, 8, 7, 4 }, 10); - - //Enchantment references - public static int enchantFrugal; - public static int enchantPotency; - public static int enchantWandFortune; - public static int enchantHaste; - public static int enchantRepair; - - //Miscellaneous - /** - * Portable Hole Block-id Blacklist. - * Simply add the block-id's of blocks you don't want the portable hole to go through. - */ - public static ArrayList portableHoleBlackList = new ArrayList(); - - //Internal (Do not alter this unless you like pretty explosions) - //Calling methods from this will only work properly once Thaumcraft is past the FMLPreInitializationEvent phase. - public static IInternalMethodHandler internalMethods = new DummyInternalMethodHandler(); - - //RESEARCH///////////////////////////////////////// - public static ArrayList scanEventhandlers = new ArrayList(); - public static ArrayList scanEntities = new ArrayList(); - public static class EntityTagsNBT { - public EntityTagsNBT(String name, Object value) { - this.name = name; - this.value = value; - } - public String name; - public Object value; - } - public static class EntityTags { - public EntityTags(String entityName, AspectList aspects, EntityTagsNBT... nbts) { - this.entityName = entityName; - this.nbts = nbts; - this.aspects = aspects; - } - public String entityName; - public EntityTagsNBT[] nbts; - public AspectList aspects; - } - - /** - * not really working atm, so ignore it for now - * @param scanEventHandler - */ - public static void registerScanEventhandler(IScanEventHandler scanEventHandler) { - scanEventhandlers.add(scanEventHandler); - } - - /** - * This is used to add aspects to entities which you can then scan using a thaumometer. - * Also used to calculate vis drops from mobs. - * @param entityName - * @param aspects - * @param nbt you can specify certain nbt keys and their values - * to differentiate between mobs.
For example the normal and wither skeleton: - *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 5)); - *
ThaumcraftApi.registerEntityTag("Skeleton", (new AspectList()).add(Aspect.DEATH, 8), new NBTTagByte("SkeletonType",(byte) 1)); - */ - public static void registerEntityTag(String entityName, AspectList aspects, EntityTagsNBT... nbt ) { - scanEntities.add(new EntityTags(entityName,aspects,nbt)); - } - - //RECIPES///////////////////////////////////////// - private static ArrayList craftingRecipes = new ArrayList(); - private static HashMap smeltingBonus = new HashMap(); - - /** - * This method is used to determine what bonus items are generated when the infernal furnace smelts items - * @param in The input of the smelting operation. e.g. new ItemStack(Block.oreGold) - * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). - * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. - */ - public static void addSmeltingBonus(ItemStack in, ItemStack out) { - smeltingBonus.put( - Arrays.asList(in.getItem(),in.getItemDamage()), - new ItemStack(out.getItem(),0,out.getItemDamage())); - } - - /** - * This method is used to determine what bonus items are generated when the infernal furnace smelts items - * @param in The ore dictionary input of the smelting operation. e.g. "oreGold" - * @param out The bonus item that can be produced from the smelting operation e.g. new ItemStack(nuggetGold,0,0). - * Stacksize should be 0 unless you want to guarantee that at least 1 item is always produced. - */ - public static void addSmeltingBonus(String in, ItemStack out) { - smeltingBonus.put( in, new ItemStack(out.getItem(),0,out.getItemDamage())); - } - - /** - * Returns the bonus item produced from a smelting operation in the infernal furnace - * @param in The input of the smelting operation. e.g. new ItemStack(oreGold) - * @return the The bonus item that can be produced - */ - public static ItemStack getSmeltingBonus(ItemStack in) { - ItemStack out = smeltingBonus.get(Arrays.asList(in.getItem(),in.getItemDamage())); - if (out==null) { - out = smeltingBonus.get(Arrays.asList(in.getItem(),OreDictionary.WILDCARD_VALUE)); - } - if (out==null) { - String od = OreDictionary.getOreName( OreDictionary.getOreID(in)); - out = smeltingBonus.get(od); - } - return out; - } - - public static List getCraftingRecipes() { - return craftingRecipes; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output - * @param aspects the vis cost per aspect. - * @param recipe The recipe. Format is exactly the same as vanilla recipes. Input itemstacks are NBT sensitive. - */ - public static ShapedArcaneRecipe addArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) - { - ShapedArcaneRecipe r= new ShapedArcaneRecipe(research, result, aspects, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output - * @param aspects the vis cost per aspect - * @param recipe The recipe. Format is exactly the same as vanilla shapeless recipes. Input itemstacks are NBT sensitive. - */ - public static ShapelessArcaneRecipe addShapelessArcaneCraftingRecipe(String research, ItemStack result, AspectList aspects, Object ... recipe) - { - ShapelessArcaneRecipe r = new ShapelessArcaneRecipe(research, result, aspects, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param result the recipe output. It can either be an itemstack or an nbt compound tag that will be added to the central item - * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an - * instability effect each second while the crafting is in progress - * @param aspects the essentia cost per aspect. - * @param aspects input the central item to be infused - * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. - * Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches. - * - */ - public static InfusionRecipe addInfusionCraftingRecipe(String research, Object result, int instability, AspectList aspects, ItemStack input,ItemStack[] recipe) - { - if (!(result instanceof ItemStack || result instanceof Object[])) return null; - InfusionRecipe r= new InfusionRecipe(research, result, instability, aspects, input, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param research the research key required for this recipe to work. Leave blank if it will work without research - * @param enchantment the enchantment that will be applied to the item - * @param instability a number that represents the N in 1000 chance for the infusion altar to spawn an - * instability effect each second while the crafting is in progress - * @param aspects the essentia cost per aspect. - * @param recipe An array of items required to craft this. Input itemstacks are NBT sensitive. - * Infusion crafting components are automatically "fuzzy" and the oredict will be checked for possible matches. - * - */ - public static InfusionEnchantmentRecipe addInfusionEnchantmentRecipe(String research, Enchantment enchantment, int instability, AspectList aspects, ItemStack[] recipe) - { - InfusionEnchantmentRecipe r= new InfusionEnchantmentRecipe(research, enchantment, instability, aspects, recipe); - craftingRecipes.add(r); - return r; - } - - /** - * @param stack the recipe result - * @return the recipe - */ - public static InfusionRecipe getInfusionRecipe(ItemStack res) { - for (Object r:getCraftingRecipes()) { - if (r instanceof InfusionRecipe) { - if (((InfusionRecipe)r).getRecipeOutput() instanceof ItemStack) { - if (((ItemStack) ((InfusionRecipe)r).getRecipeOutput()).isItemEqual(res)) - return (InfusionRecipe)r; - } - } - } - return null; - } - - - /** - * @param key the research key required for this recipe to work. - * @param result the output result - * @param catalyst an itemstack of the catalyst or a string if it is an ore dictionary item - * @param cost the vis cost - * @param tags the aspects required to craft this - */ - public static CrucibleRecipe addCrucibleRecipe(String key, ItemStack result, Object catalyst, AspectList tags) { - CrucibleRecipe rc = new CrucibleRecipe(key, result, catalyst, tags); - getCraftingRecipes().add(rc); - return rc; - } - - - /** - * @param stack the recipe result - * @return the recipe - */ - public static CrucibleRecipe getCrucibleRecipe(ItemStack stack) { - for (Object r:getCraftingRecipes()) { - if (r instanceof CrucibleRecipe) { - if (((CrucibleRecipe)r).getRecipeOutput().isItemEqual(stack)) - return (CrucibleRecipe)r; - } - } - return null; - } - - /** - * @param hash the unique recipe code - * @return the recipe - */ - public static CrucibleRecipe getCrucibleRecipeFromHash(int hash) { - for (Object r:getCraftingRecipes()) { - if (r instanceof CrucibleRecipe) { - if (((CrucibleRecipe)r).hash==hash) - return (CrucibleRecipe)r; - } - } - return null; - } - - /** - * Used by the thaumonomicon drilldown feature. - * @param stack the item - * @return the thaumcraft recipe key that produces that item. - */ - private static HashMap keyCache = new HashMap(); - - public static Object[] getCraftingRecipeKey(EntityPlayer player, ItemStack stack) { - int[] key = new int[] {Item.getIdFromItem(stack.getItem()),stack.getItemDamage()}; - if (keyCache.containsKey(key)) { - if (keyCache.get(key)==null) return null; - if (ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), (String)(keyCache.get(key))[0])) - return keyCache.get(key); - else - return null; - } - for (ResearchCategoryList rcl:ResearchCategories.researchCategories.values()) { - for (ResearchItem ri:rcl.research.values()) { - if (ri.getPages()==null) continue; - for (int a=0;a objectTags = new ConcurrentHashMap(); - public static ConcurrentHashMap groupedObjectTags = new ConcurrentHashMap(); - - /** - * Checks to see if the passed item/block already has aspects associated with it. - * @param id - * @param meta - * @return - */ - public static boolean exists(Item item, int meta) { - AspectList tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,meta)); - if (tmp==null) { - tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,OreDictionary.WILDCARD_VALUE)); - if (meta==OreDictionary.WILDCARD_VALUE && tmp==null) { - int index=0; - do { - tmp = ThaumcraftApi.objectTags.get(Arrays.asList(item,index)); - index++; - } while (index<16 && tmp==null); - } - if (tmp==null) return false; - } - - return true; - } - - /** - * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

- * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); - * @param item the item passed. Pass OreDictionary.WILDCARD_VALUE if all damage values of this item/block should have the same aspects - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerObjectTag(ItemStack item, AspectList aspects) { - if (aspects==null) aspects=new AspectList(); - try { - objectTags.put(Arrays.asList(item.getItem(),item.getItemDamage()), aspects); - } catch (Exception e) {} - } - - - /** - * Used to assign apsects to the given item/block. Here is an example of the declaration for cobblestone:

- * ThaumcraftApi.registerObjectTag(new ItemStack(Blocks.cobblestone), new int[]{0,1}, (new AspectList()).add(Aspect.ENTROPY, 1).add(Aspect.EARTH, 1)); - * @param item - * @param meta A range of meta values if you wish to lump several item meta's together as being the "same" item (i.e. stair orientations) - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerObjectTag(ItemStack item, int[] meta, AspectList aspects) { - if (aspects==null) aspects=new AspectList(); - try { - objectTags.put(Arrays.asList(item.getItem(),meta[0]), aspects); - for (int m:meta) { - groupedObjectTags.put(Arrays.asList(item.getItem(),m), meta); - } - - } catch (Exception e) {} - } - - /** - * Used to assign apsects to the given ore dictionary item. - * @param oreDict the ore dictionary name - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerObjectTag(String oreDict, AspectList aspects) { - if (aspects==null) aspects=new AspectList(); - ArrayList ores = OreDictionary.getOres(oreDict); - if (ores!=null && ores.size()>0) { - for (ItemStack ore:ores) { - try { - objectTags.put(Arrays.asList(ore.getItem(), ore.getItemDamage()), aspects); - } catch (Exception e) {} - } - } - } - - /** - * Used to assign aspects to the given item/block. - * Attempts to automatically generate aspect tags by checking registered recipes. - * Here is an example of the declaration for pistons:

- * ThaumcraftApi.registerComplexObjectTag(new ItemStack(Blocks.cobblestone), (new AspectList()).add(Aspect.MECHANISM, 2).add(Aspect.MOTION, 4)); - * IMPORTANT - this should only be used if you are not happy with the default aspects the object would be assigned. - * @param item, pass OreDictionary.WILDCARD_VALUE to meta if all damage values of this item/block should have the same aspects - * @param aspects A ObjectTags object of the associated aspects - */ - public static void registerComplexObjectTag(ItemStack item, AspectList aspects ) { - if (!exists(item.getItem(),item.getItemDamage())) { - AspectList tmp = ThaumcraftApiHelper.generateTags(item.getItem(), item.getItemDamage()); - if (tmp != null && tmp.size()>0) { - for(Aspect tag:tmp.getAspects()) { - aspects.add(tag, tmp.getAmount(tag)); - } - } - registerObjectTag(item,aspects); - } else { - AspectList tmp = ThaumcraftApiHelper.getObjectAspects(item); - for(Aspect tag:aspects.getAspects()) { - tmp.merge(tag, tmp.getAmount(tag)); - } - registerObjectTag(item,tmp); - } - } - - //WARP /////////////////////////////////////////////////////////////////////////////////////// - private static HashMap warpMap = new HashMap(); - - /** - * This method is used to determine how much warp is gained if the item is crafted. The warp - * added is "sticky" warp - * @param craftresult The item crafted - * @param amount how much warp is gained - */ - public static void addWarpToItem(ItemStack craftresult, int amount) { - warpMap.put(Arrays.asList(craftresult.getItem(),craftresult.getItemDamage()),amount); - } - - /** - * This method is used to determine how much permanent warp is gained if the research is completed - * @param in The item crafted - * @param amount how much warp is gained - */ - public static void addWarpToResearch(String research, int amount) { - warpMap.put(research, amount); - } - - /** - * Returns how much warp is gained from the item or research passed in - * @param in itemstack or string - * @return how much warp it will give - */ - public static int getWarp(Object in) { - if (in==null) return 0; - if (in instanceof ItemStack && warpMap.containsKey(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage()))) { - return warpMap.get(Arrays.asList(((ItemStack)in).getItem(),((ItemStack)in).getItemDamage())); - } else - if (in instanceof String && warpMap.containsKey((String)in)) { - return warpMap.get((String)in); - } - return 0; - } - - //LOOT BAGS ////////////////////////////////////////////////////////////////////////////////////////// - - /** - * Used to add possible loot to treasure bags. As a reference, the weight of gold coins are 2000 - * and a diamond is 50. - * The weights are the same for all loot bag types - the only difference is how many items the bag - * contains. - * @param item - * @param weight - * @param bagTypes array of which type of bag to add this loot to. Multiple types can be specified - * 0 = common, 1 = uncommon, 2 = rare - */ - public static void addLootBagItem(ItemStack item, int weight, int... bagTypes) { - if (bagTypes==null || bagTypes.length==0) - WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); - else { - for (int rarity:bagTypes) { - switch(rarity) { - case 0: WeightedRandomLoot.lootBagCommon.add(new WeightedRandomLoot(item,weight)); break; - case 1: WeightedRandomLoot.lootBagUncommon.add(new WeightedRandomLoot(item,weight)); break; - case 2: WeightedRandomLoot.lootBagRare.add(new WeightedRandomLoot(item,weight)); break; - } - } - } - } - - //CROPS ////////////////////////////////////////////////////////////////////////////////////////// - - /** - * To define mod crops you need to use FMLInterModComms in your @Mod.Init method. - * There are two 'types' of crops you can add. Standard crops and clickable crops. - * - * Standard crops work like normal vanilla crops - they grow until a certain metadata - * value is reached and you harvest them by destroying the block and collecting the blocks. - * You need to create and ItemStack that tells the golem what block id and metadata represents - * the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get - * checked. - * Example for vanilla wheat: - * FMLInterModComms.sendMessage("Thaumcraft", "harvestStandardCrop", new ItemStack(Block.crops,1,7)); - * - * Clickable crops are crops that you right click to gather their bounty instead of destroying them. - * As for standard crops, you need to create and ItemStack that tells the golem what block id - * and metadata represents the crop when fully grown. The golem will trigger the blocks onBlockActivated method. - * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. - * Example (this will technically do nothing since clicking wheat does nothing, but you get the idea): - * FMLInterModComms.sendMessage("Thaumcraft", "harvestClickableCrop", new ItemStack(Block.crops,1,7)); - * - * Stacked crops (like reeds) are crops that you wish the bottom block should remain after harvesting. - * As for standard crops, you need to create and ItemStack that tells the golem what block id - * and metadata represents the crop when fully grown. Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the actualy md won't get - * checked. If it has the order upgrade it will only harvest if the crop is more than one block high. - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "harvestStackedCrop", new ItemStack(Block.reed,1,7)); - */ - - //NATIVE CLUSTERS ////////////////////////////////////////////////////////////////////////////////// - - /** - * You can define certain ores that will have a chance to produce native clusters via FMLInterModComms - * in your @Mod.Init method using the "nativeCluster" string message. - * The format should be: - * "[ore item/block id],[ore item/block metadata],[cluster item/block id],[cluster item/block metadata],[chance modifier float]" - * - * NOTE: The chance modifier is a multiplier applied to the default chance for that cluster to be produced (default 27.5% for a pickaxe of the core) - * - * Example for vanilla iron ore to produce one of my own native iron clusters (assuming default id's) at double the default chance: - * FMLInterModComms.sendMessage("Thaumcraft", "nativeCluster","15,0,25016,16,2.0"); - */ - - //LAMP OF GROWTH BLACKLIST /////////////////////////////////////////////////////////////////////////// - /** - * You can blacklist crops that should not be effected by the Lamp of Growth via FMLInterModComms - * in your @Mod.Init method using the "lampBlacklist" itemstack message. - * Sending a metadata of [OreDictionary.WILDCARD_VALUE] will mean the metadata won't get checked. - * Example for vanilla wheat: - * FMLInterModComms.sendMessage("Thaumcraft", "lampBlacklist", new ItemStack(Block.crops,1,OreDictionary.WILDCARD_VALUE)); - */ - - //DIMENSION BLACKLIST /////////////////////////////////////////////////////////////////////////// - /** - * You can blacklist a dimension to not spawn certain thaumcraft features - * in your @Mod.Init method using the "dimensionBlacklist" string message in the format "[dimension]:[level]" - * The level values are as follows: - * [0] stop all tc spawning and generation - * [1] allow ore and node generation (and node special features) - * [2] allow mob spawning - * [3] allow ore and node gen + mob spawning (and node special features) - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "dimensionBlacklist", "15:1"); - */ - - //BIOME BLACKLIST /////////////////////////////////////////////////////////////////////////// - /** - * You can blacklist a biome to not spawn certain thaumcraft features - * in your @Mod.Init method using the "biomeBlacklist" string message in the format "[biome id]:[level]" - * The level values are as follows: - * [0] stop all tc spawning and generation - * [1] allow ore and node generation (and node special features) - * [2] allow mob spawning - * [3] allow ore and node gen + mob spawning (and node special features) - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "biomeBlacklist", "180:2"); - */ - - //CHAMPION MOB WHITELIST /////////////////////////////////////////////////////////////////////////// - /** - * You can whitelist an entity class so it can rarely spawn champion versions in your @Mod.Init method using - * the "championWhiteList" string message in the format "[Entity]:[level]" - * The entity must extend EntityMob. - * [Entity] is in a similar format to what is used for mob spawners and such (see EntityList.class for vanilla examples). - * The [level] value indicate how rare the champion version will be - the higher the number the more common. - * The number roughly equals the [n] in 100 chance of a mob being a champion version. - * You can give 0 or negative numbers to allow champions to spawn with a very low chance only in particularly dangerous places. - * However anything less than about -2 will probably result in no spawns at all. - * Example: - * FMLInterModComms.sendMessage("Thaumcraft", "championWhiteList", "Thaumcraft.Wisp:1"); - */ -} diff --git a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java b/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java deleted file mode 100644 index 77d55885..00000000 --- a/src/api/java/thaumcraft/api/ThaumcraftApiHelper.java +++ /dev/null @@ -1,467 +0,0 @@ -package thaumcraft.api; - -import java.util.HashMap; -import java.util.Iterator; - -import net.minecraft.block.Block; -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.MathHelper; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.Vec3; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.IEssentiaTransport; - -public class ThaumcraftApiHelper { - - public static AspectList cullTags(AspectList temp) { - AspectList temp2 = new AspectList(); - for (Aspect tag:temp.getAspects()) { - if (tag!=null) - temp2.add(tag, temp.getAmount(tag)); - } - while (temp2!=null && temp2.size()>6) { - Aspect lowest = null; - float low = Short.MAX_VALUE; - for (Aspect tag:temp2.getAspects()) { - if (tag==null) continue; - float ta=temp2.getAmount(tag); - if (tag.isPrimal()) { - ta *= .9f; - } else { - if (!tag.getComponents()[0].isPrimal()) { - ta *= 1.1f; - if (!tag.getComponents()[0].getComponents()[0].isPrimal()) { - ta *= 1.05f; - } - if (!tag.getComponents()[0].getComponents()[1].isPrimal()) { - ta *= 1.05f; - } - } - if (!tag.getComponents()[1].isPrimal()) { - ta *= 1.1f; - if (!tag.getComponents()[1].getComponents()[0].isPrimal()) { - ta *= 1.05f; - } - if (!tag.getComponents()[1].getComponents()[1].isPrimal()) { - ta *= 1.05f; - } - } - } - - if (ta allAspects= new HashMap(); - private static HashMap allCompoundAspects= new HashMap(); - - public static AspectList getAllAspects(int amount) { - if (allAspects.get(amount)==null) { - AspectList al = new AspectList(); - for (Aspect aspect:Aspect.aspects.values()) { - al.add(aspect, amount); - } - allAspects.put(amount, al); - } - return allAspects.get(amount); - } - - public static AspectList getAllCompoundAspects(int amount) { - if (allCompoundAspects.get(amount)==null) { - AspectList al = new AspectList(); - for (Aspect aspect:Aspect.getCompoundAspects()) { - al.add(aspect, amount); - } - allCompoundAspects.put(amount, al); - } - return allCompoundAspects.get(amount); - } - - - /** - * Use to subtract vis from a wand for most operations - * Wands store vis differently so "real" vis costs need to be multiplied by 100 before calling this method - * @param wand the wand itemstack - * @param player the player using the wand - * @param cost the cost of the operation. - * @param doit actually subtract the vis from the wand if true - if false just simulate the result - * @param crafting is this a crafting operation or not - if - * false then things like frugal and potency will apply to the costs - * @return was the vis successfully subtracted - */ - public static boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, - AspectList cost, boolean doit, boolean crafting) { - return ThaumcraftApi.internalMethods.consumeVisFromWand(wand, player, cost, doit, crafting); - } - - /** - * Subtract vis for use by a crafting mechanic. Costs are calculated slightly - * differently and things like the frugal enchant is ignored - * Must NOT be multiplied by 100 - send the actual vis cost - * @param wand the wand itemstack - * @param player the player using the wand - * @param cost the cost of the operation. - * @param doit actually subtract the vis from the wand if true - if false just simulate the result - * @return was the vis successfully subtracted - */ - public static boolean consumeVisFromWandCrafting(ItemStack wand, EntityPlayer player, - AspectList cost, boolean doit) { - return ThaumcraftApi.internalMethods.consumeVisFromWandCrafting(wand, player, cost, doit); - } - - /** - * Subtract vis from a wand the player is carrying. Works like consumeVisFromWand in that actual vis - * costs should be multiplied by 100. The costs are handled like crafting however and things like - * frugal don't effect them - * @param player the player using the wand - * @param cost the cost of the operation. - * @return was the vis successfully subtracted - */ - public static boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { - return ThaumcraftApi.internalMethods.consumeVisFromInventory(player, cost); - } - - - /** - * This adds permanents or temporary warp to a player. It will automatically be synced clientside - * @param player the player using the wand - * @param amount how much warp to add. Negative amounts are only valid for temporary warp - * @param temporary add temporary warp instead of permanent - */ - public static void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary) { - ThaumcraftApi.internalMethods.addWarpToPlayer(player, amount, temporary); - } - - /** - * This "sticky" warp to a player. Sticky warp is permanent warp that can be removed. - * It will automatically be synced clientside - * @param player the player using the wand - * @param amount how much warp to add. Can have negative amounts. - */ - public static void addStickyWarpToPlayer(EntityPlayer player, int amount) { - ThaumcraftApi.internalMethods.addStickyWarpToPlayer(player, amount); - } - - public static MovingObjectPosition rayTraceIgnoringSource(World world, Vec3 v1, Vec3 v2, - boolean bool1, boolean bool2, boolean bool3) - { - if (!Double.isNaN(v1.xCoord) && !Double.isNaN(v1.yCoord) && !Double.isNaN(v1.zCoord)) - { - if (!Double.isNaN(v2.xCoord) && !Double.isNaN(v2.yCoord) && !Double.isNaN(v2.zCoord)) - { - int i = MathHelper.floor_double(v2.xCoord); - int j = MathHelper.floor_double(v2.yCoord); - int k = MathHelper.floor_double(v2.zCoord); - int l = MathHelper.floor_double(v1.xCoord); - int i1 = MathHelper.floor_double(v1.yCoord); - int j1 = MathHelper.floor_double(v1.zCoord); - Block block = world.getBlock(l, i1, j1); - int k1 = world.getBlockMetadata(l, i1, j1); - - MovingObjectPosition movingobjectposition2 = null; - k1 = 200; - - while (k1-- >= 0) - { - if (Double.isNaN(v1.xCoord) || Double.isNaN(v1.yCoord) || Double.isNaN(v1.zCoord)) - { - return null; - } - - if (l == i && i1 == j && j1 == k) - { - continue; - } - - boolean flag6 = true; - boolean flag3 = true; - boolean flag4 = true; - double d0 = 999.0D; - double d1 = 999.0D; - double d2 = 999.0D; - - if (i > l) - { - d0 = (double)l + 1.0D; - } - else if (i < l) - { - d0 = (double)l + 0.0D; - } - else - { - flag6 = false; - } - - if (j > i1) - { - d1 = (double)i1 + 1.0D; - } - else if (j < i1) - { - d1 = (double)i1 + 0.0D; - } - else - { - flag3 = false; - } - - if (k > j1) - { - d2 = (double)j1 + 1.0D; - } - else if (k < j1) - { - d2 = (double)j1 + 0.0D; - } - else - { - flag4 = false; - } - - double d3 = 999.0D; - double d4 = 999.0D; - double d5 = 999.0D; - double d6 = v2.xCoord - v1.xCoord; - double d7 = v2.yCoord - v1.yCoord; - double d8 = v2.zCoord - v1.zCoord; - - if (flag6) - { - d3 = (d0 - v1.xCoord) / d6; - } - - if (flag3) - { - d4 = (d1 - v1.yCoord) / d7; - } - - if (flag4) - { - d5 = (d2 - v1.zCoord) / d8; - } - - boolean flag5 = false; - byte b0; - - if (d3 < d4 && d3 < d5) - { - if (i > l) - { - b0 = 4; - } - else - { - b0 = 5; - } - - v1.xCoord = d0; - v1.yCoord += d7 * d3; - v1.zCoord += d8 * d3; - } - else if (d4 < d5) - { - if (j > i1) - { - b0 = 0; - } - else - { - b0 = 1; - } - - v1.xCoord += d6 * d4; - v1.yCoord = d1; - v1.zCoord += d8 * d4; - } - else - { - if (k > j1) - { - b0 = 2; - } - else - { - b0 = 3; - } - - v1.xCoord += d6 * d5; - v1.yCoord += d7 * d5; - v1.zCoord = d2; - } - - Vec3 vec32 = Vec3.createVectorHelper(v1.xCoord, v1.yCoord, v1.zCoord); - l = (int)(vec32.xCoord = (double)MathHelper.floor_double(v1.xCoord)); - - if (b0 == 5) - { - --l; - ++vec32.xCoord; - } - - i1 = (int)(vec32.yCoord = (double)MathHelper.floor_double(v1.yCoord)); - - if (b0 == 1) - { - --i1; - ++vec32.yCoord; - } - - j1 = (int)(vec32.zCoord = (double)MathHelper.floor_double(v1.zCoord)); - - if (b0 == 3) - { - --j1; - ++vec32.zCoord; - } - - Block block1 = world.getBlock(l, i1, j1); - int l1 = world.getBlockMetadata(l, i1, j1); - - if (!bool2 || block1.getCollisionBoundingBoxFromPool(world, l, i1, j1) != null) - { - if (block1.canCollideCheck(l1, bool1)) - { - MovingObjectPosition movingobjectposition1 = block1.collisionRayTrace(world, l, i1, j1, v1, v2); - - if (movingobjectposition1 != null) - { - return movingobjectposition1; - } - } - else - { - movingobjectposition2 = new MovingObjectPosition(l, i1, j1, b0, v1, false); - } - } - } - - return bool3 ? movingobjectposition2 : null; - } - else - { - return null; - } - } - else - { - return null; - } - } -} diff --git a/src/api/java/thaumcraft/api/TileThaumcraft.java b/src/api/java/thaumcraft/api/TileThaumcraft.java deleted file mode 100644 index 56ccae87..00000000 --- a/src/api/java/thaumcraft/api/TileThaumcraft.java +++ /dev/null @@ -1,63 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; - -/** - * - * @author azanor - * - * Custom tile entity class I use for most of my tile entities. Setup in such a way that only - * the nbt data within readCustomNBT / writeCustomNBT will be sent to the client when the tile - * updates. Apart from all the normal TE data that gets sent that is. - * - */ -public class TileThaumcraft extends TileEntity { - - //NBT stuff - - @Override - public void readFromNBT(NBTTagCompound nbttagcompound) - { - super.readFromNBT(nbttagcompound); - readCustomNBT(nbttagcompound); - } - - public void readCustomNBT(NBTTagCompound nbttagcompound) - { - //TODO - } - - @Override - public void writeToNBT(NBTTagCompound nbttagcompound) - { - super.writeToNBT(nbttagcompound); - writeCustomNBT(nbttagcompound); - } - - public void writeCustomNBT(NBTTagCompound nbttagcompound) - { - //TODO - } - - //Client Packet stuff - @Override - public Packet getDescriptionPacket() { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - this.writeCustomNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, -999, nbttagcompound); - } - - @Override - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) { - super.onDataPacket(net, pkt); - this.readCustomNBT(pkt.func_148857_g()); - } - - - - -} diff --git a/src/api/java/thaumcraft/api/WorldCoordinates.java b/src/api/java/thaumcraft/api/WorldCoordinates.java deleted file mode 100644 index 6c620af5..00000000 --- a/src/api/java/thaumcraft/api/WorldCoordinates.java +++ /dev/null @@ -1,117 +0,0 @@ -package thaumcraft.api; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; - -public class WorldCoordinates implements Comparable -{ - public int x; - - /** the y coordinate */ - public int y; - - /** the z coordinate */ - public int z; - - public int dim; - - public WorldCoordinates() {} - - public WorldCoordinates(int par1, int par2, int par3, int d) - { - this.x = par1; - this.y = par2; - this.z = par3; - this.dim = d; - } - - public WorldCoordinates(TileEntity tile) - { - this.x = tile.xCoord; - this.y = tile.yCoord; - this.z = tile.zCoord; - this.dim = tile.getWorldObj().provider.dimensionId; - } - - public WorldCoordinates(WorldCoordinates par1ChunkCoordinates) - { - this.x = par1ChunkCoordinates.x; - this.y = par1ChunkCoordinates.y; - this.z = par1ChunkCoordinates.z; - this.dim = par1ChunkCoordinates.dim; - } - - public boolean equals(Object par1Obj) - { - if (!(par1Obj instanceof WorldCoordinates)) - { - return false; - } - else - { - WorldCoordinates coordinates = (WorldCoordinates)par1Obj; - return this.x == coordinates.x && this.y == coordinates.y && this.z == coordinates.z && this.dim == coordinates.dim ; - } - } - - public int hashCode() - { - return this.x + this.y << 8 + this.z << 16 + this.dim << 24; - } - - /** - * Compare the coordinate with another coordinate - */ - public int compareWorldCoordinate(WorldCoordinates par1) - { - return this.dim == par1.dim ? ( - this.y == par1.y ? (this.z == par1.z ? this.x - par1.x : this.z - par1.z) : this.y - par1.y) : -1; - } - - public void set(int par1, int par2, int par3, int d) - { - this.x = par1; - this.y = par2; - this.z = par3; - this.dim = d; - } - - /** - * Returns the squared distance between this coordinates and the coordinates given as argument. - */ - public float getDistanceSquared(int par1, int par2, int par3) - { - float f = (float)(this.x - par1); - float f1 = (float)(this.y - par2); - float f2 = (float)(this.z - par3); - return f * f + f1 * f1 + f2 * f2; - } - - /** - * Return the squared distance between this coordinates and the ChunkCoordinates given as argument. - */ - public float getDistanceSquaredToWorldCoordinates(WorldCoordinates par1ChunkCoordinates) - { - return this.getDistanceSquared(par1ChunkCoordinates.x, par1ChunkCoordinates.y, par1ChunkCoordinates.z); - } - - public int compareTo(Object par1Obj) - { - return this.compareWorldCoordinate((WorldCoordinates)par1Obj); - } - - public void readNBT(NBTTagCompound nbt) { - this.x = nbt.getInteger("w_x"); - this.y = nbt.getInteger("w_y"); - this.z = nbt.getInteger("w_z"); - this.dim = nbt.getInteger("w_d"); - } - - public void writeNBT(NBTTagCompound nbt) { - nbt.setInteger("w_x",x); - nbt.setInteger("w_y",y); - nbt.setInteger("w_z",z); - nbt.setInteger("w_d",dim); - } - -} diff --git a/src/api/java/thaumcraft/api/aspects/Aspect.java b/src/api/java/thaumcraft/api/aspects/Aspect.java deleted file mode 100644 index 3c33a4a7..00000000 --- a/src/api/java/thaumcraft/api/aspects/Aspect.java +++ /dev/null @@ -1,201 +0,0 @@ -package thaumcraft.api.aspects; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.apache.commons.lang3.text.WordUtils; - -public class Aspect { - - String tag; - Aspect[] components; - int color; - private String chatcolor; - ResourceLocation image; - int blend; - - /** - * Use this constructor to register your own aspects. - * @param tag the key that will be used to reference this aspect, as well as its latin display name - * @param color color to display the tag in - * @param components the aspects this one is formed from - * @param image ResourceLocation pointing to a 32x32 icon of the aspect - * @param blend GL11 blendmode (1 or 771). Used for rendering nodes. Default is 1 - */ - public Aspect(String tag, int color, Aspect[] components, ResourceLocation image, int blend) { - if (aspects.containsKey(tag)) throw new IllegalArgumentException(tag+" already registered!"); - this.tag = tag; - this.components = components; - this.color = color; - this.image = image; - this.blend = blend; - aspects.put(tag, this); - } - - /** - * Shortcut constructor I use for the default aspects - you shouldn't be using this. - */ - public Aspect(String tag, int color, Aspect[] components) { - this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),1); - } - - /** - * Shortcut constructor I use for the default aspects - you shouldn't be using this. - */ - public Aspect(String tag, int color, Aspect[] components, int blend) { - this(tag,color,components,new ResourceLocation("thaumcraft","textures/aspects/"+tag.toLowerCase()+".png"),blend); - } - - /** - * Shortcut constructor I use for the primal aspects - - * you shouldn't use this as making your own primal aspects will break all the things. - */ - public Aspect(String tag, int color, String chatcolor, int blend) { - this(tag,color,(Aspect[])null, blend); - this.setChatcolor(chatcolor); - } - - public int getColor() { - return color; - } - - public String getName() { - return WordUtils.capitalizeFully(tag); - } - - public String getLocalizedDescription() { - return StatCollector.translateToLocal("tc.aspect."+tag); - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - public Aspect[] getComponents() { - return components; - } - - public void setComponents(Aspect[] components) { - this.components = components; - } - - public ResourceLocation getImage() { - return image; - } - - public static Aspect getAspect(String tag) { - return aspects.get(tag); - } - - public int getBlend() { - return blend; - } - - public void setBlend(int blend) { - this.blend = blend; - } - - public boolean isPrimal() { - return getComponents()==null || getComponents().length!=2; - } - - /////////////////////////////// - public static ArrayList getPrimalAspects() { - ArrayList primals = new ArrayList(); - Collection pa = aspects.values(); - for (Aspect aspect:pa) { - if (aspect.isPrimal()) primals.add(aspect); - } - return primals; - } - - public static ArrayList getCompoundAspects() { - ArrayList compounds = new ArrayList(); - Collection pa = aspects.values(); - for (Aspect aspect:pa) { - if (!aspect.isPrimal()) compounds.add(aspect); - } - return compounds; - } - - public String getChatcolor() { - return chatcolor; - } - - public void setChatcolor(String chatcolor) { - this.chatcolor = chatcolor; - } - - - /////////////////////////////// - public static LinkedHashMap aspects = new LinkedHashMap(); - - //PRIMAL - public static final Aspect AIR = new Aspect("aer",0xffff7e,"e",1); - public static final Aspect EARTH = new Aspect("terra",0x56c000,"2",1); - public static final Aspect FIRE = new Aspect("ignis",0xff5a01,"c",1); - public static final Aspect WATER = new Aspect("aqua",0x3cd4fc,"3",1); - public static final Aspect ORDER = new Aspect("ordo",0xd5d4ec,"7",1); - public static final Aspect ENTROPY = new Aspect("perditio",0x404040,"8",771); - - //SECONDARY - public static final Aspect VOID = new Aspect("vacuos",0x888888, new Aspect[] {AIR, ENTROPY},771); - public static final Aspect LIGHT = new Aspect("lux",0xfff663, new Aspect[] {AIR, FIRE}); - public static final Aspect WEATHER = new Aspect("tempestas",0xFFFFFF, new Aspect[] {AIR, WATER}); - public static final Aspect MOTION = new Aspect("motus",0xcdccf4, new Aspect[] {AIR, ORDER}); - public static final Aspect COLD = new Aspect("gelum",0xe1ffff, new Aspect[] {FIRE, ENTROPY}); - public static final Aspect CRYSTAL = new Aspect("vitreus",0x80ffff, new Aspect[] {EARTH, ORDER}); - public static final Aspect LIFE = new Aspect("victus",0xde0005, new Aspect[] {WATER, EARTH}); - public static final Aspect POISON = new Aspect("venenum",0x89f000, new Aspect[] {WATER, ENTROPY}); - public static final Aspect ENERGY = new Aspect("potentia",0xc0ffff, new Aspect[] {ORDER, FIRE}); - public static final Aspect EXCHANGE = new Aspect("permutatio",0x578357, new Aspect[] {ENTROPY, ORDER}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {AIR, EARTH}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, EARTH}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {FIRE, WATER}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {ORDER, WATER}); -// public static final Aspect ?? = new Aspect("??",0xcdccf4, new Aspect[] {EARTH, ENTROPY}); - - //TERTIARY - public static final Aspect METAL = new Aspect("metallum",0xb5b5cd, new Aspect[] {EARTH, CRYSTAL}); - public static final Aspect DEATH = new Aspect("mortuus",0x887788, new Aspect[] {LIFE, ENTROPY}); - public static final Aspect FLIGHT = new Aspect("volatus",0xe7e7d7, new Aspect[] {AIR, MOTION}); - public static final Aspect DARKNESS = new Aspect("tenebrae",0x222222, new Aspect[] {VOID, LIGHT}); - public static final Aspect SOUL = new Aspect("spiritus",0xebebfb, new Aspect[] {LIFE, DEATH}); - public static final Aspect HEAL = new Aspect("sano",0xff2f34, new Aspect[] {LIFE, ORDER}); - public static final Aspect TRAVEL = new Aspect("iter",0xe0585b, new Aspect[] {MOTION, EARTH}); - public static final Aspect ELDRITCH = new Aspect("alienis",0x805080, new Aspect[] {VOID, DARKNESS}); - public static final Aspect MAGIC = new Aspect("praecantatio",0x9700c0, new Aspect[] {VOID, ENERGY}); - public static final Aspect AURA = new Aspect("auram",0xffc0ff, new Aspect[] {MAGIC, AIR}); - public static final Aspect TAINT = new Aspect("vitium",0x800080, new Aspect[] {MAGIC, ENTROPY}); - public static final Aspect SLIME = new Aspect("limus",0x01f800, new Aspect[] {LIFE, WATER}); - public static final Aspect PLANT = new Aspect("herba",0x01ac00, new Aspect[] {LIFE, EARTH}); - public static final Aspect TREE = new Aspect("arbor",0x876531, new Aspect[] {AIR, PLANT}); - public static final Aspect BEAST = new Aspect("bestia",0x9f6409, new Aspect[] {MOTION, LIFE}); - public static final Aspect FLESH = new Aspect("corpus",0xee478d, new Aspect[] {DEATH, BEAST}); - public static final Aspect UNDEAD = new Aspect("exanimis",0x3a4000, new Aspect[] {MOTION, DEATH}); - public static final Aspect MIND = new Aspect("cognitio",0xffc2b3, new Aspect[] {EARTH, SOUL}); - public static final Aspect SENSES = new Aspect("sensus",0x0fd9ff, new Aspect[] {AIR, SOUL}); - public static final Aspect MAN = new Aspect("humanus",0xffd7c0, new Aspect[] {BEAST, MIND}); - public static final Aspect CROP = new Aspect("messis",0xe1b371, new Aspect[] {PLANT, MAN}); - public static final Aspect MINE = new Aspect("perfodio",0xdcd2d8, new Aspect[] {MAN, EARTH}); - public static final Aspect TOOL = new Aspect("instrumentum",0x4040ee, new Aspect[] {MAN, ORDER}); - public static final Aspect HARVEST = new Aspect("meto",0xeead82, new Aspect[] {CROP, TOOL}); - public static final Aspect WEAPON = new Aspect("telum",0xc05050, new Aspect[] {TOOL, ENTROPY}); - public static final Aspect ARMOR = new Aspect("tutamen",0x00c0c0, new Aspect[] {TOOL, EARTH}); - public static final Aspect HUNGER = new Aspect("fames",0x9a0305, new Aspect[] {LIFE, VOID}); - public static final Aspect GREED = new Aspect("lucrum",0xe6be44, new Aspect[] {MAN, HUNGER}); - public static final Aspect CRAFT = new Aspect("fabrico",0x809d80, new Aspect[] {MAN, TOOL}); - public static final Aspect CLOTH = new Aspect("pannus",0xeaeac2, new Aspect[] {TOOL, BEAST}); - public static final Aspect MECHANISM = new Aspect("machina",0x8080a0, new Aspect[] {MOTION, TOOL}); - public static final Aspect TRAP = new Aspect("vinculum",0x9a8080, new Aspect[] {MOTION, ENTROPY}); - - -} diff --git a/src/api/java/thaumcraft/api/aspects/AspectList.java b/src/api/java/thaumcraft/api/aspects/AspectList.java deleted file mode 100644 index b5781410..00000000 --- a/src/api/java/thaumcraft/api/aspects/AspectList.java +++ /dev/null @@ -1,292 +0,0 @@ -package thaumcraft.api.aspects; - -import java.io.Serializable; -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import thaumcraft.api.ThaumcraftApiHelper; - -public class AspectList implements Serializable { - - public LinkedHashMap aspects = new LinkedHashMap();//aspects associated with this object - - - /** - * this creates a new aspect list with preloaded values based off the aspects of the given item. - * @param the itemstack of the given item - */ - public AspectList(ItemStack stack) { - try { - AspectList temp = ThaumcraftApiHelper.getObjectAspects(stack); - if (temp!=null) - for (Aspect tag:temp.getAspects()) { - add(tag,temp.getAmount(tag)); - } - } catch (Exception e) {} - } - - public AspectList() { - } - - public AspectList copy() { - AspectList out = new AspectList(); - for (Aspect a:this.getAspects()) - out.add(a, this.getAmount(a)); - return out; - } - - /** - * @return the amount of different aspects in this collection - */ - public int size() { - return aspects.size(); - } - - /** - * @return the amount of total vis in this collection - */ - public int visSize() { - int q = 0; - - for (Aspect as:aspects.keySet()) { - q+=this.getAmount(as); - } - - return q; - } - - /** - * @return an array of all the aspects in this collection - */ - public Aspect[] getAspects() { - Aspect[] q = new Aspect[1]; - return aspects.keySet().toArray(q); - } - - /** - * @return an array of all the aspects in this collection - */ - public Aspect[] getPrimalAspects() { - AspectList t = new AspectList(); - for (Aspect as:aspects.keySet()) { - if (as.isPrimal()) { - t.add(as,1); - } - } - Aspect[] q = new Aspect[1]; - return t.aspects.keySet().toArray(q); - } - - /** - * @return an array of all the aspects in this collection sorted by name - */ - public Aspect[] getAspectsSorted() { - try { - Aspect[] out = aspects.keySet().toArray(new Aspect[]{}); - boolean change=false; - do { - change=false; - for(int a=0;a0) { - out[a] = e2; - out[a+1] = e1; - change = true; - break; - } - } - } while (change==true); - return out; - } catch (Exception e) { - return this.getAspects(); - } - } - - /** - * @return an array of all the aspects in this collection sorted by amount - */ - public Aspect[] getAspectsSortedAmount() { - try { - Aspect[] out = aspects.keySet().toArray(new Aspect[1]); - boolean change=false; - do { - change=false; - for(int a=0;a0 && e2>0 && e2>e1) { - Aspect ea = out[a]; - Aspect eb = out[a+1]; - out[a] = eb; - out[a+1] = ea; - change = true; - break; - } - } - } while (change==true); - return out; - } catch (Exception e) { - return this.getAspects(); - } - } - - /** - * @param key - * @return the amount associated with the given aspect in this collection - */ - public int getAmount(Aspect key) { - return aspects.get(key)==null?0:aspects.get(key); - } - - /** - * Reduces the amount of an aspect in this collection by the given amount. - * @param key - * @param amount - * @return - */ - public boolean reduce(Aspect key, int amount) { - if (getAmount(key)>=amount) { - int am = getAmount(key)-amount; - aspects.put(key, am); - return true; - } - return false; - } - - /** - * Reduces the amount of an aspect in this collection by the given amount. - * If reduced to 0 or less the aspect will be removed completely. - * @param key - * @param amount - * @return - */ - public AspectList remove(Aspect key, int amount) { - int am = getAmount(key)-amount; - if (am<=0) aspects.remove(key); else - this.aspects.put(key, am); - return this; - } - - /** - * Simply removes the aspect from the list - * @param key - * @param amount - * @return - */ - public AspectList remove(Aspect key) { - aspects.remove(key); - return this; - } - - /** - * Adds this aspect and amount to the collection. - * If the aspect exists then its value will be increased by the given amount. - * @param aspect - * @param amount - * @return - */ - public AspectList add(Aspect aspect, int amount) { - if (this.aspects.containsKey(aspect)) { - int oldamount = this.aspects.get(aspect); - amount+=oldamount; - } - this.aspects.put( aspect, amount ); - return this; - } - - - /** - * Adds this aspect and amount to the collection. - * If the aspect exists then only the highest of the old or new amount will be used. - * @param aspect - * @param amount - * @return - */ - public AspectList merge(Aspect aspect, int amount) { - if (this.aspects.containsKey(aspect)) { - int oldamount = this.aspects.get(aspect); - if (amount0?aspects:null; - } - return null; - } - - @Override - public void setAspects(ItemStack itemstack, AspectList aspects) { - if (!itemstack.hasTagCompound()) itemstack.setTagCompound(new NBTTagCompound()); - aspects.writeToNBT(itemstack.getTagCompound()); - } -*/ \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java b/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java deleted file mode 100644 index fecbc160..00000000 --- a/src/api/java/thaumcraft/api/aspects/IEssentiaTransport.java +++ /dev/null @@ -1,100 +0,0 @@ -package thaumcraft.api.aspects; - -import net.minecraftforge.common.util.ForgeDirection; - - -/** - * @author Azanor - * This interface is used by tiles that use or transport vis. - * Only tiles that implement this interface will be able to connect to vis conduits or other thaumic devices - */ -public interface IEssentiaTransport { - /** - * Is this tile able to connect to other vis users/sources on the specified side? - * @param face - * @return - */ - public boolean isConnectable(ForgeDirection face); - - /** - * Is this side used to input essentia? - * @param face - * @return - */ - boolean canInputFrom(ForgeDirection face); - - /** - * Is this side used to output essentia? - * @param face - * @return - */ - boolean canOutputTo(ForgeDirection face); - - /** - * Sets the amount of suction this block will apply - * @param suction - */ - public void setSuction(Aspect aspect, int amount); - - /** - * Returns the type of suction this block is applying. - * @param loc - * the location from where the suction is being checked - * @return - * a return type of null indicates the suction is untyped and the first thing available will be drawn - */ - public Aspect getSuctionType(ForgeDirection face); - - /** - * Returns the strength of suction this block is applying. - * @param loc - * the location from where the suction is being checked - * @return - */ - public int getSuctionAmount(ForgeDirection face); - - /** - * remove the specified amount of essentia from this transport tile - * @return how much was actually taken - */ - public int takeEssentia(Aspect aspect, int amount, ForgeDirection face); - - /** - * add the specified amount of essentia to this transport tile - * @return how much was actually added - */ - public int addEssentia(Aspect aspect, int amount, ForgeDirection face); - - /** - * What type of essentia this contains - * @param face - * @return - */ - public Aspect getEssentiaType(ForgeDirection face); - - /** - * How much essentia this block contains - * @param face - * @return - */ - public int getEssentiaAmount(ForgeDirection face); - - - - /** - * Essentia will not be drawn from this container unless the suction exceeds this amount. - * @return the amount - */ - public int getMinimumSuction(); - - /** - * Return true if you want the conduit to extend a little further into the block. - * Used by jars and alembics that have smaller than normal hitboxes - * @return - */ - boolean renderExtendedTube(); - - - -} - diff --git a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java b/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java deleted file mode 100644 index 595b6e53..00000000 --- a/src/api/java/thaumcraft/api/crafting/CrucibleRecipe.java +++ /dev/null @@ -1,91 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class CrucibleRecipe { - - private ItemStack recipeOutput; - - public Object catalyst; - public AspectList aspects; - public String key; - - public int hash; - - public CrucibleRecipe(String researchKey, ItemStack result, Object cat, AspectList tags) { - recipeOutput = result; - this.aspects = tags; - this.key = researchKey; - this.catalyst = cat; - if (cat instanceof String) { - this.catalyst = OreDictionary.getOres((String) cat); - } - String hc = researchKey + result.toString(); - for (Aspect tag:tags.getAspects()) { - hc += tag.getTag()+tags.getAmount(tag); - } - if (cat instanceof ItemStack) { - hc += ((ItemStack)cat).toString(); - } else - if (cat instanceof ArrayList && ((ArrayList)catalyst).size()>0) { - for (ItemStack is :(ArrayList)catalyst) { - hc += is.toString(); - } - } - - hash = hc.hashCode(); - } - - - - public boolean matches(AspectList itags, ItemStack cat) { - if (catalyst instanceof ItemStack && - !ThaumcraftApiHelper.itemMatches((ItemStack) catalyst,cat,false)) { - return false; - } else - if (catalyst instanceof ArrayList && ((ArrayList)catalyst).size()>0) { - ItemStack[] ores = ((ArrayList)catalyst).toArray(new ItemStack[]{}); - if (!ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat},ores)) return false; - } - if (itags==null) return false; - for (Aspect tag:aspects.getAspects()) { - if (itags.getAmount(tag))catalyst).size()>0) { - ItemStack[] ores = ((ArrayList)catalyst).toArray(new ItemStack[]{}); - if (ThaumcraftApiHelper.containsMatch(false, new ItemStack[]{cat},ores)) return true; - } - return false; - } - - public AspectList removeMatching(AspectList itags) { - AspectList temptags = new AspectList(); - temptags.aspects.putAll(itags.aspects); - - for (Aspect tag:aspects.getAspects()) { - temptags.remove(tag, aspects.getAmount(tag)); - } - - itags = temptags; - return itags; - } - - public ItemStack getRecipeOutput() { - return recipeOutput; - } - - -} diff --git a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java deleted file mode 100644 index bb5036d2..00000000 --- a/src/api/java/thaumcraft/api/crafting/IArcaneRecipe.java +++ /dev/null @@ -1,35 +0,0 @@ -package thaumcraft.api.crafting; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import thaumcraft.api.aspects.AspectList; - -public interface IArcaneRecipe -{ - - - /** - * Used to check if a recipe matches current crafting inventory - * @param player - */ - boolean matches(IInventory var1, World world, EntityPlayer player); - - /** - * Returns an Item that is the result of this recipe - */ - ItemStack getCraftingResult(IInventory var1); - - /** - * Returns the size of the recipe area - */ - int getRecipeSize(); - - ItemStack getRecipeOutput(); - AspectList getAspects(); - AspectList getAspects(IInventory var1); - String getResearch(); - - -} diff --git a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java b/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java deleted file mode 100644 index d137ff24..00000000 --- a/src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java +++ /dev/null @@ -1,19 +0,0 @@ -package thaumcraft.api.crafting; - -import net.minecraft.world.World; - -/** - * - * @author Azanor - * - * Blocks that implement this interface act as infusion crafting stabilisers like candles and skulls - * - */ -public interface IInfusionStabiliser { - - /** - * returns true if the block can stabilise things - */ - public boolean canStabaliseInfusion(World world, int x, int y, int z); - -} diff --git a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java b/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java deleted file mode 100644 index bdc5f505..00000000 --- a/src/api/java/thaumcraft/api/crafting/InfusionEnchantmentRecipe.java +++ /dev/null @@ -1,154 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentHelper; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.AspectList; - -public class InfusionEnchantmentRecipe -{ - - public AspectList aspects; - public String research; - public ItemStack[] components; - public Enchantment enchantment; - public int recipeXP; - public int instability; - - public InfusionEnchantmentRecipe(String research, Enchantment input, int inst, - AspectList aspects2, ItemStack[] recipe) { - this.research = research; - this.enchantment = input; - this.aspects = aspects2; - this.components = recipe; - this.instability = inst; - this.recipeXP = Math.max(1, input.getMinEnchantability(1)/3); - } - - /** - * Used to check if a recipe matches current crafting inventory - * @param player - */ - public boolean matches(ArrayList input, ItemStack central, World world, EntityPlayer player) { - if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { - return false; - } - - if (!enchantment.canApply(central) || !central.getItem().isItemTool(central)) { - return false; - } - - Map map1 = EnchantmentHelper.getEnchantments(central); - Iterator iterator = map1.keySet().iterator(); - while (iterator.hasNext()) - { - int j1 = ((Integer)iterator.next()).intValue(); - Enchantment ench = Enchantment.enchantmentsList[j1]; - if (j1 == enchantment.effectId && - EnchantmentHelper.getEnchantmentLevel(j1, central)>=ench.getMaxLevel()) - return false; - if (enchantment.effectId != ench.effectId && - (!enchantment.canApplyTogether(ench) || - !ench.canApplyTogether(enchantment))) { - return false; - } - } - - ItemStack i2 = null; - - ArrayList ii = new ArrayList(); - for (ItemStack is:input) { - ii.add(is.copy()); - } - - for (ItemStack comp:components) { - boolean b=false; - for (int a=0;a input, ItemStack central, World world, EntityPlayer player) { - if (getRecipeInput()==null) return false; - - if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { - return false; - } - - ItemStack i2 = central.copy(); - if (getRecipeInput().getItemDamage()==OreDictionary.WILDCARD_VALUE) { - i2.setItemDamage(OreDictionary.WILDCARD_VALUE); - } - - if (!areItemStacksEqual(i2, getRecipeInput(), true)) return false; - - ArrayList ii = new ArrayList(); - for (ItemStack is:input) { - ii.add(is.copy()); - } - - for (ItemStack comp:getComponents()) { - boolean b=false; - for (int a=0;a itemMap = new HashMap(); - - for (; idx < recipe.length; idx += 2) - { - Character chr = (Character)recipe[idx]; - Object in = recipe[idx + 1]; - - if (in instanceof ItemStack) - { - itemMap.put(chr, ((ItemStack)in).copy()); - } - else if (in instanceof Item) - { - itemMap.put(chr, new ItemStack((Item)in)); - } - else if (in instanceof Block) - { - itemMap.put(chr, new ItemStack((Block)in, 1, OreDictionary.WILDCARD_VALUE)); - } - else if (in instanceof String) - { - itemMap.put(chr, OreDictionary.getOres((String)in)); - } - else - { - String ret = "Invalid shaped ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - } - - input = new Object[width * height]; - int x = 0; - for (char chr : shape.toCharArray()) - { - input[x++] = itemMap.get(chr); - } - } - - @Override - public ItemStack getCraftingResult(IInventory var1){ return output.copy(); } - - @Override - public int getRecipeSize(){ return input.length; } - - @Override - public ItemStack getRecipeOutput(){ return output; } - - @Override - public boolean matches(IInventory inv, World world, EntityPlayer player) - { - if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { - return false; - } - for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) - { - for (int y = 0; y <= MAX_CRAFT_GRID_HEIGHT - height; ++y) - { - if (checkMatch(inv, x, y, false)) - { - return true; - } - - if (mirrored && checkMatch(inv, x, y, true)) - { - return true; - } - } - } - - return false; - } - - private boolean checkMatch(IInventory inv, int startX, int startY, boolean mirror) - { - for (int x = 0; x < MAX_CRAFT_GRID_WIDTH; x++) - { - for (int y = 0; y < MAX_CRAFT_GRID_HEIGHT; y++) - { - int subX = x - startX; - int subY = y - startY; - Object target = null; - - if (subX >= 0 && subY >= 0 && subX < width && subY < height) - { - if (mirror) - { - target = input[width - subX - 1 + subY * width]; - } - else - { - target = input[subX + subY * width]; - } - } - - ItemStack slot = ThaumcraftApiHelper.getStackInRowAndColumn(inv, x, y); - - if (target instanceof ItemStack) - { - if (!checkItemEquals((ItemStack)target, slot)) - { - return false; - } - } - else if (target instanceof ArrayList) - { - boolean matched = false; - - for (ItemStack item : (ArrayList)target) - { - matched = matched || checkItemEquals(item, slot); - } - - if (!matched) - { - return false; - } - } - else if (target == null && slot != null) - { - return false; - } - } - } - - return true; - } - - private boolean checkItemEquals(ItemStack target, ItemStack input) - { - if (input == null && target != null || input != null && target == null) - { - return false; - } - return (target.getItem() == input.getItem() && - (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) && - (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); - } - - public ShapedArcaneRecipe setMirrored(boolean mirror) - { - mirrored = mirror; - return this; - } - - /** - * Returns the input for this recipe, any mod accessing this value should never - * manipulate the values in this array as it will effect the recipe itself. - * @return The recipes input vales. - */ - public Object[] getInput() - { - return this.input; - } - - @Override - public AspectList getAspects() { - return aspects; - } - - @Override - public AspectList getAspects(IInventory inv) { - return aspects; - } - - @Override - public String getResearch() { - return research; - } -} diff --git a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java b/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java deleted file mode 100644 index 3b1eaeb8..00000000 --- a/src/api/java/thaumcraft/api/crafting/ShapelessArcaneRecipe.java +++ /dev/null @@ -1,161 +0,0 @@ -package thaumcraft.api.crafting; - -import java.util.ArrayList; -import java.util.Iterator; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.AspectList; - -public class ShapelessArcaneRecipe implements IArcaneRecipe -{ - private ItemStack output = null; - private ArrayList input = new ArrayList(); - - public AspectList aspects = null; - public String research; - - public ShapelessArcaneRecipe(String research, Block result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); } - public ShapelessArcaneRecipe(String research, Item result, AspectList aspects, Object... recipe){ this(research,new ItemStack(result),aspects, recipe); } - - public ShapelessArcaneRecipe(String research, ItemStack result, AspectList aspects, Object... recipe) - { - output = result.copy(); - this.research = research; - this.aspects = aspects; - for (Object in : recipe) - { - if (in instanceof ItemStack) - { - input.add(((ItemStack)in).copy()); - } - else if (in instanceof Item) - { - input.add(new ItemStack((Item)in)); - } - else if (in instanceof Block) - { - input.add(new ItemStack((Block)in)); - } - else if (in instanceof String) - { - input.add(OreDictionary.getOres((String)in)); - } - else - { - String ret = "Invalid shapeless ore recipe: "; - for (Object tmp : recipe) - { - ret += tmp + ", "; - } - ret += output; - throw new RuntimeException(ret); - } - } - } - - @Override - public int getRecipeSize(){ return input.size(); } - - @Override - public ItemStack getRecipeOutput(){ return output; } - - @Override - public ItemStack getCraftingResult(IInventory var1){ return output.copy(); } - - @Override - public boolean matches(IInventory var1, World world, EntityPlayer player) - { - if (research.length()>0 && !ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), research)) { - return false; - } - - ArrayList required = new ArrayList(input); - - for (int x = 0; x < 9; x++) - { - ItemStack slot = var1.getStackInSlot(x); - - if (slot != null) - { - boolean inRecipe = false; - Iterator req = required.iterator(); - - while (req.hasNext()) - { - boolean match = false; - - Object next = req.next(); - - if (next instanceof ItemStack) - { - match = checkItemEquals((ItemStack)next, slot); - } - else if (next instanceof ArrayList) - { - for (ItemStack item : (ArrayList)next) - { - match = match || checkItemEquals(item, slot); - } - } - - if (match) - { - inRecipe = true; - required.remove(next); - break; - } - } - - if (!inRecipe) - { - return false; - } - } - } - - return required.isEmpty(); - } - - private boolean checkItemEquals(ItemStack target, ItemStack input) - { - if (input == null && target != null || input != null && target == null) - { - return false; - } - return (target.getItem() == input.getItem() && - (!target.hasTagCompound() || ThaumcraftApiHelper.areItemStackTagsEqualForCrafting(input,target)) && - (target.getItemDamage() == OreDictionary.WILDCARD_VALUE|| target.getItemDamage() == input.getItemDamage())); - } - - /** - * Returns the input for this recipe, any mod accessing this value should never - * manipulate the values in this array as it will effect the recipe itself. - * @return The recipes input vales. - */ - public ArrayList getInput() - { - return this.input; - } - - @Override - public AspectList getAspects() { - return aspects; - } - - @Override - public AspectList getAspects(IInventory inv) { - return aspects; - } - - @Override - public String getResearch() { - return research; - } -} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java deleted file mode 100644 index 1562d052..00000000 --- a/src/api/java/thaumcraft/api/damagesource/DamageSourceIndirectThaumcraftEntity.java +++ /dev/null @@ -1,32 +0,0 @@ -package thaumcraft.api.damagesource; - -import net.minecraft.entity.Entity; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; - -public class DamageSourceIndirectThaumcraftEntity extends EntityDamageSourceIndirect { - - private boolean fireDamage; - private float hungerDamage; - private boolean isUnblockable; - - - public DamageSourceIndirectThaumcraftEntity(String par1Str, - Entity par2Entity, Entity par3Entity) { - super(par1Str, par2Entity, par3Entity); - } - - - public DamageSource setFireDamage() - { - this.fireDamage = true; - return this; - } - - public DamageSource setDamageBypassesArmor() - { - this.isUnblockable = true; - this.hungerDamage = 0.0F; - return this; - } -} diff --git a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java b/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java deleted file mode 100644 index bb55672b..00000000 --- a/src/api/java/thaumcraft/api/damagesource/DamageSourceThaumcraft.java +++ /dev/null @@ -1,47 +0,0 @@ -package thaumcraft.api.damagesource; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSource; - -public class DamageSourceThaumcraft extends DamageSource -{ - - public static DamageSource taint = new DamageSourceThaumcraft("taint").setDamageBypassesArmor().setMagicDamage(); - public static DamageSource tentacle = new DamageSourceThaumcraft("tentacle"); - public static DamageSource swarm = new DamageSourceThaumcraft("swarm"); - public static DamageSource dissolve = new DamageSourceThaumcraft("dissolve").setDamageBypassesArmor(); - - protected DamageSourceThaumcraft(String par1Str) { - super(par1Str); - } - - /** This kind of damage can be blocked or not. */ - private boolean isUnblockable = false; - private boolean isDamageAllowedInCreativeMode = false; - private float hungerDamage = 0.3F; - - /** This kind of damage is based on fire or not. */ - private boolean fireDamage; - - /** This kind of damage is based on a projectile or not. */ - private boolean projectile; - - /** - * Whether this damage source will have its damage amount scaled based on the current difficulty. - */ - private boolean difficultyScaled; - private boolean magicDamage = false; - private boolean explosion = false; - - public static DamageSource causeSwarmDamage(EntityLivingBase par0EntityLiving) - { - return new EntityDamageSource("swarm", par0EntityLiving); - } - - public static DamageSource causeTentacleDamage(EntityLivingBase par0EntityLiving) - { - return new EntityDamageSource("tentacle", par0EntityLiving); - } - -} diff --git a/src/api/java/thaumcraft/api/entities/IEldritchMob.java b/src/api/java/thaumcraft/api/entities/IEldritchMob.java deleted file mode 100644 index 79fc75b5..00000000 --- a/src/api/java/thaumcraft/api/entities/IEldritchMob.java +++ /dev/null @@ -1,5 +0,0 @@ -package thaumcraft.api.entities; - -public interface IEldritchMob { - -} diff --git a/src/api/java/thaumcraft/api/entities/ITaintedMob.java b/src/api/java/thaumcraft/api/entities/ITaintedMob.java deleted file mode 100644 index 83fb1fcb..00000000 --- a/src/api/java/thaumcraft/api/entities/ITaintedMob.java +++ /dev/null @@ -1,5 +0,0 @@ -package thaumcraft.api.entities; - -public interface ITaintedMob { - -} diff --git a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java deleted file mode 100644 index 9af8c30e..00000000 --- a/src/api/java/thaumcraft/api/internal/DummyInternalMethodHandler.java +++ /dev/null @@ -1,78 +0,0 @@ -package thaumcraft.api.internal; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class DummyInternalMethodHandler implements IInternalMethodHandler { - - @Override - public void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color) { - - } - - @Override - public boolean isResearchComplete(String username, String researchkey) { - return false; - } - - @Override - public boolean hasDiscoveredAspect(String username, Aspect aspect) { - return false; - } - - @Override - public AspectList getDiscoveredAspects(String username) { - return null; - } - - @Override - public ItemStack getStackInRowAndColumn(Object instance, int row, int column) { - return null; - } - - @Override - public AspectList getObjectAspects(ItemStack is) { - return null; - } - - @Override - public AspectList getBonusObjectTags(ItemStack is, AspectList ot) { - return null; - } - - @Override - public AspectList generateTags(Item item, int meta) { - return null; - } - - @Override - public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, - AspectList cost, boolean doit, boolean crafting) { - return false; - } - - @Override - public boolean consumeVisFromWandCrafting(ItemStack wand, - EntityPlayer player, AspectList cost, boolean doit) { - return false; - } - - @Override - public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost) { - return false; - } - - @Override - public void addWarpToPlayer(EntityPlayer player, int amount, boolean temporary) { - } - - @Override - public void addStickyWarpToPlayer(EntityPlayer player, int amount) { - } - - - -} diff --git a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java b/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java deleted file mode 100644 index 73fce669..00000000 --- a/src/api/java/thaumcraft/api/internal/IInternalMethodHandler.java +++ /dev/null @@ -1,25 +0,0 @@ -package thaumcraft.api.internal; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public interface IInternalMethodHandler { - - public void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color); - public boolean isResearchComplete(String username, String researchkey); - public ItemStack getStackInRowAndColumn(Object instance, int row, int column); - public AspectList getObjectAspects(ItemStack is); - public AspectList getBonusObjectTags(ItemStack is,AspectList ot); - public AspectList generateTags(Item item, int meta); - public boolean consumeVisFromWand(ItemStack wand, EntityPlayer player, AspectList cost, boolean doit, boolean crafting); - public boolean consumeVisFromWandCrafting(ItemStack wand,EntityPlayer player, AspectList cost, boolean doit); - public boolean consumeVisFromInventory(EntityPlayer player, AspectList cost); - public void addWarpToPlayer(EntityPlayer player, int amount,boolean temporary); - public void addStickyWarpToPlayer(EntityPlayer player, int amount); - public boolean hasDiscoveredAspect(String username, Aspect aspect); - public AspectList getDiscoveredAspects(String username); - -} diff --git a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java b/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java deleted file mode 100644 index 4ac6ee7d..00000000 --- a/src/api/java/thaumcraft/api/internal/WeightedRandomLoot.java +++ /dev/null @@ -1,24 +0,0 @@ -package thaumcraft.api.internal; - -import java.util.ArrayList; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - - -public class WeightedRandomLoot extends WeightedRandom.Item { - - /** The Item/Block ID to generate in the bag. */ - public ItemStack item; - - public WeightedRandomLoot(ItemStack stack, int weight) - { - super(weight); - this.item = stack; - } - - public static ArrayList lootBagCommon = new ArrayList(); - public static ArrayList lootBagUncommon = new ArrayList(); - public static ArrayList lootBagRare = new ArrayList(); - -} diff --git a/src/api/java/thaumcraft/api/nodes/INode.java b/src/api/java/thaumcraft/api/nodes/INode.java deleted file mode 100644 index 61da1f77..00000000 --- a/src/api/java/thaumcraft/api/nodes/INode.java +++ /dev/null @@ -1,53 +0,0 @@ -package thaumcraft.api.nodes; - -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.aspects.IAspectContainer; - -public interface INode extends IAspectContainer { - - /** - * Unique identifier to distinguish nodes. Normal node id's are based on world id and coordinates - * @return - */ - public String getId(); - - public AspectList getAspectsBase(); - - /** - * Return the type of node - * @return - */ - public NodeType getNodeType(); - - /** - * Set the type of node - * @return - */ - public void setNodeType(NodeType nodeType); - - /** - * Set the node modifier - * @return - */ - public void setNodeModifier(NodeModifier nodeModifier); - - /** - * Return the node modifier - * @return - */ - public NodeModifier getNodeModifier(); - - /** - * Return the maximum capacity of each aspect the node can hold - * @return - */ - public int getNodeVisBase(Aspect aspect); - - /** - * Set the maximum capacity of each aspect the node can hold - * @return - */ - public void setNodeVisBase(Aspect aspect, short nodeVisBase); - -} diff --git a/src/api/java/thaumcraft/api/nodes/IRevealer.java b/src/api/java/thaumcraft/api/nodes/IRevealer.java deleted file mode 100644 index 14a19b54..00000000 --- a/src/api/java/thaumcraft/api/nodes/IRevealer.java +++ /dev/null @@ -1,22 +0,0 @@ -package thaumcraft.api.nodes; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * - * @author Azanor - * - * Equipped head slot items that extend this class will make nodes visible in world. - * - */ - -public interface IRevealer { - - /* - * If this method returns true the nodes will be visible. - */ - public boolean showNodes(ItemStack itemstack, EntityLivingBase player); - - -} diff --git a/src/api/java/thaumcraft/api/nodes/NodeModifier.java b/src/api/java/thaumcraft/api/nodes/NodeModifier.java deleted file mode 100644 index 885b8678..00000000 --- a/src/api/java/thaumcraft/api/nodes/NodeModifier.java +++ /dev/null @@ -1,6 +0,0 @@ -package thaumcraft.api.nodes; - -public enum NodeModifier -{ - BRIGHT, PALE, FADING -} \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/nodes/NodeType.java b/src/api/java/thaumcraft/api/nodes/NodeType.java deleted file mode 100644 index 355324b5..00000000 --- a/src/api/java/thaumcraft/api/nodes/NodeType.java +++ /dev/null @@ -1,6 +0,0 @@ -package thaumcraft.api.nodes; - -public enum NodeType -{ - NORMAL, UNSTABLE, DARK, TAINTED, HUNGRY, PURE -} \ No newline at end of file diff --git a/src/api/java/thaumcraft/api/package-info.java b/src/api/java/thaumcraft/api/package-info.java deleted file mode 100644 index 0de39267..00000000 --- a/src/api/java/thaumcraft/api/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -@API(owner = "Thaumcraft", apiVersion = "4.2.0.0", provides = "Thaumcraft|API") -package thaumcraft.api; - -import cpw.mods.fml.common.API; diff --git a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java b/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java deleted file mode 100644 index b950de0e..00000000 --- a/src/api/java/thaumcraft/api/potions/PotionFluxTaint.java +++ /dev/null @@ -1,67 +0,0 @@ -package thaumcraft.api.potions; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.damagesource.DamageSourceThaumcraft; -import thaumcraft.api.entities.ITaintedMob; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class PotionFluxTaint extends Potion -{ - public static PotionFluxTaint instance = null; // will be instantiated at runtime - private int statusIconIndex = -1; - - public PotionFluxTaint(int par1, boolean par2, int par3) - { - super(par1,par2,par3); - setIconIndex(0, 0); - } - - public static void init() - { - instance.setPotionName("potion.fluxtaint"); - instance.setIconIndex(3, 1); - instance.setEffectiveness(0.25D); - } - - @Override - public boolean isBadEffect() { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(rl); - return super.getStatusIconIndex(); - } - - static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); - - @Override - public void performEffect(EntityLivingBase target, int par2) { - if (target instanceof ITaintedMob) { - target.heal(1); - } else - if (!target.isEntityUndead() && !(target instanceof EntityPlayer)) - { - target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); - } - else - if (!target.isEntityUndead() && (target.getMaxHealth() > 1 || (target instanceof EntityPlayer))) - { - target.attackEntityFrom(DamageSourceThaumcraft.taint, 1); - } - } - - public boolean isReady(int par1, int par2) - { - int k = 40 >> par2; - return k > 0 ? par1 % k == 0 : true; - } - -} diff --git a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java b/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java deleted file mode 100644 index cd7fc18c..00000000 --- a/src/api/java/thaumcraft/api/potions/PotionVisExhaust.java +++ /dev/null @@ -1,48 +0,0 @@ -package thaumcraft.api.potions; - -import net.minecraft.client.Minecraft; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.Potion; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class PotionVisExhaust extends Potion -{ - public static PotionVisExhaust instance = null; // will be instantiated at runtime - private int statusIconIndex = -1; - - public PotionVisExhaust(int par1, boolean par2, int par3) - { - super(par1,par2,par3); - setIconIndex(0, 0); - } - - public static void init() - { - instance.setPotionName("potion.visexhaust"); - instance.setIconIndex(5, 1); - instance.setEffectiveness(0.25D); - } - - @Override - public boolean isBadEffect() { - return true; - } - - @Override - @SideOnly(Side.CLIENT) - public int getStatusIconIndex() { - Minecraft.getMinecraft().renderEngine.bindTexture(rl); - return super.getStatusIconIndex(); - } - - static final ResourceLocation rl = new ResourceLocation("thaumcraft","textures/misc/potions.png"); - - @Override - public void performEffect(EntityLivingBase target, int par2) { - - } - - -} diff --git a/src/api/java/thaumcraft/api/research/IScanEventHandler.java b/src/api/java/thaumcraft/api/research/IScanEventHandler.java deleted file mode 100644 index d0efac5f..00000000 --- a/src/api/java/thaumcraft/api/research/IScanEventHandler.java +++ /dev/null @@ -1,9 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IScanEventHandler { - ScanResult scanPhenomena(ItemStack stack, World world, EntityPlayer player); -} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategories.java b/src/api/java/thaumcraft/api/research/ResearchCategories.java deleted file mode 100644 index 82309b36..00000000 --- a/src/api/java/thaumcraft/api/research/ResearchCategories.java +++ /dev/null @@ -1,101 +0,0 @@ -package thaumcraft.api.research; - -import java.util.Collection; -import java.util.LinkedHashMap; - -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.apache.logging.log4j.Level; - -import cpw.mods.fml.common.FMLLog; - -public class ResearchCategories { - - //Research - public static LinkedHashMap researchCategories = new LinkedHashMap (); - - /** - * @param key - * @return the research item linked to this key - */ - public static ResearchCategoryList getResearchList(String key) { - return researchCategories.get(key); - } - - /** - * @param key - * @return the name of the research category linked to this key. - * Must be stored as localization information in the LanguageRegistry. - */ - public static String getCategoryName(String key) { - return StatCollector.translateToLocal("tc.research_category."+key); - } - - /** - * @param key the research key - * @return the ResearchItem object. - */ - public static ResearchItem getResearch(String key) { - Collection rc = researchCategories.values(); - for (Object cat:rc) { - Collection rl = ((ResearchCategoryList)cat).research.values(); - for (Object ri:rl) { - if ((((ResearchItem)ri).key).equals(key)) return (ResearchItem)ri; - } - } - return null; - } - - /** - * This should only be done at the PostInit stage - * @param key the key used for this category - * @param icon the icon to be used for the research category tab - * @param background the resource location of the background image to use for this category - * @return the name of the research linked to this key - */ - public static void registerCategory(String key, ResourceLocation icon, ResourceLocation background) { - if (getResearchList(key)==null) { - ResearchCategoryList rl = new ResearchCategoryList(icon, background); - researchCategories.put(key, rl); - } - } - - public static void addResearch(ResearchItem ri) { - ResearchCategoryList rl = getResearchList(ri.category); - if (rl!=null && !rl.research.containsKey(ri.key)) { - - if (!ri.isVirtual()) { - for (ResearchItem rr:rl.research.values()) { - if (rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow) { - FMLLog.log(Level.FATAL, "[Thaumcraft] Research ["+ri.getName()+"] not added as it overlaps with existing research ["+rr.getName()+"]"); - return; - } - } - } - - - rl.research.put(ri.key, ri); - - if (ri.displayColumn < rl.minDisplayColumn) - { - rl.minDisplayColumn = ri.displayColumn; - } - - if (ri.displayRow < rl.minDisplayRow) - { - rl.minDisplayRow = ri.displayRow; - } - - if (ri.displayColumn > rl.maxDisplayColumn) - { - rl.maxDisplayColumn = ri.displayColumn; - } - - if (ri.displayRow > rl.maxDisplayRow) - { - rl.maxDisplayRow = ri.displayRow; - } - } - } -} diff --git a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java b/src/api/java/thaumcraft/api/research/ResearchCategoryList.java deleted file mode 100644 index 7eed0101..00000000 --- a/src/api/java/thaumcraft/api/research/ResearchCategoryList.java +++ /dev/null @@ -1,37 +0,0 @@ -package thaumcraft.api.research; - -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.util.ResourceLocation; - -public class ResearchCategoryList { - - /** Is the smallest column used on the GUI. */ - public int minDisplayColumn; - - /** Is the smallest row used on the GUI. */ - public int minDisplayRow; - - /** Is the biggest column used on the GUI. */ - public int maxDisplayColumn; - - /** Is the biggest row used on the GUI. */ - public int maxDisplayRow; - - /** display variables **/ - public ResourceLocation icon; - public ResourceLocation background; - - public ResearchCategoryList(ResourceLocation icon, ResourceLocation background) { - this.icon = icon; - this.background = background; - } - - //Research - public Map research = new HashMap(); - - - - -} diff --git a/src/api/java/thaumcraft/api/research/ResearchItem.java b/src/api/java/thaumcraft/api/research/ResearchItem.java deleted file mode 100644 index 1d5fd8bf..00000000 --- a/src/api/java/thaumcraft/api/research/ResearchItem.java +++ /dev/null @@ -1,369 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - -public class ResearchItem -{ - /** - * A short string used as a key for this research. Must be unique - */ - public final String key; - - /** - * A short string used as a reference to the research category to which this must be added. - */ - public final String category; - - /** - * The aspect tags and their values required to complete this research - */ - public final AspectList tags; - - /** - * This links to any research that needs to be completed before this research can be discovered or learnt. - */ - public String[] parents = null; - - /** - * Like parent above, but a line will not be displayed in the thaumonomicon linking them. Just used to prevent clutter. - */ - public String[] parentsHidden = null; - /** - * any research linked to this that will be unlocked automatically when this research is complete - */ - public String[] siblings = null; - - /** - * the horizontal position of the research icon - */ - public final int displayColumn; - - /** - * the vertical position of the research icon - */ - public final int displayRow; - - /** - * the icon to be used for this research - */ - public final ItemStack icon_item; - - /** - * the icon to be used for this research - */ - public final ResourceLocation icon_resource; - - /** - * How large the research grid is. Valid values are 1 to 3. - */ - private int complexity; - - /** - * Special research has a spiky border. Used for important research milestones. - */ - private boolean isSpecial; - - /** - * Research that can be directly purchased with RP in normal research difficulty. - */ - private boolean isSecondary; - - /** - * This indicates if the research should use a circular icon border. Usually used for "passive" research - * that doesn't have recipes and grants passive effects, or that unlock automatically. - */ - private boolean isRound; - - /** - * Stub research cannot be discovered by normal means, but can be unlocked via the sibling system. - */ - private boolean isStub; - - /** - * This indicated that the research is completely hidden and cannot be discovered by any - * player-controlled means. The recipes will never show up in the thaumonomicon. - * Usually used to unlock "hidden" recipes via sibling unlocking, like - * the various cap and rod combos for wands. - */ - private boolean isVirtual; - - - - /** - * Concealed research does not display in the thaumonomicon until parent researches are discovered. - */ - private boolean isConcealed; - - /** - * Hidden research can only be discovered via scanning or knowledge fragments - */ - private boolean isHidden; - - /** - * This is the same as isHidden, except it cannot be discovered with knowledge fragments, only scanning. - */ - private boolean isLost; - - /** - * These research items will automatically unlock for all players on game start - */ - private boolean isAutoUnlock; - - /** - * Scanning these items will have a chance of revealing hidden knowledge in the thaumonomicon - */ - private ItemStack[] itemTriggers; - - /** - * Scanning these entities will have a chance of revealing hidden knowledge in the thaumonomicon - */ - private String[] entityTriggers; - - /** - * Scanning things with these aspects will have a chance of revealing hidden knowledge in the thaumonomicon - */ - private Aspect[] aspectTriggers; - - private ResearchPage[] pages = null; - - public ResearchItem(String key, String category) - { - this.key = key; - this.category = category; - this.tags = new AspectList(); - this.icon_resource = null; - this.icon_item = null; - this.displayColumn = 0; - this.displayRow = 0; - this.setVirtual(); - - } - - public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ResourceLocation icon) - { - this.key = key; - this.category = category; - this.tags = tags; - this.icon_resource = icon; - this.icon_item = null; - this.displayColumn = col; - this.displayRow = row; - this.complexity = complex; - if (complexity < 1) this.complexity = 1; - if (complexity > 3) this.complexity = 3; - } - - public ResearchItem(String key, String category, AspectList tags, int col, int row, int complex, ItemStack icon) - { - this.key = key; - this.category = category; - this.tags = tags; - this.icon_item = icon; - this.icon_resource = null; - this.displayColumn = col; - this.displayRow = row; - this.complexity = complex; - if (complexity < 1) this.complexity = 1; - if (complexity > 3) this.complexity = 3; - } - - public ResearchItem setSpecial() - { - this.isSpecial = true; - return this; - } - - public ResearchItem setStub() - { - this.isStub = true; - return this; - } - - public ResearchItem setLost() - { - this.isLost = true; - return this; - } - - public ResearchItem setConcealed() - { - this.isConcealed = true; - return this; - } - - public ResearchItem setHidden() - { - this.isHidden = true; - return this; - } - - public ResearchItem setVirtual() - { - this.isVirtual = true; - return this; - } - - public ResearchItem setParents(String... par) - { - this.parents = par; - return this; - } - - - - public ResearchItem setParentsHidden(String... par) - { - this.parentsHidden = par; - return this; - } - - public ResearchItem setSiblings(String... sib) - { - this.siblings = sib; - return this; - } - - public ResearchItem setPages(ResearchPage... par) - { - this.pages = par; - return this; - } - - public ResearchPage[] getPages() { - return pages; - } - - public ResearchItem setItemTriggers(ItemStack... par) - { - this.itemTriggers = par; - return this; - } - - public ResearchItem setEntityTriggers(String... par) - { - this.entityTriggers = par; - return this; - } - - public ResearchItem setAspectTriggers(Aspect... par) - { - this.aspectTriggers = par; - return this; - } - - public ItemStack[] getItemTriggers() { - return itemTriggers; - } - - public String[] getEntityTriggers() { - return entityTriggers; - } - - public Aspect[] getAspectTriggers() { - return aspectTriggers; - } - - public ResearchItem registerResearchItem() - { - ResearchCategories.addResearch(this); - return this; - } - - public String getName() - { - return StatCollector.translateToLocal("tc.research_name."+key); - } - - public String getText() - { - return StatCollector.translateToLocal("tc.research_text."+key); - } - - public boolean isSpecial() - { - return this.isSpecial; - } - - public boolean isStub() - { - return this.isStub; - } - - public boolean isLost() - { - return this.isLost; - } - - public boolean isConcealed() - { - return this.isConcealed; - } - - public boolean isHidden() - { - return this.isHidden; - } - - public boolean isVirtual() - { - return this.isVirtual; - } - - public boolean isAutoUnlock() { - return isAutoUnlock; - } - - public ResearchItem setAutoUnlock() - { - this.isAutoUnlock = true; - return this; - } - - public boolean isRound() { - return isRound; - } - - public ResearchItem setRound() { - this.isRound = true; - return this; - } - - public boolean isSecondary() { - return isSecondary; - } - - public ResearchItem setSecondary() { - this.isSecondary = true; - return this; - } - - public int getComplexity() { - return complexity; - } - - public ResearchItem setComplexity(int complexity) { - this.complexity = complexity; - return this; - } - - /** - * @return the aspect aspects ordinal with the highest value. Used to determine scroll color and similar things - */ - public Aspect getResearchPrimaryTag() { - Aspect aspect=null; - int highest=0; - if (tags!=null) - for (Aspect tag:tags.getAspects()) { - if (tags.getAmount(tag)>highest) { - aspect=tag; - highest=tags.getAmount(tag); - }; - } - return aspect; - } - -} diff --git a/src/api/java/thaumcraft/api/research/ResearchPage.java b/src/api/java/thaumcraft/api/research/ResearchPage.java deleted file mode 100644 index fdada843..00000000 --- a/src/api/java/thaumcraft/api/research/ResearchPage.java +++ /dev/null @@ -1,193 +0,0 @@ -package thaumcraft.api.research; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.IRecipe; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.api.crafting.CrucibleRecipe; -import thaumcraft.api.crafting.IArcaneRecipe; -import thaumcraft.api.crafting.InfusionEnchantmentRecipe; -import thaumcraft.api.crafting.InfusionRecipe; - -public class ResearchPage { - public static enum PageType - { - TEXT, - TEXT_CONCEALED, - IMAGE, - CRUCIBLE_CRAFTING, - ARCANE_CRAFTING, - ASPECTS, - NORMAL_CRAFTING, - INFUSION_CRAFTING, - COMPOUND_CRAFTING, - INFUSION_ENCHANTMENT, - SMELTING - } - - public PageType type = PageType.TEXT; - - public String text=null; - public String research=null; - public ResourceLocation image=null; - public AspectList aspects=null; - public Object recipe=null; - public ItemStack recipeOutput=null; - - /** - * @param text this can (but does not have to) be a reference to a localization variable, not the actual text. - */ - public ResearchPage(String text) { - this.type = PageType.TEXT; - this.text = text; - } - - /** - * @param research this page will only be displayed if the player has discovered this research - * @param text this can (but does not have to) be a reference to a localization variable, not the actual text. - */ - public ResearchPage(String research, String text) { - this.type = PageType.TEXT_CONCEALED; - this.research = research; - this.text = text; - } - - /** - * @param recipe a vanilla crafting recipe. - */ - public ResearchPage(IRecipe recipe) { - this.type = PageType.NORMAL_CRAFTING; - this.recipe = recipe; - this.recipeOutput = recipe.getRecipeOutput(); - } - - /** - * @param recipe a collection of vanilla crafting recipes. - */ - public ResearchPage(IRecipe[] recipe) { - this.type = PageType.NORMAL_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a collection of arcane crafting recipes. - */ - public ResearchPage(IArcaneRecipe[] recipe) { - this.type = PageType.ARCANE_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a collection of arcane crafting recipes. - */ - public ResearchPage(CrucibleRecipe[] recipe) { - this.type = PageType.CRUCIBLE_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a collection of infusion crafting recipes. - */ - public ResearchPage(InfusionRecipe[] recipe) { - this.type = PageType.INFUSION_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe a compound crafting recipe. - */ - public ResearchPage(List recipe) { - this.type = PageType.COMPOUND_CRAFTING; - this.recipe = recipe; - } - - /** - * @param recipe an arcane worktable crafting recipe. - */ - public ResearchPage(IArcaneRecipe recipe) { - this.type = PageType.ARCANE_CRAFTING; - this.recipe = recipe; - this.recipeOutput = recipe.getRecipeOutput(); - } - - /** - * @param recipe an alchemy crafting recipe. - */ - public ResearchPage(CrucibleRecipe recipe) { - this.type = PageType.CRUCIBLE_CRAFTING; - this.recipe = recipe; - this.recipeOutput = recipe.getRecipeOutput(); - } - - /** - * @param recipe a furnace smelting crafting recipe. - */ - public ResearchPage(ItemStack input) { - this.type = PageType.SMELTING; - this.recipe = input; - this.recipeOutput = FurnaceRecipes.smelting().getSmeltingResult(input); - } - - /** - * @param recipe an infusion crafting recipe. - */ - public ResearchPage(InfusionRecipe recipe) { - this.type = PageType.INFUSION_CRAFTING; - this.recipe = recipe; - if (recipe.getRecipeOutput() instanceof ItemStack) { - this.recipeOutput = (ItemStack) recipe.getRecipeOutput(); - } else { - this.recipeOutput = recipe.getRecipeInput(); - } - } - - /** - * @param recipe an infusion crafting recipe. - */ - public ResearchPage(InfusionEnchantmentRecipe recipe) { - this.type = PageType.INFUSION_ENCHANTMENT; - this.recipe = recipe; -// if (recipe.recipeOutput instanceof ItemStack) { -// this.recipeOutput = (ItemStack) recipe.recipeOutput; -// } else { -// this.recipeOutput = recipe.recipeInput; -// } - } - - /** - * @param image - * @param caption this can (but does not have to) be a reference to a localization variable, not the actual text. - */ - public ResearchPage(ResourceLocation image, String caption) { - this.type = PageType.IMAGE; - this.image = image; - this.text = caption; - } - - /** - * This function should really not be called directly - used internally - */ - public ResearchPage(AspectList as) { - this.type = PageType.ASPECTS; - this.aspects = as; - } - - /** - * returns a localized text of the text field (if one exists). Returns the text field itself otherwise. - * @return - */ - public String getTranslatedText() { - String ret=""; - if (text != null) { - ret = StatCollector.translateToLocal(text); - if (ret.isEmpty()) ret = text; - } - return ret; - } - - -} diff --git a/src/api/java/thaumcraft/api/research/ScanResult.java b/src/api/java/thaumcraft/api/research/ScanResult.java deleted file mode 100644 index e1498f31..00000000 --- a/src/api/java/thaumcraft/api/research/ScanResult.java +++ /dev/null @@ -1,39 +0,0 @@ -package thaumcraft.api.research; - -import net.minecraft.entity.Entity; - -public class ScanResult { - public byte type = 0; //1=blocks,2=entities,3=phenomena - public int id; - public int meta; - public Entity entity; - public String phenomena; - - public ScanResult(byte type, int blockId, int blockMeta, Entity entity, - String phenomena) { - super(); - this.type = type; - this.id = blockId; - this.meta = blockMeta; - this.entity = entity; - this.phenomena = phenomena; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof ScanResult) { - ScanResult sr = (ScanResult) obj; - if (type != sr.type) - return false; - if (type == 1 - && (id != sr.id || meta != sr.meta)) - return false; - if (type == 2 && entity.getEntityId() != sr.entity.getEntityId()) - return false; - if (type == 3 && !phenomena.equals(sr.phenomena)) - return false; - } - return true; - } - -} diff --git a/src/api/java/thaumcraft/api/visnet/TileVisNode.java b/src/api/java/thaumcraft/api/visnet/TileVisNode.java deleted file mode 100644 index 204879e6..00000000 --- a/src/api/java/thaumcraft/api/visnet/TileVisNode.java +++ /dev/null @@ -1,188 +0,0 @@ -package thaumcraft.api.visnet; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.HashMap; - -import thaumcraft.api.TileThaumcraft; -import thaumcraft.api.WorldCoordinates; -import thaumcraft.api.aspects.Aspect; - -/** - * @author Azanor - * - * The tile entity used by nodes in the vis energy network. A node is either a source (like an aura node), - * a transport relay or vis receiver (like the infernal furnace). - * - */ -public abstract class TileVisNode extends TileThaumcraft { - - WeakReference parent = null; - ArrayList> children = new ArrayList>(); - - /** - * @return the WorldCoordinates location of where this node is located - */ - public WorldCoordinates getLocation() { - return new WorldCoordinates(this); - } - - /** - * @return the number of blocks away this node will check for parent nodes to connect to. - */ - public abstract int getRange(); - - /** - * @return true if this is the source or root node of the vis network. - */ - public abstract boolean isSource(); - - /** - * This method should never be called directly. Use VisNetHandler.drainVis() instead - * @param aspect what aspect to drain - * @param vis how much to drain - * @return how much was actually drained - */ - public int consumeVis(Aspect aspect, int vis) { - if (VisNetHandler.isNodeValid(getParent())) { - int out = getParent().get().consumeVis(aspect, vis); - if (out>0) { - triggerConsumeEffect(aspect); - } - return out; - } - return 0; - } - - public void removeThisNode() { - for (WeakReference n:getChildren()) { - if (n!=null && n.get()!=null) { - n.get().removeThisNode(); - } - } - - children = new ArrayList>(); - if (VisNetHandler.isNodeValid(this.getParent())) { - this.getParent().get().nodeRefresh=true; - } - this.setParent(null); - this.parentChanged(); - - if (this.isSource()) { - HashMap> sourcelist = VisNetHandler.sources.get(worldObj.provider.dimensionId); - if (sourcelist==null) { - sourcelist = new HashMap>(); - } - sourcelist.remove(getLocation()); - VisNetHandler.sources.put( worldObj.provider.dimensionId, sourcelist ); - } - - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - } - - - - @Override - public void invalidate() { - removeThisNode(); - super.invalidate(); - } - - public void triggerConsumeEffect(Aspect aspect) { } - - /** - * @return - */ - public WeakReference getParent() { - return parent; - } - - /** - * @return - */ - public WeakReference getRootSource() { - return VisNetHandler.isNodeValid(getParent()) ? - getParent().get().getRootSource() : this.isSource() ? - new WeakReference(this) : null; - } - - /** - * @param parent - */ - public void setParent(WeakReference parent) { - this.parent = parent; - } - - /** - * @return - */ - public ArrayList> getChildren() { - return children; - } - - @Override - public boolean canUpdate() { - return true; - } - - protected int nodeCounter = 0; - private boolean nodeRegged = false; - public boolean nodeRefresh = false; - - @Override - public void updateEntity() { - - if (!worldObj.isRemote && ((nodeCounter++) % 40==0 || nodeRefresh)) { - //check for changes - if (!nodeRefresh && children.size()>0) { - for (WeakReference n:children) { - if (n==null || n.get()==null || !VisNetHandler.canNodeBeSeen(this, n.get())) { - nodeRefresh=true; - break; - } - } - } - - //refresh linked nodes - if (nodeRefresh) { - for (WeakReference n:children) { - if (n.get()!=null) { - n.get().nodeRefresh=true; - } - } - children.clear(); - parent=null; - } - - //redo stuff - if (isSource() && !nodeRegged) { - VisNetHandler.addSource(getWorldObj(), this); - nodeRegged = true; - } else - if (!isSource() && !VisNetHandler.isNodeValid(getParent())) { - setParent(VisNetHandler.addNode(getWorldObj(), this)); - nodeRefresh=true; - } - - if (nodeRefresh) { - worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); - parentChanged(); - } - nodeRefresh=false; - } - - } - - public void parentChanged() { } - - /** - * @return the type of shard this is attuned to: - * none -1, air 0, fire 1, water 2, earth 3, order 4, entropy 5 - * Should return -1 for most implementations - */ - public byte getAttunement() { - return -1; - } - - -} diff --git a/src/api/java/thaumcraft/api/visnet/VisNetHandler.java b/src/api/java/thaumcraft/api/visnet/VisNetHandler.java deleted file mode 100644 index 7ac4c699..00000000 --- a/src/api/java/thaumcraft/api/visnet/VisNetHandler.java +++ /dev/null @@ -1,282 +0,0 @@ -package thaumcraft.api.visnet; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.HashMap; - -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.MovingObjectPosition.MovingObjectType; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.WorldCoordinates; -import thaumcraft.api.aspects.Aspect; - -public class VisNetHandler { - - // NODE DRAINING - /** - * This method drains vis from a relay or source near the passed in - * location. The amount received can be less than the amount requested so - * take that into account. - * - * @param world - * @param x the x position of the draining block or entity - * @param y the y position of the draining block or entity - * @param z the z position of the draining block or entity - * @param aspect what aspect to drain - * @param amount how much to drain - * @return how much was actually drained - */ - public static int drainVis(World world, int x, int y, int z, Aspect aspect, int amount) { - - int drainedAmount = 0; - - WorldCoordinates drainer = new WorldCoordinates(x, y, z, - world.provider.dimensionId); - if (!nearbyNodes.containsKey(drainer)) { - calculateNearbyNodes(world, x, y, z); - } - - ArrayList> nodes = nearbyNodes.get(drainer); - if (nodes!=null && nodes.size()>0) - for (WeakReference noderef : nodes) { - - TileVisNode node = noderef.get(); - - if (node == null) continue; - - int a = node.consumeVis(aspect, amount); - drainedAmount += a; - amount -= a; - if (a>0) { - int color = Aspect.getPrimalAspects().indexOf(aspect); - generateVisEffect(world.provider.dimensionId, x, y, z, node.xCoord, node.yCoord, node.zCoord, color); - } - if (amount <= 0) { - break; - } - } - - return drainedAmount; - } - - public static void generateVisEffect(int dim, int x, int y, int z, int x2, int y2, int z2, int color) { - ThaumcraftApi.internalMethods.generateVisEffect(dim, x, y, z, x2, y2, z2, color); - } - - public static HashMap>> sources = new HashMap>>(); - - public static void addSource(World world, TileVisNode vs) { - HashMap> sourcelist = sources - .get(world.provider.dimensionId); - if (sourcelist == null) { - sourcelist = new HashMap>(); - } - sourcelist.put(vs.getLocation(), new WeakReference(vs)); - sources.put(world.provider.dimensionId, sourcelist); - nearbyNodes.clear(); - } - - public static boolean isNodeValid(WeakReference node) { - if (node == null || node.get() == null || node.get().isInvalid()) - return false; - return true; - } - - public static WeakReference addNode(World world, TileVisNode vn) { - WeakReference ref = new WeakReference(vn); - - HashMap> sourcelist = sources - .get(world.provider.dimensionId); - if (sourcelist == null) { - sourcelist = new HashMap>(); - return null; - } - - ArrayList nearby = new ArrayList(); - - for (WeakReference root : sourcelist.values()) { - if (!isNodeValid(root)) - continue; - - TileVisNode source = root.get(); - - float r = inRange(world, vn.getLocation(), source.getLocation(), - vn.getRange()); - if (r > 0) { - nearby.add(new Object[] { source, r - vn.getRange() * 2 }); - } - - nearby = findClosestNodes(vn, source, nearby); - cache.clear(); - } - - float dist = Float.MAX_VALUE; - TileVisNode closest = null; - if (nearby.size() > 0) { - for (Object[] o : nearby) { - if ((Float) o[1] < dist && - (vn.getAttunement() == -1 || ((TileVisNode) o[0]).getAttunement() == -1 || - vn.getAttunement() == ((TileVisNode) o[0]).getAttunement())//) { - && canNodeBeSeen(vn,(TileVisNode)o[0])) { - dist = (Float) o[1]; - closest = (TileVisNode) o[0]; - } - } - } - if (closest != null) { - closest.getChildren().add(ref); - nearbyNodes.clear(); - return new WeakReference(closest); - } - - return null; - } - - static ArrayList cache = new ArrayList(); - public static ArrayList findClosestNodes(TileVisNode target, - TileVisNode parent, ArrayList in) { - - if (cache.size() > 512 || cache.contains(new WorldCoordinates(parent))) return in; - cache.add(new WorldCoordinates(parent)); - - for (WeakReference childWR : parent.getChildren()) { - TileVisNode child = childWR.get(); - - if (child != null && !child.equals(target) && !child.equals(parent)) { - float r2 = inRange(child.getWorldObj(), child.getLocation(), - target.getLocation(), target.getRange()); - if (r2 > 0) { - in.add(new Object[] { child, r2 }); - } - - in = findClosestNodes(target, child, in); - } - } - return in; - } - - private static float inRange(World world, WorldCoordinates cc1, - WorldCoordinates cc2, int range) { - float distance = cc1.getDistanceSquaredToWorldCoordinates(cc2); - return distance > range * range ? -1 : distance; - } - - private static HashMap>> nearbyNodes = new HashMap>>(); - - private static void calculateNearbyNodes(World world, int x, int y, int z) { - - HashMap> sourcelist = sources - .get(world.provider.dimensionId); - if (sourcelist == null) { - sourcelist = new HashMap>(); - return; - } - - ArrayList> cn = new ArrayList>(); - WorldCoordinates drainer = new WorldCoordinates(x, y, z, - world.provider.dimensionId); - - ArrayList nearby = new ArrayList(); - - for (WeakReference root : sourcelist.values()) { - - if (!isNodeValid(root)) - continue; - - TileVisNode source = root.get(); - - TileVisNode closest = null; - float range = Float.MAX_VALUE; - - float r = inRange(world, drainer, source.getLocation(), - source.getRange()); - if (r > 0) { - range = r; - closest = source; - } - - ArrayList> children = new ArrayList>(); - children = getAllChildren(source,children); - - for (WeakReference child : children) { - TileVisNode n = child.get(); - if (n != null && !n.equals(root)) { - - float r2 = inRange(n.getWorldObj(), n.getLocation(), - drainer, n.getRange()); - if (r2 > 0 && r2 < range) { - range = r2; - closest = n; - } - } - } - - if (closest != null) { - - cn.add(new WeakReference(closest)); - } - } - - nearbyNodes.put(drainer, cn); - } - - private static ArrayList> getAllChildren(TileVisNode source, ArrayList> list) { - for (WeakReference child : source.getChildren()) { - TileVisNode n = child.get(); - - if (n != null && n.getWorldObj()!=null && isChunkLoaded(n.getWorldObj(), n.xCoord, n.zCoord)) { - list.add(child); - list = getAllChildren(n,list); - } - } - return list; - } - - public static boolean isChunkLoaded(World world, int x, int z) { - int xx = x >> 4; - int zz = z >> 4; - return world.getChunkProvider().chunkExists(xx, zz); - } - - public static boolean canNodeBeSeen(TileVisNode source,TileVisNode target) - { - MovingObjectPosition mop = ThaumcraftApiHelper.rayTraceIgnoringSource(source.getWorldObj(), - Vec3.createVectorHelper(source.xCoord+.5, source.yCoord+.5,source.zCoord+.5), - Vec3.createVectorHelper(target.xCoord+.5, target.yCoord+.5,target.zCoord+.5), - false, true, false); - return mop == null || (mop.typeOfHit==MovingObjectType.BLOCK && - mop.blockX==target.xCoord && mop.blockY==target.yCoord && mop.blockZ==target.zCoord); - } - - // public static HashMap> - // noderef = new HashMap>(); - // - // public static TileVisNode getClosestNodeWithinRadius(World world, int x, - // int y, int z, int radius) { - // TileVisNode out = null; - // WorldCoordinates wc = null; - // float cd = Float.MAX_VALUE; - // for (int sx = x - radius; sx <= x + radius; sx++) { - // for (int sy = y - radius; sy <= y + radius; sy++) { - // for (int sz = z - radius; sz <= z + radius; sz++) { - // wc = new WorldCoordinates(sx,sy,sz,world.provider.dimensionId); - // if (noderef.containsKey(wc)) { - // float d = wc.getDistanceSquared(x, y, z); - // if (d=types.length) { - FocusUpgradeType[] temp = new FocusUpgradeType[id+1]; - System.arraycopy(types, 0, temp, 0, types.length); - types = temp; - } - - types[id] = this; - } - - public String getLocalizedName() { - return StatCollector.translateToLocal(name); - } - - public String getLocalizedText() { - return StatCollector.translateToLocal(text); - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof FocusUpgradeType) { - return this.id == ((FocusUpgradeType)obj).id; - } else return false; - } - - // basic upgrade types - public static FocusUpgradeType potency = new FocusUpgradeType( 0, - new ResourceLocation("thaumcraft", "textures/foci/potency.png"), - "focus.upgrade.potency.name","focus.upgrade.potency.text", - new AspectList().add(Aspect.WEAPON,1)); - - public static FocusUpgradeType frugal = new FocusUpgradeType( 1, - new ResourceLocation("thaumcraft", "textures/foci/frugal.png"), - "focus.upgrade.frugal.name","focus.upgrade.frugal.text", - new AspectList().add(Aspect.HUNGER,1)); - - public static FocusUpgradeType treasure = new FocusUpgradeType( 2, - new ResourceLocation("thaumcraft", "textures/foci/treasure.png"), - "focus.upgrade.treasure.name","focus.upgrade.treasure.text", - new AspectList().add(Aspect.GREED,1)); - - public static FocusUpgradeType enlarge = new FocusUpgradeType( 3, - new ResourceLocation("thaumcraft", "textures/foci/enlarge.png"), - "focus.upgrade.enlarge.name","focus.upgrade.enlarge.text", - new AspectList().add(Aspect.TRAVEL,1)); - - public static FocusUpgradeType alchemistsfire = new FocusUpgradeType( 4, - new ResourceLocation("thaumcraft", "textures/foci/alchemistsfire.png"), - "focus.upgrade.alchemistsfire.name","focus.upgrade.alchemistsfire.text", - new AspectList().add(Aspect.ENERGY,1).add(Aspect.SLIME,1)); - - public static FocusUpgradeType alchemistsfrost = new FocusUpgradeType( 5, - new ResourceLocation("thaumcraft", "textures/foci/alchemistsfrost.png"), - "focus.upgrade.alchemistsfrost.name","focus.upgrade.alchemistsfrost.text", - new AspectList().add(Aspect.COLD,1).add(Aspect.TRAP,1)); - - public static FocusUpgradeType architect = new FocusUpgradeType( 6, - new ResourceLocation("thaumcraft", "textures/foci/architect.png"), - "focus.upgrade.architect.name","focus.upgrade.architect.text", - new AspectList().add(Aspect.CRAFT,1)); - - public static FocusUpgradeType extend = new FocusUpgradeType( 7, - new ResourceLocation("thaumcraft", "textures/foci/extend.png"), - "focus.upgrade.extend.name","focus.upgrade.extend.text", - new AspectList().add(Aspect.EXCHANGE,1)); - - public static FocusUpgradeType silktouch = new FocusUpgradeType( 8, - new ResourceLocation("thaumcraft", "textures/foci/silktouch.png"), - "focus.upgrade.silktouch.name","focus.upgrade.silktouch.text", - new AspectList().add(Aspect.GREED,1)); - - -} diff --git a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java b/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java deleted file mode 100644 index 4ef8c849..00000000 --- a/src/api/java/thaumcraft/api/wands/IWandRodOnUpdate.java +++ /dev/null @@ -1,16 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * - * @author azanor - * - * Implemented by a class that you wish to be called whenever a wand with this rod performs its - * update tick. - * - */ -public interface IWandRodOnUpdate { - void onUpdate(ItemStack itemstack, EntityPlayer player); -} diff --git a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java b/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java deleted file mode 100644 index 7c299deb..00000000 --- a/src/api/java/thaumcraft/api/wands/IWandTriggerManager.java +++ /dev/null @@ -1,15 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IWandTriggerManager { - - /** - * This class will be called by wands with the proper parameters. It is up to you to decide what to do with them. - */ - public boolean performTrigger(World world, ItemStack wand, EntityPlayer player, - int x, int y, int z, int side, int event); - -} diff --git a/src/api/java/thaumcraft/api/wands/IWandable.java b/src/api/java/thaumcraft/api/wands/IWandable.java deleted file mode 100644 index aeb9bac7..00000000 --- a/src/api/java/thaumcraft/api/wands/IWandable.java +++ /dev/null @@ -1,25 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * - * @author azanor - * - * Add this to a tile entity that you wish wands to interact with in some way. - * - */ - -public interface IWandable { - - public int onWandRightClick(World world, ItemStack wandstack, EntityPlayer player, int x, int y, int z, int side, int md); - - public ItemStack onWandRightClick(World world, ItemStack wandstack, EntityPlayer player); - - public void onUsingWandTick(ItemStack wandstack, EntityPlayer player, int count); - - public void onWandStoppedUsing(ItemStack wandstack, World world, EntityPlayer player, int count); - -} diff --git a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java b/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java deleted file mode 100644 index e8938e91..00000000 --- a/src/api/java/thaumcraft/api/wands/ItemFocusBasic.java +++ /dev/null @@ -1,276 +0,0 @@ -package thaumcraft.api.wands; - -import java.text.DecimalFormat; -import java.util.LinkedHashMap; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemFocusBasic extends Item { - - public ItemFocusBasic () - { - super(); - maxStackSize = 1; - canRepair=false; - this.setMaxDamage(0); - } - - public IIcon icon; - - @SideOnly(Side.CLIENT) - @Override - public IIcon getIconFromDamage(int par1) { - return icon; - } - - @Override - public boolean isDamageable() { - return false; - } - - @Override - public void addInformation(ItemStack stack,EntityPlayer player, List list, boolean par4) { - AspectList al = this.getVisCost(stack); - if (al!=null && al.size()>0) { - list.add(StatCollector.translateToLocal(isVisCostPerTick(stack)?"item.Focus.cost2":"item.Focus.cost1")); - for (Aspect aspect:al.getAspectsSorted()) { - DecimalFormat myFormatter = new DecimalFormat("#####.##"); - String amount = myFormatter.format(al.getAmount(aspect)/100f); - list.add(" \u00A7"+aspect.getChatcolor()+aspect.getName()+"\u00A7r x "+ amount); - } - } - addFocusInformation(stack,player,list,par4); - } - - public void addFocusInformation(ItemStack focusstack,EntityPlayer player, List list, boolean par4) { - LinkedHashMap map = new LinkedHashMap(); - for (short id:this.getAppliedUpgrades(focusstack)) { - if (id>=0) { - int amt = 1; - if (map.containsKey(id)) { - amt = map.get(id) + 1; - } - map.put(id, amt); - } - } - for (Short id:map.keySet()) { - list.add(EnumChatFormatting.DARK_PURPLE +FocusUpgradeType.types[id].getLocalizedName()+ - (map.get(id)>1?" "+StatCollector.translateToLocal("enchantment.level." + map.get(id)):"")); - } - } - - /** - * Purely for display on the focus tooltip (see addInformation method above) - */ - public boolean isVisCostPerTick(ItemStack focusstack) { - return false; - } - - @Override - public EnumRarity getRarity(ItemStack focusstack) - { - return EnumRarity.rare; - } - - /** - * What color will the focus orb be rendered on the held wand - */ - public int getFocusColor(ItemStack focusstack) { - return 0; - } - - - /** - * Does the focus have ornamentation like the focus of the nine hells. Ornamentation is a standard icon rendered in a cross around the focus - */ - public IIcon getOrnament(ItemStack focusstack) { - // TODO Auto-generated method stub - return null; - } - - /** - * An icon to be rendered inside the focus itself - */ - public IIcon getFocusDepthLayerIcon(ItemStack focusstack) { - // TODO Auto-generated method stub - return null; - } - - public enum WandFocusAnimation { - WAVE, CHARGE; - } - - public WandFocusAnimation getAnimation(ItemStack focusstack) { - return WandFocusAnimation.WAVE; - } - - /** - * Just insert two alphanumeric characters before this string in your focus item class - */ - public String getSortingHelper(ItemStack focusstack) { - String out=""; - for (short id:this.getAppliedUpgrades(focusstack)) { - out = out + id; - } - return out; - } - - - /** - * How much vis does this focus consume per activation. - */ - public AspectList getVisCost(ItemStack focusstack) { - return null; - } - - /** - * This returns how many milliseconds must pass before the focus can be activated again. - */ - public int getActivationCooldown(ItemStack focusstack) { - return 0; - } - - /** - * Used by foci like equal trade to determine their area in artchitect mode - */ - public int getMaxAreaSize(ItemStack focusstack) { - return 1; - } - - /** - * What upgrades can be applied to this focus for ranks 1 to 5 - */ - public FocusUpgradeType[] getPossibleUpgradesByRank(ItemStack focusstack, int rank) { - return null; - } - - /** - * What upgrades does the focus currently have - */ - public short[] getAppliedUpgrades(ItemStack focusstack) { - short[] l = new short[] {-1,-1,-1,-1,-1}; - NBTTagList nbttaglist = getFocusUpgradeTagList(focusstack); - if (nbttaglist == null) - { - return l; - } - else - { - for (int j = 0; j < nbttaglist.tagCount(); ++j) - { - if (j>=5) break; - l[j] = nbttaglist.getCompoundTagAt(j).getShort("id"); - } - - return l; - } - } - - public boolean applyUpgrade(ItemStack focusstack, FocusUpgradeType type, int rank) { - short[] upgrades = getAppliedUpgrades(focusstack); - if (upgrades[rank-1]!=-1 || rank<1 || rank>5) { - return false; - } - upgrades[rank-1] = type.id; - setFocusUpgradeTagList(focusstack, upgrades); - return true; - } - - /** - * Use this method to define custom logic about which upgrades can be applied. This can be used to set up upgrade "trees" - * that make certain upgrades available only when others are unlocked first, when certain research is completed, or similar logic. - * - */ - public boolean canApplyUpgrade(ItemStack focusstack, EntityPlayer player, FocusUpgradeType type, int rank) { - return true; - } - - /** - * Does this focus have the passed upgrade type - */ - public boolean isUpgradedWith(ItemStack focusstack, FocusUpgradeType focusUpgradetype) { - return getUpgradeLevel(focusstack,focusUpgradetype)>0; - } - - /** - * What level is the passed upgrade type on the focus. If it is not present it returns 0 - */ - public int getUpgradeLevel(ItemStack focusstack, FocusUpgradeType focusUpgradetype) { - short[] list = getAppliedUpgrades(focusstack); - int level=0; - for (short id:list) { - if (id == focusUpgradetype.id) - { - level++; - } - } - return level; - } - - public ItemStack onFocusRightClick(ItemStack wandstack, World world,EntityPlayer player, MovingObjectPosition movingobjectposition) { - // TODO Auto-generated method stub - return null; - } - - public void onUsingFocusTick(ItemStack wandstack, EntityPlayer player,int count) { - // TODO Auto-generated method stub - } - - public void onPlayerStoppedUsingFocus(ItemStack wandstack, World world, EntityPlayer player, int count) { - // TODO Auto-generated method stub - - } - - public boolean onFocusBlockStartBreak(ItemStack wandstack, int x, int y,int z, EntityPlayer player) { - // TODO Auto-generated method stub - return false; - } - - /** - * Internal helper methods - */ - private NBTTagList getFocusUpgradeTagList(ItemStack focusstack) - { - return focusstack.stackTagCompound == null ? null : focusstack.stackTagCompound.getTagList("upgrade", 10); - } - - private void setFocusUpgradeTagList(ItemStack focusstack, short[] upgrades) { - if (!focusstack.hasTagCompound()) - focusstack.setTagCompound(new NBTTagCompound()); - NBTTagCompound nbttagcompound = focusstack.getTagCompound(); - NBTTagList tlist = new NBTTagList(); - nbttagcompound.setTag("upgrade", tlist); - for (short id : upgrades) { - NBTTagCompound f = new NBTTagCompound(); - f.setShort("id", id); - tlist.appendTag(f); - } - } - - @Override - public void onUpdate(ItemStack stack, World world, Entity entity, int p_77663_4_, boolean p_77663_5_) { - if (stack.stackTagCompound !=null && stack.stackTagCompound.hasKey("ench")) { - stack.stackTagCompound.removeTag("ench"); - } - super.onUpdate(stack, world, entity, p_77663_4_, p_77663_5_); - } - - - -} diff --git a/src/api/java/thaumcraft/api/wands/StaffRod.java b/src/api/java/thaumcraft/api/wands/StaffRod.java deleted file mode 100644 index e7ae90f0..00000000 --- a/src/api/java/thaumcraft/api/wands/StaffRod.java +++ /dev/null @@ -1,48 +0,0 @@ -package thaumcraft.api.wands; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -/** - * - * @author Azanor - * - * This class is used to keep the material information for the various rods. - * It is also used to generate the wand recipes ingame. - * - */ -public class StaffRod extends WandRod { - - boolean runes=false; - - public StaffRod(String tag, int capacity, ItemStack item, int craftCost) { - super(tag+"_staff", capacity, item, craftCost); - this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png"); - } - - public StaffRod(String tag, int capacity, ItemStack item, int craftCost, - IWandRodOnUpdate onUpdate, ResourceLocation texture) { - super(tag+"_staff", capacity, item, craftCost, onUpdate, texture); - } - - public StaffRod(String tag, int capacity, ItemStack item, int craftCost, - IWandRodOnUpdate onUpdate) { - super(tag+"_staff", capacity, item, craftCost, onUpdate); - this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+tag+".png"); - } - - public StaffRod(String tag, int capacity, ItemStack item, int craftCost, - ResourceLocation texture) { - super(tag+"_staff", capacity, item, craftCost, texture); - } - - public boolean hasRunes() { - return runes; - } - - public void setRunes(boolean hasRunes) { - this.runes = hasRunes; - } - - -} diff --git a/src/api/java/thaumcraft/api/wands/WandCap.java b/src/api/java/thaumcraft/api/wands/WandCap.java deleted file mode 100644 index 17b4581c..00000000 --- a/src/api/java/thaumcraft/api/wands/WandCap.java +++ /dev/null @@ -1,129 +0,0 @@ -package thaumcraft.api.wands; - -import java.util.LinkedHashMap; -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import thaumcraft.api.aspects.Aspect; - -/** - * This class is used to keep the material information for the various caps. - * It is also used to generate the wand recipes ingame. - * @author Azanor - * - */ -public class WandCap { - - private String tag; - - /** - * Cost to craft this wand. Combined with the rod cost. - */ - private int craftCost; - - /** - * the amount by which all aspect costs are multiplied - */ - float baseCostModifier; - - /** - * specifies a list of primal aspects that use the special discount figure instead of the normal discount. - */ - List specialCostModifierAspects; - - /** - * the amount by which the specified aspect costs are multiplied - */ - float specialCostModifier; - - /** - * The texture that will be used for the ingame wand cap - */ - ResourceLocation texture; - - /** - * the actual item that makes up this cap and will be used to generate the wand recipes - */ - ItemStack item; - - public static LinkedHashMap caps = new LinkedHashMap(); - - public WandCap (String tag, float discount, ItemStack item, int craftCost) { - this.setTag(tag); - this.baseCostModifier = discount; - this.specialCostModifierAspects = null; - texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png"); - this.item=item; - this.setCraftCost(craftCost); - caps.put(tag, this); - } - - public WandCap (String tag, float discount, List specialAspects, float discountSpecial, ItemStack item, int craftCost) { - this.setTag(tag); - this.baseCostModifier = discount; - this.specialCostModifierAspects = specialAspects; - this.specialCostModifier = discountSpecial; - texture = new ResourceLocation("thaumcraft","textures/models/wand_cap_"+getTag()+".png"); - this.item=item; - this.setCraftCost(craftCost); - caps.put(tag, this); - } - - public float getBaseCostModifier() { - return baseCostModifier; - } - - public List getSpecialCostModifierAspects() { - return specialCostModifierAspects; - } - - public float getSpecialCostModifier() { - return specialCostModifier; - } - - public ResourceLocation getTexture() { - return texture; - } - - public void setTexture(ResourceLocation texture) { - this.texture = texture; - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - - public ItemStack getItem() { - return item; - } - - public void setItem(ItemStack item) { - this.item = item; - } - - public int getCraftCost() { - return craftCost; - } - - public void setCraftCost(int craftCost) { - this.craftCost = craftCost; - } - - /** - * The research a player needs to have finished to be able to craft a wand with this cap. - */ - public String getResearch() { - return "CAP_"+getTag(); - } - - // Some examples: - // WandCap WAND_CAP_IRON = new WandCap("iron", 1.1f, Arrays.asList(Aspect.ORDER),1, new ItemStack(ConfigItems.itemWandCap,1,0),1); - // WandCap WAND_CAP_GOLD = new WandCap("gold", 1f, new ItemStack(ConfigItems.itemWandCap,1,1),3); - -} diff --git a/src/api/java/thaumcraft/api/wands/WandRod.java b/src/api/java/thaumcraft/api/wands/WandRod.java deleted file mode 100644 index 85954e46..00000000 --- a/src/api/java/thaumcraft/api/wands/WandRod.java +++ /dev/null @@ -1,158 +0,0 @@ -package thaumcraft.api.wands; - -import java.util.LinkedHashMap; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -/** - * - * @author Azanor - * - * This class is used to keep the material information for the various rods. - * It is also used to generate the wand recipes ingame. - * - */ -public class WandRod { - - - private String tag; - - /** - * Cost to craft this wand. Combined with the rod cost. - */ - private int craftCost; - - /** - * The amount of vis that can be stored - this number is actually multiplied - * by 100 for use by the wands internals - */ - int capacity; - - /** - * The texture that will be used for the ingame wand rod - */ - protected ResourceLocation texture; - - /** - * the actual item that makes up this rod and will be used to generate the wand recipes - */ - ItemStack item; - - /** - * A class that will be called whenever the wand onUpdate tick is run - */ - IWandRodOnUpdate onUpdate; - - /** - * Does the rod glow in the dark? - */ - boolean glow; - - public static LinkedHashMap rods = new LinkedHashMap(); - - public WandRod (String tag, int capacity, ItemStack item, int craftCost, ResourceLocation texture) { - this.setTag(tag); - this.capacity = capacity; - this.texture = texture; - this.item=item; - this.setCraftCost(craftCost); - rods.put(tag, this); - } - - public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate, ResourceLocation texture) { - this.setTag(tag); - this.capacity = capacity; - this.texture = texture; - this.item=item; - this.setCraftCost(craftCost); - rods.put(tag, this); - this.onUpdate = onUpdate; - } - - public WandRod (String tag, int capacity, ItemStack item, int craftCost) { - this.setTag(tag); - this.capacity = capacity; - this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png"); - this.item=item; - this.setCraftCost(craftCost); - rods.put(tag, this); - } - - public WandRod (String tag, int capacity, ItemStack item, int craftCost, IWandRodOnUpdate onUpdate) { - this.setTag(tag); - this.capacity = capacity; - this.texture = new ResourceLocation("thaumcraft","textures/models/wand_rod_"+getTag()+".png"); - this.item=item; - this.setCraftCost(craftCost); - rods.put(tag, this); - this.onUpdate = onUpdate; - } - - public String getTag() { - return tag; - } - - public void setTag(String tag) { - this.tag = tag; - } - - public int getCapacity() { - return capacity; - } - - public void setCapacity(int capacity) { - this.capacity = capacity; - } - - public ResourceLocation getTexture() { - return texture; - } - - public void setTexture(ResourceLocation texture) { - this.texture = texture; - } - - public ItemStack getItem() { - return item; - } - - public void setItem(ItemStack item) { - this.item = item; - } - - public int getCraftCost() { - return craftCost; - } - - public void setCraftCost(int craftCost) { - this.craftCost = craftCost; - } - - public IWandRodOnUpdate getOnUpdate() { - return onUpdate; - } - - public void setOnUpdate(IWandRodOnUpdate onUpdate) { - this.onUpdate = onUpdate; - } - - public boolean isGlowing() { - return glow; - } - - public void setGlowing(boolean hasGlow) { - this.glow = hasGlow; - } - - /** - * The research a player needs to have finished to be able to craft a wand with this rod. - */ - public String getResearch() { - return "ROD_"+getTag(); - } - - // Some examples: - // WandRod WAND_ROD_WOOD = new WandRod("wood",25,new ItemStack(Item.stick),1); - // WandRod WAND_ROD_BLAZE = new WandRod("blaze",100,new ItemStack(Item.blazeRod),7,new WandRodBlazeOnUpdate()); -} diff --git a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java b/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java deleted file mode 100644 index 7224e12f..00000000 --- a/src/api/java/thaumcraft/api/wands/WandTriggerRegistry.java +++ /dev/null @@ -1,126 +0,0 @@ -package thaumcraft.api.wands; - -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * This class serves a similar function to IWandable in that it allows wands to interact - * with object in the world. In this case it is most useful for adding interaction with non-mod - * blocks where you can't control what happens in their code. - * Example where it is used is in crafting the thaumonomicon from a bookshelf and the - * crucible from a cauldron - * - * @author azanor - * - */ -public class WandTriggerRegistry { - - private static HashMap> triggers = new HashMap>(); - private static final String DEFAULT = "default"; - - /** - * Registers an action to perform when a casting wand right clicks on a specific block. - * A manager class needs to be created that implements IWandTriggerManager. - * @param manager - * @param event a logical number that you can use to differentiate different events or actions - * @param block - * @param meta send -1 as a wildcard value for all possible meta values - * @param modid a unique identifier. It is best to register your own triggers using your mod id to avoid conflicts with mods that register triggers for the same block - */ - public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta, String modid) { - if (!triggers.containsKey(modid)) { - triggers.put(modid, new HashMap()); - } - HashMap temp = triggers.get(modid); - temp.put(Arrays.asList(block,meta),Arrays.asList(manager,event)); - triggers.put(modid, temp); - } - - /** - * for legacy support - */ - public static void registerWandBlockTrigger(IWandTriggerManager manager, int event, Block block, int meta) { - registerWandBlockTrigger(manager, event, block, meta, DEFAULT); - } - - /** - * Checks all trigger registries if one exists for the given block and meta - * @param block - * @param meta - * @return - */ - public static boolean hasTrigger(Block block, int meta) { - for (String modid:triggers.keySet()) { - HashMap temp = triggers.get(modid); - if (temp.containsKey(Arrays.asList(block,meta)) || - temp.containsKey(Arrays.asList(block,-1))) return true; - } - return false; - } - - /** - * modid sensitive version - */ - public static boolean hasTrigger(Block block, int meta, String modid) { - if (!triggers.containsKey(modid)) return false; - HashMap temp = triggers.get(modid); - if (temp.containsKey(Arrays.asList(block,meta)) || - temp.containsKey(Arrays.asList(block,-1))) return true; - return false; - } - - - /** - * This is called by the onItemUseFirst function in wands. - * Parameters and return value functions like you would expect for that function. - * @param world - * @param wand - * @param player - * @param x - * @param y - * @param z - * @param side - * @param block - * @param meta - * @return - */ - public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, - int x, int y, int z, int side, Block block, int meta) { - - for (String modid:triggers.keySet()) { - HashMap temp = triggers.get(modid); - List l = temp.get(Arrays.asList(block,meta)); - if (l==null) l = temp.get(Arrays.asList(block,-1)); - if (l==null) continue; - - IWandTriggerManager manager = (IWandTriggerManager) l.get(0); - int event = (Integer) l.get(1); - boolean result = manager.performTrigger(world, wand, player, x, y, z, side, event); - if (result) return true; - } - return false; - } - - /** - * modid sensitive version - */ - public static boolean performTrigger(World world, ItemStack wand, EntityPlayer player, - int x, int y, int z, int side, Block block, int meta, String modid) { - if (!triggers.containsKey(modid)) return false; - HashMap temp = triggers.get(modid); - List l = temp.get(Arrays.asList(block,meta)); - if (l==null) l = temp.get(Arrays.asList(block,-1)); - if (l==null) return false; - - IWandTriggerManager manager = (IWandTriggerManager) l.get(0); - int event = (Integer) l.get(1); - return manager.performTrigger(world, wand, player, x, y, z, side, event); - } - -} diff --git a/src/main/java/cofh/api/CoFHAPIProps.java b/src/main/java/cofh/api/CoFHAPIProps.java deleted file mode 100644 index 7f000d42..00000000 --- a/src/main/java/cofh/api/CoFHAPIProps.java +++ /dev/null @@ -1,11 +0,0 @@ -package cofh.api; - -public class CoFHAPIProps { - - private CoFHAPIProps() { - - } - - public static final String VERSION = "1.7.10R1.0.13"; - -} diff --git a/src/main/java/cofh/api/block/IBlockAppearance.java b/src/main/java/cofh/api/block/IBlockAppearance.java deleted file mode 100644 index 558d348e..00000000 --- a/src/main/java/cofh/api/block/IBlockAppearance.java +++ /dev/null @@ -1,51 +0,0 @@ -package cofh.api.block; - -import net.minecraft.block.Block; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on blocks that can mimic the appearance of other blocks. Note that this is meant to be available server-side, so ensure the code is - * server-safe and doesn't use client-side code. - * - */ -public interface IBlockAppearance { - - /** - * This function returns the block that is being shown on a given side. - * - * @param world - * Reference to the world. - * @param x - * X coordinate of the block. - * @param y - * Y coordinate of the block. - * @param z - * Z coordinate of the block. - * @param side - * The side of the block. - */ - public Block getVisualBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side); - - /** - * This function returns metadata of the block that is being shown on a given side. - * - * @param world - * Reference to the world. - * @param x - * X coordinate of the block. - * @param y - * Y coordinate of the block. - * @param z - * Z coordinate of the block. - * @param side - * The side of the block. - */ - public int getVisualMeta(IBlockAccess world, int x, int y, int z, ForgeDirection side); - - /** - * This function returns whether the block's renderer will visually connect to other blocks implementing IBlockAppearance. - */ - public boolean supportsVisualConnections(); - -} diff --git a/src/main/java/cofh/api/block/IBlockConfigGui.java b/src/main/java/cofh/api/block/IBlockConfigGui.java deleted file mode 100644 index 9e00c87d..00000000 --- a/src/main/java/cofh/api/block/IBlockConfigGui.java +++ /dev/null @@ -1,31 +0,0 @@ -package cofh.api.block; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on blocks which have a GUI that needs a tool (e.g., multimeter) to open. - * - */ -public interface IBlockConfigGui { - - /** - * This function will open a GUI if the player has permission. - * - * @param world - * Reference to the world. - * @param x - * X coordinate of the block. - * @param y - * Y coordinate of the block. - * @param z - * Z coordinate of the block. - * @param side - * The side of the block. - * @param player - * Player doing the configuring. - * @return True if the GUI was opened. - */ - public boolean openConfigGui(IBlockAccess world, int x, int y, int z, ForgeDirection side, EntityPlayer player); -} diff --git a/src/main/java/cofh/api/block/IBlockDebug.java b/src/main/java/cofh/api/block/IBlockDebug.java deleted file mode 100644 index dc02f7f7..00000000 --- a/src/main/java/cofh/api/block/IBlockDebug.java +++ /dev/null @@ -1,33 +0,0 @@ -package cofh.api.block; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on blocks which have some debug method which can be activated via a tool or other means. - * - * @author King Lemming - * - */ -public interface IBlockDebug { - - /** - * This function debugs a block. - * - * @param world - * Reference to the world. - * @param x - * X coordinate of the block. - * @param y - * Y coordinate of the block. - * @param z - * Z coordinate of the block. - * @param side - * The side of the block. - * @param player - * Player doing the debugging. - */ - void debugBlock(IBlockAccess world, int x, int y, int z, ForgeDirection side, EntityPlayer player); - -} diff --git a/src/main/java/cofh/api/block/IBlockInfo.java b/src/main/java/cofh/api/block/IBlockInfo.java deleted file mode 100644 index 8494243c..00000000 --- a/src/main/java/cofh/api/block/IBlockInfo.java +++ /dev/null @@ -1,43 +0,0 @@ -package cofh.api.block; - -import cofh.api.tileentity.ITileInfo; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.IChatComponent; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on blocks which can provide information about themselves. If the block contains Tile Entities, then it is recommended that this - * function serve as a passthrough for {@link ITileInfo}. - * - * @author King Lemming - * - */ -public interface IBlockInfo { - - /** - * This function appends information to a list provided to it. - * - * @param world - * Reference to the world. - * @param x - * X coordinate of the block. - * @param y - * Y coordinate of the block. - * @param z - * Z coordinate of the block. - * @param side - * The side of the block that is being queried. - * @param player - * Player doing the querying - this can be NULL. - * @param info - * The list that the information should be appended to. - * @param debug - * If true, the block should return "debug" information. - */ - void getBlockInfo(IBlockAccess world, int x, int y, int z, ForgeDirection side, EntityPlayer player, List info, boolean debug); - -} diff --git a/src/main/java/cofh/api/block/IDismantleable.java b/src/main/java/cofh/api/block/IDismantleable.java deleted file mode 100644 index 12c09e3a..00000000 --- a/src/main/java/cofh/api/block/IDismantleable.java +++ /dev/null @@ -1,27 +0,0 @@ -package cofh.api.block; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * Implemented on Blocks which have some method of being instantly dismantled. - * - * @author King Lemming - * - */ -public interface IDismantleable { - - /** - * Dismantles the block. If returnDrops is true, the drop(s) should be placed into the player's inventory. - */ - ArrayList dismantleBlock(EntityPlayer player, World world, int x, int y, int z, boolean returnDrops); - - /** - * Return true if the block can be dismantled. The criteria for this is entirely up to the block. - */ - boolean canDismantle(EntityPlayer player, World world, int x, int y, int z); - -} diff --git a/src/main/java/cofh/api/block/package-info.java b/src/main/java/cofh/api/block/package-info.java deleted file mode 100644 index 36f61194..00000000 --- a/src/main/java/cofh/api/block/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|block") -package cofh.api.block; - -import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; - diff --git a/src/main/java/cofh/api/energy/EnergyStorage.java b/src/main/java/cofh/api/energy/EnergyStorage.java deleted file mode 100644 index 25e0126a..00000000 --- a/src/main/java/cofh/api/energy/EnergyStorage.java +++ /dev/null @@ -1,158 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.nbt.NBTTagCompound; - -/** - * Reference implementation of {@link IEnergyStorage}. Use/extend this or implement your own. - * - * @author King Lemming - * - */ -public class EnergyStorage implements IEnergyStorage { - - protected int energy; - protected int capacity; - protected int maxReceive; - protected int maxExtract; - - public EnergyStorage(int capacity) { - - this(capacity, capacity, capacity); - } - - public EnergyStorage(int capacity, int maxTransfer) { - - this(capacity, maxTransfer, maxTransfer); - } - - public EnergyStorage(int capacity, int maxReceive, int maxExtract) { - - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } - - public EnergyStorage readFromNBT(NBTTagCompound nbt) { - - this.energy = nbt.getInteger("Energy"); - - if (energy > capacity) { - energy = capacity; - } - return this; - } - - public NBTTagCompound writeToNBT(NBTTagCompound nbt) { - - if (energy < 0) { - energy = 0; - } - nbt.setInteger("Energy", energy); - return nbt; - } - - public void setCapacity(int capacity) { - - this.capacity = capacity; - - if (energy > capacity) { - energy = capacity; - } - } - - public void setMaxTransfer(int maxTransfer) { - - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - } - - public void setMaxReceive(int maxReceive) { - - this.maxReceive = maxReceive; - } - - public void setMaxExtract(int maxExtract) { - - this.maxExtract = maxExtract; - } - - public int getMaxReceive() { - - return maxReceive; - } - - public int getMaxExtract() { - - return maxExtract; - } - - /** - * This function is included to allow for server -> client sync. Do not call this externally to the containing Tile Entity, as not all IEnergyHandlers - * are guaranteed to have it. - * - * @param energy - */ - public void setEnergyStored(int energy) { - - this.energy = energy; - - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } - - /** - * This function is included to allow the containing tile to directly and efficiently modify the energy contained in the EnergyStorage. Do not rely on this - * externally, as not all IEnergyHandlers are guaranteed to have it. - * - * @param energy - */ - public void modifyEnergyStored(int energy) { - - this.energy += energy; - - if (this.energy > capacity) { - this.energy = capacity; - } else if (this.energy < 0) { - this.energy = 0; - } - } - - /* IEnergyStorage */ - @Override - public int receiveEnergy(int maxReceive, boolean simulate) { - - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - - if (!simulate) { - energy += energyReceived; - } - return energyReceived; - } - - @Override - public int extractEnergy(int maxExtract, boolean simulate) { - - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - - if (!simulate) { - energy -= energyExtracted; - } - return energyExtracted; - } - - @Override - public int getEnergyStored() { - - return energy; - } - - @Override - public int getMaxEnergyStored() { - - return capacity; - } - -} diff --git a/src/main/java/cofh/api/energy/IEnergyConnection.java b/src/main/java/cofh/api/energy/IEnergyConnection.java deleted file mode 100644 index 301271e5..00000000 --- a/src/main/java/cofh/api/energy/IEnergyConnection.java +++ /dev/null @@ -1,21 +0,0 @@ -package cofh.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * 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(ForgeDirection from); - -} diff --git a/src/main/java/cofh/api/energy/IEnergyContainerItem.java b/src/main/java/cofh/api/energy/IEnergyContainerItem.java deleted file mode 100644 index 3ef72576..00000000 --- a/src/main/java/cofh/api/energy/IEnergyContainerItem.java +++ /dev/null @@ -1,52 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.item.ItemStack; - -/** - * Implement this interface on Item classes that support external manipulation of their internal energy storages. - *

- * A reference implementation is provided {@link ItemEnergyContainer}. - * - * @author King Lemming - * - */ -public interface IEnergyContainerItem { - - /** - * Adds energy to a container item. Returns the quantity of energy that was accepted. This should always return 0 if the item cannot be externally charged. - * - * @param container - * ItemStack to be charged. - * @param maxReceive - * Maximum amount of energy to be sent into the item. - * @param simulate - * If TRUE, the charge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) received by the item. - */ - int receiveEnergy(ItemStack container, int maxReceive, boolean simulate); - - /** - * Removes energy from a container item. Returns the quantity of energy that was removed. This should always return 0 if the item cannot be externally - * discharged. - * - * @param container - * ItemStack to be discharged. - * @param maxExtract - * Maximum amount of energy to be extracted from the item. - * @param simulate - * If TRUE, the discharge will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted from the item. - */ - int extractEnergy(ItemStack container, int maxExtract, boolean simulate); - - /** - * Get the amount of energy currently stored in the container item. - */ - int getEnergyStored(ItemStack container); - - /** - * Get the max amount of energy that can be stored in the container item. - */ - int getMaxEnergyStored(ItemStack container); - -} diff --git a/src/main/java/cofh/api/energy/IEnergyHandler.java b/src/main/java/cofh/api/energy/IEnergyHandler.java deleted file mode 100644 index 6a4600a4..00000000 --- a/src/main/java/cofh/api/energy/IEnergyHandler.java +++ /dev/null @@ -1,57 +0,0 @@ -package cofh.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * 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}. - * - * @author King Lemming - * - */ -public interface IEnergyHandler extends IEnergyProvider, IEnergyReceiver { - - // merely a convenience interface (remove these methods in 1.8; provided here for back-compat via compiler doing things) - - /** - * 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. - */ - @Override - int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate); - - /** - * 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. - */ - @Override - int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - @Override - int getEnergyStored(ForgeDirection from); - - /** - * Returns the maximum amount of energy that can be stored. - */ - @Override - int getMaxEnergyStored(ForgeDirection from); - -} diff --git a/src/main/java/cofh/api/energy/IEnergyProvider.java b/src/main/java/cofh/api/energy/IEnergyProvider.java deleted file mode 100644 index 05287b35..00000000 --- a/src/main/java/cofh/api/energy/IEnergyProvider.java +++ /dev/null @@ -1,38 +0,0 @@ -package cofh.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * 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 IEnergyConnection { - - /** - * 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(ForgeDirection from, int maxExtract, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(ForgeDirection from); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(ForgeDirection from); - -} diff --git a/src/main/java/cofh/api/energy/IEnergyReceiver.java b/src/main/java/cofh/api/energy/IEnergyReceiver.java deleted file mode 100644 index c726e09e..00000000 --- a/src/main/java/cofh/api/energy/IEnergyReceiver.java +++ /dev/null @@ -1,38 +0,0 @@ -package cofh.api.energy; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * 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 IEnergyConnection { - - /** - * 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(ForgeDirection from, int maxReceive, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(ForgeDirection from); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(ForgeDirection from); - -} diff --git a/src/main/java/cofh/api/energy/IEnergyStorage.java b/src/main/java/cofh/api/energy/IEnergyStorage.java deleted file mode 100644 index 414b2656..00000000 --- a/src/main/java/cofh/api/energy/IEnergyStorage.java +++ /dev/null @@ -1,46 +0,0 @@ -package cofh.api.energy; - -/** - * An energy storage is the unit of interaction with Energy inventories.
- * This is not to be implemented on TileEntities. This is for internal use only. - *

- * A reference implementation can be found at {@link EnergyStorage}. - * - * @author King Lemming - * - */ -public interface IEnergyStorage { - - /** - * Adds energy to the storage. Returns quantity of energy that was accepted. - * - * @param maxReceive - * Maximum amount of energy to be inserted. - * @param simulate - * If TRUE, the insertion will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) accepted by the storage. - */ - int receiveEnergy(int maxReceive, boolean simulate); - - /** - * Removes energy from the storage. Returns quantity of energy that was removed. - * - * @param maxExtract - * Maximum amount of energy to be extracted. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return Amount of energy that was (or would have been, if simulated) extracted from the storage. - */ - int extractEnergy(int maxExtract, boolean simulate); - - /** - * Returns the amount of energy currently stored. - */ - int getEnergyStored(); - - /** - * Returns the maximum amount of energy that can be stored. - */ - int getMaxEnergyStored(); - -} diff --git a/src/main/java/cofh/api/energy/ItemEnergyContainer.java b/src/main/java/cofh/api/energy/ItemEnergyContainer.java deleted file mode 100644 index 2d3659cb..00000000 --- a/src/main/java/cofh/api/energy/ItemEnergyContainer.java +++ /dev/null @@ -1,110 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -/** - * Reference implementation of {@link IEnergyContainerItem}. Use/extend this or implement your own. - * - * @author King Lemming - * - */ -public class ItemEnergyContainer extends Item implements IEnergyContainerItem { - - protected int capacity; - protected int maxReceive; - protected int maxExtract; - - public ItemEnergyContainer() { - - } - - public ItemEnergyContainer(int capacity) { - - this(capacity, capacity, capacity); - } - - public ItemEnergyContainer(int capacity, int maxTransfer) { - - this(capacity, maxTransfer, maxTransfer); - } - - public ItemEnergyContainer(int capacity, int maxReceive, int maxExtract) { - - this.capacity = capacity; - this.maxReceive = maxReceive; - this.maxExtract = maxExtract; - } - - public ItemEnergyContainer setCapacity(int capacity) { - - this.capacity = capacity; - return this; - } - - public void setMaxTransfer(int maxTransfer) { - - setMaxReceive(maxTransfer); - setMaxExtract(maxTransfer); - } - - public void setMaxReceive(int maxReceive) { - - this.maxReceive = maxReceive; - } - - public void setMaxExtract(int maxExtract) { - - this.maxExtract = maxExtract; - } - - /* IEnergyContainerItem */ - @Override - public int receiveEnergy(ItemStack container, int maxReceive, boolean simulate) { - - if (container.stackTagCompound == null) { - container.stackTagCompound = new NBTTagCompound(); - } - int energy = container.stackTagCompound.getInteger("Energy"); - int energyReceived = Math.min(capacity - energy, Math.min(this.maxReceive, maxReceive)); - - if (!simulate) { - energy += energyReceived; - container.stackTagCompound.setInteger("Energy", energy); - } - return energyReceived; - } - - @Override - public int extractEnergy(ItemStack container, int maxExtract, boolean simulate) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; - } - int energy = container.stackTagCompound.getInteger("Energy"); - int energyExtracted = Math.min(energy, Math.min(this.maxExtract, maxExtract)); - - if (!simulate) { - energy -= energyExtracted; - container.stackTagCompound.setInteger("Energy", energy); - } - return energyExtracted; - } - - @Override - public int getEnergyStored(ItemStack container) { - - if (container.stackTagCompound == null || !container.stackTagCompound.hasKey("Energy")) { - return 0; - } - return container.stackTagCompound.getInteger("Energy"); - } - - @Override - public int getMaxEnergyStored(ItemStack container) { - - return capacity; - } - -} diff --git a/src/main/java/cofh/api/energy/TileEnergyHandler.java b/src/main/java/cofh/api/energy/TileEnergyHandler.java deleted file mode 100644 index 7cc655e9..00000000 --- a/src/main/java/cofh/api/energy/TileEnergyHandler.java +++ /dev/null @@ -1,65 +0,0 @@ -package cofh.api.energy; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Reference implementation of {@link IEnergyHandler}. Use/extend this or implement your own. - * - * @author King Lemming - * - */ -public class TileEnergyHandler extends TileEntity implements IEnergyHandler { - - protected EnergyStorage storage = new EnergyStorage(32000); - - @Override - public void readFromNBT(NBTTagCompound nbt) { - - super.readFromNBT(nbt); - storage.readFromNBT(nbt); - } - - @Override - public void writeToNBT(NBTTagCompound nbt) { - - super.writeToNBT(nbt); - storage.writeToNBT(nbt); - } - - /* IEnergyConnection */ - @Override - public boolean canConnectEnergy(ForgeDirection from) { - - return true; - } - - /* IEnergyReceiver */ - @Override - public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - - return storage.receiveEnergy(maxReceive, simulate); - } - - /* IEnergyProvider */ - @Override - public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) { - - return storage.extractEnergy(maxExtract, simulate); - } - - /* IEnergyReceiver and IEnergyProvider */ - @Override - public int getEnergyStored(ForgeDirection from) { - - return storage.getEnergyStored(); - } - - @Override - public int getMaxEnergyStored(ForgeDirection from) { - - return storage.getMaxEnergyStored(); - } - -} diff --git a/src/main/java/cofh/api/energy/package-info.java b/src/main/java/cofh/api/energy/package-info.java deleted file mode 100644 index 7379702b..00000000 --- a/src/main/java/cofh/api/energy/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|energy") -package cofh.api.energy; - -import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; - diff --git a/src/main/java/cofh/api/inventory/IInventoryConnection.java b/src/main/java/cofh/api/inventory/IInventoryConnection.java deleted file mode 100644 index 99ea70bf..00000000 --- a/src/main/java/cofh/api/inventory/IInventoryConnection.java +++ /dev/null @@ -1,24 +0,0 @@ -package cofh.api.inventory; - -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on TileEntities which should connect to item transportation blocks. - */ -public interface IInventoryConnection { - - /** - * @param from - * Side to which a connector would connect - * @return DEFAULT if the connector should decide how to connect; FORCE if the connector should always connect; DENY if the connector should never connect. - */ - public ConnectionType canConnectInventory(ForgeDirection from); - - public static enum ConnectionType { - DEFAULT, FORCE, DENY; - - public final boolean canConnect = ordinal() != 2; - public final boolean forceConnect = ordinal() == 1; - } - -} diff --git a/src/main/java/cofh/api/inventory/IInventoryHandler.java b/src/main/java/cofh/api/inventory/IInventoryHandler.java deleted file mode 100644 index 344e8153..00000000 --- a/src/main/java/cofh/api/inventory/IInventoryHandler.java +++ /dev/null @@ -1,82 +0,0 @@ -package cofh.api.inventory; - -import java.util.List; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on TileEntities which should handle items. - * - * A reference implementation is provided {@link TileInventoryHandler}. - * - * @author King Lemming - * - */ -public interface IInventoryHandler extends IInventoryConnection { - - /** - * Insert an ItemStack into the IInventoryHandler, internal distribution is left entirely to the IInventoryHandler. This returns what is remaining of the - * original stack - a null return means that the entire stack was accepted! - * - * @param from - * Orientation the item is inserted from. - * @param item - * ItemStack to be inserted. The size of this stack corresponds to the maximum amount to insert. - * @param simulate - * If TRUE, the insertion will only be simulated. - * @return An ItemStack representing how much is remaining after the item was inserted (or would have been, if simulated) into the container inventory. - */ - ItemStack insertItem(ForgeDirection from, ItemStack item, boolean simulate); - - /** - * Extract an ItemStack from an IInventoryHandler, internal distribution is left entirely to the IInventoryHandler. This returns the resulting stack - a - * null return means that nothing was extracted! - * - * @param from - * Orientation the item is extracted from. - * @param item - * ItemStack to be extracted. The size of this stack corresponds to the maximum amount to extract. If this is null, then a null ItemStack should - * immediately be returned. - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return An ItemStack representing how much was extracted (or would have been, if simulated) from the container inventory. - */ - ItemStack extractItem(ForgeDirection from, ItemStack item, boolean simulate); - - /** - * Extract an ItemStack from an IInventoryHandler, internal distribution is left entirely to the IInventoryHandler. This returns the resulting stack - a - * null return means that nothing was extracted! - * - * @param from - * Orientation the item is extracted from. - * @param maxExtract - * Maximum number of items to extract. (The returned ItemStack should have a stackSize no higher than this.) - * @param simulate - * If TRUE, the extraction will only be simulated. - * @return An ItemStack representing how much was extracted (or would have been, if simulated) from the container inventory. - */ - ItemStack extractItem(ForgeDirection from, int maxExtract, boolean simulate); - - /** - * Get the contents of the IInventoryHandler's inventory. This returns a COPY. This should only return non-null ItemStacks, and an empty List if the - * inventory has nothing. - */ - List getInventoryContents(ForgeDirection from); - - /** - * Get the size (number of internal slots) of the IInventoryHandler's inventory. - */ - int getSizeInventory(ForgeDirection from); - - /** - * Returns whether or not the IInventoryHandler's inventory is empty (for a given side). - */ - boolean isEmpty(ForgeDirection from); - - /** - * Returns whether or not the IInventoryHandler's inventory is full (for a given side). - */ - boolean isFull(ForgeDirection from); - -} diff --git a/src/main/java/cofh/api/inventory/IInventoryRetainer.java b/src/main/java/cofh/api/inventory/IInventoryRetainer.java deleted file mode 100644 index df79681e..00000000 --- a/src/main/java/cofh/api/inventory/IInventoryRetainer.java +++ /dev/null @@ -1,12 +0,0 @@ -package cofh.api.inventory; - -/** - * Marks a block which will retain its inventory when broken. - * - * @author King Lemming - * - */ -public interface IInventoryRetainer { - - // There's nothing else to go here at the moment. Potentially a conditional at a later date. -} diff --git a/src/main/java/cofh/api/inventory/package-info.java b/src/main/java/cofh/api/inventory/package-info.java deleted file mode 100644 index a11a175c..00000000 --- a/src/main/java/cofh/api/inventory/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|inventory") -package cofh.api.inventory; - -import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; - diff --git a/src/main/java/cofh/api/item/IAugmentItem.java b/src/main/java/cofh/api/item/IAugmentItem.java deleted file mode 100644 index e17fa8de..00000000 --- a/src/main/java/cofh/api/item/IAugmentItem.java +++ /dev/null @@ -1,29 +0,0 @@ -package cofh.api.item; - -import java.util.Set; - -import net.minecraft.item.ItemStack; - -public interface IAugmentItem { - - /** - * Get the augmentation level for a given Augment and Augment Type. - * - * @param stack - * ItemStack representing the Augment. - * @param type - * String containing the Augment type name. - * @return The Augment level of the stack for the requested type - 0 if it does not affect that attribute. - */ - int getAugmentLevel(ItemStack stack, String type); - - /** - * Get the Augment Types for a given Augment. Set ensure that there are no duplicates. - * - * @param stack - * ItemStack representing the Augment. - * @return Set of the Augmentation Types. Should return an empty set if there are none (but this would be really stupid to make). DO NOT RETURN NULL. - */ - Set getAugmentTypes(ItemStack stack); - -} diff --git a/src/main/java/cofh/api/item/IEmpowerableItem.java b/src/main/java/cofh/api/item/IEmpowerableItem.java deleted file mode 100644 index 42877110..00000000 --- a/src/main/java/cofh/api/item/IEmpowerableItem.java +++ /dev/null @@ -1,41 +0,0 @@ -package cofh.api.item; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * Implement this interface on Item classes which may be "Empowered" - what that means is completely up to you. This just provides a uniform way of dealing with - * them. - * - * @author King Lemming - * - */ -public interface IEmpowerableItem { - - /** - * Check whether or not a given item is currently in an empowered state. - */ - boolean isEmpowered(ItemStack stack); - - /** - * Attempt to set the empowered state of the item. - * - * @param stack - * ItemStack to be empowered/disempowered. - * @param state - * Desired state. - * @return TRUE if the operation was successful, FALSE if it was not. - */ - boolean setEmpoweredState(ItemStack stack, boolean state); - - /** - * Callback method for reacting to a state change. Useful in KeyBinding handlers. - * - * @param player - * Player holding the item, if applicable. - * @param stack - * The item being held. - */ - void onStateChange(EntityPlayer player, ItemStack stack); - -} diff --git a/src/main/java/cofh/api/item/IInventoryContainerItem.java b/src/main/java/cofh/api/item/IInventoryContainerItem.java deleted file mode 100644 index adadf10a..00000000 --- a/src/main/java/cofh/api/item/IInventoryContainerItem.java +++ /dev/null @@ -1,20 +0,0 @@ -package cofh.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Implement this interface on Item classes that are themselves inventories. - * - * A reference implementation is provided {@link ItemInventoryContainer}. - * - * @author King Lemming - * - */ -public interface IInventoryContainerItem { - - /** - * Get the size of this inventory of this container item. - */ - int getSizeInventory(ItemStack container); - -} diff --git a/src/main/java/cofh/api/item/IMultiModeItem.java b/src/main/java/cofh/api/item/IMultiModeItem.java deleted file mode 100644 index c236bbfb..00000000 --- a/src/main/java/cofh/api/item/IMultiModeItem.java +++ /dev/null @@ -1,56 +0,0 @@ -package cofh.api.item; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -/** - * Implement this interface on Item classes which may be "Empowered" - what that means is completely up to you. This just provides a uniform way of dealing with - * them. - * - * @author King Lemming - * - */ -public interface IMultiModeItem { - - /** - * Get the current mode of an item. - */ - int getMode(ItemStack stack); - - /** - * Attempt to set the empowered state of the item. - * - * @param stack - * ItemStack to set the mode on. - * @param mode - * Desired mode. - * @return TRUE if the operation was successful, FALSE if it was not. - */ - boolean setMode(ItemStack stack, int mode); - - /** - * Increment the current mode of an item. - */ - boolean incrMode(ItemStack stack); - - /** - * Decrement the current mode of an item. - */ - boolean decrMode(ItemStack stack); - - /** - * Returns the number of possible modes. - */ - int getNumModes(ItemStack stack); - - /** - * Callback method for reacting to a state change. Useful in KeyBinding handlers. - * - * @param player - * Player holding the item, if applicable. - * @param stack - * The item being held. - */ - void onModeChange(EntityPlayer player, ItemStack stack); - -} diff --git a/src/main/java/cofh/api/item/ISpecialFilterFluid.java b/src/main/java/cofh/api/item/ISpecialFilterFluid.java deleted file mode 100644 index 7e8d3d02..00000000 --- a/src/main/java/cofh/api/item/ISpecialFilterFluid.java +++ /dev/null @@ -1,24 +0,0 @@ -package cofh.api.item; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - -/** - * Implement this interface on subclasses of Item to change how the item works in Thermal Dynamics Fluiducts filter slots. - * - * This can be used to create customizable Items which are determined to be "equal" for the purposes of filtering. - */ -public interface ISpecialFilterFluid { - - /** - * This method is called to find out if the given FluidStack should be matched by the given Filter ItemStack. - * - * @param filter - * ItemStack representing the filter. - * @param fluid - * FluidStack representing the queried fluid. - * @return True if the filter should match the FluidStack. False if the default matching should be used. - */ - public boolean matchesFluid(ItemStack filter, FluidStack fluid); - -} diff --git a/src/main/java/cofh/api/item/ISpecialFilterItem.java b/src/main/java/cofh/api/item/ISpecialFilterItem.java deleted file mode 100644 index ef9f953d..00000000 --- a/src/main/java/cofh/api/item/ISpecialFilterItem.java +++ /dev/null @@ -1,23 +0,0 @@ -package cofh.api.item; - -import net.minecraft.item.ItemStack; - -/** - * Implement this interface on subclasses of Item to change how the item works in Thermal Dynamics Itemducts filter slots. - * - * This can be used to create customizable Items which are determined to be "equal" for the purposes of filtering. - */ -public interface ISpecialFilterItem { - - /** - * This method is called to find out if the given ItemStack should be matched by the given Filter ItemStack. - * - * @param filter - * ItemStack representing the filter. - * @param item - * ItemStack representing the queried item. - * @return True if the filter should match. False if the default matching should be used. - */ - public boolean matchesItem(ItemStack filter, ItemStack item); - -} diff --git a/src/main/java/cofh/api/item/IToolHammer.java b/src/main/java/cofh/api/item/IToolHammer.java deleted file mode 100644 index f7b3918f..00000000 --- a/src/main/java/cofh/api/item/IToolHammer.java +++ /dev/null @@ -1,44 +0,0 @@ -package cofh.api.item; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -/** - * Implement this interface on subclasses of Item to have that item work as a tool for CoFH mods. - */ -public interface IToolHammer { - - /** - * Called to ensure that the wrench can be used. - * - * @param item - * The itemstack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools) - * @param user - * The entity using the tool - * @param x - * X location of the block/tile - * @param y - * Y location of the block/tile - * @param z - * Z location of the block/tile - * @return True if this tool can be used - */ - boolean isUsable(ItemStack item, EntityLivingBase user, int x, int y, int z); - - /** - * Callback for when the tool has been used reactively. - * - * @param item - * The ItemStack for the tool. Not required to match equipped item (e.g., multi-tools that contain other tools) - * @param user - * The entity using the tool - * @param x - * X location of the block/tile - * @param y - * Y location of the block/tile - * @param z - * Z location of the block/tile - */ - void toolUsed(ItemStack item, EntityLivingBase user, int x, int y, int z); - -} diff --git a/src/main/java/cofh/api/item/package-info.java b/src/main/java/cofh/api/item/package-info.java deleted file mode 100644 index 49608fd1..00000000 --- a/src/main/java/cofh/api/item/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|item") -package cofh.api.item; - -import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; - diff --git a/src/main/java/cofh/api/package-info.java b/src/main/java/cofh/api/package-info.java deleted file mode 100644 index 08ff5fcb..00000000 --- a/src/main/java/cofh/api/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHLib", provides = "CoFHAPI") -package cofh.api; - -import cpw.mods.fml.common.API; - diff --git a/src/main/java/cofh/api/tileentity/IAugmentable.java b/src/main/java/cofh/api/tileentity/IAugmentable.java deleted file mode 100644 index 5a99c598..00000000 --- a/src/main/java/cofh/api/tileentity/IAugmentable.java +++ /dev/null @@ -1,28 +0,0 @@ -package cofh.api.tileentity; - -import net.minecraft.item.ItemStack; - -/** - * Implemented on objects which support Augments. - * - * @author King Lemming - * - */ -public interface IAugmentable { - - /** - * Attempt to reconfigure the tile based on the Augmentations present. - */ - void installAugments(); - - /** - * Returns an array of the Augment slots for this Tile Entity. - */ - ItemStack[] getAugmentSlots(); - - /** - * Returns a status array for the Augmentations installed in the Tile Entity. - */ - boolean[] getAugmentStatus(); - -} diff --git a/src/main/java/cofh/api/tileentity/IEnergyInfo.java b/src/main/java/cofh/api/tileentity/IEnergyInfo.java deleted file mode 100644 index 6277a34c..00000000 --- a/src/main/java/cofh/api/tileentity/IEnergyInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -package cofh.api.tileentity; - -/** - * Implement this interface on objects which can report information about their energy usage. - * - * This is used for reporting purposes - Energy transactions are handled through IEnergyHandler! - * - * @author King Lemming - * - */ -public interface IEnergyInfo { - - /** - * Returns energy usage/generation per tick (RF/t). - */ - int getInfoEnergyPerTick(); - - /** - * Returns maximum energy usage/generation per tick (RF/t). - */ - int getInfoMaxEnergyPerTick(); - - /** - * Returns energy stored (RF). - */ - int getInfoEnergyStored(); - - /** - * Returns maximum energy stored (RF). - */ - int getInfoMaxEnergyStored(); - -} diff --git a/src/main/java/cofh/api/tileentity/IPortableData.java b/src/main/java/cofh/api/tileentity/IPortableData.java deleted file mode 100644 index 81d42964..00000000 --- a/src/main/java/cofh/api/tileentity/IPortableData.java +++ /dev/null @@ -1,33 +0,0 @@ -package cofh.api.tileentity; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; - -/** - * Implement this interface on Tile Entities which can write a limited amount of data about themselves. - * - * This is typically for the purposes of being transferred to a similar tile entity. - * - * @author King Lemming - * - */ -public interface IPortableData { - - /** - * Data identifier of the Tile Entity/Block. Used for display as well as verification purposes. Tiles with completely interchangeable data should return the - * same type. - * - * @return - */ - String getDataType(); - - /** - * Read the data from a tag. The player object exists because this should always be called via player interaction! - */ - void readPortableData(EntityPlayer player, NBTTagCompound tag); - - /** - * Write the data to a tag. The player object exists because this should always be called via player interaction! - */ - void writePortableData(EntityPlayer player, NBTTagCompound tag); -} diff --git a/src/main/java/cofh/api/tileentity/IReconfigurableFacing.java b/src/main/java/cofh/api/tileentity/IReconfigurableFacing.java deleted file mode 100644 index e6972091..00000000 --- a/src/main/java/cofh/api/tileentity/IReconfigurableFacing.java +++ /dev/null @@ -1,39 +0,0 @@ -package cofh.api.tileentity; - -/** - * Implement this interface on Tile Entities which allow for reconfiguration of their facing. - * - * Coordination with the containing block is required. - * - * @author King Lemming - * - */ -public interface IReconfigurableFacing { - - /** - * Returns the current facing of the block. - */ - int getFacing(); - - /** - * Returns whether or not the block's face can be aligned with the Y Axis. - */ - boolean allowYAxisFacing(); - - /** - * Attempt to rotate the block. Arbitrary based on implementation. - * - * @return True if rotation was successful, false otherwise. - */ - boolean rotateBlock(); - - /** - * Set the facing of the block. - * - * @param side - * The side to set the facing to. - * @return True if the facing was set, false otherwise. - */ - boolean setFacing(int side); - -} diff --git a/src/main/java/cofh/api/tileentity/IReconfigurableSides.java b/src/main/java/cofh/api/tileentity/IReconfigurableSides.java deleted file mode 100644 index e3a708dd..00000000 --- a/src/main/java/cofh/api/tileentity/IReconfigurableSides.java +++ /dev/null @@ -1,54 +0,0 @@ -package cofh.api.tileentity; - -/** - * Implement this interface on Tile Entities which allow for reconfiguration of their sides. - * - * Coordination with the containing block is required. - * - * @author King Lemming - * - */ -public interface IReconfigurableSides { - - /** - * Decrement the config for a given side. - * - * @param side - * The side to decrement. - * @return True if config was changed, false otherwise. - */ - boolean decrSide(int side); - - /** - * Increment the config for a given side. - * - * @param side - * The side to decrement. - * @return True if config was changed, false otherwise. - */ - boolean incrSide(int side); - - /** - * Set the config for a given side. - * - * @param side - * The side to set. - * @param config - * The config value to use. - * @return True of config was set, false otherwise. - */ - boolean setSide(int side, int config); - - /** - * Reset configs on all sides to their base values. - * - * @return True if reset was successful, false otherwise. - */ - boolean resetSides(); - - /** - * Returns the number of possible config settings for a given side. - */ - int getNumConfig(int side); - -} diff --git a/src/main/java/cofh/api/tileentity/IRedstoneCache.java b/src/main/java/cofh/api/tileentity/IRedstoneCache.java deleted file mode 100644 index 1d873e53..00000000 --- a/src/main/java/cofh/api/tileentity/IRedstoneCache.java +++ /dev/null @@ -1,17 +0,0 @@ -package cofh.api.tileentity; - -/** - * Implement this interface on Tile Entities which cache their redstone status. - * - * Note that {@link IRedstoneControl} is an extension of this. - * - * @author King Lemming - * - */ -public interface IRedstoneCache { - - void setPowered(boolean isPowered); - - boolean isPowered(); - -} diff --git a/src/main/java/cofh/api/tileentity/IRedstoneControl.java b/src/main/java/cofh/api/tileentity/IRedstoneControl.java deleted file mode 100644 index f868affb..00000000 --- a/src/main/java/cofh/api/tileentity/IRedstoneControl.java +++ /dev/null @@ -1,57 +0,0 @@ -package cofh.api.tileentity; - -/** - * Implement this interface on Tile Entities which have Redstone Control functionality. This means that a tile can be set to ignore redstone entirely, or - * respond to a low or high redstone state. - * - * @author King Lemming - * - */ -public interface IRedstoneControl extends IRedstoneCache { - - public static enum ControlMode { - DISABLED(true), LOW(false), HIGH(true); - - private final boolean state; - - private ControlMode(boolean state) { - - this.state = state; - } - - public boolean isDisabled() { - - return this == DISABLED; - } - - public boolean isLow() { - - return this == LOW; - } - - public boolean isHigh() { - - return this == HIGH; - } - - public boolean getState() { - - return state; - } - - public static ControlMode stepForward(ControlMode curControl) { - - return curControl == DISABLED ? LOW : curControl == HIGH ? DISABLED : HIGH; - } - - public static ControlMode stepBackward(ControlMode curControl) { - - return curControl == DISABLED ? HIGH : curControl == HIGH ? LOW : DISABLED; - } - } - - void setControl(ControlMode control); - - ControlMode getControl(); - -} diff --git a/src/main/java/cofh/api/tileentity/ISecurable.java b/src/main/java/cofh/api/tileentity/ISecurable.java deleted file mode 100644 index fd29f1e6..00000000 --- a/src/main/java/cofh/api/tileentity/ISecurable.java +++ /dev/null @@ -1,64 +0,0 @@ -package cofh.api.tileentity; - -import com.mojang.authlib.GameProfile; - -import net.minecraft.entity.player.EntityPlayer; - -/** - * Implement this interface on Tile Entities which can have access restrictions. - * - * @author King Lemming - * - */ -public interface ISecurable { - - /** - * Enum for Access Modes - Restricted is Friends Only, Private is Owner only. - * - * @author King Lemming - * - */ - public static enum AccessMode { - PUBLIC, RESTRICTED, PRIVATE; - - public boolean isPublic() { - - return this == PUBLIC; - } - - public boolean isRestricted() { - - return this == RESTRICTED; - } - - public boolean isPrivate() { - - return this == PRIVATE; - } - - public static AccessMode stepForward(AccessMode curAccess) { - - return curAccess == PUBLIC ? RESTRICTED : curAccess == PRIVATE ? PUBLIC : PRIVATE; - } - - public static AccessMode stepBackward(AccessMode curAccess) { - - return curAccess == PUBLIC ? PRIVATE : curAccess == PRIVATE ? RESTRICTED : PUBLIC; - } - } - - boolean setAccess(AccessMode access); - - boolean setOwnerName(String name); - - boolean setOwner(GameProfile name); - - AccessMode getAccess(); - - String getOwnerName(); - - GameProfile getOwner(); - - boolean canPlayerAccess(EntityPlayer player); - -} diff --git a/src/main/java/cofh/api/tileentity/ISidedTexture.java b/src/main/java/cofh/api/tileentity/ISidedTexture.java deleted file mode 100644 index 20be6dd6..00000000 --- a/src/main/java/cofh/api/tileentity/ISidedTexture.java +++ /dev/null @@ -1,25 +0,0 @@ -package cofh.api.tileentity; - -import net.minecraft.util.IIcon; - -/** - * Implement this interface on Tile Entities which can change their block's texture based on the current render pass. The block must defer the call to its Tile - * Entity. - * - * @author Zeldo Kavira - * - */ -public interface ISidedTexture { - - /** - * Returns the icon to use for a given side and render pass. - * - * @param side - * Block side to get the texture for. - * @param pass - * Render pass. - * @return The icon to use. - */ - IIcon getTexture(int side, int pass); - -} diff --git a/src/main/java/cofh/api/tileentity/ITileInfo.java b/src/main/java/cofh/api/tileentity/ITileInfo.java deleted file mode 100644 index 87e4ce8f..00000000 --- a/src/main/java/cofh/api/tileentity/ITileInfo.java +++ /dev/null @@ -1,31 +0,0 @@ -package cofh.api.tileentity; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.IChatComponent; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * Implement this interface on Tile Entities which can provide information about themselves. - * - * @author King Lemming - * - */ -public interface ITileInfo { - - /** - * This function appends information to a list provided to it. - * - * @param info - * The list that the information should be appended to. - * @param side - * The side of the block that is being queried. - * @param player - * Player doing the querying - this can be NULL. - * @param debug - * If true, the tile should return "debug" information. - */ - void getTileInfo(List info, ForgeDirection side, EntityPlayer player, boolean debug); - -} diff --git a/src/main/java/cofh/api/tileentity/package-info.java b/src/main/java/cofh/api/tileentity/package-info.java deleted file mode 100644 index eae5967b..00000000 --- a/src/main/java/cofh/api/tileentity/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|tileentity") -package cofh.api.tileentity; - -import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; - diff --git a/src/main/java/cofh/api/transport/IEnderAttuned.java b/src/main/java/cofh/api/transport/IEnderAttuned.java deleted file mode 100644 index 4a453f52..00000000 --- a/src/main/java/cofh/api/transport/IEnderAttuned.java +++ /dev/null @@ -1,13 +0,0 @@ -package cofh.api.transport; - -interface IEnderAttuned { - - public String getChannelString(); - - public int getFrequency(); - - public boolean setFrequency(int frequency); - - public boolean clearFrequency(); - -} diff --git a/src/main/java/cofh/api/transport/IEnderDestination.java b/src/main/java/cofh/api/transport/IEnderDestination.java deleted file mode 100644 index f3042a76..00000000 --- a/src/main/java/cofh/api/transport/IEnderDestination.java +++ /dev/null @@ -1,21 +0,0 @@ -package cofh.api.transport; - -public interface IEnderDestination extends IEnderAttuned { - - public boolean isNotValid(); - - public int x(); - - public int y(); - - public int z(); - - public int dimension(); - - public int getDestination(); - - public boolean setDestination(int frequency); - - public boolean clearDestination(); - -} diff --git a/src/main/java/cofh/api/transport/IEnderEnergyHandler.java b/src/main/java/cofh/api/transport/IEnderEnergyHandler.java deleted file mode 100644 index 892a5c66..00000000 --- a/src/main/java/cofh/api/transport/IEnderEnergyHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -package cofh.api.transport; - -/** - * This interface is implemented on Ender Attuned objects which can receive Energy (Redstone Flux). - * - * @author King Lemming - * - */ -public interface IEnderEnergyHandler extends IEnderAttuned { - - /** - * Return whether or not the Ender Attuned object can currently send energy (Redstone Flux). - */ - boolean canSendEnergy(); - - /** - * This should be checked to see if the Ender Attuned object can currently receive energy (Redstone Flux). - * - * Note: In practice, this can (and should) be used to ensure that something does not send to itself. - */ - boolean canReceiveEnergy(); - - /** - * This tells the Ender Attuned object to receive energy. This returns the amount remaining, *not* the amount received - a return of 0 means that all energy - * was received! - * - * @param energy - * Amount of energy to be received. - * @param simulate - * If TRUE, the result will only be simulated. - * @return Amount of energy that is remaining (or would be remaining, if simulated). - */ - int receiveEnergy(int energy, boolean simulate); - -} diff --git a/src/main/java/cofh/api/transport/IEnderFluidHandler.java b/src/main/java/cofh/api/transport/IEnderFluidHandler.java deleted file mode 100644 index 2f509e81..00000000 --- a/src/main/java/cofh/api/transport/IEnderFluidHandler.java +++ /dev/null @@ -1,37 +0,0 @@ -package cofh.api.transport; - -import net.minecraftforge.fluids.FluidStack; - -/** - * This interface is implemented on Ender Attuned objects which can receive Fluid. - * - * @author King Lemming - * - */ -public interface IEnderFluidHandler extends IEnderAttuned { - - /** - * Return whether or not the Ender Attuned object can currently send FluidStacks. - */ - boolean canSendFluid(); - - /** - * This should be checked to see if the Ender Attuned object can currently receive a FluidStack. - * - * Note: In practice, this can (and should) be used to ensure that something does not send to itself. - */ - boolean canReceiveFluid(); - - /** - * This tells the Ender Attuned object to receive a FluidStack. This returns what remains of the original stack, *not* the amount received - a null return - * means that the entire stack was received! - * - * @param fluid - * FluidStack to be received. - * @param simulate - * If TRUE, the result will only be simulated. - * @return FluidStack representing how much fluid is remaining (or would be remaining, if simulated). - */ - FluidStack receiveFluid(FluidStack fluid, boolean simulate); - -} diff --git a/src/main/java/cofh/api/transport/IEnderItemHandler.java b/src/main/java/cofh/api/transport/IEnderItemHandler.java deleted file mode 100644 index d5dad8f3..00000000 --- a/src/main/java/cofh/api/transport/IEnderItemHandler.java +++ /dev/null @@ -1,38 +0,0 @@ -package cofh.api.transport; - -import net.minecraft.item.ItemStack; - -/** - * This interface is implemented on Ender Attuned objects which can receive Items. - * - * @author King Lemming - * - */ -public interface IEnderItemHandler extends IEnderAttuned { - - /** - * Return whether or not the Ender Attuned object can currently send ItemStacks. - */ - boolean canSendItems(); - - /** - * This should be checked to see if the Ender Attuned object can currently receive an ItemStack. - * - * Note: In practice, this can (and should) be used to ensure that something does not send to itself. - */ - boolean canReceiveItems(); - - /** - * This tells the Ender Attuned object to receive an ItemStack. This returns what remains of the original stack, *not* the amount received - a null return - * means that the entire stack was received! - * - * This function does not support simulation because Inventory manipulation in Minecraft is an absolute mess and it would be a computational liability to do - * so. - * - * @param item - * ItemStack to be received. - * @return An ItemStack representing how much is remaining. - */ - ItemStack receiveItem(ItemStack item); - -} diff --git a/src/main/java/cofh/api/transport/IItemDuct.java b/src/main/java/cofh/api/transport/IItemDuct.java deleted file mode 100644 index 67338346..00000000 --- a/src/main/java/cofh/api/transport/IItemDuct.java +++ /dev/null @@ -1,26 +0,0 @@ -package cofh.api.transport; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - -/** - * This interface is implemented on ItemDucts. Use it to attempt to eject items into an entry point. - * - * @author Zeldo Kavira, King Lemming - * - */ -public interface IItemDuct { - - /** - * Insert an ItemStack into the IItemDuct. Will only accept items if there is a valid destination. This returns what is remaining of the original stack - a - * null return means that the entire stack was accepted/routed! - * - * @param from - * Orientation the item is inserted from. - * @param item - * ItemStack to be inserted. The size of this stack corresponds to the maximum amount to insert. - * @return An ItemStack representing how much is remaining after the item was inserted into the Duct. - */ - public ItemStack insertItem(ForgeDirection from, ItemStack item); - -} diff --git a/src/main/java/cofh/api/transport/RegistryEnderAttuned.java b/src/main/java/cofh/api/transport/RegistryEnderAttuned.java deleted file mode 100644 index 9213d95f..00000000 --- a/src/main/java/cofh/api/transport/RegistryEnderAttuned.java +++ /dev/null @@ -1,389 +0,0 @@ -package cofh.api.transport; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.WorldServer; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.config.Configuration; - -public final class RegistryEnderAttuned { - - public static Map>> inputItem = new HashMap>>(); - public static Map>> inputFluid = new HashMap>>(); - public static Map>> inputEnergy = new HashMap>>(); - - public static Map>> outputItem = new HashMap>>(); - public static Map>> outputFluid = new HashMap>>(); - public static Map>> outputEnergy = new HashMap>>(); - - public static Map> outputTeleport = new HashMap>(); - - public static Configuration linkConf; - - public static Map clientFrequencyNames = new LinkedHashMap(); - public static Map clientFrequencyNamesReversed = new LinkedHashMap(); - - private static class EnderDestination { - - private final int dimension; - private final int x, y, z; - private IEnderDestination output; - - public EnderDestination(IEnderDestination output) { - - x = output.x(); - y = output.y(); - z = output.z(); - dimension = output.dimension(); - this.output = output; - } - - public boolean hasOutput() { - - return DimensionManager.isDimensionRegistered(dimension); - } - - public IEnderDestination getOutput() { - - if (output == null || output.isNotValid()) { - output = null; - if (!DimensionManager.isDimensionRegistered(dimension)) { - return null; - } - WorldServer world = DimensionManager.getWorld(dimension); - if (world == null) { - DimensionManager.initDimension(dimension); - world = DimensionManager.getWorld(dimension); - } - TileEntity te = world.getTileEntity(x, y, z); - if (te instanceof IEnderDestination) { - output = (IEnderDestination) te; - } - } - return output; - } - } - - public static void clear() { - - inputItem.clear(); - inputFluid.clear(); - inputEnergy.clear(); - outputItem.clear(); - outputFluid.clear(); - outputEnergy.clear(); - } - - public static List getLinkedItemInputs(IEnderItemHandler theAttuned) { - - if (inputItem.get(theAttuned.getChannelString()) == null) { - return null; - } - return inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()); - } - - public static List getLinkedItemOutputs(IEnderItemHandler theAttuned) { - - if (outputItem.get(theAttuned.getChannelString()) == null) { - return null; - } - return outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()); - } - - public static List getLinkedFluidInputs(IEnderFluidHandler theAttuned) { - - if (inputFluid.get(theAttuned.getChannelString()) == null) { - return null; - } - return inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()); - } - - public static List getLinkedFluidOutputs(IEnderFluidHandler theAttuned) { - - if (outputFluid.get(theAttuned.getChannelString()) == null) { - return null; - } - return outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()); - } - - public static List getLinkedEnergyInputs(IEnderEnergyHandler theAttuned) { - - if (inputEnergy.get(theAttuned.getChannelString()) == null) { - return null; - } - return inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()); - } - - public static List getLinkedEnergyOutputs(IEnderEnergyHandler theAttuned) { - - if (outputEnergy.get(theAttuned.getChannelString()) == null) { - return null; - } - return outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()); - } - - public static boolean hasDestination(IEnderDestination theAttuned) { - - return hasDestination(theAttuned, true); - } - - public static boolean hasDestination(IEnderDestination theAttuned, boolean to) { - - Map map = outputTeleport.get(theAttuned.getChannelString()); - if (map == null) { - return false; - } - EnderDestination dest = map.get(to ? theAttuned.getDestination() : theAttuned.getFrequency()); - return dest == null ? false : dest.hasOutput(); - } - - public static IEnderDestination getDestination(IEnderDestination theAttuned) { - - Map map = outputTeleport.get(theAttuned.getChannelString()); - if (map == null) { - return null; - } - EnderDestination dest = map.get(theAttuned.getDestination()); - return dest == null ? null : dest.getOutput(); - } - - /* HELPER FUNCTIONS */ - public static void addItemHandler(IEnderItemHandler theAttuned) { - - if (theAttuned.canSendItems()) { - if (inputItem.get(theAttuned.getChannelString()) == null) { - inputItem.put(theAttuned.getChannelString(), new HashMap>()); - } - if (inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) == null) { - inputItem.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new ArrayList()); - } - if (!inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).contains(theAttuned)) { - inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).add(theAttuned); - } - } - if (theAttuned.canReceiveItems()) { - if (outputItem.get(theAttuned.getChannelString()) == null) { - outputItem.put(theAttuned.getChannelString(), new HashMap>()); - } - if (outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) == null) { - outputItem.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new ArrayList()); - } - if (!outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).contains(theAttuned)) { - outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).add(theAttuned); - } - } - } - - public static void addFluidHandler(IEnderFluidHandler theAttuned) { - - if (theAttuned.canSendFluid()) { - if (inputFluid.get(theAttuned.getChannelString()) == null) { - inputFluid.put(theAttuned.getChannelString(), new HashMap>()); - } - if (inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) == null) { - inputFluid.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new ArrayList()); - } - if (!inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).contains(theAttuned)) { - inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).add(theAttuned); - } - } - if (theAttuned.canReceiveFluid()) { - if (outputFluid.get(theAttuned.getChannelString()) == null) { - outputFluid.put(theAttuned.getChannelString(), new HashMap>()); - } - if (outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) == null) { - outputFluid.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new ArrayList()); - } - if (!outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).contains(theAttuned)) { - outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).add(theAttuned); - } - } - } - - public static void addEnergyHandler(IEnderEnergyHandler theAttuned) { - - if (theAttuned.canSendEnergy()) { - if (inputEnergy.get(theAttuned.getChannelString()) == null) { - inputEnergy.put(theAttuned.getChannelString(), new HashMap>()); - } - if (inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) == null) { - inputEnergy.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new ArrayList()); - } - if (!inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).contains(theAttuned)) { - inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).add(theAttuned); - } - } - if (theAttuned.canReceiveEnergy()) { - if (outputEnergy.get(theAttuned.getChannelString()) == null) { - outputEnergy.put(theAttuned.getChannelString(), new HashMap>()); - } - if (outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) == null) { - outputEnergy.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new ArrayList()); - } - if (!outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).contains(theAttuned)) { - outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).add(theAttuned); - } - } - } - - public static void addDestination(IEnderDestination theAttuned) { - - if (!hasDestination(theAttuned, false)) { - if (outputTeleport.get(theAttuned.getChannelString()) == null) { - outputTeleport.put(theAttuned.getChannelString(), new HashMap()); - } - outputTeleport.get(theAttuned.getChannelString()).put(theAttuned.getFrequency(), new EnderDestination(theAttuned)); - } - } - - public static void removeItemHandler(IEnderItemHandler theAttuned) { - - if (inputItem.get(theAttuned.getChannelString()) != null) { - if (inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) != null) { - inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).remove(theAttuned); - if (inputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).size() == 0) { - inputItem.get(theAttuned.getChannelString()).remove(theAttuned.getFrequency()); - } - } - } - if (outputItem.get(theAttuned.getChannelString()) != null) { - if (outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) != null) { - outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).remove(theAttuned); - if (outputItem.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).size() == 0) { - outputItem.get(theAttuned.getChannelString()).remove(theAttuned.getFrequency()); - } - } - } - } - - public static void removeFluidHandler(IEnderFluidHandler theAttuned) { - - if (inputFluid.get(theAttuned.getChannelString()) != null) { - if (inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) != null) { - inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).remove(theAttuned); - if (inputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).size() == 0) { - inputFluid.get(theAttuned.getChannelString()).remove(theAttuned.getFrequency()); - } - } - } - if (outputFluid.get(theAttuned.getChannelString()) != null) { - if (outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) != null) { - outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).remove(theAttuned); - if (outputFluid.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).size() == 0) { - outputFluid.get(theAttuned.getChannelString()).remove(theAttuned.getFrequency()); - } - } - } - } - - public static void removeEnergyHandler(IEnderEnergyHandler theAttuned) { - - if (inputEnergy.get(theAttuned.getChannelString()) != null) { - if (inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) != null) { - inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).remove(theAttuned); - if (inputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).size() == 0) { - inputEnergy.get(theAttuned.getChannelString()).remove(theAttuned.getFrequency()); - } - } - } - if (outputEnergy.get(theAttuned.getChannelString()) != null) { - if (outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()) != null) { - outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).remove(theAttuned); - if (outputEnergy.get(theAttuned.getChannelString()).get(theAttuned.getFrequency()).size() == 0) { - outputEnergy.get(theAttuned.getChannelString()).remove(theAttuned.getFrequency()); - } - } - } - } - - public static void removeDestination(IEnderDestination theAttuned) { - - Map map = outputTeleport.get(theAttuned.getChannelString()); - if (map == null) { - return; - } - EnderDestination dest = map.get(theAttuned.getFrequency()); - if (dest == null) { - return; - } - if (dest.dimension == theAttuned.dimension()) { - if (dest.x == theAttuned.x() && dest.y == theAttuned.x() && dest.z == theAttuned.x()) { - map.remove(theAttuned.getFrequency()); - } - } - } - - public static void add(IEnderAttuned theAttuned) { - - if (theAttuned instanceof IEnderItemHandler) { - addItemHandler((IEnderItemHandler) theAttuned); - } - if (theAttuned instanceof IEnderFluidHandler) { - addFluidHandler((IEnderFluidHandler) theAttuned); - } - if (theAttuned instanceof IEnderEnergyHandler) { - addEnergyHandler((IEnderEnergyHandler) theAttuned); - } - if (theAttuned instanceof IEnderDestination) { - addDestination((IEnderDestination) theAttuned); - } - } - - public static void remove(IEnderAttuned theAttuned) { - - if (theAttuned instanceof IEnderItemHandler) { - removeItemHandler((IEnderItemHandler) theAttuned); - } - if (theAttuned instanceof IEnderFluidHandler) { - removeFluidHandler((IEnderFluidHandler) theAttuned); - } - if (theAttuned instanceof IEnderEnergyHandler) { - removeEnergyHandler((IEnderEnergyHandler) theAttuned); - } - if (theAttuned instanceof IEnderDestination) { - removeDestination((IEnderDestination) theAttuned); - } - } - - public static void sortClientNames() { - - List> list = new ArrayList>(clientFrequencyNames.entrySet()); - Collections.sort(list, new Comparator>() { - - @Override - public int compare(Map.Entry o1, Map.Entry o2) { - - int int1 = Integer.valueOf(clientFrequencyNamesReversed.get(o1.getValue())); - int int2 = Integer.valueOf(clientFrequencyNamesReversed.get(o2.getValue())); - return int1 > int2 ? 1 : int1 == int2 ? 0 : -1; - } - }); - Map result = new LinkedHashMap(); - for (Map.Entry entry : list) { - result.put(entry.getKey(), entry.getValue()); - } - clientFrequencyNames = result; - } - - public static void clearClientNames() { - - clientFrequencyNames.clear(); - clientFrequencyNamesReversed.clear(); - } - - public static void addClientNames(String owner, String name) { - - if (!owner.isEmpty()) { - clientFrequencyNames.put(owner, name); - clientFrequencyNamesReversed.put(name, owner); - } - } - -} diff --git a/src/main/java/cofh/api/transport/package-info.java b/src/main/java/cofh/api/transport/package-info.java deleted file mode 100644 index fae0150f..00000000 --- a/src/main/java/cofh/api/transport/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -/** - * (C) 2014 Team CoFH / CoFH / Cult of the Full Hub - * http://www.teamcofh.com - */ -@API(apiVersion = CoFHAPIProps.VERSION, owner = "CoFHAPI", provides = "CoFHAPI|transport") -package cofh.api.transport; - -import cofh.api.CoFHAPIProps; -import cpw.mods.fml.common.API; - diff --git a/src/main/java/com/cricketcraft/chisel/api/IFacade.java b/src/main/java/com/cricketcraft/chisel/api/IFacade.java deleted file mode 100644 index 16fa5491..00000000 --- a/src/main/java/com/cricketcraft/chisel/api/IFacade.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.cricketcraft.chisel.api; - -import net.minecraft.block.Block; -import net.minecraft.world.IBlockAccess; - -public interface IFacade { - - int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side); - - Block getFacade(IBlockAccess world, int x, int y, int z, int side); - -} diff --git a/src/main/java/crazypants/.gitignore b/src/main/java/crazypants/.gitignore deleted file mode 100644 index d6306fb6..00000000 --- a/src/main/java/crazypants/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/Crap.java diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java b/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java deleted file mode 100644 index a7febd4c..00000000 --- a/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java +++ /dev/null @@ -1,13 +0,0 @@ -package info.jbcs.minecraft.chisel.api; - -import net.minecraft.block.Block; -import net.minecraft.world.IBlockAccess; - -public interface IFacade { - - int getFacadeMetadata(IBlockAccess world, int x, int y, int z, int side); - - Block getFacade(IBlockAccess world, int x, int y, int z, int side); - - -} diff --git a/resources/CGLibLiscence.txt b/src/main/resources/CGLibLiscence.txt similarity index 100% rename from resources/CGLibLiscence.txt rename to src/main/resources/CGLibLiscence.txt diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml b/src/main/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml similarity index 100% rename from resources/assets/enderio/config/AlloySmelterRecipes_Core.xml rename to src/main/resources/assets/enderio/config/AlloySmelterRecipes_Core.xml diff --git a/resources/assets/enderio/config/AlloySmelterRecipes_User.xml b/src/main/resources/assets/enderio/config/AlloySmelterRecipes_User.xml similarity index 100% rename from resources/assets/enderio/config/AlloySmelterRecipes_User.xml rename to src/main/resources/assets/enderio/config/AlloySmelterRecipes_User.xml diff --git a/resources/assets/enderio/config/EnchanterRecipes_Core.xml b/src/main/resources/assets/enderio/config/EnchanterRecipes_Core.xml similarity index 100% rename from resources/assets/enderio/config/EnchanterRecipes_Core.xml rename to src/main/resources/assets/enderio/config/EnchanterRecipes_Core.xml diff --git a/resources/assets/enderio/config/EnchanterRecipes_User.xml b/src/main/resources/assets/enderio/config/EnchanterRecipes_User.xml similarity index 100% rename from resources/assets/enderio/config/EnchanterRecipes_User.xml rename to src/main/resources/assets/enderio/config/EnchanterRecipes_User.xml diff --git a/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml b/src/main/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml similarity index 100% rename from resources/assets/enderio/config/OreDictionaryPreferences_Core.xml rename to src/main/resources/assets/enderio/config/OreDictionaryPreferences_Core.xml diff --git a/resources/assets/enderio/config/OreDictionaryPreferences_User.xml b/src/main/resources/assets/enderio/config/OreDictionaryPreferences_User.xml similarity index 100% rename from resources/assets/enderio/config/OreDictionaryPreferences_User.xml rename to src/main/resources/assets/enderio/config/OreDictionaryPreferences_User.xml diff --git a/resources/assets/enderio/config/PainterPaintSources_Core.xml b/src/main/resources/assets/enderio/config/PainterPaintSources_Core.xml similarity index 100% rename from resources/assets/enderio/config/PainterPaintSources_Core.xml rename to src/main/resources/assets/enderio/config/PainterPaintSources_Core.xml diff --git a/resources/assets/enderio/config/PainterPaintSources_User.xml b/src/main/resources/assets/enderio/config/PainterPaintSources_User.xml similarity index 100% rename from resources/assets/enderio/config/PainterPaintSources_User.xml rename to src/main/resources/assets/enderio/config/PainterPaintSources_User.xml diff --git a/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json b/src/main/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json similarity index 100% rename from resources/assets/enderio/config/PoweredSpawnerConfig_Core.json rename to src/main/resources/assets/enderio/config/PoweredSpawnerConfig_Core.json diff --git a/resources/assets/enderio/config/PoweredSpawnerConfig_User.json b/src/main/resources/assets/enderio/config/PoweredSpawnerConfig_User.json similarity index 100% rename from resources/assets/enderio/config/PoweredSpawnerConfig_User.json rename to src/main/resources/assets/enderio/config/PoweredSpawnerConfig_User.json diff --git a/resources/assets/enderio/config/SAGMillRecipes_Core.xml b/src/main/resources/assets/enderio/config/SAGMillRecipes_Core.xml similarity index 100% rename from resources/assets/enderio/config/SAGMillRecipes_Core.xml rename to src/main/resources/assets/enderio/config/SAGMillRecipes_Core.xml diff --git a/resources/assets/enderio/config/SAGMillRecipes_User.xml b/src/main/resources/assets/enderio/config/SAGMillRecipes_User.xml similarity index 100% rename from resources/assets/enderio/config/SAGMillRecipes_User.xml rename to src/main/resources/assets/enderio/config/SAGMillRecipes_User.xml diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml b/src/main/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml similarity index 100% rename from resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml rename to src/main/resources/assets/enderio/config/SliceAndSpliceRecipes_Core.xml diff --git a/resources/assets/enderio/config/SliceAndSpliceRecipes_User.xml b/src/main/resources/assets/enderio/config/SliceAndSpliceRecipes_User.xml similarity index 100% rename from resources/assets/enderio/config/SliceAndSpliceRecipes_User.xml rename to src/main/resources/assets/enderio/config/SliceAndSpliceRecipes_User.xml diff --git a/resources/assets/enderio/config/VatRecipes_Core.xml b/src/main/resources/assets/enderio/config/VatRecipes_Core.xml similarity index 100% rename from resources/assets/enderio/config/VatRecipes_Core.xml rename to src/main/resources/assets/enderio/config/VatRecipes_Core.xml diff --git a/resources/assets/enderio/config/VatRecipes_User.xml b/src/main/resources/assets/enderio/config/VatRecipes_User.xml similarity index 100% rename from resources/assets/enderio/config/VatRecipes_User.xml rename to src/main/resources/assets/enderio/config/VatRecipes_User.xml diff --git a/resources/assets/enderio/lang/cs_CZ.lang b/src/main/resources/assets/enderio/lang/cs_CZ.lang similarity index 100% rename from resources/assets/enderio/lang/cs_CZ.lang rename to src/main/resources/assets/enderio/lang/cs_CZ.lang diff --git a/resources/assets/enderio/lang/de_DE.lang b/src/main/resources/assets/enderio/lang/de_DE.lang similarity index 100% rename from resources/assets/enderio/lang/de_DE.lang rename to src/main/resources/assets/enderio/lang/de_DE.lang diff --git a/resources/assets/enderio/lang/en_US.lang b/src/main/resources/assets/enderio/lang/en_US.lang similarity index 100% rename from resources/assets/enderio/lang/en_US.lang rename to src/main/resources/assets/enderio/lang/en_US.lang diff --git a/resources/assets/enderio/lang/es_AR.lang b/src/main/resources/assets/enderio/lang/es_AR.lang similarity index 100% rename from resources/assets/enderio/lang/es_AR.lang rename to src/main/resources/assets/enderio/lang/es_AR.lang diff --git a/resources/assets/enderio/lang/es_ES.lang b/src/main/resources/assets/enderio/lang/es_ES.lang similarity index 100% rename from resources/assets/enderio/lang/es_ES.lang rename to src/main/resources/assets/enderio/lang/es_ES.lang diff --git a/resources/assets/enderio/lang/es_MX.lang b/src/main/resources/assets/enderio/lang/es_MX.lang similarity index 100% rename from resources/assets/enderio/lang/es_MX.lang rename to src/main/resources/assets/enderio/lang/es_MX.lang diff --git a/resources/assets/enderio/lang/es_UY.lang b/src/main/resources/assets/enderio/lang/es_UY.lang similarity index 100% rename from resources/assets/enderio/lang/es_UY.lang rename to src/main/resources/assets/enderio/lang/es_UY.lang diff --git a/resources/assets/enderio/lang/es_VE.lang b/src/main/resources/assets/enderio/lang/es_VE.lang similarity index 100% rename from resources/assets/enderio/lang/es_VE.lang rename to src/main/resources/assets/enderio/lang/es_VE.lang diff --git a/resources/assets/enderio/lang/fr_FR.lang b/src/main/resources/assets/enderio/lang/fr_FR.lang similarity index 100% rename from resources/assets/enderio/lang/fr_FR.lang rename to src/main/resources/assets/enderio/lang/fr_FR.lang diff --git a/resources/assets/enderio/lang/ko_KR.lang b/src/main/resources/assets/enderio/lang/ko_KR.lang similarity index 100% rename from resources/assets/enderio/lang/ko_KR.lang rename to src/main/resources/assets/enderio/lang/ko_KR.lang diff --git a/resources/assets/enderio/lang/pl_PL.lang b/src/main/resources/assets/enderio/lang/pl_PL.lang similarity index 100% rename from resources/assets/enderio/lang/pl_PL.lang rename to src/main/resources/assets/enderio/lang/pl_PL.lang diff --git a/resources/assets/enderio/lang/pt_BR.lang b/src/main/resources/assets/enderio/lang/pt_BR.lang similarity index 100% rename from resources/assets/enderio/lang/pt_BR.lang rename to src/main/resources/assets/enderio/lang/pt_BR.lang diff --git a/resources/assets/enderio/lang/pt_PT.lang b/src/main/resources/assets/enderio/lang/pt_PT.lang similarity index 100% rename from resources/assets/enderio/lang/pt_PT.lang rename to src/main/resources/assets/enderio/lang/pt_PT.lang diff --git a/resources/assets/enderio/lang/ru_RU.lang b/src/main/resources/assets/enderio/lang/ru_RU.lang similarity index 100% rename from resources/assets/enderio/lang/ru_RU.lang rename to src/main/resources/assets/enderio/lang/ru_RU.lang diff --git a/resources/assets/enderio/lang/zh_CN.lang b/src/main/resources/assets/enderio/lang/zh_CN.lang similarity index 100% rename from resources/assets/enderio/lang/zh_CN.lang rename to src/main/resources/assets/enderio/lang/zh_CN.lang diff --git a/resources/assets/enderio/lang/zh_TW.lang b/src/main/resources/assets/enderio/lang/zh_TW.lang similarity index 100% rename from resources/assets/enderio/lang/zh_TW.lang rename to src/main/resources/assets/enderio/lang/zh_TW.lang diff --git a/resources/assets/enderio/models/BookStand.png b/src/main/resources/assets/enderio/models/BookStand.png similarity index 100% rename from resources/assets/enderio/models/BookStand.png rename to src/main/resources/assets/enderio/models/BookStand.png diff --git a/resources/assets/enderio/models/EnderJar.png b/src/main/resources/assets/enderio/models/EnderJar.png similarity index 100% rename from resources/assets/enderio/models/EnderJar.png rename to src/main/resources/assets/enderio/models/EnderJar.png diff --git a/resources/assets/enderio/models/FrankenzombieJar.png b/src/main/resources/assets/enderio/models/FrankenzombieJar.png similarity index 100% rename from resources/assets/enderio/models/FrankenzombieJar.png rename to src/main/resources/assets/enderio/models/FrankenzombieJar.png diff --git a/resources/assets/enderio/models/KillerJoe.png b/src/main/resources/assets/enderio/models/KillerJoe.png similarity index 100% rename from resources/assets/enderio/models/KillerJoe.png rename to src/main/resources/assets/enderio/models/KillerJoe.png diff --git a/resources/assets/enderio/models/ZombieJar.png b/src/main/resources/assets/enderio/models/ZombieJar.png similarity index 100% rename from resources/assets/enderio/models/ZombieJar.png rename to src/main/resources/assets/enderio/models/ZombieJar.png diff --git a/resources/assets/enderio/models/combustionGen.tcn b/src/main/resources/assets/enderio/models/combustionGen.tcn similarity index 100% rename from resources/assets/enderio/models/combustionGen.tcn rename to src/main/resources/assets/enderio/models/combustionGen.tcn diff --git a/resources/assets/enderio/models/farm.tcn b/src/main/resources/assets/enderio/models/farm.tcn similarity index 100% rename from resources/assets/enderio/models/farm.tcn rename to src/main/resources/assets/enderio/models/farm.tcn diff --git a/resources/assets/enderio/models/hyperCube.obj b/src/main/resources/assets/enderio/models/hyperCube.obj similarity index 100% rename from resources/assets/enderio/models/hyperCube.obj rename to src/main/resources/assets/enderio/models/hyperCube.obj diff --git a/resources/assets/enderio/models/old/combustionGenerator.png b/src/main/resources/assets/enderio/models/old/combustionGenerator.png similarity index 100% rename from resources/assets/enderio/models/old/combustionGenerator.png rename to src/main/resources/assets/enderio/models/old/combustionGenerator.png diff --git a/resources/assets/enderio/models/old/hyperCube.png b/src/main/resources/assets/enderio/models/old/hyperCube.png similarity index 100% rename from resources/assets/enderio/models/old/hyperCube.png rename to src/main/resources/assets/enderio/models/old/hyperCube.png diff --git a/resources/assets/enderio/models/old/tesseract.png b/src/main/resources/assets/enderio/models/old/tesseract.png similarity index 100% rename from resources/assets/enderio/models/old/tesseract.png rename to src/main/resources/assets/enderio/models/old/tesseract.png diff --git a/resources/assets/enderio/models/old/transceiverAlt.png b/src/main/resources/assets/enderio/models/old/transceiverAlt.png similarity index 100% rename from resources/assets/enderio/models/old/transceiverAlt.png rename to src/main/resources/assets/enderio/models/old/transceiverAlt.png diff --git a/resources/assets/enderio/models/soulBinder.tcn b/src/main/resources/assets/enderio/models/soulBinder.tcn similarity index 100% rename from resources/assets/enderio/models/soulBinder.tcn rename to src/main/resources/assets/enderio/models/soulBinder.tcn diff --git a/resources/assets/enderio/models/spawner.tcn b/src/main/resources/assets/enderio/models/spawner.tcn similarity index 100% rename from resources/assets/enderio/models/spawner.tcn rename to src/main/resources/assets/enderio/models/spawner.tcn diff --git a/resources/assets/enderio/models/telePad.tcn b/src/main/resources/assets/enderio/models/telePad.tcn similarity index 100% rename from resources/assets/enderio/models/telePad.tcn rename to src/main/resources/assets/enderio/models/telePad.tcn diff --git a/resources/assets/enderio/models/transceiver.obj b/src/main/resources/assets/enderio/models/transceiver.obj similarity index 100% rename from resources/assets/enderio/models/transceiver.obj rename to src/main/resources/assets/enderio/models/transceiver.obj diff --git a/resources/assets/enderio/models/transceiver.png b/src/main/resources/assets/enderio/models/transceiver.png similarity index 100% rename from resources/assets/enderio/models/transceiver.png rename to src/main/resources/assets/enderio/models/transceiver.png diff --git a/resources/assets/enderio/models/transceiver.tcn b/src/main/resources/assets/enderio/models/transceiver.tcn similarity index 100% rename from resources/assets/enderio/models/transceiver.tcn rename to src/main/resources/assets/enderio/models/transceiver.tcn diff --git a/resources/assets/enderio/models/vat.tcn b/src/main/resources/assets/enderio/models/vat.tcn similarity index 100% rename from resources/assets/enderio/models/vat.tcn rename to src/main/resources/assets/enderio/models/vat.tcn diff --git a/resources/assets/enderio/sounds.json b/src/main/resources/assets/enderio/sounds.json similarity index 100% rename from resources/assets/enderio/sounds.json rename to src/main/resources/assets/enderio/sounds.json diff --git a/resources/assets/enderio/sounds/darksteel/modules/jump/jump1.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump1.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/jump/jump1.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump1.ogg diff --git a/resources/assets/enderio/sounds/darksteel/modules/jump/jump2.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump2.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/jump/jump2.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump2.ogg diff --git a/resources/assets/enderio/sounds/darksteel/modules/jump/jump3.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump3.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/jump/jump3.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump3.ogg diff --git a/resources/assets/enderio/sounds/darksteel/modules/jump/jump4.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump4.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/jump/jump4.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump4.ogg diff --git a/resources/assets/enderio/sounds/darksteel/modules/jump/jump5.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump5.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/jump/jump5.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/jump/jump5.ogg diff --git a/resources/assets/enderio/sounds/darksteel/modules/nightvision/off.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/nightvision/off.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/nightvision/off.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/nightvision/off.ogg diff --git a/resources/assets/enderio/sounds/darksteel/modules/nightvision/on.ogg b/src/main/resources/assets/enderio/sounds/darksteel/modules/nightvision/on.ogg similarity index 100% rename from resources/assets/enderio/sounds/darksteel/modules/nightvision/on.ogg rename to src/main/resources/assets/enderio/sounds/darksteel/modules/nightvision/on.ogg diff --git a/resources/assets/enderio/sounds/generator/stirling/burn.ogg b/src/main/resources/assets/enderio/sounds/generator/stirling/burn.ogg similarity index 100% rename from resources/assets/enderio/sounds/generator/stirling/burn.ogg rename to src/main/resources/assets/enderio/sounds/generator/stirling/burn.ogg diff --git a/resources/assets/enderio/sounds/generator/zombie/bubble.ogg b/src/main/resources/assets/enderio/sounds/generator/zombie/bubble.ogg similarity index 100% rename from resources/assets/enderio/sounds/generator/zombie/bubble.ogg rename to src/main/resources/assets/enderio/sounds/generator/zombie/bubble.ogg diff --git a/resources/assets/enderio/sounds/machine/sagmill/tumble.ogg b/src/main/resources/assets/enderio/sounds/machine/sagmill/tumble.ogg similarity index 100% rename from resources/assets/enderio/sounds/machine/sagmill/tumble.ogg rename to src/main/resources/assets/enderio/sounds/machine/sagmill/tumble.ogg diff --git a/resources/assets/enderio/sounds/machine/vat/gurgle.ogg b/src/main/resources/assets/enderio/sounds/machine/vat/gurgle.ogg similarity index 100% rename from resources/assets/enderio/sounds/machine/vat/gurgle.ogg rename to src/main/resources/assets/enderio/sounds/machine/vat/gurgle.ogg diff --git a/resources/assets/enderio/sounds/silence.ogg b/src/main/resources/assets/enderio/sounds/silence.ogg similarity index 100% rename from resources/assets/enderio/sounds/silence.ogg rename to src/main/resources/assets/enderio/sounds/silence.ogg diff --git a/resources/assets/enderio/sounds/telepad/active.ogg b/src/main/resources/assets/enderio/sounds/telepad/active.ogg similarity index 100% rename from resources/assets/enderio/sounds/telepad/active.ogg rename to src/main/resources/assets/enderio/sounds/telepad/active.ogg diff --git a/resources/assets/enderio/sounds/telepad/teleport1.ogg b/src/main/resources/assets/enderio/sounds/telepad/teleport1.ogg similarity index 100% rename from resources/assets/enderio/sounds/telepad/teleport1.ogg rename to src/main/resources/assets/enderio/sounds/telepad/teleport1.ogg diff --git a/resources/assets/enderio/sounds/telepad/teleport2.ogg b/src/main/resources/assets/enderio/sounds/telepad/teleport2.ogg similarity index 100% rename from resources/assets/enderio/sounds/telepad/teleport2.ogg rename to src/main/resources/assets/enderio/sounds/telepad/teleport2.ogg diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFront.png b/src/main/resources/assets/enderio/textures/blocks/alloySmelterFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/alloySmelterFront.png rename to src/main/resources/assets/enderio/textures/blocks/alloySmelterFront.png diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/alloySmelterFrontOn.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/anvil_0.png b/src/main/resources/assets/enderio/textures/blocks/anvil_0.png similarity index 100% rename from resources/assets/enderio/textures/blocks/anvil_0.png rename to src/main/resources/assets/enderio/textures/blocks/anvil_0.png diff --git a/resources/assets/enderio/textures/blocks/anvil_1.png b/src/main/resources/assets/enderio/textures/blocks/anvil_1.png similarity index 100% rename from resources/assets/enderio/textures/blocks/anvil_1.png rename to src/main/resources/assets/enderio/textures/blocks/anvil_1.png diff --git a/resources/assets/enderio/textures/blocks/anvil_2.png b/src/main/resources/assets/enderio/textures/blocks/anvil_2.png similarity index 100% rename from resources/assets/enderio/textures/blocks/anvil_2.png rename to src/main/resources/assets/enderio/textures/blocks/anvil_2.png diff --git a/resources/assets/enderio/textures/blocks/anvil_base.png b/src/main/resources/assets/enderio/textures/blocks/anvil_base.png similarity index 100% rename from resources/assets/enderio/textures/blocks/anvil_base.png rename to src/main/resources/assets/enderio/textures/blocks/anvil_base.png diff --git a/resources/assets/enderio/textures/blocks/blank.png b/src/main/resources/assets/enderio/textures/blocks/blank.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blank.png rename to src/main/resources/assets/enderio/textures/blocks/blank.png diff --git a/resources/assets/enderio/textures/blocks/blankMachinePanel.png b/src/main/resources/assets/enderio/textures/blocks/blankMachinePanel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blankMachinePanel.png rename to src/main/resources/assets/enderio/textures/blocks/blankMachinePanel.png diff --git a/resources/assets/enderio/textures/blocks/blockAttractorSide.png b/src/main/resources/assets/enderio/textures/blocks/blockAttractorSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockAttractorSide.png rename to src/main/resources/assets/enderio/textures/blocks/blockAttractorSide.png diff --git a/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png b/src/main/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockAttractorSideOn.png rename to src/main/resources/assets/enderio/textures/blocks/blockAttractorSideOn.png diff --git a/resources/assets/enderio/textures/blocks/blockBuffer.png b/src/main/resources/assets/enderio/textures/blocks/blockBuffer.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockBuffer.png rename to src/main/resources/assets/enderio/textures/blocks/blockBuffer.png diff --git a/resources/assets/enderio/textures/blocks/blockBufferCreative.png b/src/main/resources/assets/enderio/textures/blocks/blockBufferCreative.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockBufferCreative.png rename to src/main/resources/assets/enderio/textures/blocks/blockBufferCreative.png diff --git a/resources/assets/enderio/textures/blocks/blockBufferItem.png b/src/main/resources/assets/enderio/textures/blocks/blockBufferItem.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockBufferItem.png rename to src/main/resources/assets/enderio/textures/blocks/blockBufferItem.png diff --git a/resources/assets/enderio/textures/blocks/blockBufferOmni.png b/src/main/resources/assets/enderio/textures/blocks/blockBufferOmni.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockBufferOmni.png rename to src/main/resources/assets/enderio/textures/blocks/blockBufferOmni.png diff --git a/resources/assets/enderio/textures/blocks/blockBufferPower.png b/src/main/resources/assets/enderio/textures/blocks/blockBufferPower.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockBufferPower.png rename to src/main/resources/assets/enderio/textures/blocks/blockBufferPower.png diff --git a/resources/assets/enderio/textures/blocks/blockDarkIronBars.png b/src/main/resources/assets/enderio/textures/blocks/blockDarkIronBars.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockDarkIronBars.png rename to src/main/resources/assets/enderio/textures/blocks/blockDarkIronBars.png diff --git a/resources/assets/enderio/textures/blocks/blockDarkSteelLadder.png b/src/main/resources/assets/enderio/textures/blocks/blockDarkSteelLadder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockDarkSteelLadder.png rename to src/main/resources/assets/enderio/textures/blocks/blockDarkSteelLadder.png diff --git a/resources/assets/enderio/textures/blocks/blockDarkSteelPressurePlate.png b/src/main/resources/assets/enderio/textures/blocks/blockDarkSteelPressurePlate.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockDarkSteelPressurePlate.png rename to src/main/resources/assets/enderio/textures/blocks/blockDarkSteelPressurePlate.png diff --git a/resources/assets/enderio/textures/blocks/blockElectricLightFace.png b/src/main/resources/assets/enderio/textures/blocks/blockElectricLightFace.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockElectricLightFace.png rename to src/main/resources/assets/enderio/textures/blocks/blockElectricLightFace.png diff --git a/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png b/src/main/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png rename to src/main/resources/assets/enderio/textures/blocks/blockElectricLightFaceOff.png diff --git a/resources/assets/enderio/textures/blocks/blockEnchanter.png b/src/main/resources/assets/enderio/textures/blocks/blockEnchanter.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnchanter.png rename to src/main/resources/assets/enderio/textures/blocks/blockEnchanter.png diff --git a/resources/assets/enderio/textures/blocks/blockEndSteelBars.png b/src/main/resources/assets/enderio/textures/blocks/blockEndSteelBars.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEndSteelBars.png rename to src/main/resources/assets/enderio/textures/blocks/blockEndSteelBars.png diff --git a/resources/assets/enderio/textures/blocks/blockEnderIo.png b/src/main/resources/assets/enderio/textures/blocks/blockEnderIo.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnderIo.png rename to src/main/resources/assets/enderio/textures/blocks/blockEnderIo.png diff --git a/resources/assets/enderio/textures/blocks/blockEnderRail.png b/src/main/resources/assets/enderio/textures/blocks/blockEnderRail.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnderRail.png rename to src/main/resources/assets/enderio/textures/blocks/blockEnderRail.png diff --git a/resources/assets/enderio/textures/blocks/blockEnderRailEastWest.png b/src/main/resources/assets/enderio/textures/blocks/blockEnderRailEastWest.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnderRailEastWest.png rename to src/main/resources/assets/enderio/textures/blocks/blockEnderRailEastWest.png diff --git a/resources/assets/enderio/textures/blocks/blockEnderRailEastWest_turned.png b/src/main/resources/assets/enderio/textures/blocks/blockEnderRailEastWest_turned.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnderRailEastWest_turned.png rename to src/main/resources/assets/enderio/textures/blocks/blockEnderRailEastWest_turned.png diff --git a/resources/assets/enderio/textures/blocks/blockEnderRail_turned.png b/src/main/resources/assets/enderio/textures/blocks/blockEnderRail_turned.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockEnderRail_turned.png rename to src/main/resources/assets/enderio/textures/blocks/blockEnderRail_turned.png diff --git a/resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png b/src/main/resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png rename to src/main/resources/assets/enderio/textures/blocks/blockReinforcedObsidian.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png b/src/main/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulMachineBack.png rename to src/main/resources/assets/enderio/textures/blocks/blockSoulMachineBack.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png b/src/main/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png rename to src/main/resources/assets/enderio/textures/blocks/blockSoulMachineBlank.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineBottom.png b/src/main/resources/assets/enderio/textures/blocks/blockSoulMachineBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulMachineBottom.png rename to src/main/resources/assets/enderio/textures/blocks/blockSoulMachineBottom.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png b/src/main/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulMachineSide.png rename to src/main/resources/assets/enderio/textures/blocks/blockSoulMachineSide.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png b/src/main/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulMachineTop.png rename to src/main/resources/assets/enderio/textures/blocks/blockSoulMachineTop.png diff --git a/resources/assets/enderio/textures/blocks/blockSoulariumBars.png b/src/main/resources/assets/enderio/textures/blocks/blockSoulariumBars.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockSoulariumBars.png rename to src/main/resources/assets/enderio/textures/blocks/blockSoulariumBars.png diff --git a/resources/assets/enderio/textures/blocks/blockTank.png b/src/main/resources/assets/enderio/textures/blocks/blockTank.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTank.png rename to src/main/resources/assets/enderio/textures/blocks/blockTank.png diff --git a/resources/assets/enderio/textures/blocks/blockTankAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/blockTankAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTankAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/blockTankAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/blockTankTopAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/blockTankTopAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTankTopAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/blockTankTopAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/blockTravelAnchor.png b/src/main/resources/assets/enderio/textures/blocks/blockTravelAnchor.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTravelAnchor.png rename to src/main/resources/assets/enderio/textures/blocks/blockTravelAnchor.png diff --git a/resources/assets/enderio/textures/blocks/blockTravelAnchor.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/blockTravelAnchor.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTravelAnchor.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/blockTravelAnchor.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/blockTravelAnchorHighlight.png b/src/main/resources/assets/enderio/textures/blocks/blockTravelAnchorHighlight.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTravelAnchorHighlight.png rename to src/main/resources/assets/enderio/textures/blocks/blockTravelAnchorHighlight.png diff --git a/resources/assets/enderio/textures/blocks/blockTravelAnchorSelected.png b/src/main/resources/assets/enderio/textures/blocks/blockTravelAnchorSelected.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockTravelAnchorSelected.png rename to src/main/resources/assets/enderio/textures/blocks/blockTravelAnchorSelected.png diff --git a/resources/assets/enderio/textures/blocks/blockVacuumChest.png b/src/main/resources/assets/enderio/textures/blocks/blockVacuumChest.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockVacuumChest.png rename to src/main/resources/assets/enderio/textures/blocks/blockVacuumChest.png diff --git a/resources/assets/enderio/textures/blocks/blockWirelessCharger.png b/src/main/resources/assets/enderio/textures/blocks/blockWirelessCharger.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockWirelessCharger.png rename to src/main/resources/assets/enderio/textures/blocks/blockWirelessCharger.png diff --git a/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png b/src/main/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png rename to src/main/resources/assets/enderio/textures/blocks/blockWirelessChargerOff.png diff --git a/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png b/src/main/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png rename to src/main/resources/assets/enderio/textures/blocks/blockWirelessChargerOn.png diff --git a/resources/assets/enderio/textures/blocks/capBankInfoPanel.png b/src/main/resources/assets/enderio/textures/blocks/capBankInfoPanel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capBankInfoPanel.png rename to src/main/resources/assets/enderio/textures/blocks/capBankInfoPanel.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBank.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBank.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBank.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBank.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankActivatedBorder.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankCreativeBorder.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankFillBar.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankFillBar.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankInput.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankInput.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankInput.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankLocked.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankLocked.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankLocked.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankLocked.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankOutput.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankOutput.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankOutput.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankOverlays.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankOverlays.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankSimple.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankSimple.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankSimple.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankSimple.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankSimpleBorder.png diff --git a/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png b/src/main/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png rename to src/main/resources/assets/enderio/textures/blocks/capacitorBankVibrantBorder.png diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_concentrated_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_flow.png b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_flow.png rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_flow.png diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_still.png b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_still.png rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_still.png diff --git a/resources/assets/enderio/textures/blocks/cloud_seed_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/cloud_seed_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/cloud_seed_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/cloud_seed_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/combustionGenModel.png b/src/main/resources/assets/enderio/textures/blocks/combustionGenModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/combustionGenModel.png rename to src/main/resources/assets/enderio/textures/blocks/combustionGenModel.png diff --git a/resources/assets/enderio/textures/blocks/conductiveIronBlock.png b/src/main/resources/assets/enderio/textures/blocks/conductiveIronBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/conductiveIronBlock.png rename to src/main/resources/assets/enderio/textures/blocks/conductiveIronBlock.png diff --git a/resources/assets/enderio/textures/blocks/conduitConnector.png b/src/main/resources/assets/enderio/textures/blocks/conduitConnector.png similarity index 100% rename from resources/assets/enderio/textures/blocks/conduitConnector.png rename to src/main/resources/assets/enderio/textures/blocks/conduitConnector.png diff --git a/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png b/src/main/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png similarity index 100% rename from resources/assets/enderio/textures/blocks/conduitConnectorExternal.png rename to src/main/resources/assets/enderio/textures/blocks/conduitConnectorExternal.png diff --git a/resources/assets/enderio/textures/blocks/conduitFacade.png b/src/main/resources/assets/enderio/textures/blocks/conduitFacade.png similarity index 100% rename from resources/assets/enderio/textures/blocks/conduitFacade.png rename to src/main/resources/assets/enderio/textures/blocks/conduitFacade.png diff --git a/resources/assets/enderio/textures/blocks/crafter.png b/src/main/resources/assets/enderio/textures/blocks/crafter.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crafter.png rename to src/main/resources/assets/enderio/textures/blocks/crafter.png diff --git a/resources/assets/enderio/textures/blocks/crafterSide.png b/src/main/resources/assets/enderio/textures/blocks/crafterSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crafterSide.png rename to src/main/resources/assets/enderio/textures/blocks/crafterSide.png diff --git a/resources/assets/enderio/textures/blocks/crafterTop.png b/src/main/resources/assets/enderio/textures/blocks/crafterTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crafterTop.png rename to src/main/resources/assets/enderio/textures/blocks/crafterTop.png diff --git a/resources/assets/enderio/textures/blocks/crudeSteelBlock.png b/src/main/resources/assets/enderio/textures/blocks/crudeSteelBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crudeSteelBlock.png rename to src/main/resources/assets/enderio/textures/blocks/crudeSteelBlock.png diff --git a/resources/assets/enderio/textures/blocks/crusherFront.png b/src/main/resources/assets/enderio/textures/blocks/crusherFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crusherFront.png rename to src/main/resources/assets/enderio/textures/blocks/crusherFront.png diff --git a/resources/assets/enderio/textures/blocks/crusherFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/crusherFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crusherFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/crusherFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png b/src/main/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png rename to src/main/resources/assets/enderio/textures/blocks/crystallineAlloyBlock.png diff --git a/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png b/src/main/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png rename to src/main/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png diff --git a/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/crystallinePinkSlimeBlock.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/darkSteelBlock.png b/src/main/resources/assets/enderio/textures/blocks/darkSteelBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/darkSteelBlock.png rename to src/main/resources/assets/enderio/textures/blocks/darkSteelBlock.png diff --git a/resources/assets/enderio/textures/blocks/electricalSteelBlock.png b/src/main/resources/assets/enderio/textures/blocks/electricalSteelBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/electricalSteelBlock.png rename to src/main/resources/assets/enderio/textures/blocks/electricalSteelBlock.png diff --git a/resources/assets/enderio/textures/blocks/emptyLiquidConduitExtract.png b/src/main/resources/assets/enderio/textures/blocks/emptyLiquidConduitExtract.png similarity index 100% rename from resources/assets/enderio/textures/blocks/emptyLiquidConduitExtract.png rename to src/main/resources/assets/enderio/textures/blocks/emptyLiquidConduitExtract.png diff --git a/resources/assets/enderio/textures/blocks/emptyLiquidConduitInsert.png b/src/main/resources/assets/enderio/textures/blocks/emptyLiquidConduitInsert.png similarity index 100% rename from resources/assets/enderio/textures/blocks/emptyLiquidConduitInsert.png rename to src/main/resources/assets/enderio/textures/blocks/emptyLiquidConduitInsert.png diff --git a/resources/assets/enderio/textures/blocks/endSteelBlock.png b/src/main/resources/assets/enderio/textures/blocks/endSteelBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/endSteelBlock.png rename to src/main/resources/assets/enderio/textures/blocks/endSteelBlock.png diff --git a/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/endSteelBlock.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/enderIOFrame.png b/src/main/resources/assets/enderio/textures/blocks/enderIOFrame.png similarity index 100% rename from resources/assets/enderio/textures/blocks/enderIOFrame.png rename to src/main/resources/assets/enderio/textures/blocks/enderIOFrame.png diff --git a/resources/assets/enderio/textures/blocks/enderIOHighlight.png b/src/main/resources/assets/enderio/textures/blocks/enderIOHighlight.png similarity index 100% rename from resources/assets/enderio/textures/blocks/enderIOHighlight.png rename to src/main/resources/assets/enderio/textures/blocks/enderIOHighlight.png diff --git a/resources/assets/enderio/textures/blocks/enderIOSelected.png b/src/main/resources/assets/enderio/textures/blocks/enderIOSelected.png similarity index 100% rename from resources/assets/enderio/textures/blocks/enderIOSelected.png rename to src/main/resources/assets/enderio/textures/blocks/enderIOSelected.png diff --git a/resources/assets/enderio/textures/blocks/enderIronNugget.png b/src/main/resources/assets/enderio/textures/blocks/enderIronNugget.png similarity index 100% rename from resources/assets/enderio/textures/blocks/enderIronNugget.png rename to src/main/resources/assets/enderio/textures/blocks/enderIronNugget.png diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_flow.png b/src/main/resources/assets/enderio/textures/blocks/ender_distillation_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ender_distillation_flow.png rename to src/main/resources/assets/enderio/textures/blocks/ender_distillation_flow.png diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/ender_distillation_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_still.png b/src/main/resources/assets/enderio/textures/blocks/ender_distillation_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ender_distillation_still.png rename to src/main/resources/assets/enderio/textures/blocks/ender_distillation_still.png diff --git a/resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/ender_distillation_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/ender_still.png b/src/main/resources/assets/enderio/textures/blocks/ender_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ender_still.png rename to src/main/resources/assets/enderio/textures/blocks/ender_still.png diff --git a/resources/assets/enderio/textures/blocks/ender_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/ender_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/ender_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/ender_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/endermanSkullFront.png b/src/main/resources/assets/enderio/textures/blocks/endermanSkullFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/endermanSkullFront.png rename to src/main/resources/assets/enderio/textures/blocks/endermanSkullFront.png diff --git a/resources/assets/enderio/textures/blocks/endermanSkullFrontEyes.png b/src/main/resources/assets/enderio/textures/blocks/endermanSkullFrontEyes.png similarity index 100% rename from resources/assets/enderio/textures/blocks/endermanSkullFrontEyes.png rename to src/main/resources/assets/enderio/textures/blocks/endermanSkullFrontEyes.png diff --git a/resources/assets/enderio/textures/blocks/endermanSkullSide.png b/src/main/resources/assets/enderio/textures/blocks/endermanSkullSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/endermanSkullSide.png rename to src/main/resources/assets/enderio/textures/blocks/endermanSkullSide.png diff --git a/resources/assets/enderio/textures/blocks/endermanSkullTop.png b/src/main/resources/assets/enderio/textures/blocks/endermanSkullTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/endermanSkullTop.png rename to src/main/resources/assets/enderio/textures/blocks/endermanSkullTop.png diff --git a/resources/assets/enderio/textures/blocks/energeticAlloyBlock.png b/src/main/resources/assets/enderio/textures/blocks/energeticAlloyBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/energeticAlloyBlock.png rename to src/main/resources/assets/enderio/textures/blocks/energeticAlloyBlock.png diff --git a/resources/assets/enderio/textures/blocks/energeticSilverBlock.png b/src/main/resources/assets/enderio/textures/blocks/energeticSilverBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/energeticSilverBlock.png rename to src/main/resources/assets/enderio/textures/blocks/energeticSilverBlock.png diff --git a/resources/assets/enderio/textures/blocks/error.png b/src/main/resources/assets/enderio/textures/blocks/error.png similarity index 100% rename from resources/assets/enderio/textures/blocks/error.png rename to src/main/resources/assets/enderio/textures/blocks/error.png diff --git a/resources/assets/enderio/textures/blocks/farmModel.png b/src/main/resources/assets/enderio/textures/blocks/farmModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/farmModel.png rename to src/main/resources/assets/enderio/textures/blocks/farmModel.png diff --git a/resources/assets/enderio/textures/blocks/fire_water_flow.png b/src/main/resources/assets/enderio/textures/blocks/fire_water_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fire_water_flow.png rename to src/main/resources/assets/enderio/textures/blocks/fire_water_flow.png diff --git a/resources/assets/enderio/textures/blocks/fire_water_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/fire_water_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/fire_water_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/fire_water_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/fire_water_still.png b/src/main/resources/assets/enderio/textures/blocks/fire_water_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fire_water_still.png rename to src/main/resources/assets/enderio/textures/blocks/fire_water_still.png diff --git a/resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/fire_water_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png b/src/main/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png rename to src/main/resources/assets/enderio/textures/blocks/furnaceSmeltingOff.png diff --git a/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png b/src/main/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png rename to src/main/resources/assets/enderio/textures/blocks/furnaceSmeltingOn.png diff --git a/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png b/src/main/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png similarity index 100% rename from resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png rename to src/main/resources/assets/enderio/textures/blocks/furnaceSmeltingOnly.png diff --git a/resources/assets/enderio/textures/blocks/fusedGlass.png b/src/main/resources/assets/enderio/textures/blocks/fusedGlass.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fusedGlass.png rename to src/main/resources/assets/enderio/textures/blocks/fusedGlass.png diff --git a/resources/assets/enderio/textures/blocks/fusedGlassFrame.png b/src/main/resources/assets/enderio/textures/blocks/fusedGlassFrame.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fusedGlassFrame.png rename to src/main/resources/assets/enderio/textures/blocks/fusedGlassFrame.png diff --git a/resources/assets/enderio/textures/blocks/fusedGlassItem.png b/src/main/resources/assets/enderio/textures/blocks/fusedGlassItem.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fusedGlassItem.png rename to src/main/resources/assets/enderio/textures/blocks/fusedGlassItem.png diff --git a/resources/assets/enderio/textures/blocks/fusedQuartz.png b/src/main/resources/assets/enderio/textures/blocks/fusedQuartz.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fusedQuartz.png rename to src/main/resources/assets/enderio/textures/blocks/fusedQuartz.png diff --git a/resources/assets/enderio/textures/blocks/fusedQuartzFrame.png b/src/main/resources/assets/enderio/textures/blocks/fusedQuartzFrame.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fusedQuartzFrame.png rename to src/main/resources/assets/enderio/textures/blocks/fusedQuartzFrame.png diff --git a/resources/assets/enderio/textures/blocks/fusedQuartzItem.png b/src/main/resources/assets/enderio/textures/blocks/fusedQuartzItem.png similarity index 100% rename from resources/assets/enderio/textures/blocks/fusedQuartzItem.png rename to src/main/resources/assets/enderio/textures/blocks/fusedQuartzItem.png diff --git a/resources/assets/enderio/textures/blocks/gasConduit.png b/src/main/resources/assets/enderio/textures/blocks/gasConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/gasConduit.png rename to src/main/resources/assets/enderio/textures/blocks/gasConduit.png diff --git a/resources/assets/enderio/textures/blocks/gasConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/gasConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/gasConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/gasConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/gasConduitEdge.png b/src/main/resources/assets/enderio/textures/blocks/gasConduitEdge.png similarity index 100% rename from resources/assets/enderio/textures/blocks/gasConduitEdge.png rename to src/main/resources/assets/enderio/textures/blocks/gasConduitEdge.png diff --git a/resources/assets/enderio/textures/blocks/gasConduitInput.png b/src/main/resources/assets/enderio/textures/blocks/gasConduitInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/gasConduitInput.png rename to src/main/resources/assets/enderio/textures/blocks/gasConduitInput.png diff --git a/resources/assets/enderio/textures/blocks/gasConduitOutput.png b/src/main/resources/assets/enderio/textures/blocks/gasConduitOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/gasConduitOutput.png rename to src/main/resources/assets/enderio/textures/blocks/gasConduitOutput.png diff --git a/resources/assets/enderio/textures/blocks/hootch_flow.png b/src/main/resources/assets/enderio/textures/blocks/hootch_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/hootch_flow.png rename to src/main/resources/assets/enderio/textures/blocks/hootch_flow.png diff --git a/resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/hootch_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/hootch_still.png b/src/main/resources/assets/enderio/textures/blocks/hootch_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/hootch_still.png rename to src/main/resources/assets/enderio/textures/blocks/hootch_still.png diff --git a/resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/hootch_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/invPanelFrontOff.png b/src/main/resources/assets/enderio/textures/blocks/invPanelFrontOff.png old mode 100755 new mode 100644 similarity index 100% rename from resources/assets/enderio/textures/blocks/invPanelFrontOff.png rename to src/main/resources/assets/enderio/textures/blocks/invPanelFrontOff.png diff --git a/resources/assets/enderio/textures/blocks/invPanelFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/invPanelFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/invPanelFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/invPanelFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/invisblePaint.png b/src/main/resources/assets/enderio/textures/blocks/invisblePaint.png similarity index 100% rename from resources/assets/enderio/textures/blocks/invisblePaint.png rename to src/main/resources/assets/enderio/textures/blocks/invisblePaint.png diff --git a/resources/assets/enderio/textures/blocks/itemConduit.png b/src/main/resources/assets/enderio/textures/blocks/itemConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduit.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduit.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/itemConduitCore.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitCore.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/itemConduitCore.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/itemConduitCoreAdvanced.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitCore_alt.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitCore_alt.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitInOut.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitInOut.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitInOut.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitInOut_In.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitInOut_In.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitInOut_Out.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitInput.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitInput.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitInput.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitIoConnector.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitIoConnector.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitIoConnector.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitIoConnector.png diff --git a/resources/assets/enderio/textures/blocks/itemConduitOutput.png b/src/main/resources/assets/enderio/textures/blocks/itemConduitOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/itemConduitOutput.png rename to src/main/resources/assets/enderio/textures/blocks/itemConduitOutput.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduit.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduit.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduit.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedEdge.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedEdge.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitAdvancedEdge.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedEdge.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInOut.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedInput.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedLocked.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitAdvancedOutput.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallineEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallineEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallineEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallineEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallinePinkSlimeEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallinePinkSlimeEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallinePinkSlimeEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreCrystallinePinkSlimeEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreMelodicEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreMelodicEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCoreMelodicEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreMelodicEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCoreStellarEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreStellarEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCoreStellarEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCoreStellarEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallineEnder.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitCrystallinePinkSlimeEnder.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/liquidConduitEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitEnder.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitEnder.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitEnder.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/liquidConduitExtract.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitExtract.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitExtract.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitExtract.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitInsert.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitInsert.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitInsert.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitInsert.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitLocked.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitLocked.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitLocked.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitLocked.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitMelodicEnder.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png b/src/main/resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png diff --git a/resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquidConduitStellarEnder.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png b/src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png rename to src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png diff --git a/resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/liquid_sunshine_still.png b/src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/liquid_sunshine_still.png rename to src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_still.png diff --git a/resources/assets/enderio/textures/blocks/liquid_sunshine_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/liquid_sunshine_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/liquid_sunshine_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/machineBack.png b/src/main/resources/assets/enderio/textures/blocks/machineBack.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineBack.png rename to src/main/resources/assets/enderio/textures/blocks/machineBack.png diff --git a/resources/assets/enderio/textures/blocks/machineBottom.png b/src/main/resources/assets/enderio/textures/blocks/machineBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineBottom.png rename to src/main/resources/assets/enderio/textures/blocks/machineBottom.png diff --git a/resources/assets/enderio/textures/blocks/machineSide.png b/src/main/resources/assets/enderio/textures/blocks/machineSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineSide.png rename to src/main/resources/assets/enderio/textures/blocks/machineSide.png diff --git a/resources/assets/enderio/textures/blocks/machineTemplate.png b/src/main/resources/assets/enderio/textures/blocks/machineTemplate.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineTemplate.png rename to src/main/resources/assets/enderio/textures/blocks/machineTemplate.png diff --git a/resources/assets/enderio/textures/blocks/machineTop.png b/src/main/resources/assets/enderio/textures/blocks/machineTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/machineTop.png rename to src/main/resources/assets/enderio/textures/blocks/machineTop.png diff --git a/resources/assets/enderio/textures/blocks/meConduit.png b/src/main/resources/assets/enderio/textures/blocks/meConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/meConduit.png rename to src/main/resources/assets/enderio/textures/blocks/meConduit.png diff --git a/resources/assets/enderio/textures/blocks/meConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/meConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/meConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/meConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/meConduitCoreDense.png b/src/main/resources/assets/enderio/textures/blocks/meConduitCoreDense.png similarity index 100% rename from resources/assets/enderio/textures/blocks/meConduitCoreDense.png rename to src/main/resources/assets/enderio/textures/blocks/meConduitCoreDense.png diff --git a/resources/assets/enderio/textures/blocks/meConduitDense.png b/src/main/resources/assets/enderio/textures/blocks/meConduitDense.png similarity index 100% rename from resources/assets/enderio/textures/blocks/meConduitDense.png rename to src/main/resources/assets/enderio/textures/blocks/meConduitDense.png diff --git a/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png b/src/main/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/melodicAlloyBlock.png rename to src/main/resources/assets/enderio/textures/blocks/melodicAlloyBlock.png diff --git a/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png b/src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png rename to src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png diff --git a/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png b/src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrient_distillation_still.png rename to src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png diff --git a/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/nutrient_distillation_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/nutrient_distillation_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/obeliskBottom.png b/src/main/resources/assets/enderio/textures/blocks/obeliskBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/obeliskBottom.png rename to src/main/resources/assets/enderio/textures/blocks/obeliskBottom.png diff --git a/resources/assets/enderio/textures/blocks/ocConduit.png b/src/main/resources/assets/enderio/textures/blocks/ocConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ocConduit.png rename to src/main/resources/assets/enderio/textures/blocks/ocConduit.png diff --git a/resources/assets/enderio/textures/blocks/ocConduitAnim.png b/src/main/resources/assets/enderio/textures/blocks/ocConduitAnim.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ocConduitAnim.png rename to src/main/resources/assets/enderio/textures/blocks/ocConduitAnim.png diff --git a/resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/ocConduitAnim.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/ocConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/ocConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ocConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/ocConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png b/src/main/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png similarity index 100% rename from resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png rename to src/main/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png diff --git a/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/ocConduitCoreAnim.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/old/alloySmelterFront.png b/src/main/resources/assets/enderio/textures/blocks/old/alloySmelterFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/alloySmelterFront.png rename to src/main/resources/assets/enderio/textures/blocks/old/alloySmelterFront.png diff --git a/resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/alloySmelterFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/blockAttractorSide.png b/src/main/resources/assets/enderio/textures/blocks/old/blockAttractorSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockAttractorSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockAttractorSide.png diff --git a/resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png b/src/main/resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockAttractorSideOn.png diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferCreative.png b/src/main/resources/assets/enderio/textures/blocks/old/blockBufferCreative.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockBufferCreative.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockBufferCreative.png diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferItem.png b/src/main/resources/assets/enderio/textures/blocks/old/blockBufferItem.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockBufferItem.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockBufferItem.png diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferOmni.png b/src/main/resources/assets/enderio/textures/blocks/old/blockBufferOmni.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockBufferOmni.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockBufferOmni.png diff --git a/resources/assets/enderio/textures/blocks/old/blockBufferPower.png b/src/main/resources/assets/enderio/textures/blocks/old/blockBufferPower.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockBufferPower.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockBufferPower.png diff --git a/resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png b/src/main/resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockElectricLightFace.png diff --git a/resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png b/src/main/resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockElectricLightFaceOff.png diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png b/src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineBack.png diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png b/src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineBlank.png diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png b/src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineSide.png diff --git a/resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png b/src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockSoulMachineTop.png diff --git a/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png b/src/main/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png diff --git a/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/old/blockTravelAnchor.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/old/blockVacuumChest.png b/src/main/resources/assets/enderio/textures/blocks/old/blockVacuumChest.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockVacuumChest.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockVacuumChest.png diff --git a/resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png b/src/main/resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockWirelessCharger.png diff --git a/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png b/src/main/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOff.png diff --git a/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png b/src/main/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/blockWirelessChargerOn.png diff --git a/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png b/src/main/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png rename to src/main/resources/assets/enderio/textures/blocks/old/capBankInfoPanel.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBank.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBank.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBank.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBank.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankActivatedBorder.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankCreativeBorder.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankFillBar.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankInput.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankInput.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankLocked.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankOutput.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankOverlays.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimple.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankSimpleBorder.png diff --git a/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png rename to src/main/resources/assets/enderio/textures/blocks/old/capacitorBankVibrantBorder.png diff --git a/resources/assets/enderio/textures/blocks/old/combustionGenFront.png b/src/main/resources/assets/enderio/textures/blocks/old/combustionGenFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/combustionGenFront.png rename to src/main/resources/assets/enderio/textures/blocks/old/combustionGenFront.png diff --git a/resources/assets/enderio/textures/blocks/old/combustionGenFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/combustionGenFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/combustionGenFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/combustionGenFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/conduitBundle.png b/src/main/resources/assets/enderio/textures/blocks/old/conduitBundle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/conduitBundle.png rename to src/main/resources/assets/enderio/textures/blocks/old/conduitBundle.png diff --git a/resources/assets/enderio/textures/blocks/old/crafter.png b/src/main/resources/assets/enderio/textures/blocks/old/crafter.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/crafter.png rename to src/main/resources/assets/enderio/textures/blocks/old/crafter.png diff --git a/resources/assets/enderio/textures/blocks/old/crafterSide.png b/src/main/resources/assets/enderio/textures/blocks/old/crafterSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/crafterSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/crafterSide.png diff --git a/resources/assets/enderio/textures/blocks/old/crafterTop.png b/src/main/resources/assets/enderio/textures/blocks/old/crafterTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/crafterTop.png rename to src/main/resources/assets/enderio/textures/blocks/old/crafterTop.png diff --git a/resources/assets/enderio/textures/blocks/old/crusherFront.png b/src/main/resources/assets/enderio/textures/blocks/old/crusherFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/crusherFront.png rename to src/main/resources/assets/enderio/textures/blocks/old/crusherFront.png diff --git a/resources/assets/enderio/textures/blocks/old/crusherFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/crusherFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/crusherFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/crusherFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png b/src/main/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOff.png diff --git a/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png b/src/main/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOn.png diff --git a/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png b/src/main/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png rename to src/main/resources/assets/enderio/textures/blocks/old/furnaceSmeltingOnly.png diff --git a/resources/assets/enderio/textures/blocks/old/gasConduit.png b/src/main/resources/assets/enderio/textures/blocks/old/gasConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/gasConduit.png rename to src/main/resources/assets/enderio/textures/blocks/old/gasConduit.png diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/old/gasConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/gasConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/old/gasConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png b/src/main/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/gasConduitEdge.png rename to src/main/resources/assets/enderio/textures/blocks/old/gasConduitEdge.png diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitInput.png b/src/main/resources/assets/enderio/textures/blocks/old/gasConduitInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/gasConduitInput.png rename to src/main/resources/assets/enderio/textures/blocks/old/gasConduitInput.png diff --git a/resources/assets/enderio/textures/blocks/old/gasConduitOutput.png b/src/main/resources/assets/enderio/textures/blocks/old/gasConduitOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/gasConduitOutput.png rename to src/main/resources/assets/enderio/textures/blocks/old/gasConduitOutput.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduit.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduit.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduit.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitCoreAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitInOut.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitInOut.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitInOut_In.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitInOut_Out.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitInput.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitInput.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitInput.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitIoConnector.png diff --git a/resources/assets/enderio/textures/blocks/old/itemConduitOutput.png b/src/main/resources/assets/enderio/textures/blocks/old/itemConduitOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/itemConduitOutput.png rename to src/main/resources/assets/enderio/textures/blocks/old/itemConduitOutput.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInOut.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedInput.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedLocked.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitAdvancedOutput.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitCoreAdvanced.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitCoreEnder.png diff --git a/resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png b/src/main/resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png rename to src/main/resources/assets/enderio/textures/blocks/old/liquidConduitEnder.png diff --git a/resources/assets/enderio/textures/blocks/old/lock.png b/src/main/resources/assets/enderio/textures/blocks/old/lock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/lock.png rename to src/main/resources/assets/enderio/textures/blocks/old/lock.png diff --git a/resources/assets/enderio/textures/blocks/old/machineBack.png b/src/main/resources/assets/enderio/textures/blocks/old/machineBack.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/machineBack.png rename to src/main/resources/assets/enderio/textures/blocks/old/machineBack.png diff --git a/resources/assets/enderio/textures/blocks/old/machineSide.png b/src/main/resources/assets/enderio/textures/blocks/old/machineSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/machineSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/machineSide.png diff --git a/resources/assets/enderio/textures/blocks/old/machineTemplate.png b/src/main/resources/assets/enderio/textures/blocks/old/machineTemplate.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/machineTemplate.png rename to src/main/resources/assets/enderio/textures/blocks/old/machineTemplate.png diff --git a/resources/assets/enderio/textures/blocks/old/machineTop.png b/src/main/resources/assets/enderio/textures/blocks/old/machineTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/machineTop.png rename to src/main/resources/assets/enderio/textures/blocks/old/machineTop.png diff --git a/resources/assets/enderio/textures/blocks/old/meConduit.png b/src/main/resources/assets/enderio/textures/blocks/old/meConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/meConduit.png rename to src/main/resources/assets/enderio/textures/blocks/old/meConduit.png diff --git a/resources/assets/enderio/textures/blocks/old/meConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/old/meConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/meConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/old/meConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png b/src/main/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png rename to src/main/resources/assets/enderio/textures/blocks/old/meConduitCoreDense.png diff --git a/resources/assets/enderio/textures/blocks/old/meConduitDense.png b/src/main/resources/assets/enderio/textures/blocks/old/meConduitDense.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/meConduitDense.png rename to src/main/resources/assets/enderio/textures/blocks/old/meConduitDense.png diff --git a/resources/assets/enderio/textures/blocks/old/painterFrontOff.png b/src/main/resources/assets/enderio/textures/blocks/old/painterFrontOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/painterFrontOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/painterFrontOff.png diff --git a/resources/assets/enderio/textures/blocks/old/painterFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/painterFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/painterFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/painterFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduit.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduit.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduit.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitCore.pdn diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnder.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitCoreEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitEnder.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitEnder.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitEnder.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitInput.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitInput.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitInput.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitInputEnder.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitInputEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitOutput.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitOutput.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitOutput.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnder.png diff --git a/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerConduitOutputEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/old/powerMonitor.png b/src/main/resources/assets/enderio/textures/blocks/old/powerMonitor.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/powerMonitor.png rename to src/main/resources/assets/enderio/textures/blocks/old/powerMonitor.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduit.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduit.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduit.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOff.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.pdn diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitCoreOn.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitch.pdn b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitch.pdn similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitSwitch.pdn rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitch.pdn diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOff.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitSwitchOn.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneConduitTransmission.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduit.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOff.png diff --git a/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png b/src/main/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/redstoneInsulatedConduitCoreOn.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoir.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoir.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoir.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoir.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbB.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbB.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbB.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbB.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbBl.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbBl.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbBl.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbBl.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbBr.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbBr.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbBr.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbBr.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbL.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbL.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbL.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbL.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbR.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbR.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbR.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbR.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbT.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbT.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbT.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbT.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbTl.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbTl.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbTl.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbTl.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirMbTr.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirMbTr.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirMbTr.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirMbTr.png diff --git a/resources/assets/enderio/textures/blocks/old/reservoirSwitch.png b/src/main/resources/assets/enderio/textures/blocks/old/reservoirSwitch.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/reservoirSwitch.png rename to src/main/resources/assets/enderio/textures/blocks/old/reservoirSwitch.png diff --git a/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png b/src/main/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png rename to src/main/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFront.png diff --git a/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/old/sliceAndSpliceFrontOn.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/solarPanelAdvancedBorder.png rename to src/main/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedBorder.png diff --git a/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedSide.png b/src/main/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/solarPanelAdvancedSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedSide.png diff --git a/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedTop.png b/src/main/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/solarPanelAdvancedTop.png rename to src/main/resources/assets/enderio/textures/blocks/old/solarPanelAdvancedTop.png diff --git a/resources/assets/enderio/textures/blocks/old/solarPanelBorder.png b/src/main/resources/assets/enderio/textures/blocks/old/solarPanelBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/solarPanelBorder.png rename to src/main/resources/assets/enderio/textures/blocks/old/solarPanelBorder.png diff --git a/resources/assets/enderio/textures/blocks/old/solarPanelSide.png b/src/main/resources/assets/enderio/textures/blocks/old/solarPanelSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/solarPanelSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/solarPanelSide.png diff --git a/resources/assets/enderio/textures/blocks/old/solarPanelTop.png b/src/main/resources/assets/enderio/textures/blocks/old/solarPanelTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/solarPanelTop.png rename to src/main/resources/assets/enderio/textures/blocks/old/solarPanelTop.png diff --git a/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png b/src/main/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png rename to src/main/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOff.png diff --git a/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/stirlingGenFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/stirlingGenSide.png b/src/main/resources/assets/enderio/textures/blocks/old/stirlingGenSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/stirlingGenSide.png rename to src/main/resources/assets/enderio/textures/blocks/old/stirlingGenSide.png diff --git a/resources/assets/enderio/textures/blocks/old/vatFront.png b/src/main/resources/assets/enderio/textures/blocks/old/vatFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/vatFront.png rename to src/main/resources/assets/enderio/textures/blocks/old/vatFront.png diff --git a/resources/assets/enderio/textures/blocks/old/vatFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/old/vatFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/vatFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/old/vatFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/old/vatFrontOnSingle.png b/src/main/resources/assets/enderio/textures/blocks/old/vatFrontOnSingle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/vatFrontOnSingle.png rename to src/main/resources/assets/enderio/textures/blocks/old/vatFrontOnSingle.png diff --git a/resources/assets/enderio/textures/blocks/old/vatFrontSingle.png b/src/main/resources/assets/enderio/textures/blocks/old/vatFrontSingle.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/vatFrontSingle.png rename to src/main/resources/assets/enderio/textures/blocks/old/vatFrontSingle.png diff --git a/resources/assets/enderio/textures/blocks/old/vatTop.png b/src/main/resources/assets/enderio/textures/blocks/old/vatTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/old/vatTop.png rename to src/main/resources/assets/enderio/textures/blocks/old/vatTop.png diff --git a/resources/assets/enderio/textures/blocks/overlays/dirt.png b/src/main/resources/assets/enderio/textures/blocks/overlays/dirt.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/dirt.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/dirt.png diff --git a/resources/assets/enderio/textures/blocks/overlays/disabled.png b/src/main/resources/assets/enderio/textures/blocks/overlays/disabled.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/disabled.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/disabled.png diff --git a/resources/assets/enderio/textures/blocks/overlays/disabledNoCenter.png b/src/main/resources/assets/enderio/textures/blocks/overlays/disabledNoCenter.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/disabledNoCenter.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/disabledNoCenter.png diff --git a/resources/assets/enderio/textures/blocks/overlays/disabledSides.png b/src/main/resources/assets/enderio/textures/blocks/overlays/disabledSides.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/disabledSides.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/disabledSides.png diff --git a/resources/assets/enderio/textures/blocks/overlays/none.png b/src/main/resources/assets/enderio/textures/blocks/overlays/none.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/none.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/none.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pull.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pull.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pull.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pullSides.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pullSides.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pullSides.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pullSides.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pullTopBottom.png diff --git a/resources/assets/enderio/textures/blocks/overlays/push.png b/src/main/resources/assets/enderio/textures/blocks/overlays/push.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/push.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/push.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pushPull.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pushPull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pushPull.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pushPull.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pushPullSides.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pushPullSides.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pushPullSides.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pushPullSides.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pushPullTopBottom.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pushSides.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pushSides.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pushSides.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pushSides.png diff --git a/resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png b/src/main/resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/pushTopBottom.png diff --git a/resources/assets/enderio/textures/blocks/overlays/selectedFace.png b/src/main/resources/assets/enderio/textures/blocks/overlays/selectedFace.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/selectedFace.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/selectedFace.png diff --git a/resources/assets/enderio/textures/blocks/overlays/transcieverDisabled.png b/src/main/resources/assets/enderio/textures/blocks/overlays/transcieverDisabled.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/transcieverDisabled.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/transcieverDisabled.png diff --git a/resources/assets/enderio/textures/blocks/overlays/transcieverPull.png b/src/main/resources/assets/enderio/textures/blocks/overlays/transcieverPull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/transcieverPull.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/transcieverPull.png diff --git a/resources/assets/enderio/textures/blocks/overlays/transcieverPush.png b/src/main/resources/assets/enderio/textures/blocks/overlays/transcieverPush.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/transcieverPush.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/transcieverPush.png diff --git a/resources/assets/enderio/textures/blocks/overlays/transcieverPushPull.png b/src/main/resources/assets/enderio/textures/blocks/overlays/transcieverPushPull.png similarity index 100% rename from resources/assets/enderio/textures/blocks/overlays/transcieverPushPull.png rename to src/main/resources/assets/enderio/textures/blocks/overlays/transcieverPushPull.png diff --git a/resources/assets/enderio/textures/blocks/painterFrontOff.png b/src/main/resources/assets/enderio/textures/blocks/painterFrontOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/painterFrontOff.png rename to src/main/resources/assets/enderio/textures/blocks/painterFrontOff.png diff --git a/resources/assets/enderio/textures/blocks/painterFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/painterFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/painterFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/painterFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/painterFrontOn.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/painterFrontOn.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/painterFrontOn.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/painterFrontOn.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/phasedGoldBlock.png b/src/main/resources/assets/enderio/textures/blocks/phasedGoldBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/phasedGoldBlock.png rename to src/main/resources/assets/enderio/textures/blocks/phasedGoldBlock.png diff --git a/resources/assets/enderio/textures/blocks/phasedIronBlock.png b/src/main/resources/assets/enderio/textures/blocks/phasedIronBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/phasedIronBlock.png rename to src/main/resources/assets/enderio/textures/blocks/phasedIronBlock.png diff --git a/resources/assets/enderio/textures/blocks/powerConduit.png b/src/main/resources/assets/enderio/textures/blocks/powerConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduit.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduit.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitAluminum.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitAluminum.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitAluminum.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitAluminum.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCopper.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCopper.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCopper.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCopper.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCore.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCore.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCore.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCore.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreAluminum.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCopper.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreCrude.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCrude.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreCrude.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCrude.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreCrystalline.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCrystalline.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreCrystalline.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCrystalline.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreCrystallinePinkSlime.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCrystallinePinkSlime.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreCrystallinePinkSlime.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreCrystallinePinkSlime.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreElectrum.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreElectrum.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreElectrum.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreElectrum.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreEnder.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreEnergeticSilver.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreGold.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreGold.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreIron.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreIron.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreIron.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreIron.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreMelodic.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreSilver.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCoreStellar.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCoreStellar.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCoreStellar.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCoreStellar.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrude.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCrude.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCrude.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCrude.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCrystalline.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCrystalline.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitCrystallinePinkSlime.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitElectrum.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitElectrum.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitElectrum.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitElectrum.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnder.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitEnder.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitEnder.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitEnergeticSilver.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitGold.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitGold.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitGold.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitGold.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitInput.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitInput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitInput.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitInput.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitInputEnder.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitInputEnder.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitInputEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitIron.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitIron.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitIron.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitIron.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitMelodic.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitMelodic.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitMelodic.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitMelodic.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutput.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitOutput.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitOutput.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitOutput.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitOutputEnder.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitOutputEnhanced.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitSilver.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitSilver.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitSilver.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitSilver.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitStellar.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitStellar.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitStellar.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitStellar.png diff --git a/resources/assets/enderio/textures/blocks/powerConduitTransmission.png b/src/main/resources/assets/enderio/textures/blocks/powerConduitTransmission.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerConduitTransmission.png rename to src/main/resources/assets/enderio/textures/blocks/powerConduitTransmission.png diff --git a/resources/assets/enderio/textures/blocks/powerMonitor.png b/src/main/resources/assets/enderio/textures/blocks/powerMonitor.png similarity index 100% rename from resources/assets/enderio/textures/blocks/powerMonitor.png rename to src/main/resources/assets/enderio/textures/blocks/powerMonitor.png diff --git a/resources/assets/enderio/textures/blocks/poweredSpawnerFront.png b/src/main/resources/assets/enderio/textures/blocks/poweredSpawnerFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/poweredSpawnerFront.png rename to src/main/resources/assets/enderio/textures/blocks/poweredSpawnerFront.png diff --git a/resources/assets/enderio/textures/blocks/poweredSpawnerFrontActive.png b/src/main/resources/assets/enderio/textures/blocks/poweredSpawnerFrontActive.png similarity index 100% rename from resources/assets/enderio/textures/blocks/poweredSpawnerFrontActive.png rename to src/main/resources/assets/enderio/textures/blocks/poweredSpawnerFrontActive.png diff --git a/resources/assets/enderio/textures/blocks/poweredSpawnerModel.png b/src/main/resources/assets/enderio/textures/blocks/poweredSpawnerModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/poweredSpawnerModel.png rename to src/main/resources/assets/enderio/textures/blocks/poweredSpawnerModel.png diff --git a/resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png b/src/main/resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneAlloyBlock.png diff --git a/resources/assets/enderio/textures/blocks/redstoneConduit.png b/src/main/resources/assets/enderio/textures/blocks/redstoneConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduit.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneConduit.png diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png b/src/main/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneConduitCoreOff.png diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png b/src/main/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneConduitCoreOn.png diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png b/src/main/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOff.png diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png b/src/main/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneConduitSwitchOn.png diff --git a/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png b/src/main/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneConduitTransmission.png diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png b/src/main/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneInsulatedConduit.png diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png b/src/main/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOff.png diff --git a/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png b/src/main/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png rename to src/main/resources/assets/enderio/textures/blocks/redstoneInsulatedConduitCoreOn.png diff --git a/resources/assets/enderio/textures/blocks/reservoir.png b/src/main/resources/assets/enderio/textures/blocks/reservoir.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoir.png rename to src/main/resources/assets/enderio/textures/blocks/reservoir.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbB.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbB.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbB.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbB.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbBl.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbBl.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbBl.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbBl.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbBr.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbBr.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbBr.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbBr.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbL.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbL.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbL.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbL.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbR.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbR.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbR.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbR.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbT.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbT.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbT.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbT.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbTl.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbTl.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbTl.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbTl.png diff --git a/resources/assets/enderio/textures/blocks/reservoirMbTr.png b/src/main/resources/assets/enderio/textures/blocks/reservoirMbTr.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirMbTr.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirMbTr.png diff --git a/resources/assets/enderio/textures/blocks/reservoirSwitch.png b/src/main/resources/assets/enderio/textures/blocks/reservoirSwitch.png similarity index 100% rename from resources/assets/enderio/textures/blocks/reservoirSwitch.png rename to src/main/resources/assets/enderio/textures/blocks/reservoirSwitch.png diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png b/src/main/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/rocket_fuel_flow.png rename to src/main/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/rocket_fuel_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_still.png b/src/main/resources/assets/enderio/textures/blocks/rocket_fuel_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/rocket_fuel_still.png rename to src/main/resources/assets/enderio/textures/blocks/rocket_fuel_still.png diff --git a/resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/rocket_fuel_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/skullCreeper.png b/src/main/resources/assets/enderio/textures/blocks/skullCreeper.png similarity index 100% rename from resources/assets/enderio/textures/blocks/skullCreeper.png rename to src/main/resources/assets/enderio/textures/blocks/skullCreeper.png diff --git a/resources/assets/enderio/textures/blocks/skullSkeleton.png b/src/main/resources/assets/enderio/textures/blocks/skullSkeleton.png similarity index 100% rename from resources/assets/enderio/textures/blocks/skullSkeleton.png rename to src/main/resources/assets/enderio/textures/blocks/skullSkeleton.png diff --git a/resources/assets/enderio/textures/blocks/skullZombie.png b/src/main/resources/assets/enderio/textures/blocks/skullZombie.png similarity index 100% rename from resources/assets/enderio/textures/blocks/skullZombie.png rename to src/main/resources/assets/enderio/textures/blocks/skullZombie.png diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png b/src/main/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png similarity index 100% rename from resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png rename to src/main/resources/assets/enderio/textures/blocks/sliceAndSpliceFront.png diff --git a/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/sliceAndSpliceFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelAdvancedBorder.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelAdvancedSide.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelAdvancedTop.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelAdvancedTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelAdvancedTop.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelAdvancedTop.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelBorder.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelBorder.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelBorder.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelSide.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelSide.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelSide.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelTop.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelTop.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelTop.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelVibrantBorder.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelVibrantSide.png diff --git a/resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png b/src/main/resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png rename to src/main/resources/assets/enderio/textures/blocks/solarPanelVibrantTop.png diff --git a/resources/assets/enderio/textures/blocks/soulBinderModel.png b/src/main/resources/assets/enderio/textures/blocks/soulBinderModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/soulBinderModel.png rename to src/main/resources/assets/enderio/textures/blocks/soulBinderModel.png diff --git a/resources/assets/enderio/textures/blocks/soulariumBlock.png b/src/main/resources/assets/enderio/textures/blocks/soulariumBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/soulariumBlock.png rename to src/main/resources/assets/enderio/textures/blocks/soulariumBlock.png diff --git a/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png b/src/main/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/stellarAlloyBlock.png rename to src/main/resources/assets/enderio/textures/blocks/stellarAlloyBlock.png diff --git a/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png b/src/main/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png similarity index 100% rename from resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png rename to src/main/resources/assets/enderio/textures/blocks/stirlingGenFrontOff.png diff --git a/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png b/src/main/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png similarity index 100% rename from resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png rename to src/main/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png diff --git a/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/stirlingGenFrontOn.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/telePadBottom.png b/src/main/resources/assets/enderio/textures/blocks/telePadBottom.png similarity index 100% rename from resources/assets/enderio/textures/blocks/telePadBottom.png rename to src/main/resources/assets/enderio/textures/blocks/telePadBottom.png diff --git a/resources/assets/enderio/textures/blocks/telePadHighlight.png b/src/main/resources/assets/enderio/textures/blocks/telePadHighlight.png similarity index 100% rename from resources/assets/enderio/textures/blocks/telePadHighlight.png rename to src/main/resources/assets/enderio/textures/blocks/telePadHighlight.png diff --git a/resources/assets/enderio/textures/blocks/telePadModel.png b/src/main/resources/assets/enderio/textures/blocks/telePadModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/telePadModel.png rename to src/main/resources/assets/enderio/textures/blocks/telePadModel.png diff --git a/resources/assets/enderio/textures/blocks/telePadSide.png b/src/main/resources/assets/enderio/textures/blocks/telePadSide.png similarity index 100% rename from resources/assets/enderio/textures/blocks/telePadSide.png rename to src/main/resources/assets/enderio/textures/blocks/telePadSide.png diff --git a/resources/assets/enderio/textures/blocks/telePadTop.png b/src/main/resources/assets/enderio/textures/blocks/telePadTop.png similarity index 100% rename from resources/assets/enderio/textures/blocks/telePadTop.png rename to src/main/resources/assets/enderio/textures/blocks/telePadTop.png diff --git a/resources/assets/enderio/textures/blocks/tesseractPortal.png b/src/main/resources/assets/enderio/textures/blocks/tesseractPortal.png similarity index 100% rename from resources/assets/enderio/textures/blocks/tesseractPortal.png rename to src/main/resources/assets/enderio/textures/blocks/tesseractPortal.png diff --git a/resources/assets/enderio/textures/blocks/tesseractPortal.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/tesseractPortal.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/tesseractPortal.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/tesseractPortal.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/transceiverModel.png b/src/main/resources/assets/enderio/textures/blocks/transceiverModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/transceiverModel.png rename to src/main/resources/assets/enderio/textures/blocks/transceiverModel.png diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png b/src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png rename to src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png b/src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vapor_of_levity_still.png rename to src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png diff --git a/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/vapor_of_levity_still.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/vatModel.png b/src/main/resources/assets/enderio/textures/blocks/vatModel.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vatModel.png rename to src/main/resources/assets/enderio/textures/blocks/vatModel.png diff --git a/resources/assets/enderio/textures/blocks/vividAlloyBlock.png b/src/main/resources/assets/enderio/textures/blocks/vividAlloyBlock.png similarity index 100% rename from resources/assets/enderio/textures/blocks/vividAlloyBlock.png rename to src/main/resources/assets/enderio/textures/blocks/vividAlloyBlock.png diff --git a/resources/assets/enderio/textures/blocks/white.png b/src/main/resources/assets/enderio/textures/blocks/white.png similarity index 100% rename from resources/assets/enderio/textures/blocks/white.png rename to src/main/resources/assets/enderio/textures/blocks/white.png diff --git a/resources/assets/enderio/textures/blocks/xpjuiceflowing.png b/src/main/resources/assets/enderio/textures/blocks/xpjuiceflowing.png similarity index 100% rename from resources/assets/enderio/textures/blocks/xpjuiceflowing.png rename to src/main/resources/assets/enderio/textures/blocks/xpjuiceflowing.png diff --git a/resources/assets/enderio/textures/blocks/xpjuiceflowing.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/xpjuiceflowing.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/xpjuiceflowing.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/xpjuiceflowing.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/xpjuiceslowing.png.mcmeta diff --git a/resources/assets/enderio/textures/blocks/xpjuicestill.png b/src/main/resources/assets/enderio/textures/blocks/xpjuicestill.png similarity index 100% rename from resources/assets/enderio/textures/blocks/xpjuicestill.png rename to src/main/resources/assets/enderio/textures/blocks/xpjuicestill.png diff --git a/resources/assets/enderio/textures/blocks/xpjuicestill.png.mcmeta b/src/main/resources/assets/enderio/textures/blocks/xpjuicestill.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/blocks/xpjuicestill.png.mcmeta rename to src/main/resources/assets/enderio/textures/blocks/xpjuicestill.png.mcmeta diff --git a/resources/assets/enderio/textures/fire_water_flow.png b/src/main/resources/assets/enderio/textures/fire_water_flow.png similarity index 100% rename from resources/assets/enderio/textures/fire_water_flow.png rename to src/main/resources/assets/enderio/textures/fire_water_flow.png diff --git a/resources/assets/enderio/textures/fire_water_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/fire_water_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/fire_water_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/fire_water_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/fire_water_still.png b/src/main/resources/assets/enderio/textures/fire_water_still.png similarity index 100% rename from resources/assets/enderio/textures/fire_water_still.png rename to src/main/resources/assets/enderio/textures/fire_water_still.png diff --git a/resources/assets/enderio/textures/fire_water_still.png.mcmeta b/src/main/resources/assets/enderio/textures/fire_water_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/fire_water_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/fire_water_still.png.mcmeta diff --git a/resources/assets/enderio/textures/gui/23/alloySmelter.png b/src/main/resources/assets/enderio/textures/gui/23/alloySmelter.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/alloySmelter.png rename to src/main/resources/assets/enderio/textures/gui/23/alloySmelter.png diff --git a/resources/assets/enderio/textures/gui/23/attractor.png b/src/main/resources/assets/enderio/textures/gui/23/attractor.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/attractor.png rename to src/main/resources/assets/enderio/textures/gui/23/attractor.png diff --git a/resources/assets/enderio/textures/gui/23/buffer.png b/src/main/resources/assets/enderio/textures/gui/23/buffer.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/buffer.png rename to src/main/resources/assets/enderio/textures/gui/23/buffer.png diff --git a/resources/assets/enderio/textures/gui/23/buffer_full.png b/src/main/resources/assets/enderio/textures/gui/23/buffer_full.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/buffer_full.png rename to src/main/resources/assets/enderio/textures/gui/23/buffer_full.png diff --git a/resources/assets/enderio/textures/gui/23/capacitorBank.png b/src/main/resources/assets/enderio/textures/gui/23/capacitorBank.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/capacitorBank.png rename to src/main/resources/assets/enderio/textures/gui/23/capacitorBank.png diff --git a/resources/assets/enderio/textures/gui/23/combustionGen.png b/src/main/resources/assets/enderio/textures/gui/23/combustionGen.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/combustionGen.png rename to src/main/resources/assets/enderio/textures/gui/23/combustionGen.png diff --git a/resources/assets/enderio/textures/gui/23/crafter.png b/src/main/resources/assets/enderio/textures/gui/23/crafter.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/crafter.png rename to src/main/resources/assets/enderio/textures/gui/23/crafter.png diff --git a/resources/assets/enderio/textures/gui/23/crusher.png b/src/main/resources/assets/enderio/textures/gui/23/crusher.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/crusher.png rename to src/main/resources/assets/enderio/textures/gui/23/crusher.png diff --git a/resources/assets/enderio/textures/gui/23/enchanter.png b/src/main/resources/assets/enderio/textures/gui/23/enchanter.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/enchanter.png rename to src/main/resources/assets/enderio/textures/gui/23/enchanter.png diff --git a/resources/assets/enderio/textures/gui/23/experianceObelisk.png b/src/main/resources/assets/enderio/textures/gui/23/experianceObelisk.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/experianceObelisk.png rename to src/main/resources/assets/enderio/textures/gui/23/experianceObelisk.png diff --git a/resources/assets/enderio/textures/gui/23/externalConduitConnection.png b/src/main/resources/assets/enderio/textures/gui/23/externalConduitConnection.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/externalConduitConnection.png rename to src/main/resources/assets/enderio/textures/gui/23/externalConduitConnection.png diff --git a/resources/assets/enderio/textures/gui/23/farmStation.png b/src/main/resources/assets/enderio/textures/gui/23/farmStation.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/farmStation.png rename to src/main/resources/assets/enderio/textures/gui/23/farmStation.png diff --git a/resources/assets/enderio/textures/gui/23/hyperCube.png b/src/main/resources/assets/enderio/textures/gui/23/hyperCube.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/hyperCube.png rename to src/main/resources/assets/enderio/textures/gui/23/hyperCube.png diff --git a/resources/assets/enderio/textures/gui/23/inhibitor.png b/src/main/resources/assets/enderio/textures/gui/23/inhibitor.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/inhibitor.png rename to src/main/resources/assets/enderio/textures/gui/23/inhibitor.png diff --git a/resources/assets/enderio/textures/gui/23/inventorypanel.png b/src/main/resources/assets/enderio/textures/gui/23/inventorypanel.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/inventorypanel.png rename to src/main/resources/assets/enderio/textures/gui/23/inventorypanel.png diff --git a/resources/assets/enderio/textures/gui/23/itemFilter.png b/src/main/resources/assets/enderio/textures/gui/23/itemFilter.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/itemFilter.png rename to src/main/resources/assets/enderio/textures/gui/23/itemFilter.png diff --git a/resources/assets/enderio/textures/gui/23/killerJoe.png b/src/main/resources/assets/enderio/textures/gui/23/killerJoe.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/killerJoe.png rename to src/main/resources/assets/enderio/textures/gui/23/killerJoe.png diff --git a/resources/assets/enderio/textures/gui/23/painter.png b/src/main/resources/assets/enderio/textures/gui/23/painter.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/painter.png rename to src/main/resources/assets/enderio/textures/gui/23/painter.png diff --git a/resources/assets/enderio/textures/gui/23/powerMonitor.png b/src/main/resources/assets/enderio/textures/gui/23/powerMonitor.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/powerMonitor.png rename to src/main/resources/assets/enderio/textures/gui/23/powerMonitor.png diff --git a/resources/assets/enderio/textures/gui/23/poweredSpawner.png b/src/main/resources/assets/enderio/textures/gui/23/poweredSpawner.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/poweredSpawner.png rename to src/main/resources/assets/enderio/textures/gui/23/poweredSpawner.png diff --git a/resources/assets/enderio/textures/gui/23/sliceAndSplice.png b/src/main/resources/assets/enderio/textures/gui/23/sliceAndSplice.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/sliceAndSplice.png rename to src/main/resources/assets/enderio/textures/gui/23/sliceAndSplice.png diff --git a/resources/assets/enderio/textures/gui/23/soulFuser.png b/src/main/resources/assets/enderio/textures/gui/23/soulFuser.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/soulFuser.png rename to src/main/resources/assets/enderio/textures/gui/23/soulFuser.png diff --git a/resources/assets/enderio/textures/gui/23/stirlingGenerator.png b/src/main/resources/assets/enderio/textures/gui/23/stirlingGenerator.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/stirlingGenerator.png rename to src/main/resources/assets/enderio/textures/gui/23/stirlingGenerator.png diff --git a/resources/assets/enderio/textures/gui/23/tank.png b/src/main/resources/assets/enderio/textures/gui/23/tank.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/tank.png rename to src/main/resources/assets/enderio/textures/gui/23/tank.png diff --git a/resources/assets/enderio/textures/gui/23/telePad.png b/src/main/resources/assets/enderio/textures/gui/23/telePad.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/telePad.png rename to src/main/resources/assets/enderio/textures/gui/23/telePad.png diff --git a/resources/assets/enderio/textures/gui/23/transceiver.png b/src/main/resources/assets/enderio/textures/gui/23/transceiver.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/transceiver.png rename to src/main/resources/assets/enderio/textures/gui/23/transceiver.png diff --git a/resources/assets/enderio/textures/gui/23/travelAccessable.png b/src/main/resources/assets/enderio/textures/gui/23/travelAccessable.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/travelAccessable.png rename to src/main/resources/assets/enderio/textures/gui/23/travelAccessable.png diff --git a/resources/assets/enderio/textures/gui/23/travelAuth.png b/src/main/resources/assets/enderio/textures/gui/23/travelAuth.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/travelAuth.png rename to src/main/resources/assets/enderio/textures/gui/23/travelAuth.png diff --git a/resources/assets/enderio/textures/gui/23/vacumChest.png b/src/main/resources/assets/enderio/textures/gui/23/vacumChest.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/vacumChest.png rename to src/main/resources/assets/enderio/textures/gui/23/vacumChest.png diff --git a/resources/assets/enderio/textures/gui/23/vat.png b/src/main/resources/assets/enderio/textures/gui/23/vat.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/vat.png rename to src/main/resources/assets/enderio/textures/gui/23/vat.png diff --git a/resources/assets/enderio/textures/gui/23/weatherObelisk.png b/src/main/resources/assets/enderio/textures/gui/23/weatherObelisk.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/weatherObelisk.png rename to src/main/resources/assets/enderio/textures/gui/23/weatherObelisk.png diff --git a/resources/assets/enderio/textures/gui/23/zombieGenerator.png b/src/main/resources/assets/enderio/textures/gui/23/zombieGenerator.png similarity index 100% rename from resources/assets/enderio/textures/gui/23/zombieGenerator.png rename to src/main/resources/assets/enderio/textures/gui/23/zombieGenerator.png diff --git a/resources/assets/enderio/textures/gui/inhibitorObelisk.xcf b/src/main/resources/assets/enderio/textures/gui/inhibitorObelisk.xcf similarity index 100% rename from resources/assets/enderio/textures/gui/inhibitorObelisk.xcf rename to src/main/resources/assets/enderio/textures/gui/inhibitorObelisk.xcf diff --git a/resources/assets/enderio/textures/gui/nei/alloySmelter.png b/src/main/resources/assets/enderio/textures/gui/nei/alloySmelter.png similarity index 100% rename from resources/assets/enderio/textures/gui/nei/alloySmelter.png rename to src/main/resources/assets/enderio/textures/gui/nei/alloySmelter.png diff --git a/resources/assets/enderio/textures/gui/nei/crusher.png b/src/main/resources/assets/enderio/textures/gui/nei/crusher.png similarity index 100% rename from resources/assets/enderio/textures/gui/nei/crusher.png rename to src/main/resources/assets/enderio/textures/gui/nei/crusher.png diff --git a/resources/assets/enderio/textures/gui/old/cog.png b/src/main/resources/assets/enderio/textures/gui/old/cog.png similarity index 100% rename from resources/assets/enderio/textures/gui/old/cog.png rename to src/main/resources/assets/enderio/textures/gui/old/cog.png diff --git a/resources/assets/enderio/textures/gui/old/lockLocked.png b/src/main/resources/assets/enderio/textures/gui/old/lockLocked.png similarity index 100% rename from resources/assets/enderio/textures/gui/old/lockLocked.png rename to src/main/resources/assets/enderio/textures/gui/old/lockLocked.png diff --git a/resources/assets/enderio/textures/gui/old/lockUnlocked.png b/src/main/resources/assets/enderio/textures/gui/old/lockUnlocked.png similarity index 100% rename from resources/assets/enderio/textures/gui/old/lockUnlocked.png rename to src/main/resources/assets/enderio/textures/gui/old/lockUnlocked.png diff --git a/resources/assets/enderio/textures/gui/old/widgets.png b/src/main/resources/assets/enderio/textures/gui/old/widgets.png similarity index 100% rename from resources/assets/enderio/textures/gui/old/widgets.png rename to src/main/resources/assets/enderio/textures/gui/old/widgets.png diff --git a/resources/assets/enderio/textures/gui/widgetsv2.png b/src/main/resources/assets/enderio/textures/gui/widgetsv2.png similarity index 100% rename from resources/assets/enderio/textures/gui/widgetsv2.png rename to src/main/resources/assets/enderio/textures/gui/widgetsv2.png diff --git a/resources/assets/enderio/textures/items/activatedCapacitor.png b/src/main/resources/assets/enderio/textures/items/activatedCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/activatedCapacitor.png rename to src/main/resources/assets/enderio/textures/items/activatedCapacitor.png diff --git a/resources/assets/enderio/textures/items/attractorCrystal.png b/src/main/resources/assets/enderio/textures/items/attractorCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/attractorCrystal.png rename to src/main/resources/assets/enderio/textures/items/attractorCrystal.png diff --git a/resources/assets/enderio/textures/items/basicCapacitor.png b/src/main/resources/assets/enderio/textures/items/basicCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/basicCapacitor.png rename to src/main/resources/assets/enderio/textures/items/basicCapacitor.png diff --git a/resources/assets/enderio/textures/items/basicGear.png b/src/main/resources/assets/enderio/textures/items/basicGear.png similarity index 100% rename from resources/assets/enderio/textures/items/basicGear.png rename to src/main/resources/assets/enderio/textures/items/basicGear.png diff --git a/resources/assets/enderio/textures/items/binderComposite.png b/src/main/resources/assets/enderio/textures/items/binderComposite.png similarity index 100% rename from resources/assets/enderio/textures/items/binderComposite.png rename to src/main/resources/assets/enderio/textures/items/binderComposite.png diff --git a/resources/assets/enderio/textures/items/bucketCloud_seed.png b/src/main/resources/assets/enderio/textures/items/bucketCloud_seed.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketCloud_seed.png rename to src/main/resources/assets/enderio/textures/items/bucketCloud_seed.png diff --git a/resources/assets/enderio/textures/items/bucketCloud_seed_concentrated.png b/src/main/resources/assets/enderio/textures/items/bucketCloud_seed_concentrated.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketCloud_seed_concentrated.png rename to src/main/resources/assets/enderio/textures/items/bucketCloud_seed_concentrated.png diff --git a/resources/assets/enderio/textures/items/bucketEnder_distillation.png b/src/main/resources/assets/enderio/textures/items/bucketEnder_distillation.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketEnder_distillation.png rename to src/main/resources/assets/enderio/textures/items/bucketEnder_distillation.png diff --git a/resources/assets/enderio/textures/items/bucketFire_water.png b/src/main/resources/assets/enderio/textures/items/bucketFire_water.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketFire_water.png rename to src/main/resources/assets/enderio/textures/items/bucketFire_water.png diff --git a/resources/assets/enderio/textures/items/bucketHootch.png b/src/main/resources/assets/enderio/textures/items/bucketHootch.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketHootch.png rename to src/main/resources/assets/enderio/textures/items/bucketHootch.png diff --git a/resources/assets/enderio/textures/items/bucketLiquid_sunshine.png b/src/main/resources/assets/enderio/textures/items/bucketLiquid_sunshine.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketLiquid_sunshine.png rename to src/main/resources/assets/enderio/textures/items/bucketLiquid_sunshine.png diff --git a/resources/assets/enderio/textures/items/bucketNutrient_distillation.png b/src/main/resources/assets/enderio/textures/items/bucketNutrient_distillation.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketNutrient_distillation.png rename to src/main/resources/assets/enderio/textures/items/bucketNutrient_distillation.png diff --git a/resources/assets/enderio/textures/items/bucketRocket_fuel.png b/src/main/resources/assets/enderio/textures/items/bucketRocket_fuel.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketRocket_fuel.png rename to src/main/resources/assets/enderio/textures/items/bucketRocket_fuel.png diff --git a/resources/assets/enderio/textures/items/bucketVapor_of_levity.png b/src/main/resources/assets/enderio/textures/items/bucketVapor_of_levity.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketVapor_of_levity.png rename to src/main/resources/assets/enderio/textures/items/bucketVapor_of_levity.png diff --git a/resources/assets/enderio/textures/items/bucketXpjuice.png b/src/main/resources/assets/enderio/textures/items/bucketXpjuice.png similarity index 100% rename from resources/assets/enderio/textures/items/bucketXpjuice.png rename to src/main/resources/assets/enderio/textures/items/bucketXpjuice.png diff --git a/resources/assets/enderio/textures/items/conductiveIron.png b/src/main/resources/assets/enderio/textures/items/conductiveIron.png similarity index 100% rename from resources/assets/enderio/textures/items/conductiveIron.png rename to src/main/resources/assets/enderio/textures/items/conductiveIron.png diff --git a/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png b/src/main/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/conductiveIronGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/conductiveIronGrindingBall.png diff --git a/resources/assets/enderio/textures/items/conduitBinder.png b/src/main/resources/assets/enderio/textures/items/conduitBinder.png similarity index 100% rename from resources/assets/enderio/textures/items/conduitBinder.png rename to src/main/resources/assets/enderio/textures/items/conduitBinder.png diff --git a/resources/assets/enderio/textures/items/conduitFacade.png b/src/main/resources/assets/enderio/textures/items/conduitFacade.png similarity index 100% rename from resources/assets/enderio/textures/items/conduitFacade.png rename to src/main/resources/assets/enderio/textures/items/conduitFacade.png diff --git a/resources/assets/enderio/textures/items/conduitFacadeHardened.png b/src/main/resources/assets/enderio/textures/items/conduitFacadeHardened.png similarity index 100% rename from resources/assets/enderio/textures/items/conduitFacadeHardened.png rename to src/main/resources/assets/enderio/textures/items/conduitFacadeHardened.png diff --git a/resources/assets/enderio/textures/items/conduitFacadeOverlay.png b/src/main/resources/assets/enderio/textures/items/conduitFacadeOverlay.png similarity index 100% rename from resources/assets/enderio/textures/items/conduitFacadeOverlay.png rename to src/main/resources/assets/enderio/textures/items/conduitFacadeOverlay.png diff --git a/resources/assets/enderio/textures/items/crudeSteel.png b/src/main/resources/assets/enderio/textures/items/crudeSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/crudeSteel.png rename to src/main/resources/assets/enderio/textures/items/crudeSteel.png diff --git a/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png b/src/main/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/crudeSteelGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/crudeSteelGrindingBall.png diff --git a/resources/assets/enderio/textures/items/crystallineAlloy.png b/src/main/resources/assets/enderio/textures/items/crystallineAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/crystallineAlloy.png rename to src/main/resources/assets/enderio/textures/items/crystallineAlloy.png diff --git a/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png b/src/main/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/crystallineAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/crystallineCapacitor.png b/src/main/resources/assets/enderio/textures/items/crystallineCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/crystallineCapacitor.png rename to src/main/resources/assets/enderio/textures/items/crystallineCapacitor.png diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlime.png b/src/main/resources/assets/enderio/textures/items/crystallinePinkSlime.png similarity index 100% rename from resources/assets/enderio/textures/items/crystallinePinkSlime.png rename to src/main/resources/assets/enderio/textures/items/crystallinePinkSlime.png diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta b/src/main/resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/crystallinePinkSlime.png.mcmeta diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png b/src/main/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png diff --git a/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png.mcmeta b/src/main/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/crystallinePinkSlimeGrindingBall.png.mcmeta diff --git a/resources/assets/enderio/textures/items/darkGrindingBall.png b/src/main/resources/assets/enderio/textures/items/darkGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/darkGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/darkGrindingBall.png diff --git a/resources/assets/enderio/textures/items/darkSteel.png b/src/main/resources/assets/enderio/textures/items/darkSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel.png rename to src/main/resources/assets/enderio/textures/items/darkSteel.png diff --git a/resources/assets/enderio/textures/items/darkSteelGrindingBall.png b/src/main/resources/assets/enderio/textures/items/darkSteelGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteelGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/darkSteelGrindingBall.png diff --git a/resources/assets/enderio/textures/items/darkSteelRod.png b/src/main/resources/assets/enderio/textures/items/darkSteelRod.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteelRod.png rename to src/main/resources/assets/enderio/textures/items/darkSteelRod.png diff --git a/resources/assets/enderio/textures/items/darkSteel_axe.png b/src/main/resources/assets/enderio/textures/items/darkSteel_axe.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_axe.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_axe.png diff --git a/resources/assets/enderio/textures/items/darkSteel_boots.png b/src/main/resources/assets/enderio/textures/items/darkSteel_boots.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_boots.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_boots.png diff --git a/resources/assets/enderio/textures/items/darkSteel_chestplate.png b/src/main/resources/assets/enderio/textures/items/darkSteel_chestplate.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_chestplate.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_chestplate.png diff --git a/resources/assets/enderio/textures/items/darkSteel_helmet.png b/src/main/resources/assets/enderio/textures/items/darkSteel_helmet.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_helmet.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_helmet.png diff --git a/resources/assets/enderio/textures/items/darkSteel_hoe.png b/src/main/resources/assets/enderio/textures/items/darkSteel_hoe.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_hoe.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_hoe.png diff --git a/resources/assets/enderio/textures/items/darkSteel_leggings.png b/src/main/resources/assets/enderio/textures/items/darkSteel_leggings.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_leggings.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_leggings.png diff --git a/resources/assets/enderio/textures/items/darkSteel_pickaxe.png b/src/main/resources/assets/enderio/textures/items/darkSteel_pickaxe.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_pickaxe.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_pickaxe.png diff --git a/resources/assets/enderio/textures/items/darkSteel_shears.png b/src/main/resources/assets/enderio/textures/items/darkSteel_shears.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_shears.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_shears.png diff --git a/resources/assets/enderio/textures/items/darkSteel_shovel.png b/src/main/resources/assets/enderio/textures/items/darkSteel_shovel.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_shovel.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_shovel.png diff --git a/resources/assets/enderio/textures/items/darkSteel_sword.png b/src/main/resources/assets/enderio/textures/items/darkSteel_sword.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_sword.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_sword.png diff --git a/resources/assets/enderio/textures/items/darkSteel_swordAlt.png b/src/main/resources/assets/enderio/textures/items/darkSteel_swordAlt.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_swordAlt.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_swordAlt.png diff --git a/resources/assets/enderio/textures/items/darkSteel_swordAlt2.png b/src/main/resources/assets/enderio/textures/items/darkSteel_swordAlt2.png similarity index 100% rename from resources/assets/enderio/textures/items/darkSteel_swordAlt2.png rename to src/main/resources/assets/enderio/textures/items/darkSteel_swordAlt2.png diff --git a/resources/assets/enderio/textures/items/dustWheat.png b/src/main/resources/assets/enderio/textures/items/dustWheat.png similarity index 100% rename from resources/assets/enderio/textures/items/dustWheat.png rename to src/main/resources/assets/enderio/textures/items/dustWheat.png diff --git a/resources/assets/enderio/textures/items/electricalSteel.png b/src/main/resources/assets/enderio/textures/items/electricalSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/electricalSteel.png rename to src/main/resources/assets/enderio/textures/items/electricalSteel.png diff --git a/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png b/src/main/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/electricalSteelGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png diff --git a/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta b/src/main/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/electricalSteelGrindingBall.png.mcmeta diff --git a/resources/assets/enderio/textures/items/endSteel.png b/src/main/resources/assets/enderio/textures/items/endSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel.png rename to src/main/resources/assets/enderio/textures/items/endSteel.png diff --git a/resources/assets/enderio/textures/items/endSteel.png.mcmeta b/src/main/resources/assets/enderio/textures/items/endSteel.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/endSteel.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/endSteel.png.mcmeta diff --git a/resources/assets/enderio/textures/items/endSteelGrindingBall.png b/src/main/resources/assets/enderio/textures/items/endSteelGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteelGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/endSteelGrindingBall.png diff --git a/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta b/src/main/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/endSteelGrindingBall.png.mcmeta diff --git a/resources/assets/enderio/textures/items/endSteelMachineChassi.png b/src/main/resources/assets/enderio/textures/items/endSteelMachineChassi.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteelMachineChassi.png rename to src/main/resources/assets/enderio/textures/items/endSteelMachineChassi.png diff --git a/resources/assets/enderio/textures/items/endSteelNugget.png b/src/main/resources/assets/enderio/textures/items/endSteelNugget.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteelNugget.png rename to src/main/resources/assets/enderio/textures/items/endSteelNugget.png diff --git a/resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta b/src/main/resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/endSteelNugget.png.mcmeta diff --git a/resources/assets/enderio/textures/items/endSteel_axe.png b/src/main/resources/assets/enderio/textures/items/endSteel_axe.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_axe.png rename to src/main/resources/assets/enderio/textures/items/endSteel_axe.png diff --git a/resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta b/src/main/resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/endSteel_axe.png.mcmeta diff --git a/resources/assets/enderio/textures/items/endSteel_boots.png b/src/main/resources/assets/enderio/textures/items/endSteel_boots.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_boots.png rename to src/main/resources/assets/enderio/textures/items/endSteel_boots.png diff --git a/resources/assets/enderio/textures/items/endSteel_chestplate.png b/src/main/resources/assets/enderio/textures/items/endSteel_chestplate.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_chestplate.png rename to src/main/resources/assets/enderio/textures/items/endSteel_chestplate.png diff --git a/resources/assets/enderio/textures/items/endSteel_helmet.png b/src/main/resources/assets/enderio/textures/items/endSteel_helmet.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_helmet.png rename to src/main/resources/assets/enderio/textures/items/endSteel_helmet.png diff --git a/resources/assets/enderio/textures/items/endSteel_leggings.png b/src/main/resources/assets/enderio/textures/items/endSteel_leggings.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_leggings.png rename to src/main/resources/assets/enderio/textures/items/endSteel_leggings.png diff --git a/resources/assets/enderio/textures/items/endSteel_pickaxe.png b/src/main/resources/assets/enderio/textures/items/endSteel_pickaxe.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_pickaxe.png rename to src/main/resources/assets/enderio/textures/items/endSteel_pickaxe.png diff --git a/resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta b/src/main/resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/endSteel_pickaxe.png.mcmeta diff --git a/resources/assets/enderio/textures/items/endSteel_sword.png b/src/main/resources/assets/enderio/textures/items/endSteel_sword.png similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_sword.png rename to src/main/resources/assets/enderio/textures/items/endSteel_sword.png diff --git a/resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta b/src/main/resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/endSteel_sword.png.mcmeta diff --git a/resources/assets/enderio/textures/items/enderCapacitor.png b/src/main/resources/assets/enderio/textures/items/enderCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/enderCapacitor.png rename to src/main/resources/assets/enderio/textures/items/enderCapacitor.png diff --git a/resources/assets/enderio/textures/items/enderCrystal.png b/src/main/resources/assets/enderio/textures/items/enderCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/enderCrystal.png rename to src/main/resources/assets/enderio/textures/items/enderCrystal.png diff --git a/resources/assets/enderio/textures/items/enderCrystalPowder.png b/src/main/resources/assets/enderio/textures/items/enderCrystalPowder.png similarity index 100% rename from resources/assets/enderio/textures/items/enderCrystalPowder.png rename to src/main/resources/assets/enderio/textures/items/enderCrystalPowder.png diff --git a/resources/assets/enderio/textures/items/enderface.png b/src/main/resources/assets/enderio/textures/items/enderface.png similarity index 100% rename from resources/assets/enderio/textures/items/enderface.png rename to src/main/resources/assets/enderio/textures/items/enderface.png diff --git a/resources/assets/enderio/textures/items/endergeticCapacitor.png b/src/main/resources/assets/enderio/textures/items/endergeticCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/endergeticCapacitor.png rename to src/main/resources/assets/enderio/textures/items/endergeticCapacitor.png diff --git a/resources/assets/enderio/textures/items/endergisedCapacitor.png b/src/main/resources/assets/enderio/textures/items/endergisedCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/endergisedCapacitor.png rename to src/main/resources/assets/enderio/textures/items/endergisedCapacitor.png diff --git a/resources/assets/enderio/textures/items/endermanSkull.png b/src/main/resources/assets/enderio/textures/items/endermanSkull.png similarity index 100% rename from resources/assets/enderio/textures/items/endermanSkull.png rename to src/main/resources/assets/enderio/textures/items/endermanSkull.png diff --git a/resources/assets/enderio/textures/items/energeticAlloy.png b/src/main/resources/assets/enderio/textures/items/energeticAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/energeticAlloy.png rename to src/main/resources/assets/enderio/textures/items/energeticAlloy.png diff --git a/resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png b/src/main/resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/energeticAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/energeticSilver.png b/src/main/resources/assets/enderio/textures/items/energeticSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/energeticSilver.png rename to src/main/resources/assets/enderio/textures/items/energeticSilver.png diff --git a/resources/assets/enderio/textures/items/energeticSilverGrindingBall.png b/src/main/resources/assets/enderio/textures/items/energeticSilverGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/energeticSilverGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/energeticSilverGrindingBall.png diff --git a/resources/assets/enderio/textures/items/existingItemFilter.png b/src/main/resources/assets/enderio/textures/items/existingItemFilter.png similarity index 100% rename from resources/assets/enderio/textures/items/existingItemFilter.png rename to src/main/resources/assets/enderio/textures/items/existingItemFilter.png diff --git a/resources/assets/enderio/textures/items/extractSpeedDowngrade.png b/src/main/resources/assets/enderio/textures/items/extractSpeedDowngrade.png similarity index 100% rename from resources/assets/enderio/textures/items/extractSpeedDowngrade.png rename to src/main/resources/assets/enderio/textures/items/extractSpeedDowngrade.png diff --git a/resources/assets/enderio/textures/items/extractSpeedUpgrade.png b/src/main/resources/assets/enderio/textures/items/extractSpeedUpgrade.png similarity index 100% rename from resources/assets/enderio/textures/items/extractSpeedUpgrade.png rename to src/main/resources/assets/enderio/textures/items/extractSpeedUpgrade.png diff --git a/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png b/src/main/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/filterUpgradeAdvanced.png rename to src/main/resources/assets/enderio/textures/items/filterUpgradeAdvanced.png diff --git a/resources/assets/enderio/textures/items/filterUpgradeBasic.png b/src/main/resources/assets/enderio/textures/items/filterUpgradeBasic.png similarity index 100% rename from resources/assets/enderio/textures/items/filterUpgradeBasic.png rename to src/main/resources/assets/enderio/textures/items/filterUpgradeBasic.png diff --git a/resources/assets/enderio/textures/items/filterUpgradeBig.png b/src/main/resources/assets/enderio/textures/items/filterUpgradeBig.png similarity index 100% rename from resources/assets/enderio/textures/items/filterUpgradeBig.png rename to src/main/resources/assets/enderio/textures/items/filterUpgradeBig.png diff --git a/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png b/src/main/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png rename to src/main/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png diff --git a/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta b/src/main/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/filterUpgradeBigAdvanced.png.mcmeta diff --git a/resources/assets/enderio/textures/items/filterUpgradePower.png b/src/main/resources/assets/enderio/textures/items/filterUpgradePower.png similarity index 100% rename from resources/assets/enderio/textures/items/filterUpgradePower.png rename to src/main/resources/assets/enderio/textures/items/filterUpgradePower.png diff --git a/resources/assets/enderio/textures/items/ingotEnderiumBase.png b/src/main/resources/assets/enderio/textures/items/ingotEnderiumBase.png similarity index 100% rename from resources/assets/enderio/textures/items/ingotEnderiumBase.png rename to src/main/resources/assets/enderio/textures/items/ingotEnderiumBase.png diff --git a/resources/assets/enderio/textures/items/inventoryPanelUpgrade.png b/src/main/resources/assets/enderio/textures/items/inventoryPanelUpgrade.png similarity index 100% rename from resources/assets/enderio/textures/items/inventoryPanelUpgrade.png rename to src/main/resources/assets/enderio/textures/items/inventoryPanelUpgrade.png diff --git a/resources/assets/enderio/textures/items/itemBrokenSpawner.png b/src/main/resources/assets/enderio/textures/items/itemBrokenSpawner.png similarity index 100% rename from resources/assets/enderio/textures/items/itemBrokenSpawner.png rename to src/main/resources/assets/enderio/textures/items/itemBrokenSpawner.png diff --git a/resources/assets/enderio/textures/items/itemCoordSelector.png b/src/main/resources/assets/enderio/textures/items/itemCoordSelector.png similarity index 100% rename from resources/assets/enderio/textures/items/itemCoordSelector.png rename to src/main/resources/assets/enderio/textures/items/itemCoordSelector.png diff --git a/resources/assets/enderio/textures/items/itemCoordSelector_alt1.png b/src/main/resources/assets/enderio/textures/items/itemCoordSelector_alt1.png similarity index 100% rename from resources/assets/enderio/textures/items/itemCoordSelector_alt1.png rename to src/main/resources/assets/enderio/textures/items/itemCoordSelector_alt1.png diff --git a/resources/assets/enderio/textures/items/itemCoordSelector_alt2.png b/src/main/resources/assets/enderio/textures/items/itemCoordSelector_alt2.png similarity index 100% rename from resources/assets/enderio/textures/items/itemCoordSelector_alt2.png rename to src/main/resources/assets/enderio/textures/items/itemCoordSelector_alt2.png diff --git a/resources/assets/enderio/textures/items/itemEnderios.png b/src/main/resources/assets/enderio/textures/items/itemEnderios.png similarity index 100% rename from resources/assets/enderio/textures/items/itemEnderios.png rename to src/main/resources/assets/enderio/textures/items/itemEnderios.png diff --git a/resources/assets/enderio/textures/items/itemGasConduit.png b/src/main/resources/assets/enderio/textures/items/itemGasConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemGasConduit.png rename to src/main/resources/assets/enderio/textures/items/itemGasConduit.png diff --git a/resources/assets/enderio/textures/items/itemGliderWing.png b/src/main/resources/assets/enderio/textures/items/itemGliderWing.png similarity index 100% rename from resources/assets/enderio/textures/items/itemGliderWing.png rename to src/main/resources/assets/enderio/textures/items/itemGliderWing.png diff --git a/resources/assets/enderio/textures/items/itemGliderWings.png b/src/main/resources/assets/enderio/textures/items/itemGliderWings.png similarity index 100% rename from resources/assets/enderio/textures/items/itemGliderWings.png rename to src/main/resources/assets/enderio/textures/items/itemGliderWings.png diff --git a/resources/assets/enderio/textures/items/itemItemConduit.png b/src/main/resources/assets/enderio/textures/items/itemItemConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemItemConduit.png rename to src/main/resources/assets/enderio/textures/items/itemItemConduit.png diff --git a/resources/assets/enderio/textures/items/itemItemConduit.png.mcmeta b/src/main/resources/assets/enderio/textures/items/itemItemConduit.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/itemItemConduit.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/itemItemConduit.png.mcmeta diff --git a/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png b/src/main/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/itemItemConduitAdvanced.png rename to src/main/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png diff --git a/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png.mcmeta b/src/main/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/itemItemConduitAdvanced.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/itemItemConduitAdvanced.png.mcmeta diff --git a/resources/assets/enderio/textures/items/itemLiquidConduit.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduit.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduit.png diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduitAdvanced.png diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitCrystallineEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitCrystallineEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduitCrystallineEnder.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduitCrystallineEnder.png diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitCrystallinePinkSlimeEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitCrystallinePinkSlimeEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduitCrystallinePinkSlimeEnder.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduitCrystallinePinkSlimeEnder.png diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduitEnder.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduitEnder.png diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitMelodicEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitMelodicEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduitMelodicEnder.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduitMelodicEnder.png diff --git a/resources/assets/enderio/textures/items/itemLiquidConduitStellarEnder.png b/src/main/resources/assets/enderio/textures/items/itemLiquidConduitStellarEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/itemLiquidConduitStellarEnder.png rename to src/main/resources/assets/enderio/textures/items/itemLiquidConduitStellarEnder.png diff --git a/resources/assets/enderio/textures/items/itemMeConduit.png b/src/main/resources/assets/enderio/textures/items/itemMeConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemMeConduit.png rename to src/main/resources/assets/enderio/textures/items/itemMeConduit.png diff --git a/resources/assets/enderio/textures/items/itemMeConduitDense.png b/src/main/resources/assets/enderio/textures/items/itemMeConduitDense.png similarity index 100% rename from resources/assets/enderio/textures/items/itemMeConduitDense.png rename to src/main/resources/assets/enderio/textures/items/itemMeConduitDense.png diff --git a/resources/assets/enderio/textures/items/itemOCConduit.png b/src/main/resources/assets/enderio/textures/items/itemOCConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemOCConduit.png rename to src/main/resources/assets/enderio/textures/items/itemOCConduit.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduit.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduit.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduit.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitAluminum.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitAluminum.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitCopper.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitCopper.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitCopper.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitCopper.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitCrude.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitCrude.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitCrude.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitCrude.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitCrystalline.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitCrystalline.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitCrystalline.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitCrystalline.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitCrystallinePinkSlime.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitCrystallinePinkSlime.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitCrystallinePinkSlime.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitCrystallinePinkSlime.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitElectrum.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitElectrum.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitElectrum.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitElectrum.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnder.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitEnder.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitEnder.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnergeticSilver.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitEnergeticSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitEnergeticSilver.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitEnergeticSilver.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitEnhanced.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitGold.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitGold.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitGold.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitGold.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitIron.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitIron.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitIron.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitIron.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitMelodic.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitMelodic.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitSilver.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitSilver.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitSilver.png diff --git a/resources/assets/enderio/textures/items/itemPowerConduitStellar.png b/src/main/resources/assets/enderio/textures/items/itemPowerConduitStellar.png similarity index 100% rename from resources/assets/enderio/textures/items/itemPowerConduitStellar.png rename to src/main/resources/assets/enderio/textures/items/itemPowerConduitStellar.png diff --git a/resources/assets/enderio/textures/items/itemRedstoneConduit.png b/src/main/resources/assets/enderio/textures/items/itemRedstoneConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemRedstoneConduit.png rename to src/main/resources/assets/enderio/textures/items/itemRedstoneConduit.png diff --git a/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png b/src/main/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png rename to src/main/resources/assets/enderio/textures/items/itemRedstoneInsulatedConduit.png diff --git a/resources/assets/enderio/textures/items/itemRedstoneSwitch.png b/src/main/resources/assets/enderio/textures/items/itemRedstoneSwitch.png similarity index 100% rename from resources/assets/enderio/textures/items/itemRedstoneSwitch.png rename to src/main/resources/assets/enderio/textures/items/itemRedstoneSwitch.png diff --git a/resources/assets/enderio/textures/items/itemTravelStaff.png b/src/main/resources/assets/enderio/textures/items/itemTravelStaff.png similarity index 100% rename from resources/assets/enderio/textures/items/itemTravelStaff.png rename to src/main/resources/assets/enderio/textures/items/itemTravelStaff.png diff --git a/resources/assets/enderio/textures/items/itemTravelStaff_long.png b/src/main/resources/assets/enderio/textures/items/itemTravelStaff_long.png similarity index 100% rename from resources/assets/enderio/textures/items/itemTravelStaff_long.png rename to src/main/resources/assets/enderio/textures/items/itemTravelStaff_long.png diff --git a/resources/assets/enderio/textures/items/mJReader.png b/src/main/resources/assets/enderio/textures/items/mJReader.png similarity index 100% rename from resources/assets/enderio/textures/items/mJReader.png rename to src/main/resources/assets/enderio/textures/items/mJReader.png diff --git a/resources/assets/enderio/textures/items/mJReader_alt1.png b/src/main/resources/assets/enderio/textures/items/mJReader_alt1.png similarity index 100% rename from resources/assets/enderio/textures/items/mJReader_alt1.png rename to src/main/resources/assets/enderio/textures/items/mJReader_alt1.png diff --git a/resources/assets/enderio/textures/items/mJReader_alt2.png b/src/main/resources/assets/enderio/textures/items/mJReader_alt2.png similarity index 100% rename from resources/assets/enderio/textures/items/mJReader_alt2.png rename to src/main/resources/assets/enderio/textures/items/mJReader_alt2.png diff --git a/resources/assets/enderio/textures/items/machineChassi.png b/src/main/resources/assets/enderio/textures/items/machineChassi.png similarity index 100% rename from resources/assets/enderio/textures/items/machineChassi.png rename to src/main/resources/assets/enderio/textures/items/machineChassi.png diff --git a/resources/assets/enderio/textures/items/magnet.png b/src/main/resources/assets/enderio/textures/items/magnet.png similarity index 100% rename from resources/assets/enderio/textures/items/magnet.png rename to src/main/resources/assets/enderio/textures/items/magnet.png diff --git a/resources/assets/enderio/textures/items/melodicAlloy.png b/src/main/resources/assets/enderio/textures/items/melodicAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/melodicAlloy.png rename to src/main/resources/assets/enderio/textures/items/melodicAlloy.png diff --git a/resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png b/src/main/resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/melodicAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/melodicCapacitor.png b/src/main/resources/assets/enderio/textures/items/melodicCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/melodicCapacitor.png rename to src/main/resources/assets/enderio/textures/items/melodicCapacitor.png diff --git a/resources/assets/enderio/textures/items/modItemFilter.png b/src/main/resources/assets/enderio/textures/items/modItemFilter.png similarity index 100% rename from resources/assets/enderio/textures/items/modItemFilter.png rename to src/main/resources/assets/enderio/textures/items/modItemFilter.png diff --git a/resources/assets/enderio/textures/items/old/activatedCapacitor.png b/src/main/resources/assets/enderio/textures/items/old/activatedCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/old/activatedCapacitor.png rename to src/main/resources/assets/enderio/textures/items/old/activatedCapacitor.png diff --git a/resources/assets/enderio/textures/items/old/attractorCrystal.png b/src/main/resources/assets/enderio/textures/items/old/attractorCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/old/attractorCrystal.png rename to src/main/resources/assets/enderio/textures/items/old/attractorCrystal.png diff --git a/resources/assets/enderio/textures/items/old/basicCapacitor.png b/src/main/resources/assets/enderio/textures/items/old/basicCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/old/basicCapacitor.png rename to src/main/resources/assets/enderio/textures/items/old/basicCapacitor.png diff --git a/resources/assets/enderio/textures/items/old/basicGear.png b/src/main/resources/assets/enderio/textures/items/old/basicGear.png similarity index 100% rename from resources/assets/enderio/textures/items/old/basicGear.png rename to src/main/resources/assets/enderio/textures/items/old/basicGear.png diff --git a/resources/assets/enderio/textures/items/old/binderComposite.png b/src/main/resources/assets/enderio/textures/items/old/binderComposite.png similarity index 100% rename from resources/assets/enderio/textures/items/old/binderComposite.png rename to src/main/resources/assets/enderio/textures/items/old/binderComposite.png diff --git a/resources/assets/enderio/textures/items/old/blueSteel.png b/src/main/resources/assets/enderio/textures/items/old/blueSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/old/blueSteel.png rename to src/main/resources/assets/enderio/textures/items/old/blueSteel.png diff --git a/resources/assets/enderio/textures/items/old/bucketFire_water.png b/src/main/resources/assets/enderio/textures/items/old/bucketFire_water.png similarity index 100% rename from resources/assets/enderio/textures/items/old/bucketFire_water.png rename to src/main/resources/assets/enderio/textures/items/old/bucketFire_water.png diff --git a/resources/assets/enderio/textures/items/old/bucketHootch.png b/src/main/resources/assets/enderio/textures/items/old/bucketHootch.png similarity index 100% rename from resources/assets/enderio/textures/items/old/bucketHootch.png rename to src/main/resources/assets/enderio/textures/items/old/bucketHootch.png diff --git a/resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png b/src/main/resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png similarity index 100% rename from resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png rename to src/main/resources/assets/enderio/textures/items/old/bucketNutrient_distillation.png diff --git a/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png b/src/main/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png similarity index 100% rename from resources/assets/enderio/textures/items/old/bucketRocket_fuel.png rename to src/main/resources/assets/enderio/textures/items/old/bucketRocket_fuel.png diff --git a/resources/assets/enderio/textures/items/old/bucketXpjuice.png b/src/main/resources/assets/enderio/textures/items/old/bucketXpjuice.png similarity index 100% rename from resources/assets/enderio/textures/items/old/bucketXpjuice.png rename to src/main/resources/assets/enderio/textures/items/old/bucketXpjuice.png diff --git a/resources/assets/enderio/textures/items/old/conductiveIron.png b/src/main/resources/assets/enderio/textures/items/old/conductiveIron.png similarity index 100% rename from resources/assets/enderio/textures/items/old/conductiveIron.png rename to src/main/resources/assets/enderio/textures/items/old/conductiveIron.png diff --git a/resources/assets/enderio/textures/items/old/conduitBinder.png b/src/main/resources/assets/enderio/textures/items/old/conduitBinder.png similarity index 100% rename from resources/assets/enderio/textures/items/old/conduitBinder.png rename to src/main/resources/assets/enderio/textures/items/old/conduitBinder.png diff --git a/resources/assets/enderio/textures/items/old/conduitFacade.png b/src/main/resources/assets/enderio/textures/items/old/conduitFacade.png similarity index 100% rename from resources/assets/enderio/textures/items/old/conduitFacade.png rename to src/main/resources/assets/enderio/textures/items/old/conduitFacade.png diff --git a/resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png b/src/main/resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png similarity index 100% rename from resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png rename to src/main/resources/assets/enderio/textures/items/old/conduitFacadeOverlay.png diff --git a/resources/assets/enderio/textures/items/old/darkGrindingBall.png b/src/main/resources/assets/enderio/textures/items/old/darkGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/old/darkGrindingBall.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_axe.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_axe.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_axe.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_axe.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_boots.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_boots.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_boots.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_boots.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_chestplate.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_chestplate.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_helmet.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_helmet.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_helmet.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_helmet.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_hoe.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_hoe.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_hoe.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_hoe.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_leggings.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_leggings.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_leggings.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_leggings.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_pickaxe.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_shovel.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_shovel.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_shovel.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_shovel.png diff --git a/resources/assets/enderio/textures/items/old/darkSteel_sword.png b/src/main/resources/assets/enderio/textures/items/old/darkSteel_sword.png similarity index 100% rename from resources/assets/enderio/textures/items/old/darkSteel_sword.png rename to src/main/resources/assets/enderio/textures/items/old/darkSteel_sword.png diff --git a/resources/assets/enderio/textures/items/old/electricalSteel.png b/src/main/resources/assets/enderio/textures/items/old/electricalSteel.png similarity index 100% rename from resources/assets/enderio/textures/items/old/electricalSteel.png rename to src/main/resources/assets/enderio/textures/items/old/electricalSteel.png diff --git a/resources/assets/enderio/textures/items/old/enderCapacitor.png b/src/main/resources/assets/enderio/textures/items/old/enderCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/old/enderCapacitor.png rename to src/main/resources/assets/enderio/textures/items/old/enderCapacitor.png diff --git a/resources/assets/enderio/textures/items/old/enderCrystal.png b/src/main/resources/assets/enderio/textures/items/old/enderCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/old/enderCrystal.png rename to src/main/resources/assets/enderio/textures/items/old/enderCrystal.png diff --git a/resources/assets/enderio/textures/items/old/enderface.png b/src/main/resources/assets/enderio/textures/items/old/enderface.png similarity index 100% rename from resources/assets/enderio/textures/items/old/enderface.png rename to src/main/resources/assets/enderio/textures/items/old/enderface.png diff --git a/resources/assets/enderio/textures/items/old/enderface2Off.png b/src/main/resources/assets/enderio/textures/items/old/enderface2Off.png similarity index 100% rename from resources/assets/enderio/textures/items/old/enderface2Off.png rename to src/main/resources/assets/enderio/textures/items/old/enderface2Off.png diff --git a/resources/assets/enderio/textures/items/old/enderface2On.png b/src/main/resources/assets/enderio/textures/items/old/enderface2On.png similarity index 100% rename from resources/assets/enderio/textures/items/old/enderface2On.png rename to src/main/resources/assets/enderio/textures/items/old/enderface2On.png diff --git a/resources/assets/enderio/textures/items/old/endermanSkull.png b/src/main/resources/assets/enderio/textures/items/old/endermanSkull.png similarity index 100% rename from resources/assets/enderio/textures/items/old/endermanSkull.png rename to src/main/resources/assets/enderio/textures/items/old/endermanSkull.png diff --git a/resources/assets/enderio/textures/items/old/energeticAlloy.png b/src/main/resources/assets/enderio/textures/items/old/energeticAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/old/energeticAlloy.png rename to src/main/resources/assets/enderio/textures/items/old/energeticAlloy.png diff --git a/resources/assets/enderio/textures/items/old/existingItemFilter.png b/src/main/resources/assets/enderio/textures/items/old/existingItemFilter.png similarity index 100% rename from resources/assets/enderio/textures/items/old/existingItemFilter.png rename to src/main/resources/assets/enderio/textures/items/old/existingItemFilter.png diff --git a/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png b/src/main/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png similarity index 100% rename from resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png rename to src/main/resources/assets/enderio/textures/items/old/extractSpeedDowngrade.png diff --git a/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png b/src/main/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png similarity index 100% rename from resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png rename to src/main/resources/assets/enderio/textures/items/old/extractSpeedUpgrade.png diff --git a/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png b/src/main/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png rename to src/main/resources/assets/enderio/textures/items/old/filterUpgradeAdvanced.png diff --git a/resources/assets/enderio/textures/items/old/filterUpgradeBasic.png b/src/main/resources/assets/enderio/textures/items/old/filterUpgradeBasic.png similarity index 100% rename from resources/assets/enderio/textures/items/old/filterUpgradeBasic.png rename to src/main/resources/assets/enderio/textures/items/old/filterUpgradeBasic.png diff --git a/resources/assets/enderio/textures/items/old/filterUpgradePower.png b/src/main/resources/assets/enderio/textures/items/old/filterUpgradePower.png similarity index 100% rename from resources/assets/enderio/textures/items/old/filterUpgradePower.png rename to src/main/resources/assets/enderio/textures/items/old/filterUpgradePower.png diff --git a/resources/assets/enderio/textures/items/old/ingotBronze.png b/src/main/resources/assets/enderio/textures/items/old/ingotBronze.png similarity index 100% rename from resources/assets/enderio/textures/items/old/ingotBronze.png rename to src/main/resources/assets/enderio/textures/items/old/ingotBronze.png diff --git a/resources/assets/enderio/textures/items/old/ingotCopper.png b/src/main/resources/assets/enderio/textures/items/old/ingotCopper.png similarity index 100% rename from resources/assets/enderio/textures/items/old/ingotCopper.png rename to src/main/resources/assets/enderio/textures/items/old/ingotCopper.png diff --git a/resources/assets/enderio/textures/items/old/ingotElectrum.png b/src/main/resources/assets/enderio/textures/items/old/ingotElectrum.png similarity index 100% rename from resources/assets/enderio/textures/items/old/ingotElectrum.png rename to src/main/resources/assets/enderio/textures/items/old/ingotElectrum.png diff --git a/resources/assets/enderio/textures/items/old/ingotLead.png b/src/main/resources/assets/enderio/textures/items/old/ingotLead.png similarity index 100% rename from resources/assets/enderio/textures/items/old/ingotLead.png rename to src/main/resources/assets/enderio/textures/items/old/ingotLead.png diff --git a/resources/assets/enderio/textures/items/old/ingotSilver.png b/src/main/resources/assets/enderio/textures/items/old/ingotSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/old/ingotSilver.png rename to src/main/resources/assets/enderio/textures/items/old/ingotSilver.png diff --git a/resources/assets/enderio/textures/items/old/ingotTin.png b/src/main/resources/assets/enderio/textures/items/old/ingotTin.png similarity index 100% rename from resources/assets/enderio/textures/items/old/ingotTin.png rename to src/main/resources/assets/enderio/textures/items/old/ingotTin.png diff --git a/resources/assets/enderio/textures/items/old/itemGasConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemGasConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemGasConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemGasConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemGliderWing.png b/src/main/resources/assets/enderio/textures/items/old/itemGliderWing.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemGliderWing.png rename to src/main/resources/assets/enderio/textures/items/old/itemGliderWing.png diff --git a/resources/assets/enderio/textures/items/old/itemGliderWings.png b/src/main/resources/assets/enderio/textures/items/old/itemGliderWings.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemGliderWings.png rename to src/main/resources/assets/enderio/textures/items/old/itemGliderWings.png diff --git a/resources/assets/enderio/textures/items/old/itemItemConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemItemConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemItemConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemItemConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta b/src/main/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/old/itemItemConduit.png.mcmeta diff --git a/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png b/src/main/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png rename to src/main/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png diff --git a/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta b/src/main/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/old/itemItemConduitAdvanced.png.mcmeta diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemLiquidConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemLiquidConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemLiquidConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png b/src/main/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png rename to src/main/resources/assets/enderio/textures/items/old/itemLiquidConduitAdvanced.png diff --git a/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png b/src/main/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png rename to src/main/resources/assets/enderio/textures/items/old/itemLiquidConduitEnder.png diff --git a/resources/assets/enderio/textures/items/old/itemMeConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemMeConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemMeConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemMeConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemMeConduitDense.png b/src/main/resources/assets/enderio/textures/items/old/itemMeConduitDense.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemMeConduitDense.png rename to src/main/resources/assets/enderio/textures/items/old/itemMeConduitDense.png diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemPowerConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemPowerConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemPowerConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png b/src/main/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png rename to src/main/resources/assets/enderio/textures/items/old/itemPowerConduitEnder.png diff --git a/resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png b/src/main/resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png rename to src/main/resources/assets/enderio/textures/items/old/itemPowerConduitEnhanced.png diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemRedstoneConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemRedstoneConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemRedstoneConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png b/src/main/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png rename to src/main/resources/assets/enderio/textures/items/old/itemRedstoneInsulatedConduit.png diff --git a/resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png b/src/main/resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png rename to src/main/resources/assets/enderio/textures/items/old/itemRedstoneSwitch.png diff --git a/resources/assets/enderio/textures/items/old/itemTravelStaff.png b/src/main/resources/assets/enderio/textures/items/old/itemTravelStaff.png similarity index 100% rename from resources/assets/enderio/textures/items/old/itemTravelStaff.png rename to src/main/resources/assets/enderio/textures/items/old/itemTravelStaff.png diff --git a/resources/assets/enderio/textures/items/old/mJReader.png b/src/main/resources/assets/enderio/textures/items/old/mJReader.png similarity index 100% rename from resources/assets/enderio/textures/items/old/mJReader.png rename to src/main/resources/assets/enderio/textures/items/old/mJReader.png diff --git a/resources/assets/enderio/textures/items/old/machineChassi.png b/src/main/resources/assets/enderio/textures/items/old/machineChassi.png similarity index 100% rename from resources/assets/enderio/textures/items/old/machineChassi.png rename to src/main/resources/assets/enderio/textures/items/old/machineChassi.png diff --git a/resources/assets/enderio/textures/items/old/magnet.png b/src/main/resources/assets/enderio/textures/items/old/magnet.png similarity index 100% rename from resources/assets/enderio/textures/items/old/magnet.png rename to src/main/resources/assets/enderio/textures/items/old/magnet.png diff --git a/resources/assets/enderio/textures/items/old/modItemFilter.png b/src/main/resources/assets/enderio/textures/items/old/modItemFilter.png similarity index 100% rename from resources/assets/enderio/textures/items/old/modItemFilter.png rename to src/main/resources/assets/enderio/textures/items/old/modItemFilter.png diff --git a/resources/assets/enderio/textures/items/old/phasedGold.png b/src/main/resources/assets/enderio/textures/items/old/phasedGold.png similarity index 100% rename from resources/assets/enderio/textures/items/old/phasedGold.png rename to src/main/resources/assets/enderio/textures/items/old/phasedGold.png diff --git a/resources/assets/enderio/textures/items/old/phasedIron.png b/src/main/resources/assets/enderio/textures/items/old/phasedIron.png similarity index 100% rename from resources/assets/enderio/textures/items/old/phasedIron.png rename to src/main/resources/assets/enderio/textures/items/old/phasedIron.png diff --git a/resources/assets/enderio/textures/items/old/phasedIronNugget.png b/src/main/resources/assets/enderio/textures/items/old/phasedIronNugget.png similarity index 100% rename from resources/assets/enderio/textures/items/old/phasedIronNugget.png rename to src/main/resources/assets/enderio/textures/items/old/phasedIronNugget.png diff --git a/resources/assets/enderio/textures/items/old/powderBronze.png b/src/main/resources/assets/enderio/textures/items/old/powderBronze.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderBronze.png rename to src/main/resources/assets/enderio/textures/items/old/powderBronze.png diff --git a/resources/assets/enderio/textures/items/old/powderCoal.png b/src/main/resources/assets/enderio/textures/items/old/powderCoal.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderCoal.png rename to src/main/resources/assets/enderio/textures/items/old/powderCoal.png diff --git a/resources/assets/enderio/textures/items/old/powderCopper.png b/src/main/resources/assets/enderio/textures/items/old/powderCopper.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderCopper.png rename to src/main/resources/assets/enderio/textures/items/old/powderCopper.png diff --git a/resources/assets/enderio/textures/items/old/powderEnder.png b/src/main/resources/assets/enderio/textures/items/old/powderEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderEnder.png rename to src/main/resources/assets/enderio/textures/items/old/powderEnder.png diff --git a/resources/assets/enderio/textures/items/old/powderGold.png b/src/main/resources/assets/enderio/textures/items/old/powderGold.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderGold.png rename to src/main/resources/assets/enderio/textures/items/old/powderGold.png diff --git a/resources/assets/enderio/textures/items/old/powderIron.png b/src/main/resources/assets/enderio/textures/items/old/powderIron.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderIron.png rename to src/main/resources/assets/enderio/textures/items/old/powderIron.png diff --git a/resources/assets/enderio/textures/items/old/powderLead.png b/src/main/resources/assets/enderio/textures/items/old/powderLead.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderLead.png rename to src/main/resources/assets/enderio/textures/items/old/powderLead.png diff --git a/resources/assets/enderio/textures/items/old/powderSilver.png b/src/main/resources/assets/enderio/textures/items/old/powderSilver.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderSilver.png rename to src/main/resources/assets/enderio/textures/items/old/powderSilver.png diff --git a/resources/assets/enderio/textures/items/old/powderTin.png b/src/main/resources/assets/enderio/textures/items/old/powderTin.png similarity index 100% rename from resources/assets/enderio/textures/items/old/powderTin.png rename to src/main/resources/assets/enderio/textures/items/old/powderTin.png diff --git a/resources/assets/enderio/textures/items/old/pulsatingCrystal.png b/src/main/resources/assets/enderio/textures/items/old/pulsatingCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/old/pulsatingCrystal.png rename to src/main/resources/assets/enderio/textures/items/old/pulsatingCrystal.png diff --git a/resources/assets/enderio/textures/items/old/redstoneAlloy.png b/src/main/resources/assets/enderio/textures/items/old/redstoneAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/old/redstoneAlloy.png rename to src/main/resources/assets/enderio/textures/items/old/redstoneAlloy.png diff --git a/resources/assets/enderio/textures/items/old/silicon.png b/src/main/resources/assets/enderio/textures/items/old/silicon.png similarity index 100% rename from resources/assets/enderio/textures/items/old/silicon.png rename to src/main/resources/assets/enderio/textures/items/old/silicon.png diff --git a/resources/assets/enderio/textures/items/old/skullEnderResonator.png b/src/main/resources/assets/enderio/textures/items/old/skullEnderResonator.png similarity index 100% rename from resources/assets/enderio/textures/items/old/skullEnderResonator.png rename to src/main/resources/assets/enderio/textures/items/old/skullEnderResonator.png diff --git a/resources/assets/enderio/textures/items/old/skullZombieController.png b/src/main/resources/assets/enderio/textures/items/old/skullZombieController.png similarity index 100% rename from resources/assets/enderio/textures/items/old/skullZombieController.png rename to src/main/resources/assets/enderio/textures/items/old/skullZombieController.png diff --git a/resources/assets/enderio/textures/items/old/skullZombieElectrode.png b/src/main/resources/assets/enderio/textures/items/old/skullZombieElectrode.png similarity index 100% rename from resources/assets/enderio/textures/items/old/skullZombieElectrode.png rename to src/main/resources/assets/enderio/textures/items/old/skullZombieElectrode.png diff --git a/resources/assets/enderio/textures/items/old/soulVessel.png b/src/main/resources/assets/enderio/textures/items/old/soulVessel.png similarity index 100% rename from resources/assets/enderio/textures/items/old/soulVessel.png rename to src/main/resources/assets/enderio/textures/items/old/soulVessel.png diff --git a/resources/assets/enderio/textures/items/old/soulVesselFilled.png b/src/main/resources/assets/enderio/textures/items/old/soulVesselFilled.png similarity index 100% rename from resources/assets/enderio/textures/items/old/soulVesselFilled.png rename to src/main/resources/assets/enderio/textures/items/old/soulVesselFilled.png diff --git a/resources/assets/enderio/textures/items/old/soularium.png b/src/main/resources/assets/enderio/textures/items/old/soularium.png similarity index 100% rename from resources/assets/enderio/textures/items/old/soularium.png rename to src/main/resources/assets/enderio/textures/items/old/soularium.png diff --git a/resources/assets/enderio/textures/items/old/upgradeBlank.png b/src/main/resources/assets/enderio/textures/items/old/upgradeBlank.png similarity index 100% rename from resources/assets/enderio/textures/items/old/upgradeBlank.png rename to src/main/resources/assets/enderio/textures/items/old/upgradeBlank.png diff --git a/resources/assets/enderio/textures/items/old/upgradeEfficieny.png b/src/main/resources/assets/enderio/textures/items/old/upgradeEfficieny.png similarity index 100% rename from resources/assets/enderio/textures/items/old/upgradeEfficieny.png rename to src/main/resources/assets/enderio/textures/items/old/upgradeEfficieny.png diff --git a/resources/assets/enderio/textures/items/old/upgradeEnergy_1.png b/src/main/resources/assets/enderio/textures/items/old/upgradeEnergy_1.png similarity index 100% rename from resources/assets/enderio/textures/items/old/upgradeEnergy_1.png rename to src/main/resources/assets/enderio/textures/items/old/upgradeEnergy_1.png diff --git a/resources/assets/enderio/textures/items/old/upgradeEnergy_2.png b/src/main/resources/assets/enderio/textures/items/old/upgradeEnergy_2.png similarity index 100% rename from resources/assets/enderio/textures/items/old/upgradeEnergy_2.png rename to src/main/resources/assets/enderio/textures/items/old/upgradeEnergy_2.png diff --git a/resources/assets/enderio/textures/items/old/upgradeEnergy_3.png b/src/main/resources/assets/enderio/textures/items/old/upgradeEnergy_3.png similarity index 100% rename from resources/assets/enderio/textures/items/old/upgradeEnergy_3.png rename to src/main/resources/assets/enderio/textures/items/old/upgradeEnergy_3.png diff --git a/resources/assets/enderio/textures/items/old/vibrantCrystal.png b/src/main/resources/assets/enderio/textures/items/old/vibrantCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/old/vibrantCrystal.png rename to src/main/resources/assets/enderio/textures/items/old/vibrantCrystal.png diff --git a/resources/assets/enderio/textures/items/old/vibrantNugget.png b/src/main/resources/assets/enderio/textures/items/old/vibrantNugget.png similarity index 100% rename from resources/assets/enderio/textures/items/old/vibrantNugget.png rename to src/main/resources/assets/enderio/textures/items/old/vibrantNugget.png diff --git a/resources/assets/enderio/textures/items/old/xpTransfer.png b/src/main/resources/assets/enderio/textures/items/old/xpTransfer.png similarity index 100% rename from resources/assets/enderio/textures/items/old/xpTransfer.png rename to src/main/resources/assets/enderio/textures/items/old/xpTransfer.png diff --git a/resources/assets/enderio/textures/items/old/yetaWrench.png b/src/main/resources/assets/enderio/textures/items/old/yetaWrench.png similarity index 100% rename from resources/assets/enderio/textures/items/old/yetaWrench.png rename to src/main/resources/assets/enderio/textures/items/old/yetaWrench.png diff --git a/resources/assets/enderio/textures/items/phasedGold.png b/src/main/resources/assets/enderio/textures/items/phasedGold.png similarity index 100% rename from resources/assets/enderio/textures/items/phasedGold.png rename to src/main/resources/assets/enderio/textures/items/phasedGold.png diff --git a/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png b/src/main/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/phasedGoldGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/phasedGoldGrindingBall.png diff --git a/resources/assets/enderio/textures/items/phasedIron.png b/src/main/resources/assets/enderio/textures/items/phasedIron.png similarity index 100% rename from resources/assets/enderio/textures/items/phasedIron.png rename to src/main/resources/assets/enderio/textures/items/phasedIron.png diff --git a/resources/assets/enderio/textures/items/phasedIronGrindingBall.png b/src/main/resources/assets/enderio/textures/items/phasedIronGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/phasedIronGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/phasedIronGrindingBall.png diff --git a/resources/assets/enderio/textures/items/phasedIronNugget.png b/src/main/resources/assets/enderio/textures/items/phasedIronNugget.png similarity index 100% rename from resources/assets/enderio/textures/items/phasedIronNugget.png rename to src/main/resources/assets/enderio/textures/items/phasedIronNugget.png diff --git a/resources/assets/enderio/textures/items/powderCoal.png b/src/main/resources/assets/enderio/textures/items/powderCoal.png similarity index 100% rename from resources/assets/enderio/textures/items/powderCoal.png rename to src/main/resources/assets/enderio/textures/items/powderCoal.png diff --git a/resources/assets/enderio/textures/items/powderCopper.png b/src/main/resources/assets/enderio/textures/items/powderCopper.png similarity index 100% rename from resources/assets/enderio/textures/items/powderCopper.png rename to src/main/resources/assets/enderio/textures/items/powderCopper.png diff --git a/resources/assets/enderio/textures/items/powderEnder.png b/src/main/resources/assets/enderio/textures/items/powderEnder.png similarity index 100% rename from resources/assets/enderio/textures/items/powderEnder.png rename to src/main/resources/assets/enderio/textures/items/powderEnder.png diff --git a/resources/assets/enderio/textures/items/powderGold.png b/src/main/resources/assets/enderio/textures/items/powderGold.png similarity index 100% rename from resources/assets/enderio/textures/items/powderGold.png rename to src/main/resources/assets/enderio/textures/items/powderGold.png diff --git a/resources/assets/enderio/textures/items/powderIron.png b/src/main/resources/assets/enderio/textures/items/powderIron.png similarity index 100% rename from resources/assets/enderio/textures/items/powderIron.png rename to src/main/resources/assets/enderio/textures/items/powderIron.png diff --git a/resources/assets/enderio/textures/items/powderObsidian.png b/src/main/resources/assets/enderio/textures/items/powderObsidian.png similarity index 100% rename from resources/assets/enderio/textures/items/powderObsidian.png rename to src/main/resources/assets/enderio/textures/items/powderObsidian.png diff --git a/resources/assets/enderio/textures/items/powderTin.png b/src/main/resources/assets/enderio/textures/items/powderTin.png similarity index 100% rename from resources/assets/enderio/textures/items/powderTin.png rename to src/main/resources/assets/enderio/textures/items/powderTin.png diff --git a/resources/assets/enderio/textures/items/precientCrystal.png b/src/main/resources/assets/enderio/textures/items/precientCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/precientCrystal.png rename to src/main/resources/assets/enderio/textures/items/precientCrystal.png diff --git a/resources/assets/enderio/textures/items/precientPowder.png b/src/main/resources/assets/enderio/textures/items/precientPowder.png similarity index 100% rename from resources/assets/enderio/textures/items/precientPowder.png rename to src/main/resources/assets/enderio/textures/items/precientPowder.png diff --git a/resources/assets/enderio/textures/items/pulsatingCrystal.png b/src/main/resources/assets/enderio/textures/items/pulsatingCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/pulsatingCrystal.png rename to src/main/resources/assets/enderio/textures/items/pulsatingCrystal.png diff --git a/resources/assets/enderio/textures/items/pulsatingPowder.png b/src/main/resources/assets/enderio/textures/items/pulsatingPowder.png similarity index 100% rename from resources/assets/enderio/textures/items/pulsatingPowder.png rename to src/main/resources/assets/enderio/textures/items/pulsatingPowder.png diff --git a/resources/assets/enderio/textures/items/redstoneAlloy.png b/src/main/resources/assets/enderio/textures/items/redstoneAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/redstoneAlloy.png rename to src/main/resources/assets/enderio/textures/items/redstoneAlloy.png diff --git a/resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png b/src/main/resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/redstoneAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/silicon.png b/src/main/resources/assets/enderio/textures/items/silicon.png similarity index 100% rename from resources/assets/enderio/textures/items/silicon.png rename to src/main/resources/assets/enderio/textures/items/silicon.png diff --git a/resources/assets/enderio/textures/items/silverCapacitor.png b/src/main/resources/assets/enderio/textures/items/silverCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/silverCapacitor.png rename to src/main/resources/assets/enderio/textures/items/silverCapacitor.png diff --git a/resources/assets/enderio/textures/items/skullEnderResonator.png b/src/main/resources/assets/enderio/textures/items/skullEnderResonator.png similarity index 100% rename from resources/assets/enderio/textures/items/skullEnderResonator.png rename to src/main/resources/assets/enderio/textures/items/skullEnderResonator.png diff --git a/resources/assets/enderio/textures/items/skullGuardianDiode.png b/src/main/resources/assets/enderio/textures/items/skullGuardianDiode.png similarity index 100% rename from resources/assets/enderio/textures/items/skullGuardianDiode.png rename to src/main/resources/assets/enderio/textures/items/skullGuardianDiode.png diff --git a/resources/assets/enderio/textures/items/skullGuardianDiode.png.mcmeta b/src/main/resources/assets/enderio/textures/items/skullGuardianDiode.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/items/skullGuardianDiode.png.mcmeta rename to src/main/resources/assets/enderio/textures/items/skullGuardianDiode.png.mcmeta diff --git a/resources/assets/enderio/textures/items/skullSkeletalContractor.png b/src/main/resources/assets/enderio/textures/items/skullSkeletalContractor.png similarity index 100% rename from resources/assets/enderio/textures/items/skullSkeletalContractor.png rename to src/main/resources/assets/enderio/textures/items/skullSkeletalContractor.png diff --git a/resources/assets/enderio/textures/items/skullZombieController.png b/src/main/resources/assets/enderio/textures/items/skullZombieController.png similarity index 100% rename from resources/assets/enderio/textures/items/skullZombieController.png rename to src/main/resources/assets/enderio/textures/items/skullZombieController.png diff --git a/resources/assets/enderio/textures/items/skullZombieElectrode.png b/src/main/resources/assets/enderio/textures/items/skullZombieElectrode.png similarity index 100% rename from resources/assets/enderio/textures/items/skullZombieElectrode.png rename to src/main/resources/assets/enderio/textures/items/skullZombieElectrode.png diff --git a/resources/assets/enderio/textures/items/soulMachineChassi.png b/src/main/resources/assets/enderio/textures/items/soulMachineChassi.png similarity index 100% rename from resources/assets/enderio/textures/items/soulMachineChassi.png rename to src/main/resources/assets/enderio/textures/items/soulMachineChassi.png diff --git a/resources/assets/enderio/textures/items/soulVessel.png b/src/main/resources/assets/enderio/textures/items/soulVessel.png similarity index 100% rename from resources/assets/enderio/textures/items/soulVessel.png rename to src/main/resources/assets/enderio/textures/items/soulVessel.png diff --git a/resources/assets/enderio/textures/items/soulVesselFilled.png b/src/main/resources/assets/enderio/textures/items/soulVesselFilled.png similarity index 100% rename from resources/assets/enderio/textures/items/soulVesselFilled.png rename to src/main/resources/assets/enderio/textures/items/soulVesselFilled.png diff --git a/resources/assets/enderio/textures/items/soularium.png b/src/main/resources/assets/enderio/textures/items/soularium.png similarity index 100% rename from resources/assets/enderio/textures/items/soularium.png rename to src/main/resources/assets/enderio/textures/items/soularium.png diff --git a/resources/assets/enderio/textures/items/soulariumGrindingBall.png b/src/main/resources/assets/enderio/textures/items/soulariumGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/soulariumGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/soulariumGrindingBall.png diff --git a/resources/assets/enderio/textures/items/stellarAlloy.png b/src/main/resources/assets/enderio/textures/items/stellarAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/stellarAlloy.png rename to src/main/resources/assets/enderio/textures/items/stellarAlloy.png diff --git a/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png b/src/main/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/stellarAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/stellarCapacitor.png b/src/main/resources/assets/enderio/textures/items/stellarCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/stellarCapacitor.png rename to src/main/resources/assets/enderio/textures/items/stellarCapacitor.png diff --git a/resources/assets/enderio/textures/items/stellar_axe.png b/src/main/resources/assets/enderio/textures/items/stellar_axe.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_axe.png rename to src/main/resources/assets/enderio/textures/items/stellar_axe.png diff --git a/resources/assets/enderio/textures/items/stellar_boots.png b/src/main/resources/assets/enderio/textures/items/stellar_boots.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_boots.png rename to src/main/resources/assets/enderio/textures/items/stellar_boots.png diff --git a/resources/assets/enderio/textures/items/stellar_chestplate.png b/src/main/resources/assets/enderio/textures/items/stellar_chestplate.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_chestplate.png rename to src/main/resources/assets/enderio/textures/items/stellar_chestplate.png diff --git a/resources/assets/enderio/textures/items/stellar_helmet.png b/src/main/resources/assets/enderio/textures/items/stellar_helmet.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_helmet.png rename to src/main/resources/assets/enderio/textures/items/stellar_helmet.png diff --git a/resources/assets/enderio/textures/items/stellar_leggings.png b/src/main/resources/assets/enderio/textures/items/stellar_leggings.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_leggings.png rename to src/main/resources/assets/enderio/textures/items/stellar_leggings.png diff --git a/resources/assets/enderio/textures/items/stellar_pickaxe.png b/src/main/resources/assets/enderio/textures/items/stellar_pickaxe.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_pickaxe.png rename to src/main/resources/assets/enderio/textures/items/stellar_pickaxe.png diff --git a/resources/assets/enderio/textures/items/stellar_sword.png b/src/main/resources/assets/enderio/textures/items/stellar_sword.png similarity index 100% rename from resources/assets/enderio/textures/items/stellar_sword.png rename to src/main/resources/assets/enderio/textures/items/stellar_sword.png diff --git a/resources/assets/enderio/textures/items/totemicCapacitor.png b/src/main/resources/assets/enderio/textures/items/totemicCapacitor.png similarity index 100% rename from resources/assets/enderio/textures/items/totemicCapacitor.png rename to src/main/resources/assets/enderio/textures/items/totemicCapacitor.png diff --git a/resources/assets/enderio/textures/items/triggers/charging.png b/src/main/resources/assets/enderio/textures/items/triggers/charging.png similarity index 100% rename from resources/assets/enderio/textures/items/triggers/charging.png rename to src/main/resources/assets/enderio/textures/items/triggers/charging.png diff --git a/resources/assets/enderio/textures/items/triggers/chargingDone.png b/src/main/resources/assets/enderio/textures/items/triggers/chargingDone.png similarity index 100% rename from resources/assets/enderio/textures/items/triggers/chargingDone.png rename to src/main/resources/assets/enderio/textures/items/triggers/chargingDone.png diff --git a/resources/assets/enderio/textures/items/triggers/fullEnergy.png b/src/main/resources/assets/enderio/textures/items/triggers/fullEnergy.png similarity index 100% rename from resources/assets/enderio/textures/items/triggers/fullEnergy.png rename to src/main/resources/assets/enderio/textures/items/triggers/fullEnergy.png diff --git a/resources/assets/enderio/textures/items/triggers/hasEnergy.png b/src/main/resources/assets/enderio/textures/items/triggers/hasEnergy.png similarity index 100% rename from resources/assets/enderio/textures/items/triggers/hasEnergy.png rename to src/main/resources/assets/enderio/textures/items/triggers/hasEnergy.png diff --git a/resources/assets/enderio/textures/items/triggers/noEnergy.png b/src/main/resources/assets/enderio/textures/items/triggers/noEnergy.png similarity index 100% rename from resources/assets/enderio/textures/items/triggers/noEnergy.png rename to src/main/resources/assets/enderio/textures/items/triggers/noEnergy.png diff --git a/resources/assets/enderio/textures/items/upgradeBlank.png b/src/main/resources/assets/enderio/textures/items/upgradeBlank.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeBlank.png rename to src/main/resources/assets/enderio/textures/items/upgradeBlank.png diff --git a/resources/assets/enderio/textures/items/upgradeBlank_alt.png b/src/main/resources/assets/enderio/textures/items/upgradeBlank_alt.png similarity index 100% rename from resources/assets/enderio/textures/items/upgradeBlank_alt.png rename to src/main/resources/assets/enderio/textures/items/upgradeBlank_alt.png diff --git a/resources/assets/enderio/textures/items/vibrantCrystal.png b/src/main/resources/assets/enderio/textures/items/vibrantCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/vibrantCrystal.png rename to src/main/resources/assets/enderio/textures/items/vibrantCrystal.png diff --git a/resources/assets/enderio/textures/items/vibrantNugget.png b/src/main/resources/assets/enderio/textures/items/vibrantNugget.png similarity index 100% rename from resources/assets/enderio/textures/items/vibrantNugget.png rename to src/main/resources/assets/enderio/textures/items/vibrantNugget.png diff --git a/resources/assets/enderio/textures/items/vibrantPowder.png b/src/main/resources/assets/enderio/textures/items/vibrantPowder.png similarity index 100% rename from resources/assets/enderio/textures/items/vibrantPowder.png rename to src/main/resources/assets/enderio/textures/items/vibrantPowder.png diff --git a/resources/assets/enderio/textures/items/vividAlloy.png b/src/main/resources/assets/enderio/textures/items/vividAlloy.png similarity index 100% rename from resources/assets/enderio/textures/items/vividAlloy.png rename to src/main/resources/assets/enderio/textures/items/vividAlloy.png diff --git a/resources/assets/enderio/textures/items/vividAlloyGrindingBall.png b/src/main/resources/assets/enderio/textures/items/vividAlloyGrindingBall.png similarity index 100% rename from resources/assets/enderio/textures/items/vividAlloyGrindingBall.png rename to src/main/resources/assets/enderio/textures/items/vividAlloyGrindingBall.png diff --git a/resources/assets/enderio/textures/items/weatherCrystal.png b/src/main/resources/assets/enderio/textures/items/weatherCrystal.png similarity index 100% rename from resources/assets/enderio/textures/items/weatherCrystal.png rename to src/main/resources/assets/enderio/textures/items/weatherCrystal.png diff --git a/resources/assets/enderio/textures/items/xpTransfer.png b/src/main/resources/assets/enderio/textures/items/xpTransfer.png similarity index 100% rename from resources/assets/enderio/textures/items/xpTransfer.png rename to src/main/resources/assets/enderio/textures/items/xpTransfer.png diff --git a/resources/assets/enderio/textures/items/xpTransfer_alt.png b/src/main/resources/assets/enderio/textures/items/xpTransfer_alt.png similarity index 100% rename from resources/assets/enderio/textures/items/xpTransfer_alt.png rename to src/main/resources/assets/enderio/textures/items/xpTransfer_alt.png diff --git a/resources/assets/enderio/textures/items/yetaWrench.png b/src/main/resources/assets/enderio/textures/items/yetaWrench.png similarity index 100% rename from resources/assets/enderio/textures/items/yetaWrench.png rename to src/main/resources/assets/enderio/textures/items/yetaWrench.png diff --git a/resources/assets/enderio/textures/items/yetaWrench_alt.png b/src/main/resources/assets/enderio/textures/items/yetaWrench_alt.png similarity index 100% rename from resources/assets/enderio/textures/items/yetaWrench_alt.png rename to src/main/resources/assets/enderio/textures/items/yetaWrench_alt.png diff --git a/resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png b/src/main/resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png rename to src/main/resources/assets/enderio/textures/models/armor/darkSteel_layer_1.png diff --git a/resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png b/src/main/resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png rename to src/main/resources/assets/enderio/textures/models/armor/darkSteel_layer_2.png diff --git a/resources/assets/enderio/textures/models/armor/endSteel_layer_1.png b/src/main/resources/assets/enderio/textures/models/armor/endSteel_layer_1.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/endSteel_layer_1.png rename to src/main/resources/assets/enderio/textures/models/armor/endSteel_layer_1.png diff --git a/resources/assets/enderio/textures/models/armor/endSteel_layer_2.png b/src/main/resources/assets/enderio/textures/models/armor/endSteel_layer_2.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/endSteel_layer_2.png rename to src/main/resources/assets/enderio/textures/models/armor/endSteel_layer_2.png diff --git a/resources/assets/enderio/textures/models/armor/old/darkSteel_layer_1.png b/src/main/resources/assets/enderio/textures/models/armor/old/darkSteel_layer_1.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/old/darkSteel_layer_1.png rename to src/main/resources/assets/enderio/textures/models/armor/old/darkSteel_layer_1.png diff --git a/resources/assets/enderio/textures/models/armor/old/darkSteel_layer_2.png b/src/main/resources/assets/enderio/textures/models/armor/old/darkSteel_layer_2.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/old/darkSteel_layer_2.png rename to src/main/resources/assets/enderio/textures/models/armor/old/darkSteel_layer_2.png diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_1.png b/src/main/resources/assets/enderio/textures/models/armor/stellar_layer_1.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/stellar_layer_1.png rename to src/main/resources/assets/enderio/textures/models/armor/stellar_layer_1.png diff --git a/resources/assets/enderio/textures/models/armor/stellar_layer_2.png b/src/main/resources/assets/enderio/textures/models/armor/stellar_layer_2.png similarity index 100% rename from resources/assets/enderio/textures/models/armor/stellar_layer_2.png rename to src/main/resources/assets/enderio/textures/models/armor/stellar_layer_2.png diff --git a/resources/assets/enderio/textures/rocket_fuel_flow.png b/src/main/resources/assets/enderio/textures/rocket_fuel_flow.png similarity index 100% rename from resources/assets/enderio/textures/rocket_fuel_flow.png rename to src/main/resources/assets/enderio/textures/rocket_fuel_flow.png diff --git a/resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta b/src/main/resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta rename to src/main/resources/assets/enderio/textures/rocket_fuel_flow.png.mcmeta diff --git a/resources/assets/enderio/textures/rocket_fuel_still.png b/src/main/resources/assets/enderio/textures/rocket_fuel_still.png similarity index 100% rename from resources/assets/enderio/textures/rocket_fuel_still.png rename to src/main/resources/assets/enderio/textures/rocket_fuel_still.png diff --git a/resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta b/src/main/resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta similarity index 100% rename from resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta rename to src/main/resources/assets/enderio/textures/rocket_fuel_still.png.mcmeta diff --git a/resources/assets/enderio/villagers/enderVillager1.png b/src/main/resources/assets/enderio/villagers/enderVillager1.png similarity index 100% rename from resources/assets/enderio/villagers/enderVillager1.png rename to src/main/resources/assets/enderio/villagers/enderVillager1.png diff --git a/resources/assets/enderio/villagers/enderioMobDropVillager.vgen b/src/main/resources/assets/enderio/villagers/enderioMobDropVillager.vgen similarity index 100% rename from resources/assets/enderio/villagers/enderioMobDropVillager.vgen rename to src/main/resources/assets/enderio/villagers/enderioMobDropVillager.vgen diff --git a/resources/assets/enderio/villagers/enderioVillageHouse1.stp b/src/main/resources/assets/enderio/villagers/enderioVillageHouse1.stp similarity index 100% rename from resources/assets/enderio/villagers/enderioVillageHouse1.stp rename to src/main/resources/assets/enderio/villagers/enderioVillageHouse1.stp diff --git a/resources/assets/enderio/villagers/enderioVillagerHouse1.nbt b/src/main/resources/assets/enderio/villagers/enderioVillagerHouse1.nbt similarity index 100% rename from resources/assets/enderio/villagers/enderioVillagerHouse1.nbt rename to src/main/resources/assets/enderio/villagers/enderioVillagerHouse1.nbt diff --git a/resources/mcmod.info b/src/main/resources/mcmod.info similarity index 74% rename from resources/mcmod.info rename to src/main/resources/mcmod.info index 4ca87cd4..f51820e9 100644 --- a/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,10 +1,10 @@ [ { - "modid": "EnderIO", - "name": "Ender IO", + "modid": "${modId}", + "name": "${modName}", "description": "Compact conduits, painted things and access to your stuff through an eye of ender.", - "version": "${version}", - "mcversion": "${mcversion}", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", "url": "http://enderio.com", "updateUrl": "", "authorList": [ "CrazyPants", "tterrag" ], diff --git a/resources/pack.mcmeta b/src/main/resources/pack.mcmeta similarity index 100% rename from resources/pack.mcmeta rename to src/main/resources/pack.mcmeta