diff --git a/src/api/java/elucent/albedo/lighting/ILightProvider.java b/src/api/java/elucent/albedo/lighting/ILightProvider.java deleted file mode 100644 index 3d57592d5..000000000 --- a/src/api/java/elucent/albedo/lighting/ILightProvider.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2017 Elucent, William Thompson (unascribed), and contributors - * - * 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 elucent.albedo.lighting; - -import javax.annotation.Nullable; - -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -public interface ILightProvider { - @SideOnly(Side.CLIENT) - @Nullable - public Light provideLight(); -} \ No newline at end of file diff --git a/src/api/java/elucent/albedo/lighting/Light.java b/src/api/java/elucent/albedo/lighting/Light.java deleted file mode 100644 index 116da7396..000000000 --- a/src/api/java/elucent/albedo/lighting/Light.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * The MIT License - * - * Copyright (c) 2017 Elucent, William Thompson (unascribed), and contributors - * - * 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 elucent.albedo.lighting; - -import net.minecraft.entity.Entity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.Vec3d; - -public class Light { - - public float x; - public float y; - public float z; - - public float r; - public float g; - public float b; - public float a; - - public float radius; - - @Deprecated - public Light(float x, float y, float z, float r, float g, float b, float a, float radius) { - this.x = x; - this.y = y; - this.z = z; - this.r = r; - this.g = g; - this.b = b; - this.a = a; - this.radius = radius; - } - - public static Builder builder() { - return new Builder(); - } - - public static final class Builder { - private float x = Float.NaN; - private float y = Float.NaN; - private float z = Float.NaN; - - private float r = Float.NaN; - private float g = Float.NaN; - private float b = Float.NaN; - private float a = Float.NaN; - - private float radius = Float.NaN; - - - public Builder pos(BlockPos pos) { - return pos(pos.getX()+0.5f, pos.getY()+0.5f, pos.getZ()+0.5f); - } - - public Builder pos(Vec3d pos) { - return pos(pos.x, pos.y, pos.z); - } - - public Builder pos(Entity e) { - return pos(e.posX, e.posY, e.posZ); - } - - public Builder pos(double x, double y, double z) { - return pos((float)x, (float)y, (float)z); - } - - public Builder pos(float x, float y, float z) { - this.x = x; - this.y = y; - this.z = z; - return this; - } - - - public Builder color(int c, boolean hasAlpha) { - return color(extract(c, 2), extract(c, 1), extract(c, 0), hasAlpha ? extract(c, 3) : 1); - } - - private float extract(int i, int idx) { - return ((i >> (idx*8)) & 0xFF)/255f; - } - - public Builder color(float r, float g, float b) { - return color(r, g, b, 1); - } - - public Builder color(float r, float g, float b, float a) { - this.r = r; - this.g = g; - this.b = b; - this.a = a; - return this; - } - - - public Builder radius(float radius) { - this.radius = radius; - return this; - } - - - public Light build() { - if (Float.isFinite(x) && Float.isFinite(y) && Float.isFinite(z) && - Float.isFinite(r) && Float.isFinite(g) && Float.isFinite(b) && Float.isFinite(a) && - Float.isFinite(radius)) { - return new Light(x, y, z, r, g, b, a, radius); - } else { - throw new IllegalArgumentException("Position, color, and radius must be set, and cannot be infinite"); - } - } - - } - -} \ No newline at end of file diff --git a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java b/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java deleted file mode 100644 index 4626f71ea..000000000 --- a/src/api/java/powercrystals/minefactoryreloaded/api/IDeepStorageUnit.java +++ /dev/null @@ -1,29 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -public interface IDeepStorageUnit -{ - /** - * @return A populated ItemStack with stackSize for the full amount of materials in the DSU. - * May have a stackSize > getMaxStackSize(). May have a stackSize of 0 (indicating locked contents). - */ - ItemStack getStoredItemType(); - - /** - * Sets the total amount of the item currently being stored, or zero if all items are to be removed. - */ - void setStoredItemCount(int amount); - - /** - * Sets the type of the stored item and initializes the number of stored items to amount. - * Will overwrite any existing stored items. - */ - void setStoredItemType(ItemStack type, int amount); - - /** - * @return The maximum number of items the DSU can hold. - * May change based on the current type stored. - */ - int getMaxStoredCount(); -} \ No newline at end of file