Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix IO Overlay not rendering #425

Merged
merged 2 commits into from
Aug 5, 2023
Merged

Fix IO Overlay not rendering #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33208ff
Fix IO Overlay not rendering
Rover656 Aug 5, 2023
b89316a
Fix network sync (IO Config mainly)
Rover656 Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/core/java/com/enderio/core/common/network/slot/NBTSerializingNetworkDataSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,16 @@ public void toBuffer(FriendlyByteBuf buf, T value) {
}

@Override
public T valueFromBuffer(FriendlyByteBuf buf) {
public void fromBuffer(FriendlyByteBuf buf) {
try {
return fromBuffer.apply(buf);
fromBuffer.apply(buf);
} catch (Exception e) {
throw new IllegalStateException("Invalid compound tag buffer was passed over the network.");
}
}

@Override
protected T valueFromBuffer(FriendlyByteBuf buf) {
return null;
}
}
2 changes: 1 addition & 1 deletion src/core/java/com/enderio/core/common/network/slot/NetworkDataSlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public void fromBuffer(FriendlyByteBuf buf) {

public abstract void toBuffer(FriendlyByteBuf buf, T value);

public abstract T valueFromBuffer(FriendlyByteBuf buf);
protected abstract T valueFromBuffer(FriendlyByteBuf buf);

public boolean needsUpdate() {
T value = getter.get();
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/alloy_smelter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/alloy_smelter",
"model": "enderio:block/alloy_smelter_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/alloy_smelter_active",
"model": "enderio:block/alloy_smelter_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/alloy_smelter"
"model": "enderio:block/alloy_smelter_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/alloy_smelter_active"
"model": "enderio:block/alloy_smelter_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/alloy_smelter",
"model": "enderio:block/alloy_smelter_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/alloy_smelter_active",
"model": "enderio:block/alloy_smelter_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/alloy_smelter",
"model": "enderio:block/alloy_smelter_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/alloy_smelter_active",
"model": "enderio:block/alloy_smelter_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/crafter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/crafter",
"model": "enderio:block/crafter_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/crafter_active",
"model": "enderio:block/crafter_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/crafter"
"model": "enderio:block/crafter_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/crafter_active"
"model": "enderio:block/crafter_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/crafter",
"model": "enderio:block/crafter_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/crafter_active",
"model": "enderio:block/crafter_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/crafter",
"model": "enderio:block/crafter_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/crafter_active",
"model": "enderio:block/crafter_combined",
"y": 270
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/generated/resources/assets/enderio/blockstates/enchanter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"variants": {
"facing=east": {
"model": "enderio:block/enchanter",
"model": "enderio:block/enchanter_combined",
"y": 90
},
"facing=north": {
"model": "enderio:block/enchanter"
"model": "enderio:block/enchanter_combined"
},
"facing=south": {
"model": "enderio:block/enchanter",
"model": "enderio:block/enchanter_combined",
"y": 180
},
"facing=west": {
"model": "enderio:block/enchanter",
"model": "enderio:block/enchanter_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/impulse_hopper.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/impulse_hopper",
"model": "enderio:block/impulse_hopper_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/impulse_hopper_active",
"model": "enderio:block/impulse_hopper_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/impulse_hopper"
"model": "enderio:block/impulse_hopper_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/impulse_hopper_active"
"model": "enderio:block/impulse_hopper_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/impulse_hopper",
"model": "enderio:block/impulse_hopper_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/impulse_hopper_active",
"model": "enderio:block/impulse_hopper_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/impulse_hopper",
"model": "enderio:block/impulse_hopper_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/impulse_hopper_active",
"model": "enderio:block/impulse_hopper_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/painting_machine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/painting_machine",
"model": "enderio:block/painting_machine_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/painting_machine_active",
"model": "enderio:block/painting_machine_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/painting_machine"
"model": "enderio:block/painting_machine_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/painting_machine_active"
"model": "enderio:block/painting_machine_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/painting_machine",
"model": "enderio:block/painting_machine_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/painting_machine_active",
"model": "enderio:block/painting_machine_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/painting_machine",
"model": "enderio:block/painting_machine_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/painting_machine_active",
"model": "enderio:block/painting_machine_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/powered_spawner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/powered_spawner",
"model": "enderio:block/powered_spawner_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/powered_spawner_active",
"model": "enderio:block/powered_spawner_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/powered_spawner"
"model": "enderio:block/powered_spawner_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/powered_spawner_active"
"model": "enderio:block/powered_spawner_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/powered_spawner",
"model": "enderio:block/powered_spawner_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/powered_spawner_active",
"model": "enderio:block/powered_spawner_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/powered_spawner",
"model": "enderio:block/powered_spawner_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/powered_spawner_active",
"model": "enderio:block/powered_spawner_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/primitive_alloy_smelter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/primitive_alloy_smelter",
"model": "enderio:block/primitive_alloy_smelter_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/primitive_alloy_smelter_active",
"model": "enderio:block/primitive_alloy_smelter_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/primitive_alloy_smelter"
"model": "enderio:block/primitive_alloy_smelter_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/primitive_alloy_smelter_active"
"model": "enderio:block/primitive_alloy_smelter_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/primitive_alloy_smelter",
"model": "enderio:block/primitive_alloy_smelter_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/primitive_alloy_smelter_active",
"model": "enderio:block/primitive_alloy_smelter_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/primitive_alloy_smelter",
"model": "enderio:block/primitive_alloy_smelter_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/primitive_alloy_smelter_active",
"model": "enderio:block/primitive_alloy_smelter_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/sag_mill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/sag_mill",
"model": "enderio:block/sag_mill_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/sag_mill_active",
"model": "enderio:block/sag_mill_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/sag_mill"
"model": "enderio:block/sag_mill_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/sag_mill_active"
"model": "enderio:block/sag_mill_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/sag_mill",
"model": "enderio:block/sag_mill_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/sag_mill_active",
"model": "enderio:block/sag_mill_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/sag_mill",
"model": "enderio:block/sag_mill_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/sag_mill_active",
"model": "enderio:block/sag_mill_combined",
"y": 270
}
}
Expand Down
16 changes: 8 additions & 8 deletions src/generated/resources/assets/enderio/blockstates/slice_and_splice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
{
"variants": {
"facing=east,powered=false": {
"model": "enderio:block/slice_and_splice",
"model": "enderio:block/slice_and_splice_combined",
"y": 90
},
"facing=east,powered=true": {
"model": "enderio:block/slice_and_splice_active",
"model": "enderio:block/slice_and_splice_combined",
"y": 90
},
"facing=north,powered=false": {
"model": "enderio:block/slice_and_splice"
"model": "enderio:block/slice_and_splice_combined"
},
"facing=north,powered=true": {
"model": "enderio:block/slice_and_splice_active"
"model": "enderio:block/slice_and_splice_combined"
},
"facing=south,powered=false": {
"model": "enderio:block/slice_and_splice",
"model": "enderio:block/slice_and_splice_combined",
"y": 180
},
"facing=south,powered=true": {
"model": "enderio:block/slice_and_splice_active",
"model": "enderio:block/slice_and_splice_combined",
"y": 180
},
"facing=west,powered=false": {
"model": "enderio:block/slice_and_splice",
"model": "enderio:block/slice_and_splice_combined",
"y": 270
},
"facing=west,powered=true": {
"model": "enderio:block/slice_and_splice_active",
"model": "enderio:block/slice_and_splice_combined",
"y": 270
}
}
Expand Down