Skip to content

Commit 415e9bb

Browse files
committed
πŸš’ roombaless behavior
1 parent f225e56 commit 415e9bb

File tree

4 files changed

+1
-19
lines changed

4 files changed

+1
-19
lines changed

β€Žsrc/main/java/one/devos/nautical/winterssummerfixes/mixin/compat/client/flashback/FlashbackReplayIncompatibleModsMixin.javaβ€Ž

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
@Mixin(value = Flashback.class, priority = 1800)
2020
@IfModLoaded("flashback")
2121
public class FlashbackReplayIncompatibleModsMixin {
22-
@Unique
23-
private static void playRoombaSound(SoundManager handler) {
24-
handler.play(SimpleSoundInstance.forUI(WintersSummerFixes.INSTANCE.getROOMBA_SOUND_EVENT(), 1.0F));
25-
}
26-
2722
@ModifyReturnValue(
2823
method = "getReplayIncompatibleMods",
2924
at = @At(value = "RETURN",
@@ -33,7 +28,6 @@ private static void playRoombaSound(SoundManager handler) {
3328
)
3429
private static List<String> getReplayIncompatibleMods(List<String> original) {
3530
if (Objects.equals(Config.flashbackReplayForceAllowIncompatibleMods, Config.painAndSufferingAndSufferingAndPain)) {
36-
playRoombaSound(Minecraft.getInstance().getSoundManager());
3731
original.clear();
3832
}
3933

β€Žsrc/main/kotlin/one/devos/nautical/winterssummerfixes/WintersSummerFixes.ktβ€Ž

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,7 @@ object WintersSummerFixes : ModInitializer {
2121
val LOGGER: Logger = LoggerFactory.getLogger(MOD_ID)
2222
val MOD_NAME: String = FMW.getName(MOD_ID)
2323

24-
val ROOMBA_SOUND_EVENT: SoundEvent = Registry.register(BuiltInRegistries.SOUND_EVENT, ResourceLocation.fromNamespaceAndPath(MOD_ID, "roomba"),
25-
SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(MOD_ID, "roomba")))
26-
2724
override fun onInitialize() {
28-
Registry.register(BuiltInRegistries.SOUND_EVENT, ResourceLocation.fromNamespaceAndPath(MOD_ID, "roomba"),
29-
SoundEvent.createVariableRangeEvent(ResourceLocation.fromNamespaceAndPath(MOD_ID, "roomba")))
3025
MidnightConfig.init(MOD_ID, Config::class.java)
3126
LOGGER.info("[${MOD_NAME}] Winter's Summer Fixes v${FMW.getVersion(MOD_ID)} loaded!")
3227
LOGGER.info("[${MOD_NAME}] Who let the gay cat furry into the server room? Get them out! Oh wait they have a wrench.")

β€Žsrc/main/kotlin/one/devos/nautical/winterssummerfixes/client/WintersSummerFixesClient.ktβ€Ž

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,5 @@ object WintersSummerFixesClient : ClientModInitializer {
1616
Component.literal("Alt Raccoon Trinket Texture"),
1717
ResourcePackActivationType.NORMAL
1818
)
19-
20-
ResourceManagerHelper.registerBuiltinResourcePack(
21-
ResourceLocation.fromNamespaceAndPath(WintersSummerFixes.MOD_ID, "flashbacklang"),
22-
FabricLoader.getInstance().getModContainer(WintersSummerFixes.MOD_ID).get(),
23-
Component.literal("Flashback Warning Override"),
24-
ResourcePackActivationType.ALWAYS_ENABLED
25-
)
2619
}
2720
}

β€Žsrc/main/resources/winterssummerfixes.mixins.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"defaultRequire": 1
88
},
99
"mixins": [
10-
"compat.client.flashback.FlashbackReplayIncompatibleModsMixin"
1110
],
1211
"client": [
12+
"compat.client.flashback.FlashbackReplayIncompatibleModsMixin",
1313
"compat.client.flashback.FlashbackReplayIncompatibleModsTitleScreenMixin",
1414
"compat.client.limitsgrapple.LimitsGrappleInGameHudColorMixin"
1515
]

0 commit comments

Comments
Β (0)