Skip to content

Commit

Permalink
try to fix shadow using dependencies from runtimeClasspath
Browse files Browse the repository at this point in the history
  • Loading branch information
screret committed Sep 29, 2024
1 parent 6d5152a commit 6f7f16a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 0 additions & 1 deletion gradle/scripts/jars.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ configurations {
}

shadowJar {
from jar.outputs
configurations = [project.configurations.includedLibrary]
archiveClassifier = "dev"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,6 @@ protected void initialize() {
this.netLogicDatas.clear();
this.capabilities.clear();
this.netCapabilities.clear();
boolean firstNode = true;
for (WorldPipeNetNode node : PipeBlock.getNodesForTile(this)) {
this.addCapabilities(node.getNet().getNewCapabilityObjects(node));
this.netCapabilities.put(node, new PipeCapabilityWrapper(this, node));
Expand All @@ -542,9 +541,10 @@ protected void initialize() {
for (var entry : node.getData().getEntries()) {
node.getData().markLogicEntryAsUpdated(entry, true);
}
if (firstNode) {
firstNode = false;
this.temperatureLogic = node.getData().getLogicEntryNullable(TemperatureLogic.TYPE);
if (this.temperatureLogic == null) {
TemperatureLogic candidate = node.getData().getLogicEntryNullable(TemperatureLogic.TYPE);
if (candidate != null)
updateTemperatureLogic(candidate);
}
}
if (this.legacy) {
Expand Down Expand Up @@ -603,7 +603,9 @@ public void receiveCustomData(int discriminator, @NotNull FriendlyByteBuf buf) {
// particle //

public void updateTemperatureLogic(@NotNull TemperatureLogic logic) {
this.temperatureLogic = logic;
if (overheatParticle == null || !overheatParticle.isAlive()) {
// TODO figure out if this can crash if playing on a server
long tick = Platform.getMinecraftServer().getTickCount();
int temp = logic.getTemperature(tick);
if (temp > GTOverheatParticle.TEMPERATURE_CUTOFF) {
Expand Down

0 comments on commit 6f7f16a

Please sign in to comment.