Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-15 20:43:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Persistence is key

Browse source 
- Projectors now remember their setting and sync between clients
This commit is contained in:
JozsefA 2021-04-23 17:20:16 -07:00
parent e8ab21c184
commit 70188889be
6 changed files with 192 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorScreen.java
View file

@ -12,28 +12,23 @@ import com.simibubi.create.foundation.gui.GuiGameElement;
import com.simibubi.create.foundation.gui.widgets.IconButton;
import com.simibubi.create.foundation.gui.widgets.ScrollInput;
import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput;
import com.simibubi.create.foundation.networking.AllPackets;
import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueBehaviour;
import com.simibubi.create.foundation.utility.Lang;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
public class ChromaticProjectorScreen extends AbstractSimiScreen {
public static final int MAX_STEPS = 4;
private final ItemStack renderedItem = AllBlocks.CHROMATIC_PROJECTOR.asStack();
private final AllGuiTextures background = AllGuiTextures.PROJECTOR;
private IconButton confirmButton;
private final ITextComponent title = Lang.translate("gui.chromatic_projector.title");
private ListNBT compareTag;
private Vector<FilterStep> stages;
private BlockPos pos;
private Vector<Vector<ScrollInput>> inputs;
@ -47,8 +42,6 @@ public class ChromaticProjectorScreen extends AbstractSimiScreen {
public ChromaticProjectorScreen(ChromaticProjectorTileEntity te) {
this.tile = te;
this.stages = te.stages;
this.pos = te.getPos();
//compareTag = Instruction.serializeAll(stages);
}
private static Integer step(ScrollValueBehaviour.StepContext ctx, int base) {
@ -62,7 +55,7 @@ public class ChromaticProjectorScreen extends AbstractSimiScreen {
super.init();
widgets.clear();
inputs = new Vector<>(MAX_STEPS);
inputs = new Vector<>(FilterStep.MAX_STEPS);
for (int row = 0; row < inputs.capacity(); row++)
inputs.add(new Vector<>(2));
@ -203,7 +196,7 @@ public class ChromaticProjectorScreen extends AbstractSimiScreen {
}
public void sendPacket() {
AllPackets.channel.sendToServer(new ConfigureProjectorPacket(tile));
}
@Override

41
src/main/java/com/simibubi/create/content/curiosities/projector/ChromaticProjectorTileEntity.java
View file

@ -4,20 +4,23 @@ import java.util.Vector;
import com.simibubi.create.foundation.render.backend.effects.FilterSphere;
import com.simibubi.create.foundation.render.backend.instancing.IInstanceRendered;
import com.simibubi.create.foundation.tileEntity.SyncedTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.block.BlockState;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraftforge.common.util.Constants;
public class ChromaticProjectorTileEntity extends TileEntity implements IInstanceRendered {
public class ChromaticProjectorTileEntity extends SyncedTileEntity implements IInstanceRendered {
Vector<FilterStep> stages = FilterStep.createDefault();
float radius = 10f;
float density = 1f;
float feather = 3;
float fade = 1.3f;
float radius = 3f;
float density = 1;
float feather = 1;
float fade = 1;
boolean blend = true;
public ChromaticProjectorTileEntity(TileEntityType<?> te) {
@ -62,4 +65,30 @@ public class ChromaticProjectorTileEntity extends TileEntity implements IInstanc
this.blend = blend;
return this;
}
@Override
public CompoundNBT write(CompoundNBT tag) {
super.write(tag);
tag.put("filters", FilterStep.writeAll(stages));
tag.putFloat("radius", radius);
tag.putFloat("density", density);
tag.putFloat("feather", feather);
tag.putFloat("fade", fade);
return tag;
}
@Override
public void fromTag(BlockState state, CompoundNBT tag) {
super.fromTag(state, tag);
stages = FilterStep.readAll(tag.getList("filters", Constants.NBT.TAG_COMPOUND));
radius = tag.getFloat("radius");
density = tag.getFloat("density");
feather = tag.getFloat("feather");
fade = tag.getFloat("fade");
}
}

76
src/main/java/com/simibubi/create/content/curiosities/projector/ConfigureProjectorPacket.java Normal file
View file

@ -0,0 +1,76 @@
package com.simibubi.create.content.curiosities.projector;
import java.util.Vector;
import java.util.stream.Collectors;
import com.simibubi.create.foundation.networking.TileEntityConfigurationPacket;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
public class ConfigureProjectorPacket extends TileEntityConfigurationPacket<ChromaticProjectorTileEntity> {
Vector<CompoundNBT> stages;
float radius;
float density;
float feather;
float fade;
public ConfigureProjectorPacket(PacketBuffer buffer) {
super(buffer);
}
public ConfigureProjectorPacket(ChromaticProjectorTileEntity tile) {
super(tile.getPos());
stages = tile.stages.stream()
.map(FilterStep::write)
.collect(Collectors.toCollection(Vector::new));
this.radius = tile.radius;
this.density = tile.density;
this.feather = tile.feather;
this.fade = tile.fade;
}
@Override
protected void writeSettings(PacketBuffer buffer) {
buffer.writeFloat(radius);
buffer.writeFloat(density);
buffer.writeFloat(feather);
buffer.writeFloat(fade);
buffer.writeInt(stages.size());
for (CompoundNBT stage : stages) {
buffer.writeCompoundTag(stage);
}
}
@Override
protected void readSettings(PacketBuffer buffer) {
radius = buffer.readFloat();
density = buffer.readFloat();
feather = buffer.readFloat();
fade = buffer.readFloat();
int count = buffer.readInt();
stages = new Vector<>(FilterStep.MAX_STEPS);
for (int i = 0; i < count; i++) {
stages.add(buffer.readCompoundTag());
}
}
@Override
protected void applySettings(ChromaticProjectorTileEntity tile) {
tile.stages = stages.stream()
.map(FilterStep::new)
.collect(Collectors.toCollection(Vector::new));
tile.radius = this.radius;
tile.density = this.density;
tile.feather = this.feather;
tile.fade = this.fade;
tile.sendData();
}
}

39
src/main/java/com/simibubi/create/content/curiosities/projector/FilterStep.java
View file

@ -5,10 +5,13 @@ import java.util.Vector;
import com.simibubi.create.foundation.render.backend.effects.ColorMatrices;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.ListNBT;
import net.minecraft.util.math.vector.Matrix4f;
public class FilterStep {
public static final int MAX_STEPS = 4;
ColorEffect filter;
int value;
@ -21,10 +24,44 @@ public class FilterStep {
this.value = value;
}
public FilterStep(CompoundNBT nbt) {
this.filter = ColorEffect.lookup.get(nbt.getString("id"));
this.value = nbt.getInt("value");
}
public Matrix4f createFilter() {
return filter.filter.create(value / filter.divisor);
}
public CompoundNBT write() {
CompoundNBT nbt = new CompoundNBT();
nbt.putString("id", filter.name);
nbt.putInt("value", value);
return nbt;
}
public static Vector<FilterStep> readAll(ListNBT list) {
Vector<FilterStep> steps = new Vector<>(MAX_STEPS);
for (int i = 0; i < list.size(); i++) {
steps.add(new FilterStep(list.getCompound(i)));
}
return steps;
}
public static ListNBT writeAll(Vector<FilterStep> filters) {
ListNBT out = new ListNBT();
for (FilterStep filter : filters) {
out.add(filter.write());
}
return out;
}
public static Matrix4f fold(Vector<FilterStep> filters) {
Iterator<FilterStep> stepIterator = filters.stream().filter(it -> it != null && it.filter != ColorEffect.END).iterator();
@ -40,7 +77,7 @@ public class FilterStep {
}
public static Vector<FilterStep> createDefault() {
Vector<FilterStep> instructions = new Vector<>(ChromaticProjectorScreen.MAX_STEPS);
Vector<FilterStep> instructions = new Vector<>(MAX_STEPS);
instructions.add(new FilterStep(ColorEffect.SEPIA, 100));
instructions.add(new FilterStep(ColorEffect.END));
return instructions;

84
src/main/java/com/simibubi/create/foundation/networking/AllPackets.java
View file

@ -1,49 +1,5 @@
package com.simibubi.create.foundation.networking;
import static net.minecraftforge.fml.network.NetworkDirection.PLAY_TO_CLIENT;
import static net.minecraftforge.fml.network.NetworkDirection.PLAY_TO_SERVER;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Supplier;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionDisassemblyPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionStallPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryContraptionUpdatePacket;
import com.simibubi.create.content.contraptions.components.structureMovement.glue.GlueEffectPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.sync.ClientMotionPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionFluidPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionInteractionPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.sync.ContraptionSeatMappingPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.sync.LimbSwingUpdatePacket;
import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingCreationPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartControllerUpdatePacket;
import com.simibubi.create.content.contraptions.fluids.actors.FluidSplashPacket;
import com.simibubi.create.content.contraptions.relays.advanced.sequencer.ConfigureSequencedGearshiftPacket;
import com.simibubi.create.content.curiosities.symmetry.SymmetryEffectPacket;
import com.simibubi.create.content.curiosities.tools.ExtendoGripInteractionPacket;
import com.simibubi.create.content.curiosities.zapper.ZapperBeamPacket;
import com.simibubi.create.content.logistics.block.depot.EjectorElytraPacket;
import com.simibubi.create.content.logistics.block.depot.EjectorPlacementPacket;
import com.simibubi.create.content.logistics.block.depot.EjectorTriggerPacket;
import com.simibubi.create.content.logistics.block.mechanicalArm.ArmPlacementPacket;
import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket;
import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket;
import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket;
import com.simibubi.create.content.logistics.packet.FunnelFlapPacket;
import com.simibubi.create.content.logistics.packet.TunnelFlapPacket;
import com.simibubi.create.content.schematics.packet.ConfigureSchematicannonPacket;
import com.simibubi.create.content.schematics.packet.InstantSchematicPacket;
import com.simibubi.create.content.schematics.packet.SchematicPlacePacket;
import com.simibubi.create.content.schematics.packet.SchematicSyncPacket;
import com.simibubi.create.content.schematics.packet.SchematicUploadPacket;
import com.simibubi.create.foundation.command.ConfigureConfigPacket;
import com.simibubi.create.foundation.command.HighlightPacket;
import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringCountUpdatePacket;
import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueUpdatePacket;
import com.simibubi.create.foundation.utility.ServerSpeedProvider;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
@ -55,6 +11,43 @@ import net.minecraftforge.fml.network.PacketDistributor;
import net.minecraftforge.fml.network.PacketDistributor.TargetPoint;
import net.minecraftforge.fml.network.simple.SimpleChannel;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.function.Supplier;
import com.simibubi.create.Create;
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionDisassemblyPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.ContraptionStallPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.gantry.GantryContraptionUpdatePacket;
import com.simibubi.create.content.contraptions.components.structureMovement.glue.GlueEffectPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.sync.*;
import com.simibubi.create.content.contraptions.components.structureMovement.train.CouplingCreationPacket;
import com.simibubi.create.content.contraptions.components.structureMovement.train.capability.MinecartControllerUpdatePacket;
import com.simibubi.create.content.contraptions.fluids.actors.FluidSplashPacket;
import com.simibubi.create.content.contraptions.relays.advanced.sequencer.ConfigureSequencedGearshiftPacket;
import com.simibubi.create.content.curiosities.projector.ConfigureProjectorPacket;
import com.simibubi.create.content.curiosities.symmetry.SymmetryEffectPacket;
import com.simibubi.create.content.curiosities.tools.ExtendoGripInteractionPacket;
import com.simibubi.create.content.curiosities.zapper.ZapperBeamPacket;
import com.simibubi.create.content.logistics.block.depot.EjectorElytraPacket;
import com.simibubi.create.content.logistics.block.depot.EjectorPlacementPacket;
import com.simibubi.create.content.logistics.block.depot.EjectorTriggerPacket;
import com.simibubi.create.content.logistics.block.mechanicalArm.ArmPlacementPacket;
import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket;
import com.simibubi.create.content.logistics.packet.ConfigureFlexcratePacket;
import com.simibubi.create.content.logistics.packet.ConfigureStockswitchPacket;
import com.simibubi.create.content.logistics.packet.FunnelFlapPacket;
import com.simibubi.create.content.logistics.packet.TunnelFlapPacket;
import com.simibubi.create.content.schematics.packet.*;
import com.simibubi.create.foundation.command.ConfigureConfigPacket;
import com.simibubi.create.foundation.command.HighlightPacket;
import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringCountUpdatePacket;
import com.simibubi.create.foundation.tileEntity.behaviour.scrollvalue.ScrollValueUpdatePacket;
import com.simibubi.create.foundation.utility.ServerSpeedProvider;
import static net.minecraftforge.fml.network.NetworkDirection.PLAY_TO_CLIENT;
import static net.minecraftforge.fml.network.NetworkDirection.PLAY_TO_SERVER;
public enum AllPackets {
// Client to Server
@ -63,7 +56,8 @@ public enum AllPackets {
CONFIGURE_FLEXCRATE(ConfigureFlexcratePacket.class, ConfigureFlexcratePacket::new, PLAY_TO_SERVER),
CONFIGURE_STOCKSWITCH(ConfigureStockswitchPacket.class, ConfigureStockswitchPacket::new, PLAY_TO_SERVER),
CONFIGURE_SEQUENCER(ConfigureSequencedGearshiftPacket.class, ConfigureSequencedGearshiftPacket::new,
PLAY_TO_SERVER),
PLAY_TO_SERVER),
CONFIGURE_PROJECTOR(ConfigureProjectorPacket.class, ConfigureProjectorPacket::new, PLAY_TO_SERVER),
PLACE_SCHEMATIC(SchematicPlacePacket.class, SchematicPlacePacket::new, PLAY_TO_SERVER),
UPLOAD_SCHEMATIC(SchematicUploadPacket.class, SchematicUploadPacket::new, PLAY_TO_SERVER),
CONFIGURE_FILTER(FilterScreenPacket.class, FilterScreenPacket::new, PLAY_TO_SERVER),

2
src/main/java/com/simibubi/create/foundation/render/backend/effects/FilterSphere.java
View file

@ -85,7 +85,7 @@ public class FilterSphere {
0.5f, //r,
0.1f, //g,
0.1f, //b,
0.12f, //colorFeather,
0f, //colorFeather,
});
buf.put(RenderUtil.writeMatrix(filter));