From aa94fc97d154dcdcaaaa5b4d5e8311af9470d38a Mon Sep 17 00:00:00 2001 From: Rabbitminers Date: Sun, 7 May 2023 09:50:50 +0100 Subject: [PATCH 1/3] Removed unused import of Railways --- build.gradle | 2 +- .../create/content/logistics/trains/entity/Navigation.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 02e7769a0..47e73e743 100644 --- a/build.gradle +++ b/build.gradle @@ -172,7 +172,7 @@ dependencies { // runtimeOnly fg.deobf("slimeknights.mantle:Mantle:1.16.5-1.6.115") // runtimeOnly fg.deobf("slimeknights.tconstruct:TConstruct:1.16.5-3.1.1.252") // runtimeOnly fg.deobf("maven.modrinth:rubidium:0.5.3") - implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false } + // implementation fg.deobf("com.railwayteam.railways:railways-1.18.2-1.1.1:all") { transitive = false } // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java index ba05808b6..f005c18c3 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Navigation.java @@ -14,7 +14,6 @@ import java.util.UUID; import javax.annotation.Nullable; -import com.railwayteam.railways.Railways; import com.simibubi.create.content.logistics.trains.TrackMaterial; import org.apache.commons.lang3.mutable.MutableDouble; From 4e4e227a351cb7f70aa4476bebfad1c0e963b561 Mon Sep 17 00:00:00 2001 From: Rabbitminers Date: Sun, 7 May 2023 10:10:30 +0100 Subject: [PATCH 2/3] Cleanup to cycle groups --- .../java/com/simibubi/create/AllBogeyStyles.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/simibubi/create/AllBogeyStyles.java b/src/main/java/com/simibubi/create/AllBogeyStyles.java index f5f94c97b..8615a610e 100644 --- a/src/main/java/com/simibubi/create/AllBogeyStyles.java +++ b/src/main/java/com/simibubi/create/AllBogeyStyles.java @@ -28,21 +28,23 @@ import static com.simibubi.create.Create.LOGGER; public class AllBogeyStyles { public static final Map BOGEY_STYLES = new HashMap<>(); - public static final Map> STYLE_GROUPS = new HashMap<>(); // each set of styles that should be cycled through + public static final Map> CYCLE_GROUPS = new HashMap<>(); // each set of styles that should be cycled through private static final Map EMPTY_GROUP = ImmutableMap.of(); public static Map getCycleGroup(ResourceLocation cycleGroup) { - return STYLE_GROUPS.getOrDefault(cycleGroup, EMPTY_GROUP); + return CYCLE_GROUPS.getOrDefault(cycleGroup, EMPTY_GROUP); } - public static BogeyStyle STANDARD = create("standard", "standard") + public static final String STANDARD_CYCLE_GROUP = "standard"; + + public static BogeyStyle STANDARD = create("standard", STANDARD_CYCLE_GROUP) .commonRenderer(CommonStandardBogeyRenderer::new) .displayName(Components.translatable("create.bogey.style.standard")) .size(BogeySizes.SMALL, SmallStandardBogeyRenderer::new, AllBlocks.SMALL_BOGEY) .size(BogeySizes.LARGE, LargeStandardBogeyRenderer::new, AllBlocks.LARGE_BOGEY) .build(); - public static BogeyStyleBuilder create(String name, String cycleGroup) { + private static BogeyStyleBuilder create(String name, String cycleGroup) { return create(Create.asResource(name), Create.asResource(cycleGroup)); } @@ -117,7 +119,7 @@ public class AllBogeyStyles { BogeyStyle entry = new BogeyStyle(name, cycleGroup, displayName, soundType, contactParticle, smokeParticle, defaultData, sizes, commonRenderer); BOGEY_STYLES.put(name, entry); - STYLE_GROUPS.computeIfAbsent(cycleGroup, l -> new HashMap<>()).put(name, entry); + CYCLE_GROUPS.computeIfAbsent(cycleGroup, l -> new HashMap<>()).put(name, entry); return entry; } } From cdb0ad210b7c984b9fcfbecae8a2a0ebf052eb9d Mon Sep 17 00:00:00 2001 From: Rabbitminers Date: Sun, 7 May 2023 10:15:47 +0100 Subject: [PATCH 3/3] Fixed merge artifact --- .../create/content/logistics/trains/entity/BogeyStyle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java index c5667cd0d..2b3efc8d7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/BogeyStyle.java @@ -39,7 +39,7 @@ public class BogeyStyle { public final CompoundTag defaultData; public BogeyStyle(ResourceLocation name, ResourceLocation cycleGroup, Component displayName, ResourceLocation soundType, ParticleOptions contactParticle, ParticleOptions smokeParticle, - CompoundTag defaultData, Map sizes, Optional commonRenderer) { + CompoundTag defaultData, Map sizes, Optional> commonRenderer) { this.name = name; this.cycleGroup = cycleGroup; this.displayName = displayName;