Removed Albedo support

This commit is contained in:
raoulvdberge
2017-07-28 22:18:59 +02:00
parent 545f33c852
commit f694e0b184
3 changed files with 1 additions and 38 deletions

View File

@@ -2,7 +2,6 @@
### 1.5.14
- Updated Forge to 2426 (raoulvdberge)
- Added Albedo support (raoulvdberge)
- Fixed more crashes relating to scrollbar in GUIs (raoulvdberge)
- Fixed crash with Detector (raoulvdberge)
- Fixed bug where pattern create button wasn't visible when grid tabs were selected (raoulvdberge)

View File

@@ -47,9 +47,6 @@ repositories {
maven {
url "https://dl.bintray.com/jaquadro/dev"
}
maven {
url 'https://repo.elytradev.com/'
}
}
dependencies {
@@ -58,7 +55,6 @@ dependencies {
deobfCompile "MCMultiPart2:MCMultiPart:2.2.2"
// deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api"
deobfCompile "com.jaquadro.minecraft.storagedrawers:StorageDrawers:1.12-5.2.9:api"
deobfCompile "elucent:albedo:2.0-SNAPSHOT"
}
processResources {

View File

@@ -45,8 +45,6 @@ import com.raoulvdberge.refinedstorage.tile.data.RSSerializers;
import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter;
import com.raoulvdberge.refinedstorage.util.StackUtils;
import com.raoulvdberge.refinedstorage.util.WorldUtils;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -63,7 +61,6 @@ import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.util.Constants;
import net.minecraftforge.energy.CapabilityEnergy;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.items.ItemHandlerHelper;
import javax.annotation.Nonnull;
@@ -71,8 +68,7 @@ import javax.annotation.Nullable;
import java.util.*;
import java.util.function.Predicate;
@Optional.Interface(iface = "elucent.albedo.lighting.ILightProvider", modid = "albedo")
public class TileController extends TileBase implements ITickable, INetwork, IRedstoneConfigurable, INetworkNode, INetworkNodeProxy<TileController>, ILightProvider {
public class TileController extends TileBase implements ITickable, INetwork, IRedstoneConfigurable, INetworkNode, INetworkNodeProxy<TileController> {
private static final Comparator<ClientNode> CLIENT_NODE_COMPARATOR = (left, right) -> {
if (left.getEnergyUsage() == right.getEnergyUsage()) {
return 0;
@@ -749,32 +745,4 @@ public class TileController extends TileBase implements ITickable, INetwork, IRe
public TileController getNode() {
return this;
}
@Optional.Method(modid = "albedo")
@Override
public Light provideLight() {
int energy = getEnergyScaledForDisplay();
if (energy == 0) {
return null;
}
float r, g, b;
if (energy >= 3) {
r = 16F;
g = 152F;
b = 255F;
} else {
r = 194F;
g = 59F;
b = 81F;
}
return Light.builder()
.pos(pos)
.color(r / 255F, g / 255F, b / 255F)
.radius(4)
.build();
}
}