Remove albedo integration for now

This commit is contained in:
Vincent Lee committed 2019-03-04 23:00:07 -06:00
1 parent 13e56153a9
commit c62e663f92
7 files changed
+7 -87

No files matched your search

@@ -16,8 +16,6 @@ import java.util.List;
import javax.annotation.Nonnull;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
@@ -244,8 +242,7 @@ public class TileLightRelay extends TileMod implements ITickable, IWandBindable
cmp.putInt(TAG_BIND_Z, bindPos.getZ());
}
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public static class EntityPlayerMover extends Entity implements ILightProvider {
public static class EntityPlayerMover extends Entity {
private static final String TAG_EXIT_X = "exitX";
private static final String TAG_EXIT_Y = "exitY";
@@ -362,17 +359,6 @@ public class TileLightRelay extends TileMod implements ITickable, IWandBindable
dataManager.set(EXIT_POS, pos);
}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
if(getPassengers().isEmpty())
return null;
Entity passenger = getPassengers().get(0);
Color color = Color.getHSBColor(passenger.ticksExisted / 36F, 1F, 1F);
return Light.builder().pos(this).color(color.getRGB(), false).radius(5).build();
}
}
}
@@ -24,7 +24,6 @@ import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ModSounds;
@@ -36,14 +35,11 @@ import vazkii.botania.common.item.relic.ItemKingKey;
import javax.annotation.Nonnull;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public class EntityBabylonWeapon extends EntityThrowableCopy implements ILightProvider {
public class EntityBabylonWeapon extends EntityThrowableCopy {
@ObjectHolder(LibMisc.MOD_ID + ":babylon_weapon")
public static EntityType<?> TYPE;
@@ -206,12 +202,6 @@ public class EntityBabylonWeapon extends EntityThrowableCopy implements ILightPr
setDelay(cmp.getInt(TAG_DELAY));
setRotation(cmp.getFloat(TAG_ROTATION));
}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
return Light.builder().pos(this).color(1F, 1F, 0F).radius(8).build();
}
public boolean isCharging() {
return dataManager.get(CHARGING);
@@ -19,19 +19,15 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ConfigHandler;
import java.util.List;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import vazkii.botania.common.lib.LibMisc;
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public class EntityFallingStar extends EntityThrowableCopy implements ILightProvider {
public class EntityFallingStar extends EntityThrowableCopy {
@ObjectHolder(LibMisc.MOD_ID + ":falling_star")
public static EntityType<?> TYPE;
@@ -96,12 +92,5 @@ public class EntityFallingStar extends EntityThrowableCopy implements ILightProv
remove();
}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
return Light.builder().pos(this).color(1F, 0F, 1F).radius(12).build();
}
}
@@ -19,21 +19,17 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.helper.MathHelper;
import javax.annotation.Nonnull;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public class EntityFlameRing extends Entity implements ILightProvider {
public class EntityFlameRing extends Entity {
@ObjectHolder(LibMisc.MOD_ID + ":flame_ring")
public static EntityType<?> TYPE;
@@ -109,10 +105,4 @@ public class EntityFlameRing extends Entity implements ILightProvider {
@Override
protected void writeAdditional(@Nonnull NBTTagCompound var1) {}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
return Light.builder().pos(this).color(1F, 0.5F, 0F).radius(20).build();
}
}
@@ -20,21 +20,17 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.Botania;
import vazkii.botania.common.core.handler.ModSounds;
import javax.annotation.Nonnull;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public class EntityMagicLandmine extends Entity implements ILightProvider {
public class EntityMagicLandmine extends Entity {
@ObjectHolder(LibMisc.MOD_ID + ":magic_landmine")
public static EntityType<?> TYPE;
@@ -96,11 +92,4 @@ public class EntityMagicLandmine extends Entity implements ILightProvider {
@Override
protected void writeAdditional(@Nonnull NBTTagCompound var1) {
}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
return Light.builder().pos(this).color(0.6F, 0F, 1F).radius(15).build();
}
}
@@ -21,8 +21,6 @@ import java.util.UUID;
import javax.annotation.Nonnull;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import net.minecraft.block.Block;
import net.minecraft.block.BlockBush;
import net.minecraft.block.BlockLeaves;
@@ -63,8 +61,7 @@ import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.equipment.bauble.ItemTinyPlanet;
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public class EntityManaBurst extends EntityThrowable implements IManaBurst, ILightProvider {
public class EntityManaBurst extends EntityThrowable implements IManaBurst {
private static final String TAG_TICKS_EXISTED = "ticksExisted";
private static final String TAG_COLOR = "color";
@@ -814,13 +811,6 @@ public class EntityManaBurst extends EntityThrowable implements IManaBurst, ILig
if(tile != null && tile instanceof IManaSpreader)
((IManaSpreader) tile).setLastBurstDeathTick(getTicksExisted());
}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
int color = getColor();
return Light.builder().pos(new Vec3d(posX - motionX, posY - motionY, posZ - motionZ)).color(color, false).radius(getParticleSize() * 8).build();
}
public static class PositionProperties {
@@ -21,18 +21,14 @@ import net.minecraft.network.datasync.EntityDataManager;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.Optional;
import net.minecraftforge.registries.ObjectHolder;
import vazkii.botania.common.Botania;
import javax.annotation.Nonnull;
import elucent.albedo.lighting.ILightProvider;
import elucent.albedo.lighting.Light;
import vazkii.botania.common.lib.LibMisc;
@Optional.Interface(iface="elucent.albedo.lighting.ILightProvider", modid="albedo")
public class EntityPixie extends EntityFlying implements ILightProvider {
public class EntityPixie extends EntityFlying {
@ObjectHolder(LibMisc.MOD_ID + ":pixie")
public static EntityType<?> TYPE;
private static final DataParameter<Integer> PIXIE_TYPE = EntityDataManager.createKey(EntityPixie.class, DataSerializers.VARINT);
@@ -149,14 +145,4 @@ public class EntityPixie extends EntityFlying implements ILightProvider {
public boolean canBeLeashedTo(EntityPlayer player) {
return false;
}
@Override
@Optional.Method(modid="albedo")
public Light provideLight() {
if(getPixieType() == 1)
return null;
return Light.builder().pos(this).color(1F, 0F, 0.5F).radius(8).build();
}
}