diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java b/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java index ab95d4cf..bef553a7 100644 --- a/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java +++ b/src/main/java/mod/acgaming/universaltweaks/core/UTLoadingPlugin.java @@ -35,8 +35,8 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchTweaks) { - put("mixins.tweaks.misc.buttons.snooper.server.json", c -> UTConfigTweaks.MISC.utSnooperToggle); - put("mixins.tweaks.misc.difficulty.multiplayer.json", c -> true); + put("mixins/tweaks/mixins.misc.buttons.snooper.server.json", c -> UTConfigTweaks.MISC.utSnooperToggle); + put("mixins/tweaks/mixins.misc.difficulty.multiplayer.json", c -> true); } } }); @@ -46,149 +46,149 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchModIntegration) { - put("mixins.vanilla.mod.accessors.json", c -> true); + put("mixins/mixins.vanilla.mod.accessors.json", c -> true); } if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchBugfixes) { - put("mixins.bugfixes.blocks.comparatortiming.json", c -> UTConfigBugfixes.BLOCKS.utComparatorTimingToggle); - put("mixins.bugfixes.blocks.falling.json", c -> UTConfigBugfixes.BLOCKS.utFallingBlockDamageToggle); - put("mixins.bugfixes.blocks.hopper.boundingbox.json", c -> UTConfigBugfixes.BLOCKS.utDietHopperToggle); - put("mixins.bugfixes.blocks.hopper.tile.json", c -> UTConfigBugfixes.BLOCKS.utHopperInsertToggle); - put("mixins.bugfixes.blocks.itemframevoid.json", c -> UTConfigBugfixes.BLOCKS.utItemFrameVoidToggle); - put("mixins.bugfixes.blocks.ladderflying.json", c -> UTConfigBugfixes.BLOCKS.utLadderFlyingToggle); - put("mixins.bugfixes.blocks.miningglitch.server.json", c -> UTConfigBugfixes.BLOCKS.MINING_GLITCH.utMiningGlitchToggle); - put("mixins.bugfixes.blocks.piston.retraction.json", c -> UTConfigBugfixes.BLOCKS.utPistonRetractionToggle); - put("mixins.bugfixes.blocks.piston.tile.json", c -> UTConfigBugfixes.BLOCKS.utPistonTileToggle); - put("mixins.bugfixes.entities.ai.json", c -> UTConfigBugfixes.ENTITIES.utEntityAITasksToggle); - put("mixins.bugfixes.entities.attackradius.json", c -> UTConfigBugfixes.ENTITIES.utAttackRadiusToggle); - put("mixins.bugfixes.entities.blockfire.json", c -> UTConfigBugfixes.ENTITIES.utBlockFireToggle); - put("mixins.bugfixes.entities.boat.breaking.json", c -> UTConfigBugfixes.ENTITIES.utBoatBreakingFallHeight >= 0); - put("mixins.bugfixes.entities.boat.offset.json", c -> UTConfigBugfixes.ENTITIES.utBoatOffsetToggle); - put("mixins.bugfixes.entities.boundingbox.json", c -> UTConfigBugfixes.ENTITIES.utEntityAABBToggle); - put("mixins.bugfixes.entities.deathtime.json", c -> UTConfigBugfixes.ENTITIES.utDeathTimeToggle); - put("mixins.bugfixes.entities.destroypacket.json", c -> UTConfigBugfixes.ENTITIES.utDestroyPacketToggle); - put("mixins.bugfixes.entities.desync.json", c -> UTConfigBugfixes.ENTITIES.ENTITY_DESYNC.utEntityDesyncToggle); - put("mixins.bugfixes.entities.dimensionchange.json", c -> UTConfigBugfixes.ENTITIES.utDimensionChangeToggle); - put("mixins.bugfixes.entities.entityid.json", c -> UTConfigBugfixes.ENTITIES.utEntityIDToggle); - put("mixins.bugfixes.entities.entitylists.json", c -> UTConfigBugfixes.ENTITIES.ENTITY_LISTS.utChunkUpdatesToggle); - put("mixins.bugfixes.entities.horsefalling.json", c -> UTConfigBugfixes.ENTITIES.utHorseFallingToggle); - put("mixins.bugfixes.entities.maxhealth.json", c -> UTConfigBugfixes.ENTITIES.utMaxHealthToggle); - put("mixins.bugfixes.entities.minecart.json", c -> UTConfigBugfixes.ENTITIES.utMinecartAIToggle); - put("mixins.bugfixes.entities.mount.json", c -> UTConfigBugfixes.ENTITIES.utMountDesyncToggle); - put("mixins.bugfixes.entities.saturation.json", c -> UTConfigBugfixes.ENTITIES.utExhaustionToggle); - put("mixins.bugfixes.entities.skeletonaim.json", c -> UTConfigBugfixes.ENTITIES.utSkeletonAimToggle); - put("mixins.bugfixes.entities.sleeping.json", c -> UTConfigBugfixes.BLOCKS.utSleepResetsWeatherToggle); - put("mixins.bugfixes.entities.suffocation.json", c -> UTConfigBugfixes.ENTITIES.utEntitySuffocationToggle); - put("mixins.bugfixes.entities.tracker.json", c -> UTConfigBugfixes.ENTITIES.utEntityTrackerToggle && !c.isModPresent("spongeforge")); - put("mixins.bugfixes.entities.untippedarrowparticles.json", c -> UTConfigBugfixes.ENTITIES.utUntippedArrowParticlesToggle); - put("mixins.bugfixes.misc.crafteditemstatistics.json", c -> UTConfigBugfixes.MISC.utCraftedItemStatisticsToggle); - put("mixins.bugfixes.misc.packetsize.json", c -> UTConfigBugfixes.MISC.utPacketSize > 0x200000 && !c.isModPresent("spongeforge") && !c.isModPresent("randompatches")); - put("mixins.bugfixes.misc.particlespawning.json", c -> UTConfigBugfixes.MISC.utParticleSpawningToggle); - put("mixins.bugfixes.misc.durabilitycap.json", c -> UTConfigBugfixes.MISC.utExtendDurabilityCap); - put("mixins.bugfixes.world.chunksaving.json", c -> UTConfigBugfixes.WORLD.utChunkSavingToggle && !c.isModPresent("spongeforge")); - put("mixins.bugfixes.world.portal.json", c -> UTConfigBugfixes.WORLD.utPortalLocationLink); - put("mixins.bugfixes.world.tileentities.json", c -> UTConfigBugfixes.WORLD.utTileEntityMap != UTConfigBugfixes.WorldCategory.EnumMaps.HASHMAP); - put("mixins.bugfixes.world.village.json", c -> UTConfigBugfixes.WORLD.utVillageComponentPartsToggle); - put("mixins.bugfixes.world.witchhut.json", c -> UTConfigBugfixes.WORLD.utWitchStructuresToggle); + put("mixins/bugfixes/mixins.blocks.comparatortiming.json", c -> UTConfigBugfixes.BLOCKS.utComparatorTimingToggle); + put("mixins/bugfixes/mixins.blocks.falling.json", c -> UTConfigBugfixes.BLOCKS.utFallingBlockDamageToggle); + put("mixins/bugfixes/mixins.blocks.hopper.boundingbox.json", c -> UTConfigBugfixes.BLOCKS.utDietHopperToggle); + put("mixins/bugfixes/mixins.blocks.hopper.tile.json", c -> UTConfigBugfixes.BLOCKS.utHopperInsertToggle); + put("mixins/bugfixes/mixins.blocks.itemframevoid.json", c -> UTConfigBugfixes.BLOCKS.utItemFrameVoidToggle); + put("mixins/bugfixes/mixins.blocks.ladderflying.json", c -> UTConfigBugfixes.BLOCKS.utLadderFlyingToggle); + put("mixins/bugfixes/mixins.blocks.miningglitch.server.json", c -> UTConfigBugfixes.BLOCKS.MINING_GLITCH.utMiningGlitchToggle); + put("mixins/bugfixes/mixins.blocks.piston.retraction.json", c -> UTConfigBugfixes.BLOCKS.utPistonRetractionToggle); + put("mixins/bugfixes/mixins.blocks.piston.tile.json", c -> UTConfigBugfixes.BLOCKS.utPistonTileToggle); + put("mixins/bugfixes/mixins.entities.ai.json", c -> UTConfigBugfixes.ENTITIES.utEntityAITasksToggle); + put("mixins/bugfixes/mixins.entities.attackradius.json", c -> UTConfigBugfixes.ENTITIES.utAttackRadiusToggle); + put("mixins/bugfixes/mixins.entities.blockfire.json", c -> UTConfigBugfixes.ENTITIES.utBlockFireToggle); + put("mixins/bugfixes/mixins.entities.boat.breaking.json", c -> UTConfigBugfixes.ENTITIES.utBoatBreakingFallHeight >= 0); + put("mixins/bugfixes/mixins.entities.boat.offset.json", c -> UTConfigBugfixes.ENTITIES.utBoatOffsetToggle); + put("mixins/bugfixes/mixins.entities.boundingbox.json", c -> UTConfigBugfixes.ENTITIES.utEntityAABBToggle); + put("mixins/bugfixes/mixins.entities.deathtime.json", c -> UTConfigBugfixes.ENTITIES.utDeathTimeToggle); + put("mixins/bugfixes/mixins.entities.destroypacket.json", c -> UTConfigBugfixes.ENTITIES.utDestroyPacketToggle); + put("mixins/bugfixes/mixins.entities.desync.json", c -> UTConfigBugfixes.ENTITIES.ENTITY_DESYNC.utEntityDesyncToggle); + put("mixins/bugfixes/mixins.entities.dimensionchange.json", c -> UTConfigBugfixes.ENTITIES.utDimensionChangeToggle); + put("mixins/bugfixes/mixins.entities.entityid.json", c -> UTConfigBugfixes.ENTITIES.utEntityIDToggle); + put("mixins/bugfixes/mixins.entities.entitylists.json", c -> UTConfigBugfixes.ENTITIES.ENTITY_LISTS.utChunkUpdatesToggle); + put("mixins/bugfixes/mixins.entities.horsefalling.json", c -> UTConfigBugfixes.ENTITIES.utHorseFallingToggle); + put("mixins/bugfixes/mixins.entities.maxhealth.json", c -> UTConfigBugfixes.ENTITIES.utMaxHealthToggle); + put("mixins/bugfixes/mixins.entities.minecart.json", c -> UTConfigBugfixes.ENTITIES.utMinecartAIToggle); + put("mixins/bugfixes/mixins.entities.mount.json", c -> UTConfigBugfixes.ENTITIES.utMountDesyncToggle); + put("mixins/bugfixes/mixins.entities.saturation.json", c -> UTConfigBugfixes.ENTITIES.utExhaustionToggle); + put("mixins/bugfixes/mixins.entities.skeletonaim.json", c -> UTConfigBugfixes.ENTITIES.utSkeletonAimToggle); + put("mixins/bugfixes/mixins.entities.sleeping.json", c -> UTConfigBugfixes.BLOCKS.utSleepResetsWeatherToggle); + put("mixins/bugfixes/mixins.entities.suffocation.json", c -> UTConfigBugfixes.ENTITIES.utEntitySuffocationToggle); + put("mixins/bugfixes/mixins.entities.tracker.json", c -> UTConfigBugfixes.ENTITIES.utEntityTrackerToggle && !c.isModPresent("spongeforge")); + put("mixins/bugfixes/mixins.entities.untippedarrowparticles.json", c -> UTConfigBugfixes.ENTITIES.utUntippedArrowParticlesToggle); + put("mixins/bugfixes/mixins.misc.crafteditemstatistics.json", c -> UTConfigBugfixes.MISC.utCraftedItemStatisticsToggle); + put("mixins/bugfixes/mixins.misc.packetsize.json", c -> UTConfigBugfixes.MISC.utPacketSize > 0x200000 && !c.isModPresent("spongeforge") && !c.isModPresent("randompatches")); + put("mixins/bugfixes/mixins.misc.particlespawning.json", c -> UTConfigBugfixes.MISC.utParticleSpawningToggle); + put("mixins/bugfixes/mixins.misc.durabilitycap.json", c -> UTConfigBugfixes.MISC.utExtendDurabilityCap); + put("mixins/bugfixes/mixins.world.chunksaving.json", c -> UTConfigBugfixes.WORLD.utChunkSavingToggle && !c.isModPresent("spongeforge")); + put("mixins/bugfixes/mixins.world.portal.json", c -> UTConfigBugfixes.WORLD.utPortalLocationLink); + put("mixins/bugfixes/mixins.world.tileentities.json", c -> UTConfigBugfixes.WORLD.utTileEntityMap != UTConfigBugfixes.WorldCategory.EnumMaps.HASHMAP); + put("mixins/bugfixes/mixins.world.village.json", c -> UTConfigBugfixes.WORLD.utVillageComponentPartsToggle); + put("mixins/bugfixes/mixins.world.witchhut.json", c -> UTConfigBugfixes.WORLD.utWitchStructuresToggle); } if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchTweaks) { - put("mixins.tweaks.blocks.anvil.json", c -> UTConfigTweaks.BLOCKS.ANVIL.utAnvilXPLevelCap != 40); - put("mixins.tweaks.blocks.barrier.json", c -> UTConfigTweaks.BLOCKS.utBarrierParticleDisplay); - put("mixins.tweaks.blocks.bedobstruction.json", c -> UTConfigTweaks.BLOCKS.utBedObstructionToggle); - put("mixins.tweaks.blocks.breakablebedrock.json", c -> UTConfigTweaks.BLOCKS.BREAKABLE_BEDROCK.utBreakableBedrockToggle); - put("mixins.tweaks.blocks.enchantmenttable.json", c -> UTConfigTweaks.BLOCKS.utEnchantmentTableObstructionToggle); - put("mixins.tweaks.blocks.endcrystal.json", c -> UTConfigTweaks.BLOCKS.END_CRYSTAL_PLACEMENT.utEndCrystalPlacementToggle); - put("mixins.tweaks.blocks.endportal.json", c -> UTConfigTweaks.BLOCKS.utRenderEndPortalBottom); - put("mixins.tweaks.blocks.explosion.json", c -> UTConfigTweaks.BLOCKS.utExplosionDropChance != 1.0D); - put("mixins.tweaks.blocks.falling.json", c -> UTConfigTweaks.BLOCKS.utFallingBlockLifespan != 600); - put("mixins.tweaks.blocks.golemstructure.json", c -> UTConfigTweaks.ENTITIES.utGolemPlacement); - put("mixins.tweaks.blocks.growthsize.json", c -> UTConfigTweaks.BLOCKS.utCactusSize != 3 && UTConfigTweaks.BLOCKS.utSugarCaneSize != 3 && UTConfigTweaks.BLOCKS.utVineSize != 0); - put("mixins.tweaks.blocks.leafdecay.json", c -> UTConfigTweaks.BLOCKS.utLeafDecayToggle); - put("mixins.tweaks.blocks.lenientpaths.json", c -> UTConfigTweaks.BLOCKS.utLenientPathsToggle); - put("mixins.tweaks.blocks.observer.json", c -> UTConfigTweaks.BLOCKS.utPreventObserverActivatesOnPlacement); - put("mixins.tweaks.blocks.overhaulbeacon.json", c -> UTConfigTweaks.BLOCKS.OVERHAUL_BEACON.utOverhaulBeaconToggle); - put("mixins.tweaks.blocks.piston.json", c -> UTConfigTweaks.BLOCKS.PISTON.utPistonBlockBlacklistToggle); - put("mixins.tweaks.blocks.pumpkinplacing.json", c -> UTConfigTweaks.BLOCKS.utUnsupportedPumpkinPlacing); - put("mixins.tweaks.blocks.sapling.json", c -> UTConfigTweaks.BLOCKS.SAPLING_BEHAVIOR.utSaplingBehaviorToggle); - put("mixins.tweaks.blocks.witherstructure.json", c -> UTConfigTweaks.ENTITIES.utWitherPlacement); - put("mixins.tweaks.entities.ai.json", c -> UTConfigTweaks.ENTITIES.utAIReplacementToggle); - put("mixins.tweaks.entities.ai.saddledwandering.json", c -> UTConfigTweaks.ENTITIES.utSaddledWanderingToggle); - put("mixins.tweaks.entities.ai.wither.json", c -> UTConfigTweaks.ENTITIES.utWitherAIToggle); - put("mixins.tweaks.entities.armedarmorstands.json", c -> UTConfigTweaks.ENTITIES.utArmedArmorStandsToggle); - put("mixins.tweaks.entities.burning.horse.json", c -> UTConfigTweaks.ENTITIES.UNDEAD_HORSES.utBurningUndeadHorsesToggle); - put("mixins.tweaks.entities.burning.mobs.json", c -> UTConfigTweaks.ENTITIES.utBurningBabyZombiesToggle); - put("mixins.tweaks.entities.damage.arrow.json", c -> UTConfigTweaks.ENTITIES.utCriticalArrowDamage != -1); - put("mixins.tweaks.entities.damage.falling.json", c -> UTConfigTweaks.ENTITIES.WATER_FALL_DAMAGE.utFallDamageToggle); - put("mixins.tweaks.entities.damage.velocity.json", c -> UTConfigTweaks.ENTITIES.DAMAGE_VELOCITY.utDamageVelocityToggle); - put("mixins.tweaks.entities.despawning.json", c -> UTConfigTweaks.ENTITIES.utMobDespawningToggle != UTConfigTweaks.EnumMobDespawning.DEFAULT); - put("mixins.tweaks.entities.loot.json", c -> UTConfigTweaks.ENTITIES.utCreeperMusicDiscsToggle); - put("mixins.tweaks.entities.minecart.json", c -> UTConfigTweaks.ENTITIES.utMinecartDropsType); - put("mixins.tweaks.entities.exhaustion.regen.json", c -> UTConfigTweaks.ENTITIES.utRegenExhaustion != 6.0D); - put("mixins.tweaks.entities.exhaustion.riding.json", c -> UTConfigTweaks.ENTITIES.utRidingExhaustion != 0.0D); - put("mixins.tweaks.entities.sleeping.json", c -> UTConfigTweaks.ENTITIES.SLEEPING.utDisableSettingSpawnToggle); - put("mixins.tweaks.entities.spawning.caps.json", c -> UTConfigTweaks.ENTITIES.SPAWN_CAPS.utSpawnCapsToggle); - put("mixins.tweaks.entities.spawning.creeper.confetti.json", c -> UTConfigTweaks.ENTITIES.CREEPER_CONFETTI.utCreeperConfettiChance != 0.0D); - put("mixins.tweaks.entities.spawning.golem.json", c -> UTConfigTweaks.ENTITIES.NO_GOLEMS.utNGIronGolemToggle || UTConfigTweaks.ENTITIES.NO_GOLEMS.utNGSnowGolemToggle || UTConfigTweaks.ENTITIES.NO_GOLEMS.utNGWitherToggle); - put("mixins.tweaks.entities.spawning.husk.json", c -> UTConfigTweaks.ENTITIES.utHuskStraySpawningToggle); - put("mixins.tweaks.entities.spawning.portal.json", c -> UTConfigTweaks.ENTITIES.utPortalSpawningToggle); - put("mixins.tweaks.entities.spawning.skeletontrap.json", c -> UTConfigTweaks.ENTITIES.UNDEAD_HORSES.utSkeletonTrapSpawningToggle); - put("mixins.tweaks.entities.spawning.stray.json", c -> UTConfigTweaks.ENTITIES.utHuskStraySpawningToggle); - put("mixins.tweaks.entities.speed.boat.json", c -> UTConfigTweaks.ENTITIES.utBoatSpeed != 0.04D); - put("mixins.tweaks.entities.speed.cobweb.json", c -> UTConfigTweaks.ENTITIES.COBWEB_SLOWNESS.utCobwebSlownessToggle); - put("mixins.tweaks.entities.speed.player.json", c -> UTConfigTweaks.ENTITIES.PLAYER_SPEED.utPlayerSpeedToggle); - put("mixins.tweaks.entities.taming.horse.json", c -> UTConfigTweaks.ENTITIES.UNDEAD_HORSES.utTamingUndeadHorsesToggle); - put("mixins.tweaks.entities.trading.json", c -> UTConfigTweaks.ENTITIES.utVillagerTradeLevelingToggle || UTConfigTweaks.ENTITIES.utVillagerTradeRestockToggle); - put("mixins.tweaks.entities.unsafesleeping.json", c -> UTConfigTweaks.ENTITIES.UNSAFE_SLEEPING.utUnsafeSleepingToggle); - put("mixins.tweaks.entities.villagerprofessions.json", c -> UTConfigTweaks.ENTITIES.utVillagerProfessionBiomeRestriction.length > 0); - put("mixins.tweaks.entities.voidteleport.json", c -> UTConfigTweaks.ENTITIES.VOID_TELEPORT.utVoidTeleportToggle); - put("mixins.tweaks.items.attackcooldown.server.json", c -> UTConfigTweaks.ITEMS.ATTACK_COOLDOWN.utAttackCooldownToggle); - put("mixins.tweaks.items.bottle.json", c -> UTConfigTweaks.ITEMS.utGlassBottlesConsumeWaterSource); - put("mixins.tweaks.items.bucket.json", c -> UTConfigTweaks.ITEMS.utPreventBucketPlacingInPortal); - put("mixins.tweaks.items.eating.json", c -> UTConfigTweaks.ITEMS.utAlwaysEatToggle || UTConfigTweaks.ITEMS.utSmartEatToggle); - put("mixins.tweaks.items.hardcorebuckets.json", c -> UTConfigTweaks.ITEMS.utHardcoreBucketsToggle); - put("mixins.tweaks.items.infinityallarrows.json", c -> UTConfigTweaks.ITEMS.INFINITY.utAllArrowsAreInfinite); - put("mixins.tweaks.items.infinitymending.json", c -> UTConfigTweaks.ITEMS.INFINITY.utInfinityEnchantmentConflicts); - put("mixins.tweaks.items.itementities.server.json", c -> UTConfigTweaks.ITEMS.ITEM_ENTITIES.utItemEntitiesToggle); - put("mixins.tweaks.items.mobegg.json", c -> UTConfigTweaks.ITEMS.utPreventMobEggsFromChangingSpawner); - put("mixins.tweaks.items.rarity.json", c -> UTConfigTweaks.ITEMS.utCustomRarities.length > 0); - put("mixins.tweaks.items.repairing.json", c -> UTConfigTweaks.ITEMS.utCraftingRepairToggle); - put("mixins.tweaks.items.xpbottle.json", c -> UTConfigTweaks.ITEMS.utXPBottleAmount != -1); - put("mixins.tweaks.misc.advancements.json", c -> UTConfigTweaks.MISC.utDisableAdvancementsToggle); - put("mixins.tweaks.misc.armorcurve.json", c -> !c.inDev() && UTConfigTweaks.MISC.ARMOR_CURVE.utArmorCurveToggle); - put("mixins.tweaks.misc.armorswap.json", c -> UTConfigTweaks.MISC.utArmorSwap); - put("mixins.tweaks.misc.bannerlayers.json", c -> UTConfigTweaks.MISC.utBannerLayers != 6); - put("mixins.tweaks.misc.commands.seed.json", c -> UTConfigTweaks.MISC.utCopyWorldSeedToggle); - put("mixins.tweaks.misc.difficulty.singleplayer.json", c -> true); - put("mixins.tweaks.misc.incurablepotions.json", c -> UTConfigTweaks.MISC.INCURABLE_POTIONS.utIncurablePotionsToggle); - put("mixins.tweaks.misc.lightning.damage.json", c -> UTConfigTweaks.MISC.LIGHTNING.utLightningDamage != 5.0D || UTConfigTweaks.MISC.LIGHTNING.utLightningFireTicks != 8); - put("mixins.tweaks.misc.lightning.fire.json", c -> UTConfigTweaks.MISC.LIGHTNING.utLightningFireToggle); - put("mixins.tweaks.misc.recipebook.server.json", c -> UTConfigTweaks.MISC.utRecipeBookToggle); - put("mixins.tweaks.misc.sound.broadcast.dragon.json", c -> !UTConfigTweaks.MISC.BROADCAST_SOUNDS.utBroadcastSoundDragon); - put("mixins.tweaks.misc.sound.broadcast.endportal.json", c -> !UTConfigTweaks.MISC.BROADCAST_SOUNDS.utBroadcastSoundEndPortal); - put("mixins.tweaks.misc.sound.broadcast.wither.json", c -> !UTConfigTweaks.MISC.BROADCAST_SOUNDS.utBroadcastSoundWither); - put("mixins.tweaks.misc.timeouts.json", c -> UTConfigTweaks.MISC.TIMEOUTS.utTimeoutsToggle); - put("mixins.tweaks.misc.xp.cap.json", c -> UTConfigTweaks.MISC.utXPLevelCap > -1); - put("mixins.tweaks.misc.xp.drop.json", c -> UTConfigTweaks.MISC.utPlayerXPDropPercentage >= 0.0D); - put("mixins.tweaks.misc.xp.linear.json", c -> UTConfigTweaks.MISC.utLinearXP > 0); - put("mixins.tweaks.misc.xp.smelting.json", c -> UTConfigTweaks.MISC.utSmeltingXPToggle); - put("mixins.tweaks.performance.advancements.logging.json", c -> UTConfigTweaks.PERFORMANCE.utAdvancementCheckToggle); - put("mixins.tweaks.performance.advancements.triggers.json", c -> UTConfigTweaks.PERFORMANCE.ADVANCEMENT_TRIGGERS.utFasterAdvancementTriggersToggle); - put("mixins.tweaks.performance.autosave.json", c -> UTConfigTweaks.PERFORMANCE.utAutoSaveInterval != 900); - put("mixins.tweaks.performance.craftingcache.json", c -> UTConfigTweaks.PERFORMANCE.utCraftingCacheToggle); - put("mixins.tweaks.performance.dyeblending.json", c -> UTConfigTweaks.PERFORMANCE.utDyeBlendingToggle); - put("mixins.tweaks.performance.entityradiuscheck.lesscollisions.json", c -> UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utEntityRadiusCheckCategoryToggle && UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utLessCollisionsToggle); - put("mixins.tweaks.performance.entityradiuscheck.reducesearchsize.json", c -> UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utEntityRadiusCheckCategoryToggle && UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utReduceSearchSizeToggle); - put("mixins.tweaks.performance.pathfinding.json", c -> UTConfigTweaks.PERFORMANCE.utPathfindingChunkCacheFixToggle); - put("mixins.tweaks.performance.prefixcheck.json", c -> UTConfigTweaks.PERFORMANCE.utPrefixCheckToggle); - put("mixins.tweaks.performance.redstone.json", c -> UTConfigTweaks.PERFORMANCE.utRedstoneLightingToggle); - put("mixins.tweaks.world.cavegen.json", c -> UTConfigTweaks.WORLD.CAVE_GEN.utCaveGenToggle); - put("mixins.tweaks.world.chunks.gen.json", c -> UTConfigTweaks.WORLD.CHUNK_GEN_LIMIT.utChunkGenLimitToggle); - put("mixins.tweaks.world.chunks.spawn.json", c -> !UTConfigTweaks.WORLD.SPAWN_CHUNKS.utSpawnChunksGenToggle || !UTConfigTweaks.WORLD.SPAWN_CHUNKS.utSpawnChunksLoadingToggle); - put("mixins.tweaks.world.sealevel.json", c -> UTConfigTweaks.WORLD.utSeaLevel != 63); - put("mixins.tweaks.world.stronghold.json", c -> UTConfigTweaks.WORLD.utStrongholdToggle); - put("mixins.tweaks.world.village.json", c -> UTConfigTweaks.WORLD.utVillageDistance != 32); + put("mixins/tweaks/mixins.blocks.anvil.json", c -> UTConfigTweaks.BLOCKS.ANVIL.utAnvilXPLevelCap != 40); + put("mixins/tweaks/mixins.blocks.barrier.json", c -> UTConfigTweaks.BLOCKS.utBarrierParticleDisplay); + put("mixins/tweaks/mixins.blocks.bedobstruction.json", c -> UTConfigTweaks.BLOCKS.utBedObstructionToggle); + put("mixins/tweaks/mixins.blocks.breakablebedrock.json", c -> UTConfigTweaks.BLOCKS.BREAKABLE_BEDROCK.utBreakableBedrockToggle); + put("mixins/tweaks/mixins.blocks.enchantmenttable.json", c -> UTConfigTweaks.BLOCKS.utEnchantmentTableObstructionToggle); + put("mixins/tweaks/mixins.blocks.endcrystal.json", c -> UTConfigTweaks.BLOCKS.END_CRYSTAL_PLACEMENT.utEndCrystalPlacementToggle); + put("mixins/tweaks/mixins.blocks.endportal.json", c -> UTConfigTweaks.BLOCKS.utRenderEndPortalBottom); + put("mixins/tweaks/mixins.blocks.explosion.json", c -> UTConfigTweaks.BLOCKS.utExplosionDropChance != 1.0D); + put("mixins/tweaks/mixins.blocks.falling.json", c -> UTConfigTweaks.BLOCKS.utFallingBlockLifespan != 600); + put("mixins/tweaks/mixins.blocks.golemstructure.json", c -> UTConfigTweaks.ENTITIES.utGolemPlacement); + put("mixins/tweaks/mixins.blocks.growthsize.json", c -> UTConfigTweaks.BLOCKS.utCactusSize != 3 && UTConfigTweaks.BLOCKS.utSugarCaneSize != 3 && UTConfigTweaks.BLOCKS.utVineSize != 0); + put("mixins/tweaks/mixins.blocks.leafdecay.json", c -> UTConfigTweaks.BLOCKS.utLeafDecayToggle); + put("mixins/tweaks/mixins.blocks.lenientpaths.json", c -> UTConfigTweaks.BLOCKS.utLenientPathsToggle); + put("mixins/tweaks/mixins.blocks.observer.json", c -> UTConfigTweaks.BLOCKS.utPreventObserverActivatesOnPlacement); + put("mixins/tweaks/mixins.blocks.overhaulbeacon.json", c -> UTConfigTweaks.BLOCKS.OVERHAUL_BEACON.utOverhaulBeaconToggle); + put("mixins/tweaks/mixins.blocks.piston.json", c -> UTConfigTweaks.BLOCKS.PISTON.utPistonBlockBlacklistToggle); + put("mixins/tweaks/mixins.blocks.pumpkinplacing.json", c -> UTConfigTweaks.BLOCKS.utUnsupportedPumpkinPlacing); + put("mixins/tweaks/mixins.blocks.sapling.json", c -> UTConfigTweaks.BLOCKS.SAPLING_BEHAVIOR.utSaplingBehaviorToggle); + put("mixins/tweaks/mixins.blocks.witherstructure.json", c -> UTConfigTweaks.ENTITIES.utWitherPlacement); + put("mixins/tweaks/mixins.entities.ai.json", c -> UTConfigTweaks.ENTITIES.utAIReplacementToggle); + put("mixins/tweaks/mixins.entities.ai.saddledwandering.json", c -> UTConfigTweaks.ENTITIES.utSaddledWanderingToggle); + put("mixins/tweaks/mixins.entities.ai.wither.json", c -> UTConfigTweaks.ENTITIES.utWitherAIToggle); + put("mixins/tweaks/mixins.entities.armedarmorstands.json", c -> UTConfigTweaks.ENTITIES.utArmedArmorStandsToggle); + put("mixins/tweaks/mixins.entities.burning.horse.json", c -> UTConfigTweaks.ENTITIES.UNDEAD_HORSES.utBurningUndeadHorsesToggle); + put("mixins/tweaks/mixins.entities.burning.mobs.json", c -> UTConfigTweaks.ENTITIES.utBurningBabyZombiesToggle); + put("mixins/tweaks/mixins.entities.damage.arrow.json", c -> UTConfigTweaks.ENTITIES.utCriticalArrowDamage != -1); + put("mixins/tweaks/mixins.entities.damage.falling.json", c -> UTConfigTweaks.ENTITIES.WATER_FALL_DAMAGE.utFallDamageToggle); + put("mixins/tweaks/mixins.entities.damage.velocity.json", c -> UTConfigTweaks.ENTITIES.DAMAGE_VELOCITY.utDamageVelocityToggle); + put("mixins/tweaks/mixins.entities.despawning.json", c -> UTConfigTweaks.ENTITIES.utMobDespawningToggle != UTConfigTweaks.EnumMobDespawning.DEFAULT); + put("mixins/tweaks/mixins.entities.loot.json", c -> UTConfigTweaks.ENTITIES.utCreeperMusicDiscsToggle); + put("mixins/tweaks/mixins.entities.minecart.json", c -> UTConfigTweaks.ENTITIES.utMinecartDropsType); + put("mixins/tweaks/mixins.entities.exhaustion.regen.json", c -> UTConfigTweaks.ENTITIES.utRegenExhaustion != 6.0D); + put("mixins/tweaks/mixins.entities.exhaustion.riding.json", c -> UTConfigTweaks.ENTITIES.utRidingExhaustion != 0.0D); + put("mixins/tweaks/mixins.entities.sleeping.json", c -> UTConfigTweaks.ENTITIES.SLEEPING.utDisableSettingSpawnToggle); + put("mixins/tweaks/mixins.entities.spawning.caps.json", c -> UTConfigTweaks.ENTITIES.SPAWN_CAPS.utSpawnCapsToggle); + put("mixins/tweaks/mixins.entities.spawning.creeper.confetti.json", c -> UTConfigTweaks.ENTITIES.CREEPER_CONFETTI.utCreeperConfettiChance != 0.0D); + put("mixins/tweaks/mixins.entities.spawning.golem.json", c -> UTConfigTweaks.ENTITIES.NO_GOLEMS.utNGIronGolemToggle || UTConfigTweaks.ENTITIES.NO_GOLEMS.utNGSnowGolemToggle || UTConfigTweaks.ENTITIES.NO_GOLEMS.utNGWitherToggle); + put("mixins/tweaks/mixins.entities.spawning.husk.json", c -> UTConfigTweaks.ENTITIES.utHuskStraySpawningToggle); + put("mixins/tweaks/mixins.entities.spawning.portal.json", c -> UTConfigTweaks.ENTITIES.utPortalSpawningToggle); + put("mixins/tweaks/mixins.entities.spawning.skeletontrap.json", c -> UTConfigTweaks.ENTITIES.UNDEAD_HORSES.utSkeletonTrapSpawningToggle); + put("mixins/tweaks/mixins.entities.spawning.stray.json", c -> UTConfigTweaks.ENTITIES.utHuskStraySpawningToggle); + put("mixins/tweaks/mixins.entities.speed.boat.json", c -> UTConfigTweaks.ENTITIES.utBoatSpeed != 0.04D); + put("mixins/tweaks/mixins.entities.speed.cobweb.json", c -> UTConfigTweaks.ENTITIES.COBWEB_SLOWNESS.utCobwebSlownessToggle); + put("mixins/tweaks/mixins.entities.speed.player.json", c -> UTConfigTweaks.ENTITIES.PLAYER_SPEED.utPlayerSpeedToggle); + put("mixins/tweaks/mixins.entities.taming.horse.json", c -> UTConfigTweaks.ENTITIES.UNDEAD_HORSES.utTamingUndeadHorsesToggle); + put("mixins/tweaks/mixins.entities.trading.json", c -> UTConfigTweaks.ENTITIES.utVillagerTradeLevelingToggle || UTConfigTweaks.ENTITIES.utVillagerTradeRestockToggle); + put("mixins/tweaks/mixins.entities.unsafesleeping.json", c -> UTConfigTweaks.ENTITIES.UNSAFE_SLEEPING.utUnsafeSleepingToggle); + put("mixins/tweaks/mixins.entities.villagerprofessions.json", c -> UTConfigTweaks.ENTITIES.utVillagerProfessionBiomeRestriction.length > 0); + put("mixins/tweaks/mixins.entities.voidteleport.json", c -> UTConfigTweaks.ENTITIES.VOID_TELEPORT.utVoidTeleportToggle); + put("mixins/tweaks/mixins.items.attackcooldown.server.json", c -> UTConfigTweaks.ITEMS.ATTACK_COOLDOWN.utAttackCooldownToggle); + put("mixins/tweaks/mixins.items.bottle.json", c -> UTConfigTweaks.ITEMS.utGlassBottlesConsumeWaterSource); + put("mixins/tweaks/mixins.items.bucket.json", c -> UTConfigTweaks.ITEMS.utPreventBucketPlacingInPortal); + put("mixins/tweaks/mixins.items.eating.json", c -> UTConfigTweaks.ITEMS.utAlwaysEatToggle || UTConfigTweaks.ITEMS.utSmartEatToggle); + put("mixins/tweaks/mixins.items.hardcorebuckets.json", c -> UTConfigTweaks.ITEMS.utHardcoreBucketsToggle); + put("mixins/tweaks/mixins.items.infinityallarrows.json", c -> UTConfigTweaks.ITEMS.INFINITY.utAllArrowsAreInfinite); + put("mixins/tweaks/mixins.items.infinitymending.json", c -> UTConfigTweaks.ITEMS.INFINITY.utInfinityEnchantmentConflicts); + put("mixins/tweaks/mixins.items.itementities.server.json", c -> UTConfigTweaks.ITEMS.ITEM_ENTITIES.utItemEntitiesToggle); + put("mixins/tweaks/mixins.items.mobegg.json", c -> UTConfigTweaks.ITEMS.utPreventMobEggsFromChangingSpawner); + put("mixins/tweaks/mixins.items.rarity.json", c -> UTConfigTweaks.ITEMS.utCustomRarities.length > 0); + put("mixins/tweaks/mixins.items.repairing.json", c -> UTConfigTweaks.ITEMS.utCraftingRepairToggle); + put("mixins/tweaks/mixins.items.xpbottle.json", c -> UTConfigTweaks.ITEMS.utXPBottleAmount != -1); + put("mixins/tweaks/mixins.misc.advancements.json", c -> UTConfigTweaks.MISC.utDisableAdvancementsToggle); + put("mixins/tweaks/mixins.misc.armorcurve.json", c -> !c.inDev() && UTConfigTweaks.MISC.ARMOR_CURVE.utArmorCurveToggle); + put("mixins/tweaks/mixins.misc.armorswap.json", c -> UTConfigTweaks.MISC.utArmorSwap); + put("mixins/tweaks/mixins.misc.bannerlayers.json", c -> UTConfigTweaks.MISC.utBannerLayers != 6); + put("mixins/tweaks/mixins.misc.commands.seed.json", c -> UTConfigTweaks.MISC.utCopyWorldSeedToggle); + put("mixins/tweaks/mixins.misc.difficulty.singleplayer.json", c -> true); + put("mixins/tweaks/mixins.misc.incurablepotions.json", c -> UTConfigTweaks.MISC.INCURABLE_POTIONS.utIncurablePotionsToggle); + put("mixins/tweaks/mixins.misc.lightning.damage.json", c -> UTConfigTweaks.MISC.LIGHTNING.utLightningDamage != 5.0D || UTConfigTweaks.MISC.LIGHTNING.utLightningFireTicks != 8); + put("mixins/tweaks/mixins.misc.lightning.fire.json", c -> UTConfigTweaks.MISC.LIGHTNING.utLightningFireToggle); + put("mixins/tweaks/mixins.misc.recipebook.server.json", c -> UTConfigTweaks.MISC.utRecipeBookToggle); + put("mixins/tweaks/mixins.misc.sound.broadcast.dragon.json", c -> !UTConfigTweaks.MISC.BROADCAST_SOUNDS.utBroadcastSoundDragon); + put("mixins/tweaks/mixins.misc.sound.broadcast.endportal.json", c -> !UTConfigTweaks.MISC.BROADCAST_SOUNDS.utBroadcastSoundEndPortal); + put("mixins/tweaks/mixins.misc.sound.broadcast.wither.json", c -> !UTConfigTweaks.MISC.BROADCAST_SOUNDS.utBroadcastSoundWither); + put("mixins/tweaks/mixins.misc.timeouts.json", c -> UTConfigTweaks.MISC.TIMEOUTS.utTimeoutsToggle); + put("mixins/tweaks/mixins.misc.xp.cap.json", c -> UTConfigTweaks.MISC.utXPLevelCap > -1); + put("mixins/tweaks/mixins.misc.xp.drop.json", c -> UTConfigTweaks.MISC.utPlayerXPDropPercentage >= 0.0D); + put("mixins/tweaks/mixins.misc.xp.linear.json", c -> UTConfigTweaks.MISC.utLinearXP > 0); + put("mixins/tweaks/mixins.misc.xp.smelting.json", c -> UTConfigTweaks.MISC.utSmeltingXPToggle); + put("mixins/tweaks/mixins.performance.advancements.logging.json", c -> UTConfigTweaks.PERFORMANCE.utAdvancementCheckToggle); + put("mixins/tweaks/mixins.performance.advancements.triggers.json", c -> UTConfigTweaks.PERFORMANCE.ADVANCEMENT_TRIGGERS.utFasterAdvancementTriggersToggle); + put("mixins/tweaks/mixins.performance.autosave.json", c -> UTConfigTweaks.PERFORMANCE.utAutoSaveInterval != 900); + put("mixins/tweaks/mixins.performance.craftingcache.json", c -> UTConfigTweaks.PERFORMANCE.utCraftingCacheToggle); + put("mixins/tweaks/mixins.performance.dyeblending.json", c -> UTConfigTweaks.PERFORMANCE.utDyeBlendingToggle); + put("mixins/tweaks/mixins.performance.entityradiuscheck.lesscollisions.json", c -> UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utEntityRadiusCheckCategoryToggle && UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utLessCollisionsToggle); + put("mixins/tweaks/mixins.performance.entityradiuscheck.reducesearchsize.json", c -> UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utEntityRadiusCheckCategoryToggle && UTConfigTweaks.PERFORMANCE.ENTITY_RADIUS_CHECK.utReduceSearchSizeToggle); + put("mixins/tweaks/mixins.performance.pathfinding.json", c -> UTConfigTweaks.PERFORMANCE.utPathfindingChunkCacheFixToggle); + put("mixins/tweaks/mixins.performance.prefixcheck.json", c -> UTConfigTweaks.PERFORMANCE.utPrefixCheckToggle); + put("mixins/tweaks/mixins.performance.redstone.json", c -> UTConfigTweaks.PERFORMANCE.utRedstoneLightingToggle); + put("mixins/tweaks/mixins.world.cavegen.json", c -> UTConfigTweaks.WORLD.CAVE_GEN.utCaveGenToggle); + put("mixins/tweaks/mixins.world.chunks.gen.json", c -> UTConfigTweaks.WORLD.CHUNK_GEN_LIMIT.utChunkGenLimitToggle); + put("mixins/tweaks/mixins.world.chunks.spawn.json", c -> !UTConfigTweaks.WORLD.SPAWN_CHUNKS.utSpawnChunksGenToggle || !UTConfigTweaks.WORLD.SPAWN_CHUNKS.utSpawnChunksLoadingToggle); + put("mixins/tweaks/mixins.world.sealevel.json", c -> UTConfigTweaks.WORLD.utSeaLevel != 63); + put("mixins/tweaks/mixins.world.stronghold.json", c -> UTConfigTweaks.WORLD.utStrongholdToggle); + put("mixins/tweaks/mixins.world.village.json", c -> UTConfigTweaks.WORLD.utVillageDistance != 32); } } }); @@ -198,85 +198,85 @@ public class UTLoadingPlugin implements IFMLLoadingPlugin, IEarlyMixinLoader { if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchBugfixes) { - put("mixins.bugfixes.blocks.banner.json", c -> UTConfigBugfixes.BLOCKS.utBannerBoundingBoxToggle && !c.isModPresent("renderlib")); - put("mixins.bugfixes.blocks.blockoverlay.json", c -> UTConfigBugfixes.BLOCKS.BLOCK_OVERLAY.utBlockOverlayToggle); - put("mixins.bugfixes.blocks.miningglitch.client.json", c -> UTConfigBugfixes.BLOCKS.MINING_GLITCH.utMiningGlitchToggle); - put("mixins.bugfixes.entities.elytra.json", c -> UTConfigBugfixes.ENTITIES.utElytraDeploymentLandingToggle); - put("mixins.bugfixes.entities.elytrarender.json", c -> UTConfigBugfixes.ENTITIES.utFixInvisiblePlayerModelWithElytra && !c.isModPresent("openmods")); - put("mixins.bugfixes.entities.entitylists.client.json", c -> UTConfigBugfixes.ENTITIES.ENTITY_LISTS.utWorldAdditionsToggle); - put("mixins.bugfixes.entities.villagermantle.json", c -> UTConfigBugfixes.ENTITIES.utVillagerMantleToggle); - put("mixins.bugfixes.misc.actionbar.json", c -> UTConfigBugfixes.MISC.utOverlayMessageFadeOut); - put("mixins.bugfixes.misc.depthmask.json", c -> UTConfigBugfixes.MISC.utDepthMaskToggle); - put("mixins.bugfixes.misc.potionamplifier.json", c -> UTConfigBugfixes.MISC.utPotionAmplifierVisibilityToggle); - put("mixins.bugfixes.misc.smoothlighting.json", c -> UTConfigBugfixes.MISC.utAccurateSmoothLighting); - put("mixins.bugfixes.misc.spectatormenu.json", c -> UTConfigBugfixes.MISC.utSpectatorMenuToggle); - put("mixins.bugfixes.misc.startup.json", c -> UTConfigTweaks.PERFORMANCE.utFasterBackgroundStartupToggle); - put("mixins.bugfixes.misc.itempickup.json", c -> UTConfigBugfixes.MISC.utItemPickupCulling); - put("mixins.bugfixes.world.frustumculling.json", c -> UTConfigBugfixes.WORLD.utFrustumCullingToggle); + put("mixins/bugfixes/mixins.blocks.banner.json", c -> UTConfigBugfixes.BLOCKS.utBannerBoundingBoxToggle && !c.isModPresent("renderlib")); + put("mixins/bugfixes/mixins.blocks.blockoverlay.json", c -> UTConfigBugfixes.BLOCKS.BLOCK_OVERLAY.utBlockOverlayToggle); + put("mixins/bugfixes/mixins.blocks.miningglitch.client.json", c -> UTConfigBugfixes.BLOCKS.MINING_GLITCH.utMiningGlitchToggle); + put("mixins/bugfixes/mixins.entities.elytra.json", c -> UTConfigBugfixes.ENTITIES.utElytraDeploymentLandingToggle); + put("mixins/bugfixes/mixins.entities.elytrarender.json", c -> UTConfigBugfixes.ENTITIES.utFixInvisiblePlayerModelWithElytra && !c.isModPresent("openmods")); + put("mixins/bugfixes/mixins.entities.entitylists.client.json", c -> UTConfigBugfixes.ENTITIES.ENTITY_LISTS.utWorldAdditionsToggle); + put("mixins/bugfixes/mixins.entities.villagermantle.json", c -> UTConfigBugfixes.ENTITIES.utVillagerMantleToggle); + put("mixins/bugfixes/mixins.misc.actionbar.json", c -> UTConfigBugfixes.MISC.utOverlayMessageFadeOut); + put("mixins/bugfixes/mixins.misc.depthmask.json", c -> UTConfigBugfixes.MISC.utDepthMaskToggle); + put("mixins/bugfixes/mixins.misc.potionamplifier.json", c -> UTConfigBugfixes.MISC.utPotionAmplifierVisibilityToggle); + put("mixins/bugfixes/mixins.misc.smoothlighting.json", c -> UTConfigBugfixes.MISC.utAccurateSmoothLighting); + put("mixins/bugfixes/mixins.misc.spectatormenu.json", c -> UTConfigBugfixes.MISC.utSpectatorMenuToggle); + put("mixins/bugfixes/mixins.misc.startup.json", c -> UTConfigTweaks.PERFORMANCE.utFasterBackgroundStartupToggle); + put("mixins/bugfixes/mixins.misc.itempickup.json", c -> UTConfigBugfixes.MISC.utItemPickupCulling); + put("mixins/bugfixes/mixins.world.frustumculling.json", c -> UTConfigBugfixes.WORLD.utFrustumCullingToggle); } if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchTweaks) { - put("mixins.tweaks.blocks.anvil.client.json", c -> UTConfigTweaks.BLOCKS.ANVIL.utAnvilXPLevelCap != 40); - put("mixins.tweaks.blocks.betterplacement.json", c -> UTConfigTweaks.BLOCKS.BETTER_PLACEMENT.utBetterPlacementToggle); - put("mixins.tweaks.blocks.betterrailplacement.json", c -> UTConfigTweaks.BLOCKS.utBetterRailPlacementToggle); - put("mixins.tweaks.blocks.hitdelay.json", c -> UTConfigTweaks.BLOCKS.utBlockHitDelay != 5); - put("mixins.tweaks.entities.burning.player.json", c -> UTConfigTweaks.ENTITIES.utFirstPersonBurningOverlay != -0.3D); - put("mixins.tweaks.entities.jumping.autojump.json", c -> UTConfigTweaks.ENTITIES.utAutoJumpToggle); - put("mixins.tweaks.entities.playerdismount.json", c -> UTConfigTweaks.MISC.utUseSeparateDismountKey); - put("mixins.tweaks.entities.playerf5.json", c -> UTConfigTweaks.ENTITIES.utThirdPersonIgnoresNonSolidBlocks); - put("mixins.tweaks.entities.sprint.json", c -> UTConfigTweaks.ENTITIES.utSprintHungerThreshold != 6); - put("mixins.tweaks.items.attackcooldown.client.json", c -> UTConfigTweaks.ITEMS.ATTACK_COOLDOWN.utAttackCooldownToggle); - put("mixins.tweaks.items.itementities.client.json", c -> UTConfigTweaks.ITEMS.ITEM_ENTITIES.utItemEntitiesToggle); - put("mixins.tweaks.misc.advancements.guisize.json", c -> UTConfigTweaks.MISC.ADVANCEMENTS.utAdvancementsToggle); - put("mixins.tweaks.misc.buttons.anaglyph.json", c -> UTConfigTweaks.MISC.ut3DAnaglyphButtonToggle && !c.isModPresent("optifine")); - put("mixins.tweaks.misc.buttons.anaglyph.optifine.json", c -> UTConfigTweaks.MISC.ut3DAnaglyphButtonToggle && c.isModPresent("optifine")); - put("mixins.tweaks.misc.buttons.realms.json", c -> SystemUtils.IS_JAVA_1_8 && UTConfigTweaks.MISC.utRealmsButtonToggle && !c.isModPresent("randompatches")); - put("mixins.tweaks.misc.buttons.snooper.client.json", c -> SystemUtils.IS_JAVA_1_8 && UTConfigTweaks.MISC.utSnooperToggle); - put("mixins.tweaks.misc.chat.bed.json", c -> UTConfigTweaks.MISC.CHAT.utKeepChatOpen); - put("mixins.tweaks.misc.chat.compactmessage.json", c -> UTConfigTweaks.MISC.CHAT.utCompactMessagesToggle); - put("mixins.tweaks.misc.chat.keepsentmessages.json", c -> UTConfigTweaks.MISC.CHAT.utKeepSentMessageHistory); - put("mixins.tweaks.misc.chat.maximumlines.json", c -> UTConfigTweaks.MISC.CHAT.utChatLines != 100); - put("mixins.tweaks.misc.credits.json", c -> UTConfigTweaks.MISC.utSkipCreditsToggle); - put("mixins.tweaks.misc.glint.enchantedbook.json", c -> UTConfigTweaks.MISC.utDisableEnchantmentBookGlint); - put("mixins.tweaks.misc.glint.potion.json", c -> UTConfigTweaks.MISC.utDisablePotionGlint); - put("mixins.tweaks.misc.gui.defaultguitextcolor.json", c -> !UTConfigTweaks.MISC.utDefaultGuiTextColor.equals("404040")); - put("mixins.tweaks.misc.gui.gamewindow.icon.json", c -> !c.inDev() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowIcon16.isEmpty() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowIcon32.isEmpty() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowIcon256.isEmpty()); - put("mixins.tweaks.misc.gui.gamewindow.title.json", c -> !c.inDev() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowDisplayTitle.isEmpty()); - put("mixins.tweaks.misc.gui.keybindlistentry.json", c -> UTConfigTweaks.MISC.utPreventKeybindingEntryOverflow); - put("mixins.tweaks.misc.gui.lanserverproperties.json", c -> UTConfigTweaks.MISC.utLANServerProperties); - put("mixins.tweaks.misc.gui.modlist.json", c -> UTConfigTweaks.MISC.utForgeModListImprovements); - put("mixins.tweaks.misc.gui.overlaymessage.json", c -> UTConfigTweaks.MISC.utOverlayMessageHeight != -4); - put("mixins.tweaks.misc.gui.ping.json", c -> UTConfigTweaks.MISC.utBetterPing); - put("mixins.tweaks.misc.gui.potionduration.json", c -> UTConfigTweaks.MISC.utPotionDurationToggle); - put("mixins.tweaks.misc.gui.selecteditemtooltip.json", c -> UTConfigTweaks.MISC.utSelectedItemTooltipHeight != 59); - put("mixins.tweaks.misc.gui.textshadow.json", c -> UTConfigTweaks.MISC.utDisableTextShadow); - put("mixins.tweaks.misc.hotbarscroll.json", c -> UTConfigTweaks.MISC.utDisableHotbarScrollWrapping); - put("mixins.tweaks.misc.lightning.flash.json", c -> UTConfigTweaks.MISC.LIGHTNING.utLightningFlashToggle); - put("mixins.tweaks.misc.gui.mainmenu.json", c -> UTConfigTweaks.MISC.utReturnToMainMenu); - put("mixins.tweaks.misc.music.json", c -> UTConfigTweaks.MISC.MUSIC.utMusicControlToggle); - put("mixins.tweaks.misc.narrator.json", c -> UTConfigTweaks.MISC.utDisableNarratorToggle); - put("mixins.tweaks.misc.narratorkeybind.json", c -> UTConfigTweaks.MISC.utUseCustomNarratorKeybind); - put("mixins.tweaks.misc.nightvisionflash.json", c -> UTConfigTweaks.MISC.utNightVisionFlashToggle); - put("mixins.tweaks.misc.particlelimit.json", c -> UTConfigTweaks.MISC.utParticleLimit > 0); - put("mixins.tweaks.misc.personalpotionparticles.json", c -> UTConfigTweaks.MISC.utPoVEffectParticles); - put("mixins.tweaks.misc.recipebook.client.json", c -> UTConfigTweaks.MISC.utRecipeBookToggle); - put("mixins.tweaks.misc.smoothscrolling.json", c -> UTConfigTweaks.MISC.SMOOTH_SCROLLING.utSmoothScrollingToggle); - put("mixins.tweaks.misc.sound.pitch.json", c -> UTConfigTweaks.MISC.utUnlimitedSoundPitchRange); - put("mixins.tweaks.misc.timeouts.client.json", c -> UTConfigTweaks.MISC.TIMEOUTS.utTimeoutsToggle); - put("mixins.tweaks.misc.toastcontrol.json", c -> UTConfigTweaks.MISC.TOAST_CONTROL.utToastControlToggle); - put("mixins.tweaks.misc.viewbobbing.json", c -> true); - put("mixins.tweaks.performance.audioreload.json", c -> UTConfigTweaks.PERFORMANCE.utDisableAudioDebugToggle && !c.isModPresent("surge")); - put("mixins.tweaks.performance.connectionspeed.json", c -> UTConfigTweaks.PERFORMANCE.utImproveLanguageSwitchingSpeed); - put("mixins.tweaks.performance.fps.json", c -> UTConfigTweaks.PERFORMANCE.utUncapFPSToggle); - put("mixins.tweaks.performance.languageswitching.json", c -> UTConfigTweaks.PERFORMANCE.utImproveLanguageSwitchingSpeed); - put("mixins.tweaks.performance.missingmodel.json", c -> UTConfigTweaks.PERFORMANCE.utDisableFancyMissingModelToggle && !UTReflectionUtil.isClassLoaded("com.hbm.lib.RefStrings")); - put("mixins.tweaks.performance.mobspawnerrender.json", c -> UTConfigTweaks.PERFORMANCE.utDisableMobSpawnerRendering); - put("mixins.tweaks.performance.resourcemanager.json", c -> UTConfigTweaks.PERFORMANCE.utCheckAnimatedModelsToggle); - put("mixins.tweaks.performance.textureatlas.json", c -> UTConfigTweaks.PERFORMANCE.utTextureAtlasToggle && !UTReflectionUtil.isClassLoaded("dev.redstudio.valkyrie.utils.ValkyrieUtils")); - put("mixins.tweaks.performance.texturemapcheck.json", c -> UTConfigTweaks.PERFORMANCE.utTextureMapCheckToggle); - put("mixins.tweaks.performance.weathereffects.json", c -> UTConfigTweaks.PERFORMANCE.utDisableRainParticles); - put("mixins.tweaks.world.loading.client.json", c -> UTConfigTweaks.PERFORMANCE.utWorldLoadingToggle); - put("mixins.tweaks.world.voidfog.json", c -> UTConfigTweaks.WORLD.VOID_FOG.utVoidFogToggle); + put("mixins/tweaks/mixins.blocks.anvil.client.json", c -> UTConfigTweaks.BLOCKS.ANVIL.utAnvilXPLevelCap != 40); + put("mixins/tweaks/mixins.blocks.betterplacement.json", c -> UTConfigTweaks.BLOCKS.BETTER_PLACEMENT.utBetterPlacementToggle); + put("mixins/tweaks/mixins.blocks.betterrailplacement.json", c -> UTConfigTweaks.BLOCKS.utBetterRailPlacementToggle); + put("mixins/tweaks/mixins.blocks.hitdelay.json", c -> UTConfigTweaks.BLOCKS.utBlockHitDelay != 5); + put("mixins/tweaks/mixins.entities.burning.player.json", c -> UTConfigTweaks.ENTITIES.utFirstPersonBurningOverlay != -0.3D); + put("mixins/tweaks/mixins.entities.jumping.autojump.json", c -> UTConfigTweaks.ENTITIES.utAutoJumpToggle); + put("mixins/tweaks/mixins.entities.playerdismount.json", c -> UTConfigTweaks.MISC.utUseSeparateDismountKey); + put("mixins/tweaks/mixins.entities.playerf5.json", c -> UTConfigTweaks.ENTITIES.utThirdPersonIgnoresNonSolidBlocks); + put("mixins/tweaks/mixins.entities.sprint.json", c -> UTConfigTweaks.ENTITIES.utSprintHungerThreshold != 6); + put("mixins/tweaks/mixins.items.attackcooldown.client.json", c -> UTConfigTweaks.ITEMS.ATTACK_COOLDOWN.utAttackCooldownToggle); + put("mixins/tweaks/mixins.items.itementities.client.json", c -> UTConfigTweaks.ITEMS.ITEM_ENTITIES.utItemEntitiesToggle); + put("mixins/tweaks/mixins.misc.advancements.guisize.json", c -> UTConfigTweaks.MISC.ADVANCEMENTS.utAdvancementsToggle); + put("mixins/tweaks/mixins.misc.buttons.anaglyph.json", c -> UTConfigTweaks.MISC.ut3DAnaglyphButtonToggle && !c.isModPresent("optifine")); + put("mixins/tweaks/mixins.misc.buttons.anaglyph.optifine.json", c -> UTConfigTweaks.MISC.ut3DAnaglyphButtonToggle && c.isModPresent("optifine")); + put("mixins/tweaks/mixins.misc.buttons.realms.json", c -> SystemUtils.IS_JAVA_1_8 && UTConfigTweaks.MISC.utRealmsButtonToggle && !c.isModPresent("randompatches")); + put("mixins/tweaks/mixins.misc.buttons.snooper.client.json", c -> SystemUtils.IS_JAVA_1_8 && UTConfigTweaks.MISC.utSnooperToggle); + put("mixins/tweaks/mixins.misc.chat.bed.json", c -> UTConfigTweaks.MISC.CHAT.utKeepChatOpen); + put("mixins/tweaks/mixins.misc.chat.compactmessage.json", c -> UTConfigTweaks.MISC.CHAT.utCompactMessagesToggle); + put("mixins/tweaks/mixins.misc.chat.keepsentmessages.json", c -> UTConfigTweaks.MISC.CHAT.utKeepSentMessageHistory); + put("mixins/tweaks/mixins.misc.chat.maximumlines.json", c -> UTConfigTweaks.MISC.CHAT.utChatLines != 100); + put("mixins/tweaks/mixins.misc.credits.json", c -> UTConfigTweaks.MISC.utSkipCreditsToggle); + put("mixins/tweaks/mixins.misc.glint.enchantedbook.json", c -> UTConfigTweaks.MISC.utDisableEnchantmentBookGlint); + put("mixins/tweaks/mixins.misc.glint.potion.json", c -> UTConfigTweaks.MISC.utDisablePotionGlint); + put("mixins/tweaks/mixins.misc.gui.defaultguitextcolor.json", c -> !UTConfigTweaks.MISC.utDefaultGuiTextColor.equals("404040")); + put("mixins/tweaks/mixins.misc.gui.gamewindow.icon.json", c -> !c.inDev() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowIcon16.isEmpty() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowIcon32.isEmpty() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowIcon256.isEmpty()); + put("mixins/tweaks/mixins.misc.gui.gamewindow.title.json", c -> !c.inDev() && !UTConfigTweaks.MISC.GAME_WINDOW.utGameWindowDisplayTitle.isEmpty()); + put("mixins/tweaks/mixins.misc.gui.keybindlistentry.json", c -> UTConfigTweaks.MISC.utPreventKeybindingEntryOverflow); + put("mixins/tweaks/mixins.misc.gui.lanserverproperties.json", c -> UTConfigTweaks.MISC.utLANServerProperties); + put("mixins/tweaks/mixins.misc.gui.modlist.json", c -> UTConfigTweaks.MISC.utForgeModListImprovements); + put("mixins/tweaks/mixins.misc.gui.overlaymessage.json", c -> UTConfigTweaks.MISC.utOverlayMessageHeight != -4); + put("mixins/tweaks/mixins.misc.gui.ping.json", c -> UTConfigTweaks.MISC.utBetterPing); + put("mixins/tweaks/mixins.misc.gui.potionduration.json", c -> UTConfigTweaks.MISC.utPotionDurationToggle); + put("mixins/tweaks/mixins.misc.gui.selecteditemtooltip.json", c -> UTConfigTweaks.MISC.utSelectedItemTooltipHeight != 59); + put("mixins/tweaks/mixins.misc.gui.textshadow.json", c -> UTConfigTweaks.MISC.utDisableTextShadow); + put("mixins/tweaks/mixins.misc.hotbarscroll.json", c -> UTConfigTweaks.MISC.utDisableHotbarScrollWrapping); + put("mixins/tweaks/mixins.misc.lightning.flash.json", c -> UTConfigTweaks.MISC.LIGHTNING.utLightningFlashToggle); + put("mixins/tweaks/mixins.misc.gui.mainmenu.json", c -> UTConfigTweaks.MISC.utReturnToMainMenu); + put("mixins/tweaks/mixins.misc.music.json", c -> UTConfigTweaks.MISC.MUSIC.utMusicControlToggle); + put("mixins/tweaks/mixins.misc.narrator.json", c -> UTConfigTweaks.MISC.utDisableNarratorToggle); + put("mixins/tweaks/mixins.misc.narratorkeybind.json", c -> UTConfigTweaks.MISC.utUseCustomNarratorKeybind); + put("mixins/tweaks/mixins.misc.nightvisionflash.json", c -> UTConfigTweaks.MISC.utNightVisionFlashToggle); + put("mixins/tweaks/mixins.misc.particlelimit.json", c -> UTConfigTweaks.MISC.utParticleLimit > 0); + put("mixins/tweaks/mixins.misc.personalpotionparticles.json", c -> UTConfigTweaks.MISC.utPoVEffectParticles); + put("mixins/tweaks/mixins.misc.recipebook.client.json", c -> UTConfigTweaks.MISC.utRecipeBookToggle); + put("mixins/tweaks/mixins.misc.smoothscrolling.json", c -> UTConfigTweaks.MISC.SMOOTH_SCROLLING.utSmoothScrollingToggle); + put("mixins/tweaks/mixins.misc.sound.pitch.json", c -> UTConfigTweaks.MISC.utUnlimitedSoundPitchRange); + put("mixins/tweaks/mixins.misc.timeouts.client.json", c -> UTConfigTweaks.MISC.TIMEOUTS.utTimeoutsToggle); + put("mixins/tweaks/mixins.misc.toastcontrol.json", c -> UTConfigTweaks.MISC.TOAST_CONTROL.utToastControlToggle); + put("mixins/tweaks/mixins.misc.viewbobbing.json", c -> true); + put("mixins/tweaks/mixins.performance.audioreload.json", c -> UTConfigTweaks.PERFORMANCE.utDisableAudioDebugToggle && !c.isModPresent("surge")); + put("mixins/tweaks/mixins.performance.connectionspeed.json", c -> UTConfigTweaks.PERFORMANCE.utImproveLanguageSwitchingSpeed); + put("mixins/tweaks/mixins.performance.fps.json", c -> UTConfigTweaks.PERFORMANCE.utUncapFPSToggle); + put("mixins/tweaks/mixins.performance.languageswitching.json", c -> UTConfigTweaks.PERFORMANCE.utImproveLanguageSwitchingSpeed); + put("mixins/tweaks/mixins.performance.missingmodel.json", c -> UTConfigTweaks.PERFORMANCE.utDisableFancyMissingModelToggle && !UTReflectionUtil.isClassLoaded("com.hbm.lib.RefStrings")); + put("mixins/tweaks/mixins.performance.mobspawnerrender.json", c -> UTConfigTweaks.PERFORMANCE.utDisableMobSpawnerRendering); + put("mixins/tweaks/mixins.performance.resourcemanager.json", c -> UTConfigTweaks.PERFORMANCE.utCheckAnimatedModelsToggle); + put("mixins/tweaks/mixins.performance.textureatlas.json", c -> UTConfigTweaks.PERFORMANCE.utTextureAtlasToggle && !UTReflectionUtil.isClassLoaded("dev.redstudio.valkyrie.utils.ValkyrieUtils")); + put("mixins/tweaks/mixins.performance.texturemapcheck.json", c -> UTConfigTweaks.PERFORMANCE.utTextureMapCheckToggle); + put("mixins/tweaks/mixins.performance.weathereffects.json", c -> UTConfigTweaks.PERFORMANCE.utDisableRainParticles); + put("mixins/tweaks/mixins.world.loading.client.json", c -> UTConfigTweaks.PERFORMANCE.utWorldLoadingToggle); + put("mixins/tweaks/mixins.world.voidfog.json", c -> UTConfigTweaks.WORLD.VOID_FOG.utVoidFogToggle); } } }); diff --git a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java index 2fc1ece7..80ff325a 100644 --- a/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java +++ b/src/main/java/mod/acgaming/universaltweaks/core/UTMixinLoader.java @@ -21,8 +21,8 @@ public class UTMixinLoader implements ILateMixinLoader private static final Map> serversideMixinConfigs = ImmutableMap.copyOf(new HashMap>() { { - put("mixins.mods.randomthings.teleport.json", c -> c.isModPresent("randomthings") && UTConfigMods.RANDOM_THINGS.utTeleportStall); - put("mixins.mods.quark.linkitems.json", c -> c.isModPresent("quark") && UTConfigMods.QUARK.utLinkItemsServer); + put("mixins/mods/mixins.randomthings.teleport.json", c -> c.isModPresent("randomthings") && UTConfigMods.RANDOM_THINGS.utTeleportStall); + put("mixins/mods/mixins.quark.linkitems.json", c -> c.isModPresent("quark") && UTConfigMods.QUARK.utLinkItemsServer); } }); @@ -31,27 +31,30 @@ public class UTMixinLoader implements ILateMixinLoader { if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchModIntegration) { - put("mixins.mods.actuallyadditions.itemparticle.json", c -> c.isModPresent("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utItemLaserParticlesGraphics > -1); - put("mixins.mods.bibliocraft.lefthand.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utSwapDisplayHandWhenLeftHanded); - put("mixins.mods.bibliocraft.sign.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utFancySignRotationToggle); - put("mixins.mods.bibliocraft.version.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utDisableVersionCheckToggle); - put("mixins.mods.cbmultipart.client.json", c -> c.isModPresent("forgemultipartcbe") && UTConfigMods.CB_MULTIPART.utMemoryLeakFixToggle); - put("mixins.mods.compactmachines.memory.json", c -> c.isModPresent("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utMemoryLeakFixToggle); - put("mixins.mods.compactmachines.render.json", c -> c.isModPresent("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utCMRenderFixToggle); - put("mixins.mods.corpse.json", c -> c.isModPresent("corpse") && UTConfigMods.CORPSE.utOpeningGuisOffThreadFixToggle); - put("mixins.mods.crafttweaker.json", c -> c.isModPresent("crafttweaker")); - put("mixins.mods.electroblobswizardry.json", c -> c.isModPresent("ebwizardry") && c.isModPresent("conarm") && UTConfigMods.ELECTROBLOBS_WIZARDRY.utConstructsArmoryFixToggle); - put("mixins.mods.enderio.itemrender.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utReplaceItemRenderer); - put("mixins.mods.fpsreducer.json", c -> c.isModPresent("fpsreducer") && UTConfigMods.FPS_REDUCER.utCorrectFpsValue); - put("mixins.mods.hwyla.json", c -> c.isModPresent("waila")); - put("mixins.mods.ironchests.json", c -> c.isModPresent("ironchest") && UTConfigMods.IRON_CHESTS.utReplaceItemRenderer); - put("mixins.mods.modularmagic.nullingredient.json", c -> c.isModPresent("modularmagic") && UTConfigMods.MODULAR_MAGIC.utEnsureIngredientNotNull); - put("mixins.mods.modularrouters.json", c -> c.isModPresent("modularrouters") && UTConfigMods.MODULAR_ROUTERS.utParticleThreadToggle); - put("mixins.mods.roost.json", c -> c.isModPresent("roost") && c.isModPresent("contenttweaker")); - put("mixins.mods.storagedrawers.client.json", c -> c.isModPresent("storagedrawers")); - put("mixins.mods.tconstruct.client.json", c -> regularTConLoaded() && UTConfigMods.TINKERS_CONSTRUCT.utParticleFixesToggle); - put("mixins.tweaks.misc.recipebook.betweenlands.client.json", c -> c.isModPresent("thebetweenlands") && UTConfigTweaks.MISC.utRecipeBookToggle); - put("mixins.tweaks.misc.recipebook.buildcraft.client.json", c -> c.isModPresent("buildcraftcore") && UTConfigTweaks.MISC.utRecipeBookToggle); + put("mixins/mods/mixins.actuallyadditions.itemparticle.json", c -> c.isModPresent("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utItemLaserParticlesGraphics > -1); + put("mixins/mods/mixins.bibliocraft.lefthand.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utSwapDisplayHandWhenLeftHanded); + put("mixins/mods/mixins.bibliocraft.sign.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utFancySignRotationToggle); + put("mixins/mods/mixins.bibliocraft.version.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utDisableVersionCheckToggle); + put("mixins/mods/mixins.cbmultipart.client.json", c -> c.isModPresent("forgemultipartcbe") && UTConfigMods.CB_MULTIPART.utMemoryLeakFixToggle); + put("mixins/mods/mixins.compactmachines.memory.json", c -> c.isModPresent("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utMemoryLeakFixToggle); + put("mixins/mods/mixins.compactmachines.render.json", c -> c.isModPresent("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utCMRenderFixToggle); + put("mixins/mods/mixins.corpse.json", c -> c.isModPresent("corpse") && UTConfigMods.CORPSE.utOpeningGuisOffThreadFixToggle); + put("mixins/mods/mixins.crafttweaker.json", c -> c.isModPresent("crafttweaker")); + put("mixins/mods/mixins.electroblobswizardry.json", c -> c.isModPresent("ebwizardry") && c.isModPresent("conarm") && UTConfigMods.ELECTROBLOBS_WIZARDRY.utConstructsArmoryFixToggle); + put("mixins/mods/mixins.enderio.itemrender.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utReplaceItemRenderer); + put("mixins/mods/mixins.fpsreducer.json", c -> c.isModPresent("fpsreducer") && UTConfigMods.FPS_REDUCER.utCorrectFpsValue); + put("mixins/mods/mixins.hwyla.json", c -> c.isModPresent("waila")); + put("mixins/mods/mixins.ironchests.json", c -> c.isModPresent("ironchest") && UTConfigMods.IRON_CHESTS.utReplaceItemRenderer); + put("mixins/mods/mixins.modularmagic.nullingredient.json", c -> c.isModPresent("modularmagic") && UTConfigMods.MODULAR_MAGIC.utEnsureIngredientNotNull); + put("mixins/mods/mixins.modularrouters.json", c -> c.isModPresent("modularrouters") && UTConfigMods.MODULAR_ROUTERS.utParticleThreadToggle); + put("mixins/mods/mixins.roost.json", c -> c.isModPresent("roost") && c.isModPresent("contenttweaker")); + put("mixins/mods/mixins.storagedrawers.client.json", c -> c.isModPresent("storagedrawers")); + put("mixins/mods/mixins.tconstruct.client.json", c -> regularTConLoaded() && UTConfigMods.TINKERS_CONSTRUCT.utParticleFixesToggle); + } + if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchTweaks) + { + put("mixins/tweaks/mixins.misc.recipebook.betweenlands.client.json", c -> c.isModPresent("thebetweenlands") && UTConfigTweaks.MISC.utRecipeBookToggle); + put("mixins/tweaks/mixins.misc.recipebook.buildcraft.client.json", c -> c.isModPresent("buildcraftcore") && UTConfigTweaks.MISC.utRecipeBookToggle); } } }); @@ -61,125 +64,128 @@ public class UTMixinLoader implements ILateMixinLoader { if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchModIntegration) { - put("mixins.mods.abyssalcraft.json", c -> c.isModPresent("abyssalcraft")); - put("mixins.mods.actuallyadditions.dupes.json", c -> c.isModPresent("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utDuplicationFixesToggle); - put("mixins.mods.actuallyadditions.relayupgrade.json", c -> c.isModPresent("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utLaserUpgradeVoid); - put("mixins.mods.agricraft.json", c -> c.isModPresent("agricraft") && UTConfigMods.AGRICRAFT.utEnderIOPluginFixToggle); - put("mixins.mods.aoa3.json", c -> c.isModPresent("aoa3") && UTConfigMods.AOA.utImprovedPlayerTickToggle); - put("mixins.mods.arcanearchives.dupes.json", c -> c.isModPresent("arcanearchives") && UTConfigMods.ARCANE_ARCHIVES.utDuplicationFixesToggle); - put("mixins.mods.astralsorcery.json", c -> c.isModPresent("astralsorcery")); - put("mixins.mods.astralsorcery.neromanticprime.json", c -> c.isModPresent("astralsorcery")); - put("mixins.mods.astralsorcery.tool.json", c -> c.isModPresent("astralsorcery") && UTConfigMods.ASTRAL_SORCERY.utEmptyPropertiesZero); - put("mixins.mods.backpack.json", c -> c.isModPresent("backpack") && UTConfigMods.BACKPACKS.utBPNoOffhandInteractionToggle); - put("mixins.mods.bewitchment.json", c -> c.isModPresent("bewitchment") && UTConfigMods.BEWITCHMENT.utWitchesOvenFixToggle); - put("mixins.mods.bibliocraft.armor.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utArmorStandSlotFixToggle); - put("mixins.mods.bibliocraft.armorbinding.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utArmorStandBindingCurseToggle); - put("mixins.mods.bibliocraft.hand.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utFixHandConsumption); - put("mixins.mods.bibliocraft.handler.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utEnsureIItemHandlerMethodToggle); - put("mixins.mods.bibliocraft.itemstack.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utCopyItemStackCorrectlyToggle); - put("mixins.mods.bibliocraft.printpress.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utPrintingPressAnyBlackDyeToggle); - put("mixins.mods.bibliocraft.transfer.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utFixItemTransferToggle); - put("mixins.mods.biomesoplenty.json", c -> c.isModPresent("biomesoplenty")); - put("mixins.mods.biomesoplenty.sealevel.json", c -> c.isModPresent("biomesoplenty") && UTConfigTweaks.WORLD.utSeaLevel != 63); - put("mixins.mods.bloodmagic.boundtool.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utBoundToolTweakToggle); - put("mixins.mods.bloodmagic.dupes.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utDuplicationFixesToggle); - put("mixins.mods.bloodmagic.fluidrouting.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utFluidRoutingFixToggle); - put("mixins.mods.bloodmagic.ritual.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utBMRitualToggle); - put("mixins.mods.bloodmagic.json", c -> c.isModPresent("bloodmagic")); - put("mixins.mods.botania.dupes.json", c -> c.isModPresent("botania") && UTConfigMods.BOTANIA.utDuplicationFixesToggle); - put("mixins.mods.botania.json", c -> c.isModPresent("botania")); - put("mixins.mods.bwm.json", c -> c.isModPresent("betterwithmods") && UTConfigMods.BWM.utBeaconNBTLoadingFix); - put("mixins.mods.cbmultipart.json", c -> c.isModPresent("forgemultipartcbe") && UTConfigMods.CB_MULTIPART.utMemoryLeakFixToggle); - put("mixins.mods.ceramics.json", c -> c.isModPresent("ceramics")); - put("mixins.mods.chisel.tcomplement.dupes.json", c -> c.isModPresent("chisel") && c.isModPresent("tcomplement") && UTConfigMods.CHISEL.utDuplicationFixesToggle); - put("mixins.mods.codechickenlib.json", c -> c.isModPresent("codechickenlib") && UTConfigMods.CCL.utPacketLeakFixToggle); - put("mixins.mods.cofhcore.json", c -> c.isModPresent("cofhcore")); - put("mixins.mods.cofhworld.json", c -> c.isModPresent("cofhworld") && UTConfigMods.COFH_WORLD.utCoFHSuperflatToggle); - put("mixins.mods.collective.json", c -> c.isModPresent("collective")); - put("mixins.mods.compactmachines.spawns.json", c -> c.isModPresent("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utAllowedSpawnsImprovementToggle); - put("mixins.mods.cookingforblockheads.json", c -> c.isModPresent("cookingforblockheads") && UTConfigMods.COOKING_FOR_BLOCKHEADS.utOvenFixToggle); - put("mixins.mods.cqrepoured.json", c -> c.isModPresent("cqrepoured")); - put("mixins.mods.cyclic.json", c -> c.isModPresent("cyclicmagic") && UTConfigMods.CYCLIC.utMemoryLeakFixToggle); - put("mixins.mods.dankstorage.json", c -> c.isModPresent("dankstorage")); - put("mixins.mods.divinerpg.aquamarine.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utFixAquamarineStackSize); - put("mixins.mods.divinerpg.armorset.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utFixArmorSetCleanup); - put("mixins.mods.divinerpg.hand.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utFixHandConsumption); - put("mixins.mods.divinerpg.waterspawning.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utChangeWaterMobCreatureType); - put("mixins.mods.effortlessbuilding.json", c -> c.isModPresent("effortlessbuilding") && UTConfigMods.EFFORTLESS_BUILDING.utEFTransmutationFixToggle); - put("mixins.mods.elementarystaffs.json", c -> c.isModPresent("element")); - put("mixins.mods.elenaidodge2.json", c -> c.isModPresent("elenaidodge2")); - put("mixins.mods.enderio.chorus.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utChorusStackOverflow); - put("mixins.mods.enderio.cyclebutton.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utSaveFilterCycleButtonProperly); - put("mixins.mods.enderio.soulbinderjei.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utFixSoulBinderJEI); - put("mixins.mods.enderstorage.json", c -> c.isModPresent("enderstorage") && UTConfigMods.ENDER_STORAGE.utFrequencyTrackFixToggle); - put("mixins.mods.epicsiegemod.json", c -> c.isModPresent("epicsiegemod")); - put("mixins.mods.erebus.cabbage.json", c -> c.isModPresent("erebus") && UTConfigMods.EREBUS.utCabbageDropToggle); - put("mixins.mods.erebus.json", c -> c.isModPresent("erebus")); - put("mixins.mods.gaiadimension.restructurer.json", c -> c.isModPresent("gaiadimension") && UTConfigMods.GAIA_DIMENSION.utFixNPERestructurerRecipe); - put("mixins.mods.erebus.quakehammer.json", c -> c.isModPresent("erebus") && UTConfigMods.EREBUS.utFixQuakeHammerTextureToggle); - put("mixins.mods.evilcraft.vengeancespirit.regex.json", c -> c.isModPresent("evilcraft") && UTConfigMods.EVIL_CRAFT.utVengeanceSpiritCache); - put("mixins.mods.evilcraft.vengeancespirit.random.json", c -> c.isModPresent("evilcraft") && UTConfigMods.EVIL_CRAFT.utVengeanceSpiritRandom); - put("mixins.mods.extrautilities.breakcreativemill.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utFixCreativeMillHarvestability); - put("mixins.mods.extrautilities.deepdarkstats.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDeepDarkStats); - put("mixins.mods.extrautilities.dupes.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDuplicationFixesToggle); - put("mixins.mods.extrautilities.mutabledrops.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utMutableBlockDrops); - put("mixins.mods.extrautilities.potionlogging.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDowngradePotionLogging); - put("mixins.mods.extrautilities.radarexception.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utCatchRadarException); - put("mixins.mods.extrautilities.radarloot.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utRadarSkipsLoottables); - put("mixins.mods.forestry.extratrees.json", c -> c.isModPresent("extratrees") && UTConfigMods.FORESTRY.utFOGatherWindfallToggle); - put("mixins.mods.forestry.json", c -> c.isModPresent("forestry")); - put("mixins.mods.immersiveengineering.toolevent.json", c -> c.isModPresent("immersiveengineering") && UTConfigMods.IMMERSIVE_ENGINEERING.utFireBreakEvent); - put("mixins.mods.immersiveengineering.toolhand.json", c -> c.isModPresent("immersiveengineering") && UTConfigMods.IMMERSIVE_ENGINEERING.utFixIncorrectHandReplacement); - put("mixins.mods.incontrol.json", c -> c.isModPresent("incontrol") && UTConfigMods.INCONTROL.utStatsFixToggle); - put("mixins.mods.industrialcraft.dupes.json", c -> c.isModPresent("ic2") && UTConfigMods.INDUSTRIALCRAFT.utDuplicationFixesToggle); - put("mixins.mods.industrialforegoing.dupes.json", c -> c.isModPresent("industrialforegoing") && UTConfigMods.INDUSTRIAL_FOREGOING.utDuplicationFixesToggle); - put("mixins.mods.industrialforegoing.rangeaddon.json", c -> c.isModPresent("industrialforegoing") && UTConfigMods.INDUSTRIAL_FOREGOING.utRangeAddonNumberFix); - put("mixins.mods.infernalmobs.json", c -> c.isModPresent("infernalmobs")); - put("mixins.mods.ironbackpacks.dupes.json", c -> c.isModPresent("ironbackpacks") && UTConfigMods.IRON_BACKPACKS.utDuplicationFixesToggle); - put("mixins.mods.itemfavorites.unixfix.json", c -> c.isModPresent("itemfav") && UTConfigMods.ITEM_FAVORITES.utUnixPathFix); - put("mixins.mods.itemstages.json", c -> c.isModPresent("itemstages")); - put("mixins.mods.jurassicreborn.json", c -> c.isModPresent("rebornmod")); - put("mixins.mods.mekanism.dupes.json", c -> c.isModPresent("mekanism") && UTConfigMods.MEKANISM.utDuplicationFixesToggle); - put("mixins.mods.mekanism.fluidtank.json", c -> c.isModPresent("mekanism") && UTConfigMods.MEKANISM.utFluidTankExtraction); - put("mixins.mods.moartinkers.json", c -> c.isModPresent("moartinkers") && UTConfigMods.MOAR_TINKERS.utBaublesCompatibility); - put("mixins.mods.mobstages.json", c -> c.isModPresent("mobstages")); - put("mixins.mods.mrtjpcore.json", c -> c.isModPresent("mrtjpcore") && UTConfigMods.MRTJPCORE.utMemoryLeakFixToggle); - put("mixins.mods.netherchest.dupes.json", c -> c.isModPresent("netherchest") && UTConfigMods.NETHER_CHEST.utDuplicationFixesToggle); - put("mixins.mods.netherrocks.json", c -> c.isModPresent("netherrocks")); - put("mixins.mods.nuclearcraft.json", c -> c.isModPresent("nuclearcraft")); - put("mixins.mods.openblocks.json", c -> regularOpenBlocksLoaded() && UTConfigMods.OPEN_BLOCKS.utLastStandFixToggle); - put("mixins.mods.properpumpkins.json", c -> c.isModPresent("pumpking") && UTConfigMods.PROPER_PUMPKIN.utFacingFix); - put("mixins.mods.quark.dupes.json", c -> c.isModPresent("quark") && UTConfigMods.QUARK.utDuplicationFixesToggle); - put("mixins.mods.randomthings.anvil.json", c -> c.isModPresent("randomthings") && UTConfigMods.RANDOM_THINGS.utAnvilCraftFix); - put("mixins.mods.randomthings.collector.json", c -> c.isModPresent("randomthings") && UTConfigMods.RANDOM_THINGS.utItemCollectorDupe); - put("mixins.mods.requiousfrakto.json", c -> c.isModPresent("requious") && UTConfigMods.REQUIOUS_FRAKTO.utParticleFixesToggle); - put("mixins.mods.reskillable.json", c -> c.isModPresent("reskillable")); - put("mixins.mods.rftoolsdimensions.json", c -> c.isModPresent("rftoolsdim")); - put("mixins.mods.roost.contenttweaker.json", c -> c.isModPresent("roost") && c.isModPresent("contenttweaker")); - put("mixins.mods.roots.creativepouch.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utDisableCreativePouchGUI); - put("mixins.mods.roots.disabledmodifier.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixDisableModifierVoiding); - put("mixins.mods.roots.icicle.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixIcicleSaving); - put("mixins.mods.roots.mortar.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixMortarSpellDust); - put("mixins.mods.roots.shatter.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utPreventShatterOnUnbreakable); - put("mixins.mods.roots.soil.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utPreventSoilNeighborUpdates); - put("mixins.mods.roots.spiritdrops.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixSpiritDrops); - put("mixins.mods.roots.summon.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixSummoningInfiniteDescent); - put("mixins.mods.simpledifficulty.json", c -> c.isModPresent("simpledifficulty")); - put("mixins.mods.spiceoflife.dupes.json", c -> c.isModPresent("spiceoflife") && UTConfigMods.SPICE_OF_LIFE.utDuplicationFixesToggle); - put("mixins.mods.steamworld.json", c -> c.isModPresent("steamworld") && UTConfigMods.STEAMWORLD.utSkyOfOldFixToggle); - put("mixins.mods.storagedrawers.json", c -> c.isModPresent("storagedrawers") && UTConfigMods.STORAGE_DRAWERS.utSDItemVoidingFixToggle); - put("mixins.mods.tconstruct.json", c -> regularTConLoaded()); - put("mixins.mods.tconstruct.oredictcache.json", c -> regularTConLoaded() && UTConfigMods.TINKERS_CONSTRUCT.utTConOreDictCacheToggle); - put("mixins.mods.tconstruct.toolcustomization.json", c -> regularTConLoaded() && UTConfigMods.TINKERS_CONSTRUCT.TOOL_CUSTOMIZATION.utTConToolCustomizationToggle); - put("mixins.mods.tconstruct.toolcustomization.plustic.json", c -> regularTConLoaded() && c.isModPresent("plustic") && UTConfigMods.TINKERS_CONSTRUCT.TOOL_CUSTOMIZATION.utTConToolCustomizationToggle); - put("mixins.mods.techreborn.json", c -> c.isModPresent("techreborn")); - put("mixins.mods.testdummy.copyarmor.json", c -> c.isModPresent("testdummy") && UTConfigMods.TEST_DUMMY.utCopyArmor); - put("mixins.mods.thefarlanders.dupes.json", c -> c.isModPresent("farlanders") && UTConfigMods.THE_FARLANDERS.utDuplicationFixesToggle); - put("mixins.mods.thermalexpansion.dupes.json", c -> c.isModPresent("thermalexpansion") && UTConfigMods.THERMAL_EXPANSION.utDuplicationFixesToggle); - put("mixins.mods.thermalexpansion.json", c -> c.isModPresent("thermalexpansion")); - put("mixins.mods.tinyprogressions.dupes.json", c -> c.isModPresent("tp") && UTConfigMods.TINY_PROGRESSIONS.utDuplicationFixesToggle); - put("mixins.mods.woot.json", c -> c.isModPresent("woot") && UTConfigMods.WOOT.utCleanupSimulatedKillsToggle); - put("mixins.tweaks.blocks.enchantmenttable.bookshelf.json", c -> c.isModPresent("bookshelf") && UTConfigTweaks.BLOCKS.utEnchantmentTableObstructionToggle); + put("mixins/mods/mixins.abyssalcraft.json", c -> c.isModPresent("abyssalcraft")); + put("mixins/mods/mixins.actuallyadditions.dupes.json", c -> c.isModPresent("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utDuplicationFixesToggle); + put("mixins/mods/mixins.actuallyadditions.relayupgrade.json", c -> c.isModPresent("actuallyadditions") && UTConfigMods.ACTUALLY_ADDITIONS.utLaserUpgradeVoid); + put("mixins/mods/mixins.agricraft.json", c -> c.isModPresent("agricraft") && UTConfigMods.AGRICRAFT.utEnderIOPluginFixToggle); + put("mixins/mods/mixins.aoa3.json", c -> c.isModPresent("aoa3") && UTConfigMods.AOA.utImprovedPlayerTickToggle); + put("mixins/mods/mixins.arcanearchives.dupes.json", c -> c.isModPresent("arcanearchives") && UTConfigMods.ARCANE_ARCHIVES.utDuplicationFixesToggle); + put("mixins/mods/mixins.astralsorcery.json", c -> c.isModPresent("astralsorcery")); + put("mixins/mods/mixins.astralsorcery.neromanticprime.json", c -> c.isModPresent("astralsorcery")); + put("mixins/mods/mixins.astralsorcery.tool.json", c -> c.isModPresent("astralsorcery") && UTConfigMods.ASTRAL_SORCERY.utEmptyPropertiesZero); + put("mixins/mods/mixins.backpack.json", c -> c.isModPresent("backpack") && UTConfigMods.BACKPACKS.utBPNoOffhandInteractionToggle); + put("mixins/mods/mixins.bewitchment.json", c -> c.isModPresent("bewitchment") && UTConfigMods.BEWITCHMENT.utWitchesOvenFixToggle); + put("mixins/mods/mixins.bibliocraft.armor.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utArmorStandSlotFixToggle); + put("mixins/mods/mixins.bibliocraft.armorbinding.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utArmorStandBindingCurseToggle); + put("mixins/mods/mixins.bibliocraft.hand.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utFixHandConsumption); + put("mixins/mods/mixins.bibliocraft.handler.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utEnsureIItemHandlerMethodToggle); + put("mixins/mods/mixins.bibliocraft.itemstack.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utCopyItemStackCorrectlyToggle); + put("mixins/mods/mixins.bibliocraft.printpress.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utPrintingPressAnyBlackDyeToggle); + put("mixins/mods/mixins.bibliocraft.transfer.json", c -> c.isModPresent("bibliocraft") && UTConfigMods.BIBLIOCRAFT.utFixItemTransferToggle); + put("mixins/mods/mixins.biomesoplenty.json", c -> c.isModPresent("biomesoplenty")); + put("mixins/mods/mixins.biomesoplenty.sealevel.json", c -> c.isModPresent("biomesoplenty") && UTConfigTweaks.WORLD.utSeaLevel != 63); + put("mixins/mods/mixins.bloodmagic.boundtool.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utBoundToolTweakToggle); + put("mixins/mods/mixins.bloodmagic.dupes.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utDuplicationFixesToggle); + put("mixins/mods/mixins.bloodmagic.fluidrouting.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utFluidRoutingFixToggle); + put("mixins/mods/mixins.bloodmagic.ritual.json", c -> c.isModPresent("bloodmagic") && UTConfigMods.BLOOD_MAGIC.utBMRitualToggle); + put("mixins/mods/mixins.bloodmagic.json", c -> c.isModPresent("bloodmagic")); + put("mixins/mods/mixins.botania.dupes.json", c -> c.isModPresent("botania") && UTConfigMods.BOTANIA.utDuplicationFixesToggle); + put("mixins/mods/mixins.botania.json", c -> c.isModPresent("botania")); + put("mixins/mods/mixins.bwm.json", c -> c.isModPresent("betterwithmods") && UTConfigMods.BWM.utBeaconNBTLoadingFix); + put("mixins/mods/mixins.cbmultipart.json", c -> c.isModPresent("forgemultipartcbe") && UTConfigMods.CB_MULTIPART.utMemoryLeakFixToggle); + put("mixins/mods/mixins.ceramics.json", c -> c.isModPresent("ceramics")); + put("mixins/mods/mixins.chisel.tcomplement.dupes.json", c -> c.isModPresent("chisel") && c.isModPresent("tcomplement") && UTConfigMods.CHISEL.utDuplicationFixesToggle); + put("mixins/mods/mixins.codechickenlib.json", c -> c.isModPresent("codechickenlib") && UTConfigMods.CCL.utPacketLeakFixToggle); + put("mixins/mods/mixins.cofhcore.json", c -> c.isModPresent("cofhcore")); + put("mixins/mods/mixins.cofhworld.json", c -> c.isModPresent("cofhworld") && UTConfigMods.COFH_WORLD.utCoFHSuperflatToggle); + put("mixins/mods/mixins.collective.json", c -> c.isModPresent("collective")); + put("mixins/mods/mixins.compactmachines.spawns.json", c -> c.isModPresent("compactmachines3") && UTConfigMods.COMPACT_MACHINES.utAllowedSpawnsImprovementToggle); + put("mixins/mods/mixins.cookingforblockheads.json", c -> c.isModPresent("cookingforblockheads") && UTConfigMods.COOKING_FOR_BLOCKHEADS.utOvenFixToggle); + put("mixins/mods/mixins.cqrepoured.json", c -> c.isModPresent("cqrepoured")); + put("mixins/mods/mixins.cyclic.json", c -> c.isModPresent("cyclicmagic") && UTConfigMods.CYCLIC.utMemoryLeakFixToggle); + put("mixins/mods/mixins.dankstorage.json", c -> c.isModPresent("dankstorage")); + put("mixins/mods/mixins.divinerpg.aquamarine.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utFixAquamarineStackSize); + put("mixins/mods/mixins.divinerpg.armorset.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utFixArmorSetCleanup); + put("mixins/mods/mixins.divinerpg.hand.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utFixHandConsumption); + put("mixins/mods/mixins.divinerpg.waterspawning.json", c -> c.isModPresent("divinerpg") && UTConfigMods.DIVINE_RPG.utChangeWaterMobCreatureType); + put("mixins/mods/mixins.effortlessbuilding.json", c -> c.isModPresent("effortlessbuilding") && UTConfigMods.EFFORTLESS_BUILDING.utEFTransmutationFixToggle); + put("mixins/mods/mixins.elementarystaffs.json", c -> c.isModPresent("element")); + put("mixins/mods/mixins.elenaidodge2.json", c -> c.isModPresent("elenaidodge2")); + put("mixins/mods/mixins.enderio.chorus.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utChorusStackOverflow); + put("mixins/mods/mixins.enderio.cyclebutton.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utSaveFilterCycleButtonProperly); + put("mixins/mods/mixins.enderio.soulbinderjei.json", c -> c.isModPresent("enderio") && UTConfigMods.ENDER_IO.utFixSoulBinderJEI); + put("mixins/mods/mixins.enderstorage.json", c -> c.isModPresent("enderstorage") && UTConfigMods.ENDER_STORAGE.utFrequencyTrackFixToggle); + put("mixins/mods/mixins.epicsiegemod.json", c -> c.isModPresent("epicsiegemod")); + put("mixins/mods/mixins.erebus.cabbage.json", c -> c.isModPresent("erebus") && UTConfigMods.EREBUS.utCabbageDropToggle); + put("mixins/mods/mixins.erebus.json", c -> c.isModPresent("erebus")); + put("mixins/mods/mixins.gaiadimension.restructurer.json", c -> c.isModPresent("gaiadimension") && UTConfigMods.GAIA_DIMENSION.utFixNPERestructurerRecipe); + put("mixins/mods/mixins.erebus.quakehammer.json", c -> c.isModPresent("erebus") && UTConfigMods.EREBUS.utFixQuakeHammerTextureToggle); + put("mixins/mods/mixins.evilcraft.vengeancespirit.regex.json", c -> c.isModPresent("evilcraft") && UTConfigMods.EVIL_CRAFT.utVengeanceSpiritCache); + put("mixins/mods/mixins.evilcraft.vengeancespirit.random.json", c -> c.isModPresent("evilcraft") && UTConfigMods.EVIL_CRAFT.utVengeanceSpiritRandom); + put("mixins/mods/mixins.extrautilities.breakcreativemill.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utFixCreativeMillHarvestability); + put("mixins/mods/mixins.extrautilities.deepdarkstats.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDeepDarkStats); + put("mixins/mods/mixins.extrautilities.dupes.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDuplicationFixesToggle); + put("mixins/mods/mixins.extrautilities.mutabledrops.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utMutableBlockDrops); + put("mixins/mods/mixins.extrautilities.potionlogging.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utDowngradePotionLogging); + put("mixins/mods/mixins.extrautilities.radarexception.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utCatchRadarException); + put("mixins/mods/mixins.extrautilities.radarloot.json", c -> c.isModPresent("extrautils2") && UTConfigMods.EXTRA_UTILITIES.utRadarSkipsLoottables); + put("mixins/mods/mixins.forestry.extratrees.json", c -> c.isModPresent("extratrees") && UTConfigMods.FORESTRY.utFOGatherWindfallToggle); + put("mixins/mods/mixins.forestry.json", c -> c.isModPresent("forestry")); + put("mixins/mods/mixins.immersiveengineering.toolevent.json", c -> c.isModPresent("immersiveengineering") && UTConfigMods.IMMERSIVE_ENGINEERING.utFireBreakEvent); + put("mixins/mods/mixins.immersiveengineering.toolhand.json", c -> c.isModPresent("immersiveengineering") && UTConfigMods.IMMERSIVE_ENGINEERING.utFixIncorrectHandReplacement); + put("mixins/mods/mixins.incontrol.json", c -> c.isModPresent("incontrol") && UTConfigMods.INCONTROL.utStatsFixToggle); + put("mixins/mods/mixins.industrialcraft.dupes.json", c -> c.isModPresent("ic2") && UTConfigMods.INDUSTRIALCRAFT.utDuplicationFixesToggle); + put("mixins/mods/mixins.industrialforegoing.dupes.json", c -> c.isModPresent("industrialforegoing") && UTConfigMods.INDUSTRIAL_FOREGOING.utDuplicationFixesToggle); + put("mixins/mods/mixins.industrialforegoing.rangeaddon.json", c -> c.isModPresent("industrialforegoing") && UTConfigMods.INDUSTRIAL_FOREGOING.utRangeAddonNumberFix); + put("mixins/mods/mixins.infernalmobs.json", c -> c.isModPresent("infernalmobs")); + put("mixins/mods/mixins.ironbackpacks.dupes.json", c -> c.isModPresent("ironbackpacks") && UTConfigMods.IRON_BACKPACKS.utDuplicationFixesToggle); + put("mixins/mods/mixins.itemfavorites.unixfix.json", c -> c.isModPresent("itemfav") && UTConfigMods.ITEM_FAVORITES.utUnixPathFix); + put("mixins/mods/mixins.itemstages.json", c -> c.isModPresent("itemstages")); + put("mixins/mods/mixins.jurassicreborn.json", c -> c.isModPresent("rebornmod")); + put("mixins/mods/mixins.mekanism.dupes.json", c -> c.isModPresent("mekanism") && UTConfigMods.MEKANISM.utDuplicationFixesToggle); + put("mixins/mods/mixins.mekanism.fluidtank.json", c -> c.isModPresent("mekanism") && UTConfigMods.MEKANISM.utFluidTankExtraction); + put("mixins/mods/mixins.moartinkers.json", c -> c.isModPresent("moartinkers") && UTConfigMods.MOAR_TINKERS.utBaublesCompatibility); + put("mixins/mods/mixins.mobstages.json", c -> c.isModPresent("mobstages")); + put("mixins/mods/mixins.mrtjpcore.json", c -> c.isModPresent("mrtjpcore") && UTConfigMods.MRTJPCORE.utMemoryLeakFixToggle); + put("mixins/mods/mixins.netherchest.dupes.json", c -> c.isModPresent("netherchest") && UTConfigMods.NETHER_CHEST.utDuplicationFixesToggle); + put("mixins/mods/mixins.netherrocks.json", c -> c.isModPresent("netherrocks")); + put("mixins/mods/mixins.nuclearcraft.json", c -> c.isModPresent("nuclearcraft")); + put("mixins/mods/mixins.openblocks.json", c -> regularOpenBlocksLoaded() && UTConfigMods.OPEN_BLOCKS.utLastStandFixToggle); + put("mixins/mods/mixins.properpumpkins.json", c -> c.isModPresent("pumpking") && UTConfigMods.PROPER_PUMPKIN.utFacingFix); + put("mixins/mods/mixins.quark.dupes.json", c -> c.isModPresent("quark") && UTConfigMods.QUARK.utDuplicationFixesToggle); + put("mixins/mods/mixins.randomthings.anvil.json", c -> c.isModPresent("randomthings") && UTConfigMods.RANDOM_THINGS.utAnvilCraftFix); + put("mixins/mods/mixins.randomthings.collector.json", c -> c.isModPresent("randomthings") && UTConfigMods.RANDOM_THINGS.utItemCollectorDupe); + put("mixins/mods/mixins.requiousfrakto.json", c -> c.isModPresent("requious") && UTConfigMods.REQUIOUS_FRAKTO.utParticleFixesToggle); + put("mixins/mods/mixins.reskillable.json", c -> c.isModPresent("reskillable")); + put("mixins/mods/mixins.rftoolsdimensions.json", c -> c.isModPresent("rftoolsdim")); + put("mixins/mods/mixins.roost.contenttweaker.json", c -> c.isModPresent("roost") && c.isModPresent("contenttweaker")); + put("mixins/mods/mixins.roots.creativepouch.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utDisableCreativePouchGUI); + put("mixins/mods/mixins.roots.disabledmodifier.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixDisableModifierVoiding); + put("mixins/mods/mixins.roots.icicle.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixIcicleSaving); + put("mixins/mods/mixins.roots.mortar.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixMortarSpellDust); + put("mixins/mods/mixins.roots.shatter.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utPreventShatterOnUnbreakable); + put("mixins/mods/mixins.roots.soil.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utPreventSoilNeighborUpdates); + put("mixins/mods/mixins.roots.spiritdrops.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixSpiritDrops); + put("mixins/mods/mixins.roots.summon.json", c -> c.isModPresent("roots") && UTConfigMods.ROOTS.utFixSummoningInfiniteDescent); + put("mixins/mods/mixins.simpledifficulty.json", c -> c.isModPresent("simpledifficulty")); + put("mixins/mods/mixins.spiceoflife.dupes.json", c -> c.isModPresent("spiceoflife") && UTConfigMods.SPICE_OF_LIFE.utDuplicationFixesToggle); + put("mixins/mods/mixins.steamworld.json", c -> c.isModPresent("steamworld") && UTConfigMods.STEAMWORLD.utSkyOfOldFixToggle); + put("mixins/mods/mixins.storagedrawers.json", c -> c.isModPresent("storagedrawers") && UTConfigMods.STORAGE_DRAWERS.utSDItemVoidingFixToggle); + put("mixins/mods/mixins.tconstruct.json", c -> regularTConLoaded()); + put("mixins/mods/mixins.tconstruct.oredictcache.json", c -> regularTConLoaded() && UTConfigMods.TINKERS_CONSTRUCT.utTConOreDictCacheToggle); + put("mixins/mods/mixins.tconstruct.toolcustomization.json", c -> regularTConLoaded() && UTConfigMods.TINKERS_CONSTRUCT.TOOL_CUSTOMIZATION.utTConToolCustomizationToggle); + put("mixins/mods/mixins.tconstruct.toolcustomization.plustic.json", c -> regularTConLoaded() && c.isModPresent("plustic") && UTConfigMods.TINKERS_CONSTRUCT.TOOL_CUSTOMIZATION.utTConToolCustomizationToggle); + put("mixins/mods/mixins.techreborn.json", c -> c.isModPresent("techreborn")); + put("mixins/mods/mixins.testdummy.copyarmor.json", c -> c.isModPresent("testdummy") && UTConfigMods.TEST_DUMMY.utCopyArmor); + put("mixins/mods/mixins.thefarlanders.dupes.json", c -> c.isModPresent("farlanders") && UTConfigMods.THE_FARLANDERS.utDuplicationFixesToggle); + put("mixins/mods/mixins.thermalexpansion.dupes.json", c -> c.isModPresent("thermalexpansion") && UTConfigMods.THERMAL_EXPANSION.utDuplicationFixesToggle); + put("mixins/mods/mixins.thermalexpansion.json", c -> c.isModPresent("thermalexpansion")); + put("mixins/mods/mixins.tinyprogressions.dupes.json", c -> c.isModPresent("tp") && UTConfigMods.TINY_PROGRESSIONS.utDuplicationFixesToggle); + put("mixins/mods/mixins.woot.json", c -> c.isModPresent("woot") && UTConfigMods.WOOT.utCleanupSimulatedKillsToggle); + } + if (UTConfigGeneral.MASTER_SWITCHES.utMasterSwitchTweaks) + { + put("mixins/tweaks/mixins.blocks.enchantmenttable.bookshelf.json", c -> c.isModPresent("bookshelf") && UTConfigTweaks.BLOCKS.utEnchantmentTableObstructionToggle); } } }); diff --git a/src/main/resources/mixins.bugfixes.blocks.banner.json b/src/main/resources/mixins/bugfixes/mixins.blocks.banner.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.banner.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.banner.json diff --git a/src/main/resources/mixins.bugfixes.blocks.blockoverlay.json b/src/main/resources/mixins/bugfixes/mixins.blocks.blockoverlay.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.blockoverlay.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.blockoverlay.json diff --git a/src/main/resources/mixins.bugfixes.blocks.comparatortiming.json b/src/main/resources/mixins/bugfixes/mixins.blocks.comparatortiming.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.comparatortiming.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.comparatortiming.json diff --git a/src/main/resources/mixins.bugfixes.blocks.falling.json b/src/main/resources/mixins/bugfixes/mixins.blocks.falling.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.falling.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.falling.json diff --git a/src/main/resources/mixins.bugfixes.blocks.hopper.boundingbox.json b/src/main/resources/mixins/bugfixes/mixins.blocks.hopper.boundingbox.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.hopper.boundingbox.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.hopper.boundingbox.json diff --git a/src/main/resources/mixins.bugfixes.blocks.hopper.tile.json b/src/main/resources/mixins/bugfixes/mixins.blocks.hopper.tile.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.hopper.tile.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.hopper.tile.json diff --git a/src/main/resources/mixins.bugfixes.blocks.itemframevoid.json b/src/main/resources/mixins/bugfixes/mixins.blocks.itemframevoid.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.itemframevoid.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.itemframevoid.json diff --git a/src/main/resources/mixins.bugfixes.blocks.ladderflying.json b/src/main/resources/mixins/bugfixes/mixins.blocks.ladderflying.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.ladderflying.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.ladderflying.json diff --git a/src/main/resources/mixins.bugfixes.blocks.miningglitch.client.json b/src/main/resources/mixins/bugfixes/mixins.blocks.miningglitch.client.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.miningglitch.client.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.miningglitch.client.json diff --git a/src/main/resources/mixins.bugfixes.blocks.miningglitch.server.json b/src/main/resources/mixins/bugfixes/mixins.blocks.miningglitch.server.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.miningglitch.server.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.miningglitch.server.json diff --git a/src/main/resources/mixins.bugfixes.blocks.piston.retraction.json b/src/main/resources/mixins/bugfixes/mixins.blocks.piston.retraction.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.piston.retraction.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.piston.retraction.json diff --git a/src/main/resources/mixins.bugfixes.blocks.piston.tile.json b/src/main/resources/mixins/bugfixes/mixins.blocks.piston.tile.json similarity index 100% rename from src/main/resources/mixins.bugfixes.blocks.piston.tile.json rename to src/main/resources/mixins/bugfixes/mixins.blocks.piston.tile.json diff --git a/src/main/resources/mixins.bugfixes.entities.ai.json b/src/main/resources/mixins/bugfixes/mixins.entities.ai.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.ai.json rename to src/main/resources/mixins/bugfixes/mixins.entities.ai.json diff --git a/src/main/resources/mixins.bugfixes.entities.attackradius.json b/src/main/resources/mixins/bugfixes/mixins.entities.attackradius.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.attackradius.json rename to src/main/resources/mixins/bugfixes/mixins.entities.attackradius.json diff --git a/src/main/resources/mixins.bugfixes.entities.blockfire.json b/src/main/resources/mixins/bugfixes/mixins.entities.blockfire.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.blockfire.json rename to src/main/resources/mixins/bugfixes/mixins.entities.blockfire.json diff --git a/src/main/resources/mixins.bugfixes.entities.boat.breaking.json b/src/main/resources/mixins/bugfixes/mixins.entities.boat.breaking.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.boat.breaking.json rename to src/main/resources/mixins/bugfixes/mixins.entities.boat.breaking.json diff --git a/src/main/resources/mixins.bugfixes.entities.boat.offset.json b/src/main/resources/mixins/bugfixes/mixins.entities.boat.offset.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.boat.offset.json rename to src/main/resources/mixins/bugfixes/mixins.entities.boat.offset.json diff --git a/src/main/resources/mixins.bugfixes.entities.boundingbox.json b/src/main/resources/mixins/bugfixes/mixins.entities.boundingbox.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.boundingbox.json rename to src/main/resources/mixins/bugfixes/mixins.entities.boundingbox.json diff --git a/src/main/resources/mixins.bugfixes.entities.deathtime.json b/src/main/resources/mixins/bugfixes/mixins.entities.deathtime.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.deathtime.json rename to src/main/resources/mixins/bugfixes/mixins.entities.deathtime.json diff --git a/src/main/resources/mixins.bugfixes.entities.destroypacket.json b/src/main/resources/mixins/bugfixes/mixins.entities.destroypacket.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.destroypacket.json rename to src/main/resources/mixins/bugfixes/mixins.entities.destroypacket.json diff --git a/src/main/resources/mixins.bugfixes.entities.desync.json b/src/main/resources/mixins/bugfixes/mixins.entities.desync.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.desync.json rename to src/main/resources/mixins/bugfixes/mixins.entities.desync.json diff --git a/src/main/resources/mixins.bugfixes.entities.dimensionchange.json b/src/main/resources/mixins/bugfixes/mixins.entities.dimensionchange.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.dimensionchange.json rename to src/main/resources/mixins/bugfixes/mixins.entities.dimensionchange.json diff --git a/src/main/resources/mixins.bugfixes.entities.elytra.json b/src/main/resources/mixins/bugfixes/mixins.entities.elytra.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.elytra.json rename to src/main/resources/mixins/bugfixes/mixins.entities.elytra.json diff --git a/src/main/resources/mixins.bugfixes.entities.elytrarender.json b/src/main/resources/mixins/bugfixes/mixins.entities.elytrarender.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.elytrarender.json rename to src/main/resources/mixins/bugfixes/mixins.entities.elytrarender.json diff --git a/src/main/resources/mixins.bugfixes.entities.entityid.json b/src/main/resources/mixins/bugfixes/mixins.entities.entityid.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.entityid.json rename to src/main/resources/mixins/bugfixes/mixins.entities.entityid.json diff --git a/src/main/resources/mixins.bugfixes.entities.entitylists.client.json b/src/main/resources/mixins/bugfixes/mixins.entities.entitylists.client.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.entitylists.client.json rename to src/main/resources/mixins/bugfixes/mixins.entities.entitylists.client.json diff --git a/src/main/resources/mixins.bugfixes.entities.entitylists.json b/src/main/resources/mixins/bugfixes/mixins.entities.entitylists.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.entitylists.json rename to src/main/resources/mixins/bugfixes/mixins.entities.entitylists.json diff --git a/src/main/resources/mixins.bugfixes.entities.horsefalling.json b/src/main/resources/mixins/bugfixes/mixins.entities.horsefalling.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.horsefalling.json rename to src/main/resources/mixins/bugfixes/mixins.entities.horsefalling.json diff --git a/src/main/resources/mixins.bugfixes.entities.maxhealth.json b/src/main/resources/mixins/bugfixes/mixins.entities.maxhealth.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.maxhealth.json rename to src/main/resources/mixins/bugfixes/mixins.entities.maxhealth.json diff --git a/src/main/resources/mixins.bugfixes.entities.minecart.json b/src/main/resources/mixins/bugfixes/mixins.entities.minecart.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.minecart.json rename to src/main/resources/mixins/bugfixes/mixins.entities.minecart.json diff --git a/src/main/resources/mixins.bugfixes.entities.mount.json b/src/main/resources/mixins/bugfixes/mixins.entities.mount.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.mount.json rename to src/main/resources/mixins/bugfixes/mixins.entities.mount.json diff --git a/src/main/resources/mixins.bugfixes.entities.saturation.json b/src/main/resources/mixins/bugfixes/mixins.entities.saturation.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.saturation.json rename to src/main/resources/mixins/bugfixes/mixins.entities.saturation.json diff --git a/src/main/resources/mixins.bugfixes.entities.skeletonaim.json b/src/main/resources/mixins/bugfixes/mixins.entities.skeletonaim.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.skeletonaim.json rename to src/main/resources/mixins/bugfixes/mixins.entities.skeletonaim.json diff --git a/src/main/resources/mixins.bugfixes.entities.sleeping.json b/src/main/resources/mixins/bugfixes/mixins.entities.sleeping.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.sleeping.json rename to src/main/resources/mixins/bugfixes/mixins.entities.sleeping.json diff --git a/src/main/resources/mixins.bugfixes.entities.suffocation.json b/src/main/resources/mixins/bugfixes/mixins.entities.suffocation.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.suffocation.json rename to src/main/resources/mixins/bugfixes/mixins.entities.suffocation.json diff --git a/src/main/resources/mixins.bugfixes.entities.tracker.json b/src/main/resources/mixins/bugfixes/mixins.entities.tracker.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.tracker.json rename to src/main/resources/mixins/bugfixes/mixins.entities.tracker.json diff --git a/src/main/resources/mixins.bugfixes.entities.untippedarrowparticles.json b/src/main/resources/mixins/bugfixes/mixins.entities.untippedarrowparticles.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.untippedarrowparticles.json rename to src/main/resources/mixins/bugfixes/mixins.entities.untippedarrowparticles.json diff --git a/src/main/resources/mixins.bugfixes.entities.villagermantle.json b/src/main/resources/mixins/bugfixes/mixins.entities.villagermantle.json similarity index 100% rename from src/main/resources/mixins.bugfixes.entities.villagermantle.json rename to src/main/resources/mixins/bugfixes/mixins.entities.villagermantle.json diff --git a/src/main/resources/mixins.bugfixes.misc.actionbar.json b/src/main/resources/mixins/bugfixes/mixins.misc.actionbar.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.actionbar.json rename to src/main/resources/mixins/bugfixes/mixins.misc.actionbar.json diff --git a/src/main/resources/mixins.bugfixes.misc.crafteditemstatistics.json b/src/main/resources/mixins/bugfixes/mixins.misc.crafteditemstatistics.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.crafteditemstatistics.json rename to src/main/resources/mixins/bugfixes/mixins.misc.crafteditemstatistics.json diff --git a/src/main/resources/mixins.bugfixes.misc.depthmask.json b/src/main/resources/mixins/bugfixes/mixins.misc.depthmask.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.depthmask.json rename to src/main/resources/mixins/bugfixes/mixins.misc.depthmask.json diff --git a/src/main/resources/mixins.bugfixes.misc.durabilitycap.json b/src/main/resources/mixins/bugfixes/mixins.misc.durabilitycap.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.durabilitycap.json rename to src/main/resources/mixins/bugfixes/mixins.misc.durabilitycap.json diff --git a/src/main/resources/mixins.bugfixes.misc.itempickup.json b/src/main/resources/mixins/bugfixes/mixins.misc.itempickup.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.itempickup.json rename to src/main/resources/mixins/bugfixes/mixins.misc.itempickup.json diff --git a/src/main/resources/mixins.bugfixes.misc.packetsize.json b/src/main/resources/mixins/bugfixes/mixins.misc.packetsize.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.packetsize.json rename to src/main/resources/mixins/bugfixes/mixins.misc.packetsize.json diff --git a/src/main/resources/mixins.bugfixes.misc.particlespawning.json b/src/main/resources/mixins/bugfixes/mixins.misc.particlespawning.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.particlespawning.json rename to src/main/resources/mixins/bugfixes/mixins.misc.particlespawning.json diff --git a/src/main/resources/mixins.bugfixes.misc.potionamplifier.json b/src/main/resources/mixins/bugfixes/mixins.misc.potionamplifier.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.potionamplifier.json rename to src/main/resources/mixins/bugfixes/mixins.misc.potionamplifier.json diff --git a/src/main/resources/mixins.bugfixes.misc.smoothlighting.json b/src/main/resources/mixins/bugfixes/mixins.misc.smoothlighting.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.smoothlighting.json rename to src/main/resources/mixins/bugfixes/mixins.misc.smoothlighting.json diff --git a/src/main/resources/mixins.bugfixes.misc.spectatormenu.json b/src/main/resources/mixins/bugfixes/mixins.misc.spectatormenu.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.spectatormenu.json rename to src/main/resources/mixins/bugfixes/mixins.misc.spectatormenu.json diff --git a/src/main/resources/mixins.bugfixes.misc.startup.json b/src/main/resources/mixins/bugfixes/mixins.misc.startup.json similarity index 100% rename from src/main/resources/mixins.bugfixes.misc.startup.json rename to src/main/resources/mixins/bugfixes/mixins.misc.startup.json diff --git a/src/main/resources/mixins.bugfixes.world.chunksaving.json b/src/main/resources/mixins/bugfixes/mixins.world.chunksaving.json similarity index 100% rename from src/main/resources/mixins.bugfixes.world.chunksaving.json rename to src/main/resources/mixins/bugfixes/mixins.world.chunksaving.json diff --git a/src/main/resources/mixins.bugfixes.world.frustumculling.json b/src/main/resources/mixins/bugfixes/mixins.world.frustumculling.json similarity index 100% rename from src/main/resources/mixins.bugfixes.world.frustumculling.json rename to src/main/resources/mixins/bugfixes/mixins.world.frustumculling.json diff --git a/src/main/resources/mixins.bugfixes.world.portal.json b/src/main/resources/mixins/bugfixes/mixins.world.portal.json similarity index 100% rename from src/main/resources/mixins.bugfixes.world.portal.json rename to src/main/resources/mixins/bugfixes/mixins.world.portal.json diff --git a/src/main/resources/mixins.bugfixes.world.tileentities.json b/src/main/resources/mixins/bugfixes/mixins.world.tileentities.json similarity index 100% rename from src/main/resources/mixins.bugfixes.world.tileentities.json rename to src/main/resources/mixins/bugfixes/mixins.world.tileentities.json diff --git a/src/main/resources/mixins.bugfixes.world.village.json b/src/main/resources/mixins/bugfixes/mixins.world.village.json similarity index 100% rename from src/main/resources/mixins.bugfixes.world.village.json rename to src/main/resources/mixins/bugfixes/mixins.world.village.json diff --git a/src/main/resources/mixins.bugfixes.world.witchhut.json b/src/main/resources/mixins/bugfixes/mixins.world.witchhut.json similarity index 100% rename from src/main/resources/mixins.bugfixes.world.witchhut.json rename to src/main/resources/mixins/bugfixes/mixins.world.witchhut.json diff --git a/src/main/resources/mixins.vanilla.mod.accessors.json b/src/main/resources/mixins/mixins.vanilla.mod.accessors.json similarity index 100% rename from src/main/resources/mixins.vanilla.mod.accessors.json rename to src/main/resources/mixins/mixins.vanilla.mod.accessors.json diff --git a/src/main/resources/mixins.mods.abyssalcraft.json b/src/main/resources/mixins/mods/mixins.abyssalcraft.json similarity index 100% rename from src/main/resources/mixins.mods.abyssalcraft.json rename to src/main/resources/mixins/mods/mixins.abyssalcraft.json diff --git a/src/main/resources/mixins.mods.actuallyadditions.dupes.json b/src/main/resources/mixins/mods/mixins.actuallyadditions.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.actuallyadditions.dupes.json rename to src/main/resources/mixins/mods/mixins.actuallyadditions.dupes.json diff --git a/src/main/resources/mixins.mods.actuallyadditions.itemparticle.json b/src/main/resources/mixins/mods/mixins.actuallyadditions.itemparticle.json similarity index 100% rename from src/main/resources/mixins.mods.actuallyadditions.itemparticle.json rename to src/main/resources/mixins/mods/mixins.actuallyadditions.itemparticle.json diff --git a/src/main/resources/mixins.mods.actuallyadditions.relayupgrade.json b/src/main/resources/mixins/mods/mixins.actuallyadditions.relayupgrade.json similarity index 100% rename from src/main/resources/mixins.mods.actuallyadditions.relayupgrade.json rename to src/main/resources/mixins/mods/mixins.actuallyadditions.relayupgrade.json diff --git a/src/main/resources/mixins.mods.agricraft.json b/src/main/resources/mixins/mods/mixins.agricraft.json similarity index 100% rename from src/main/resources/mixins.mods.agricraft.json rename to src/main/resources/mixins/mods/mixins.agricraft.json diff --git a/src/main/resources/mixins.mods.aoa3.json b/src/main/resources/mixins/mods/mixins.aoa3.json similarity index 100% rename from src/main/resources/mixins.mods.aoa3.json rename to src/main/resources/mixins/mods/mixins.aoa3.json diff --git a/src/main/resources/mixins.mods.arcanearchives.dupes.json b/src/main/resources/mixins/mods/mixins.arcanearchives.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.arcanearchives.dupes.json rename to src/main/resources/mixins/mods/mixins.arcanearchives.dupes.json diff --git a/src/main/resources/mixins.mods.astralsorcery.json b/src/main/resources/mixins/mods/mixins.astralsorcery.json similarity index 100% rename from src/main/resources/mixins.mods.astralsorcery.json rename to src/main/resources/mixins/mods/mixins.astralsorcery.json diff --git a/src/main/resources/mixins.mods.astralsorcery.neromanticprime.json b/src/main/resources/mixins/mods/mixins.astralsorcery.neromanticprime.json similarity index 100% rename from src/main/resources/mixins.mods.astralsorcery.neromanticprime.json rename to src/main/resources/mixins/mods/mixins.astralsorcery.neromanticprime.json diff --git a/src/main/resources/mixins.mods.astralsorcery.tool.json b/src/main/resources/mixins/mods/mixins.astralsorcery.tool.json similarity index 100% rename from src/main/resources/mixins.mods.astralsorcery.tool.json rename to src/main/resources/mixins/mods/mixins.astralsorcery.tool.json diff --git a/src/main/resources/mixins.mods.backpack.json b/src/main/resources/mixins/mods/mixins.backpack.json similarity index 100% rename from src/main/resources/mixins.mods.backpack.json rename to src/main/resources/mixins/mods/mixins.backpack.json diff --git a/src/main/resources/mixins.mods.bewitchment.json b/src/main/resources/mixins/mods/mixins.bewitchment.json similarity index 100% rename from src/main/resources/mixins.mods.bewitchment.json rename to src/main/resources/mixins/mods/mixins.bewitchment.json diff --git a/src/main/resources/mixins.mods.bibliocraft.armor.json b/src/main/resources/mixins/mods/mixins.bibliocraft.armor.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.armor.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.armor.json diff --git a/src/main/resources/mixins.mods.bibliocraft.armorbinding.json b/src/main/resources/mixins/mods/mixins.bibliocraft.armorbinding.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.armorbinding.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.armorbinding.json diff --git a/src/main/resources/mixins.mods.bibliocraft.hand.json b/src/main/resources/mixins/mods/mixins.bibliocraft.hand.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.hand.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.hand.json diff --git a/src/main/resources/mixins.mods.bibliocraft.handler.json b/src/main/resources/mixins/mods/mixins.bibliocraft.handler.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.handler.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.handler.json diff --git a/src/main/resources/mixins.mods.bibliocraft.itemstack.json b/src/main/resources/mixins/mods/mixins.bibliocraft.itemstack.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.itemstack.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.itemstack.json diff --git a/src/main/resources/mixins.mods.bibliocraft.lefthand.json b/src/main/resources/mixins/mods/mixins.bibliocraft.lefthand.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.lefthand.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.lefthand.json diff --git a/src/main/resources/mixins.mods.bibliocraft.printpress.json b/src/main/resources/mixins/mods/mixins.bibliocraft.printpress.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.printpress.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.printpress.json diff --git a/src/main/resources/mixins.mods.bibliocraft.sign.json b/src/main/resources/mixins/mods/mixins.bibliocraft.sign.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.sign.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.sign.json diff --git a/src/main/resources/mixins.mods.bibliocraft.transfer.json b/src/main/resources/mixins/mods/mixins.bibliocraft.transfer.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.transfer.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.transfer.json diff --git a/src/main/resources/mixins.mods.bibliocraft.version.json b/src/main/resources/mixins/mods/mixins.bibliocraft.version.json similarity index 100% rename from src/main/resources/mixins.mods.bibliocraft.version.json rename to src/main/resources/mixins/mods/mixins.bibliocraft.version.json diff --git a/src/main/resources/mixins.mods.biomesoplenty.json b/src/main/resources/mixins/mods/mixins.biomesoplenty.json similarity index 100% rename from src/main/resources/mixins.mods.biomesoplenty.json rename to src/main/resources/mixins/mods/mixins.biomesoplenty.json diff --git a/src/main/resources/mixins.mods.biomesoplenty.sealevel.json b/src/main/resources/mixins/mods/mixins.biomesoplenty.sealevel.json similarity index 100% rename from src/main/resources/mixins.mods.biomesoplenty.sealevel.json rename to src/main/resources/mixins/mods/mixins.biomesoplenty.sealevel.json diff --git a/src/main/resources/mixins.mods.bloodmagic.boundtool.json b/src/main/resources/mixins/mods/mixins.bloodmagic.boundtool.json similarity index 100% rename from src/main/resources/mixins.mods.bloodmagic.boundtool.json rename to src/main/resources/mixins/mods/mixins.bloodmagic.boundtool.json diff --git a/src/main/resources/mixins.mods.bloodmagic.dupes.json b/src/main/resources/mixins/mods/mixins.bloodmagic.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.bloodmagic.dupes.json rename to src/main/resources/mixins/mods/mixins.bloodmagic.dupes.json diff --git a/src/main/resources/mixins.mods.bloodmagic.fluidrouting.json b/src/main/resources/mixins/mods/mixins.bloodmagic.fluidrouting.json similarity index 100% rename from src/main/resources/mixins.mods.bloodmagic.fluidrouting.json rename to src/main/resources/mixins/mods/mixins.bloodmagic.fluidrouting.json diff --git a/src/main/resources/mixins.mods.bloodmagic.json b/src/main/resources/mixins/mods/mixins.bloodmagic.json similarity index 100% rename from src/main/resources/mixins.mods.bloodmagic.json rename to src/main/resources/mixins/mods/mixins.bloodmagic.json diff --git a/src/main/resources/mixins.mods.bloodmagic.ritual.json b/src/main/resources/mixins/mods/mixins.bloodmagic.ritual.json similarity index 100% rename from src/main/resources/mixins.mods.bloodmagic.ritual.json rename to src/main/resources/mixins/mods/mixins.bloodmagic.ritual.json diff --git a/src/main/resources/mixins.mods.botania.dupes.json b/src/main/resources/mixins/mods/mixins.botania.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.botania.dupes.json rename to src/main/resources/mixins/mods/mixins.botania.dupes.json diff --git a/src/main/resources/mixins.mods.botania.json b/src/main/resources/mixins/mods/mixins.botania.json similarity index 100% rename from src/main/resources/mixins.mods.botania.json rename to src/main/resources/mixins/mods/mixins.botania.json diff --git a/src/main/resources/mixins.mods.bwm.json b/src/main/resources/mixins/mods/mixins.bwm.json similarity index 100% rename from src/main/resources/mixins.mods.bwm.json rename to src/main/resources/mixins/mods/mixins.bwm.json diff --git a/src/main/resources/mixins.mods.cbmultipart.client.json b/src/main/resources/mixins/mods/mixins.cbmultipart.client.json similarity index 100% rename from src/main/resources/mixins.mods.cbmultipart.client.json rename to src/main/resources/mixins/mods/mixins.cbmultipart.client.json diff --git a/src/main/resources/mixins.mods.cbmultipart.json b/src/main/resources/mixins/mods/mixins.cbmultipart.json similarity index 100% rename from src/main/resources/mixins.mods.cbmultipart.json rename to src/main/resources/mixins/mods/mixins.cbmultipart.json diff --git a/src/main/resources/mixins.mods.ceramics.json b/src/main/resources/mixins/mods/mixins.ceramics.json similarity index 100% rename from src/main/resources/mixins.mods.ceramics.json rename to src/main/resources/mixins/mods/mixins.ceramics.json diff --git a/src/main/resources/mixins.mods.chisel.tcomplement.dupes.json b/src/main/resources/mixins/mods/mixins.chisel.tcomplement.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.chisel.tcomplement.dupes.json rename to src/main/resources/mixins/mods/mixins.chisel.tcomplement.dupes.json diff --git a/src/main/resources/mixins.mods.codechickenlib.json b/src/main/resources/mixins/mods/mixins.codechickenlib.json similarity index 100% rename from src/main/resources/mixins.mods.codechickenlib.json rename to src/main/resources/mixins/mods/mixins.codechickenlib.json diff --git a/src/main/resources/mixins.mods.cofhcore.json b/src/main/resources/mixins/mods/mixins.cofhcore.json similarity index 100% rename from src/main/resources/mixins.mods.cofhcore.json rename to src/main/resources/mixins/mods/mixins.cofhcore.json diff --git a/src/main/resources/mixins.mods.cofhworld.json b/src/main/resources/mixins/mods/mixins.cofhworld.json similarity index 100% rename from src/main/resources/mixins.mods.cofhworld.json rename to src/main/resources/mixins/mods/mixins.cofhworld.json diff --git a/src/main/resources/mixins.mods.collective.json b/src/main/resources/mixins/mods/mixins.collective.json similarity index 100% rename from src/main/resources/mixins.mods.collective.json rename to src/main/resources/mixins/mods/mixins.collective.json diff --git a/src/main/resources/mixins.mods.compactmachines.memory.json b/src/main/resources/mixins/mods/mixins.compactmachines.memory.json similarity index 100% rename from src/main/resources/mixins.mods.compactmachines.memory.json rename to src/main/resources/mixins/mods/mixins.compactmachines.memory.json diff --git a/src/main/resources/mixins.mods.compactmachines.render.json b/src/main/resources/mixins/mods/mixins.compactmachines.render.json similarity index 100% rename from src/main/resources/mixins.mods.compactmachines.render.json rename to src/main/resources/mixins/mods/mixins.compactmachines.render.json diff --git a/src/main/resources/mixins.mods.compactmachines.spawns.json b/src/main/resources/mixins/mods/mixins.compactmachines.spawns.json similarity index 100% rename from src/main/resources/mixins.mods.compactmachines.spawns.json rename to src/main/resources/mixins/mods/mixins.compactmachines.spawns.json diff --git a/src/main/resources/mixins.mods.cookingforblockheads.json b/src/main/resources/mixins/mods/mixins.cookingforblockheads.json similarity index 100% rename from src/main/resources/mixins.mods.cookingforblockheads.json rename to src/main/resources/mixins/mods/mixins.cookingforblockheads.json diff --git a/src/main/resources/mixins.mods.corpse.json b/src/main/resources/mixins/mods/mixins.corpse.json similarity index 100% rename from src/main/resources/mixins.mods.corpse.json rename to src/main/resources/mixins/mods/mixins.corpse.json diff --git a/src/main/resources/mixins.mods.cqrepoured.json b/src/main/resources/mixins/mods/mixins.cqrepoured.json similarity index 100% rename from src/main/resources/mixins.mods.cqrepoured.json rename to src/main/resources/mixins/mods/mixins.cqrepoured.json diff --git a/src/main/resources/mixins.mods.crafttweaker.json b/src/main/resources/mixins/mods/mixins.crafttweaker.json similarity index 100% rename from src/main/resources/mixins.mods.crafttweaker.json rename to src/main/resources/mixins/mods/mixins.crafttweaker.json diff --git a/src/main/resources/mixins.mods.cyclic.json b/src/main/resources/mixins/mods/mixins.cyclic.json similarity index 100% rename from src/main/resources/mixins.mods.cyclic.json rename to src/main/resources/mixins/mods/mixins.cyclic.json diff --git a/src/main/resources/mixins.mods.dankstorage.json b/src/main/resources/mixins/mods/mixins.dankstorage.json similarity index 100% rename from src/main/resources/mixins.mods.dankstorage.json rename to src/main/resources/mixins/mods/mixins.dankstorage.json diff --git a/src/main/resources/mixins.mods.divinerpg.aquamarine.json b/src/main/resources/mixins/mods/mixins.divinerpg.aquamarine.json similarity index 100% rename from src/main/resources/mixins.mods.divinerpg.aquamarine.json rename to src/main/resources/mixins/mods/mixins.divinerpg.aquamarine.json diff --git a/src/main/resources/mixins.mods.divinerpg.armorset.json b/src/main/resources/mixins/mods/mixins.divinerpg.armorset.json similarity index 100% rename from src/main/resources/mixins.mods.divinerpg.armorset.json rename to src/main/resources/mixins/mods/mixins.divinerpg.armorset.json diff --git a/src/main/resources/mixins.mods.divinerpg.hand.json b/src/main/resources/mixins/mods/mixins.divinerpg.hand.json similarity index 100% rename from src/main/resources/mixins.mods.divinerpg.hand.json rename to src/main/resources/mixins/mods/mixins.divinerpg.hand.json diff --git a/src/main/resources/mixins.mods.divinerpg.waterspawning.json b/src/main/resources/mixins/mods/mixins.divinerpg.waterspawning.json similarity index 100% rename from src/main/resources/mixins.mods.divinerpg.waterspawning.json rename to src/main/resources/mixins/mods/mixins.divinerpg.waterspawning.json diff --git a/src/main/resources/mixins.mods.effortlessbuilding.json b/src/main/resources/mixins/mods/mixins.effortlessbuilding.json similarity index 100% rename from src/main/resources/mixins.mods.effortlessbuilding.json rename to src/main/resources/mixins/mods/mixins.effortlessbuilding.json diff --git a/src/main/resources/mixins.mods.electroblobswizardry.json b/src/main/resources/mixins/mods/mixins.electroblobswizardry.json similarity index 100% rename from src/main/resources/mixins.mods.electroblobswizardry.json rename to src/main/resources/mixins/mods/mixins.electroblobswizardry.json diff --git a/src/main/resources/mixins.mods.elementarystaffs.json b/src/main/resources/mixins/mods/mixins.elementarystaffs.json similarity index 100% rename from src/main/resources/mixins.mods.elementarystaffs.json rename to src/main/resources/mixins/mods/mixins.elementarystaffs.json diff --git a/src/main/resources/mixins.mods.elenaidodge2.json b/src/main/resources/mixins/mods/mixins.elenaidodge2.json similarity index 100% rename from src/main/resources/mixins.mods.elenaidodge2.json rename to src/main/resources/mixins/mods/mixins.elenaidodge2.json diff --git a/src/main/resources/mixins.mods.enderio.chorus.json b/src/main/resources/mixins/mods/mixins.enderio.chorus.json similarity index 100% rename from src/main/resources/mixins.mods.enderio.chorus.json rename to src/main/resources/mixins/mods/mixins.enderio.chorus.json diff --git a/src/main/resources/mixins.mods.enderio.cyclebutton.json b/src/main/resources/mixins/mods/mixins.enderio.cyclebutton.json similarity index 100% rename from src/main/resources/mixins.mods.enderio.cyclebutton.json rename to src/main/resources/mixins/mods/mixins.enderio.cyclebutton.json diff --git a/src/main/resources/mixins.mods.enderio.itemrender.json b/src/main/resources/mixins/mods/mixins.enderio.itemrender.json similarity index 100% rename from src/main/resources/mixins.mods.enderio.itemrender.json rename to src/main/resources/mixins/mods/mixins.enderio.itemrender.json diff --git a/src/main/resources/mixins.mods.enderio.soulbinderjei.json b/src/main/resources/mixins/mods/mixins.enderio.soulbinderjei.json similarity index 100% rename from src/main/resources/mixins.mods.enderio.soulbinderjei.json rename to src/main/resources/mixins/mods/mixins.enderio.soulbinderjei.json diff --git a/src/main/resources/mixins.mods.enderstorage.json b/src/main/resources/mixins/mods/mixins.enderstorage.json similarity index 100% rename from src/main/resources/mixins.mods.enderstorage.json rename to src/main/resources/mixins/mods/mixins.enderstorage.json diff --git a/src/main/resources/mixins.mods.epicsiegemod.json b/src/main/resources/mixins/mods/mixins.epicsiegemod.json similarity index 100% rename from src/main/resources/mixins.mods.epicsiegemod.json rename to src/main/resources/mixins/mods/mixins.epicsiegemod.json diff --git a/src/main/resources/mixins.mods.erebus.cabbage.json b/src/main/resources/mixins/mods/mixins.erebus.cabbage.json similarity index 100% rename from src/main/resources/mixins.mods.erebus.cabbage.json rename to src/main/resources/mixins/mods/mixins.erebus.cabbage.json diff --git a/src/main/resources/mixins.mods.erebus.json b/src/main/resources/mixins/mods/mixins.erebus.json similarity index 100% rename from src/main/resources/mixins.mods.erebus.json rename to src/main/resources/mixins/mods/mixins.erebus.json diff --git a/src/main/resources/mixins.mods.erebus.quakehammer.json b/src/main/resources/mixins/mods/mixins.erebus.quakehammer.json similarity index 100% rename from src/main/resources/mixins.mods.erebus.quakehammer.json rename to src/main/resources/mixins/mods/mixins.erebus.quakehammer.json diff --git a/src/main/resources/mixins.mods.evilcraft.vengeancespirit.random.json b/src/main/resources/mixins/mods/mixins.evilcraft.vengeancespirit.random.json similarity index 100% rename from src/main/resources/mixins.mods.evilcraft.vengeancespirit.random.json rename to src/main/resources/mixins/mods/mixins.evilcraft.vengeancespirit.random.json diff --git a/src/main/resources/mixins.mods.evilcraft.vengeancespirit.regex.json b/src/main/resources/mixins/mods/mixins.evilcraft.vengeancespirit.regex.json similarity index 100% rename from src/main/resources/mixins.mods.evilcraft.vengeancespirit.regex.json rename to src/main/resources/mixins/mods/mixins.evilcraft.vengeancespirit.regex.json diff --git a/src/main/resources/mixins.mods.extrautilities.breakcreativemill.json b/src/main/resources/mixins/mods/mixins.extrautilities.breakcreativemill.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.breakcreativemill.json rename to src/main/resources/mixins/mods/mixins.extrautilities.breakcreativemill.json diff --git a/src/main/resources/mixins.mods.extrautilities.deepdarkstats.json b/src/main/resources/mixins/mods/mixins.extrautilities.deepdarkstats.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.deepdarkstats.json rename to src/main/resources/mixins/mods/mixins.extrautilities.deepdarkstats.json diff --git a/src/main/resources/mixins.mods.extrautilities.dupes.json b/src/main/resources/mixins/mods/mixins.extrautilities.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.dupes.json rename to src/main/resources/mixins/mods/mixins.extrautilities.dupes.json diff --git a/src/main/resources/mixins.mods.extrautilities.mutabledrops.json b/src/main/resources/mixins/mods/mixins.extrautilities.mutabledrops.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.mutabledrops.json rename to src/main/resources/mixins/mods/mixins.extrautilities.mutabledrops.json diff --git a/src/main/resources/mixins.mods.extrautilities.potionlogging.json b/src/main/resources/mixins/mods/mixins.extrautilities.potionlogging.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.potionlogging.json rename to src/main/resources/mixins/mods/mixins.extrautilities.potionlogging.json diff --git a/src/main/resources/mixins.mods.extrautilities.radarexception.json b/src/main/resources/mixins/mods/mixins.extrautilities.radarexception.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.radarexception.json rename to src/main/resources/mixins/mods/mixins.extrautilities.radarexception.json diff --git a/src/main/resources/mixins.mods.extrautilities.radarloot.json b/src/main/resources/mixins/mods/mixins.extrautilities.radarloot.json similarity index 100% rename from src/main/resources/mixins.mods.extrautilities.radarloot.json rename to src/main/resources/mixins/mods/mixins.extrautilities.radarloot.json diff --git a/src/main/resources/mixins.mods.forestry.extratrees.json b/src/main/resources/mixins/mods/mixins.forestry.extratrees.json similarity index 100% rename from src/main/resources/mixins.mods.forestry.extratrees.json rename to src/main/resources/mixins/mods/mixins.forestry.extratrees.json diff --git a/src/main/resources/mixins.mods.forestry.json b/src/main/resources/mixins/mods/mixins.forestry.json similarity index 100% rename from src/main/resources/mixins.mods.forestry.json rename to src/main/resources/mixins/mods/mixins.forestry.json diff --git a/src/main/resources/mixins.mods.fpsreducer.json b/src/main/resources/mixins/mods/mixins.fpsreducer.json similarity index 100% rename from src/main/resources/mixins.mods.fpsreducer.json rename to src/main/resources/mixins/mods/mixins.fpsreducer.json diff --git a/src/main/resources/mixins.mods.gaiadimension.restructurer.json b/src/main/resources/mixins/mods/mixins.gaiadimension.restructurer.json similarity index 100% rename from src/main/resources/mixins.mods.gaiadimension.restructurer.json rename to src/main/resources/mixins/mods/mixins.gaiadimension.restructurer.json diff --git a/src/main/resources/mixins.mods.hwyla.json b/src/main/resources/mixins/mods/mixins.hwyla.json similarity index 100% rename from src/main/resources/mixins.mods.hwyla.json rename to src/main/resources/mixins/mods/mixins.hwyla.json diff --git a/src/main/resources/mixins.mods.immersiveengineering.toolevent.json b/src/main/resources/mixins/mods/mixins.immersiveengineering.toolevent.json similarity index 100% rename from src/main/resources/mixins.mods.immersiveengineering.toolevent.json rename to src/main/resources/mixins/mods/mixins.immersiveengineering.toolevent.json diff --git a/src/main/resources/mixins.mods.immersiveengineering.toolhand.json b/src/main/resources/mixins/mods/mixins.immersiveengineering.toolhand.json similarity index 100% rename from src/main/resources/mixins.mods.immersiveengineering.toolhand.json rename to src/main/resources/mixins/mods/mixins.immersiveengineering.toolhand.json diff --git a/src/main/resources/mixins.mods.incontrol.json b/src/main/resources/mixins/mods/mixins.incontrol.json similarity index 100% rename from src/main/resources/mixins.mods.incontrol.json rename to src/main/resources/mixins/mods/mixins.incontrol.json diff --git a/src/main/resources/mixins.mods.industrialcraft.dupes.json b/src/main/resources/mixins/mods/mixins.industrialcraft.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.industrialcraft.dupes.json rename to src/main/resources/mixins/mods/mixins.industrialcraft.dupes.json diff --git a/src/main/resources/mixins.mods.industrialforegoing.dupes.json b/src/main/resources/mixins/mods/mixins.industrialforegoing.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.industrialforegoing.dupes.json rename to src/main/resources/mixins/mods/mixins.industrialforegoing.dupes.json diff --git a/src/main/resources/mixins.mods.industrialforegoing.rangeaddon.json b/src/main/resources/mixins/mods/mixins.industrialforegoing.rangeaddon.json similarity index 100% rename from src/main/resources/mixins.mods.industrialforegoing.rangeaddon.json rename to src/main/resources/mixins/mods/mixins.industrialforegoing.rangeaddon.json diff --git a/src/main/resources/mixins.mods.infernalmobs.json b/src/main/resources/mixins/mods/mixins.infernalmobs.json similarity index 100% rename from src/main/resources/mixins.mods.infernalmobs.json rename to src/main/resources/mixins/mods/mixins.infernalmobs.json diff --git a/src/main/resources/mixins.mods.ironbackpacks.dupes.json b/src/main/resources/mixins/mods/mixins.ironbackpacks.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.ironbackpacks.dupes.json rename to src/main/resources/mixins/mods/mixins.ironbackpacks.dupes.json diff --git a/src/main/resources/mixins.mods.ironchests.json b/src/main/resources/mixins/mods/mixins.ironchests.json similarity index 100% rename from src/main/resources/mixins.mods.ironchests.json rename to src/main/resources/mixins/mods/mixins.ironchests.json diff --git a/src/main/resources/mixins.mods.itemfavorites.unixfix.json b/src/main/resources/mixins/mods/mixins.itemfavorites.unixfix.json similarity index 100% rename from src/main/resources/mixins.mods.itemfavorites.unixfix.json rename to src/main/resources/mixins/mods/mixins.itemfavorites.unixfix.json diff --git a/src/main/resources/mixins.mods.itemstages.json b/src/main/resources/mixins/mods/mixins.itemstages.json similarity index 100% rename from src/main/resources/mixins.mods.itemstages.json rename to src/main/resources/mixins/mods/mixins.itemstages.json diff --git a/src/main/resources/mixins.mods.jurassicreborn.json b/src/main/resources/mixins/mods/mixins.jurassicreborn.json similarity index 100% rename from src/main/resources/mixins.mods.jurassicreborn.json rename to src/main/resources/mixins/mods/mixins.jurassicreborn.json diff --git a/src/main/resources/mixins.mods.mekanism.dupes.json b/src/main/resources/mixins/mods/mixins.mekanism.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.mekanism.dupes.json rename to src/main/resources/mixins/mods/mixins.mekanism.dupes.json diff --git a/src/main/resources/mixins.mods.mekanism.fluidtank.json b/src/main/resources/mixins/mods/mixins.mekanism.fluidtank.json similarity index 100% rename from src/main/resources/mixins.mods.mekanism.fluidtank.json rename to src/main/resources/mixins/mods/mixins.mekanism.fluidtank.json diff --git a/src/main/resources/mixins.mods.moartinkers.json b/src/main/resources/mixins/mods/mixins.moartinkers.json similarity index 100% rename from src/main/resources/mixins.mods.moartinkers.json rename to src/main/resources/mixins/mods/mixins.moartinkers.json diff --git a/src/main/resources/mixins.mods.mobstages.json b/src/main/resources/mixins/mods/mixins.mobstages.json similarity index 100% rename from src/main/resources/mixins.mods.mobstages.json rename to src/main/resources/mixins/mods/mixins.mobstages.json diff --git a/src/main/resources/mixins.mods.modularmagic.nullingredient.json b/src/main/resources/mixins/mods/mixins.modularmagic.nullingredient.json similarity index 100% rename from src/main/resources/mixins.mods.modularmagic.nullingredient.json rename to src/main/resources/mixins/mods/mixins.modularmagic.nullingredient.json diff --git a/src/main/resources/mixins.mods.modularrouters.json b/src/main/resources/mixins/mods/mixins.modularrouters.json similarity index 100% rename from src/main/resources/mixins.mods.modularrouters.json rename to src/main/resources/mixins/mods/mixins.modularrouters.json diff --git a/src/main/resources/mixins.mods.mrtjpcore.json b/src/main/resources/mixins/mods/mixins.mrtjpcore.json similarity index 100% rename from src/main/resources/mixins.mods.mrtjpcore.json rename to src/main/resources/mixins/mods/mixins.mrtjpcore.json diff --git a/src/main/resources/mixins.mods.netherchest.dupes.json b/src/main/resources/mixins/mods/mixins.netherchest.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.netherchest.dupes.json rename to src/main/resources/mixins/mods/mixins.netherchest.dupes.json diff --git a/src/main/resources/mixins.mods.netherrocks.json b/src/main/resources/mixins/mods/mixins.netherrocks.json similarity index 100% rename from src/main/resources/mixins.mods.netherrocks.json rename to src/main/resources/mixins/mods/mixins.netherrocks.json diff --git a/src/main/resources/mixins.mods.nuclearcraft.json b/src/main/resources/mixins/mods/mixins.nuclearcraft.json similarity index 100% rename from src/main/resources/mixins.mods.nuclearcraft.json rename to src/main/resources/mixins/mods/mixins.nuclearcraft.json diff --git a/src/main/resources/mixins.mods.openblocks.json b/src/main/resources/mixins/mods/mixins.openblocks.json similarity index 100% rename from src/main/resources/mixins.mods.openblocks.json rename to src/main/resources/mixins/mods/mixins.openblocks.json diff --git a/src/main/resources/mixins.mods.properpumpkins.json b/src/main/resources/mixins/mods/mixins.properpumpkins.json similarity index 100% rename from src/main/resources/mixins.mods.properpumpkins.json rename to src/main/resources/mixins/mods/mixins.properpumpkins.json diff --git a/src/main/resources/mixins.mods.quark.dupes.json b/src/main/resources/mixins/mods/mixins.quark.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.quark.dupes.json rename to src/main/resources/mixins/mods/mixins.quark.dupes.json diff --git a/src/main/resources/mixins.mods.quark.linkitems.json b/src/main/resources/mixins/mods/mixins.quark.linkitems.json similarity index 100% rename from src/main/resources/mixins.mods.quark.linkitems.json rename to src/main/resources/mixins/mods/mixins.quark.linkitems.json diff --git a/src/main/resources/mixins.mods.randomthings.anvil.json b/src/main/resources/mixins/mods/mixins.randomthings.anvil.json similarity index 100% rename from src/main/resources/mixins.mods.randomthings.anvil.json rename to src/main/resources/mixins/mods/mixins.randomthings.anvil.json diff --git a/src/main/resources/mixins.mods.randomthings.collector.json b/src/main/resources/mixins/mods/mixins.randomthings.collector.json similarity index 100% rename from src/main/resources/mixins.mods.randomthings.collector.json rename to src/main/resources/mixins/mods/mixins.randomthings.collector.json diff --git a/src/main/resources/mixins.mods.randomthings.teleport.json b/src/main/resources/mixins/mods/mixins.randomthings.teleport.json similarity index 100% rename from src/main/resources/mixins.mods.randomthings.teleport.json rename to src/main/resources/mixins/mods/mixins.randomthings.teleport.json diff --git a/src/main/resources/mixins.mods.requiousfrakto.json b/src/main/resources/mixins/mods/mixins.requiousfrakto.json similarity index 100% rename from src/main/resources/mixins.mods.requiousfrakto.json rename to src/main/resources/mixins/mods/mixins.requiousfrakto.json diff --git a/src/main/resources/mixins.mods.reskillable.json b/src/main/resources/mixins/mods/mixins.reskillable.json similarity index 100% rename from src/main/resources/mixins.mods.reskillable.json rename to src/main/resources/mixins/mods/mixins.reskillable.json diff --git a/src/main/resources/mixins.mods.rftoolsdimensions.json b/src/main/resources/mixins/mods/mixins.rftoolsdimensions.json similarity index 100% rename from src/main/resources/mixins.mods.rftoolsdimensions.json rename to src/main/resources/mixins/mods/mixins.rftoolsdimensions.json diff --git a/src/main/resources/mixins.mods.roost.contenttweaker.json b/src/main/resources/mixins/mods/mixins.roost.contenttweaker.json similarity index 100% rename from src/main/resources/mixins.mods.roost.contenttweaker.json rename to src/main/resources/mixins/mods/mixins.roost.contenttweaker.json diff --git a/src/main/resources/mixins.mods.roost.json b/src/main/resources/mixins/mods/mixins.roost.json similarity index 100% rename from src/main/resources/mixins.mods.roost.json rename to src/main/resources/mixins/mods/mixins.roost.json diff --git a/src/main/resources/mixins.mods.roots.creativepouch.json b/src/main/resources/mixins/mods/mixins.roots.creativepouch.json similarity index 100% rename from src/main/resources/mixins.mods.roots.creativepouch.json rename to src/main/resources/mixins/mods/mixins.roots.creativepouch.json diff --git a/src/main/resources/mixins.mods.roots.disabledmodifier.json b/src/main/resources/mixins/mods/mixins.roots.disabledmodifier.json similarity index 100% rename from src/main/resources/mixins.mods.roots.disabledmodifier.json rename to src/main/resources/mixins/mods/mixins.roots.disabledmodifier.json diff --git a/src/main/resources/mixins.mods.roots.icicle.json b/src/main/resources/mixins/mods/mixins.roots.icicle.json similarity index 100% rename from src/main/resources/mixins.mods.roots.icicle.json rename to src/main/resources/mixins/mods/mixins.roots.icicle.json diff --git a/src/main/resources/mixins.mods.roots.mortar.json b/src/main/resources/mixins/mods/mixins.roots.mortar.json similarity index 100% rename from src/main/resources/mixins.mods.roots.mortar.json rename to src/main/resources/mixins/mods/mixins.roots.mortar.json diff --git a/src/main/resources/mixins.mods.roots.shatter.json b/src/main/resources/mixins/mods/mixins.roots.shatter.json similarity index 100% rename from src/main/resources/mixins.mods.roots.shatter.json rename to src/main/resources/mixins/mods/mixins.roots.shatter.json diff --git a/src/main/resources/mixins.mods.roots.soil.json b/src/main/resources/mixins/mods/mixins.roots.soil.json similarity index 100% rename from src/main/resources/mixins.mods.roots.soil.json rename to src/main/resources/mixins/mods/mixins.roots.soil.json diff --git a/src/main/resources/mixins.mods.roots.spiritdrops.json b/src/main/resources/mixins/mods/mixins.roots.spiritdrops.json similarity index 100% rename from src/main/resources/mixins.mods.roots.spiritdrops.json rename to src/main/resources/mixins/mods/mixins.roots.spiritdrops.json diff --git a/src/main/resources/mixins.mods.roots.summon.json b/src/main/resources/mixins/mods/mixins.roots.summon.json similarity index 100% rename from src/main/resources/mixins.mods.roots.summon.json rename to src/main/resources/mixins/mods/mixins.roots.summon.json diff --git a/src/main/resources/mixins.mods.simpledifficulty.json b/src/main/resources/mixins/mods/mixins.simpledifficulty.json similarity index 100% rename from src/main/resources/mixins.mods.simpledifficulty.json rename to src/main/resources/mixins/mods/mixins.simpledifficulty.json diff --git a/src/main/resources/mixins.mods.spiceoflife.dupes.json b/src/main/resources/mixins/mods/mixins.spiceoflife.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.spiceoflife.dupes.json rename to src/main/resources/mixins/mods/mixins.spiceoflife.dupes.json diff --git a/src/main/resources/mixins.mods.steamworld.json b/src/main/resources/mixins/mods/mixins.steamworld.json similarity index 100% rename from src/main/resources/mixins.mods.steamworld.json rename to src/main/resources/mixins/mods/mixins.steamworld.json diff --git a/src/main/resources/mixins.mods.storagedrawers.client.json b/src/main/resources/mixins/mods/mixins.storagedrawers.client.json similarity index 100% rename from src/main/resources/mixins.mods.storagedrawers.client.json rename to src/main/resources/mixins/mods/mixins.storagedrawers.client.json diff --git a/src/main/resources/mixins.mods.storagedrawers.json b/src/main/resources/mixins/mods/mixins.storagedrawers.json similarity index 100% rename from src/main/resources/mixins.mods.storagedrawers.json rename to src/main/resources/mixins/mods/mixins.storagedrawers.json diff --git a/src/main/resources/mixins.mods.tconstruct.client.json b/src/main/resources/mixins/mods/mixins.tconstruct.client.json similarity index 100% rename from src/main/resources/mixins.mods.tconstruct.client.json rename to src/main/resources/mixins/mods/mixins.tconstruct.client.json diff --git a/src/main/resources/mixins.mods.tconstruct.json b/src/main/resources/mixins/mods/mixins.tconstruct.json similarity index 100% rename from src/main/resources/mixins.mods.tconstruct.json rename to src/main/resources/mixins/mods/mixins.tconstruct.json diff --git a/src/main/resources/mixins.mods.tconstruct.oredictcache.json b/src/main/resources/mixins/mods/mixins.tconstruct.oredictcache.json similarity index 100% rename from src/main/resources/mixins.mods.tconstruct.oredictcache.json rename to src/main/resources/mixins/mods/mixins.tconstruct.oredictcache.json diff --git a/src/main/resources/mixins.mods.tconstruct.toolcustomization.json b/src/main/resources/mixins/mods/mixins.tconstruct.toolcustomization.json similarity index 100% rename from src/main/resources/mixins.mods.tconstruct.toolcustomization.json rename to src/main/resources/mixins/mods/mixins.tconstruct.toolcustomization.json diff --git a/src/main/resources/mixins.mods.tconstruct.toolcustomization.plustic.json b/src/main/resources/mixins/mods/mixins.tconstruct.toolcustomization.plustic.json similarity index 100% rename from src/main/resources/mixins.mods.tconstruct.toolcustomization.plustic.json rename to src/main/resources/mixins/mods/mixins.tconstruct.toolcustomization.plustic.json diff --git a/src/main/resources/mixins.mods.techreborn.json b/src/main/resources/mixins/mods/mixins.techreborn.json similarity index 100% rename from src/main/resources/mixins.mods.techreborn.json rename to src/main/resources/mixins/mods/mixins.techreborn.json diff --git a/src/main/resources/mixins.mods.testdummy.copyarmor.json b/src/main/resources/mixins/mods/mixins.testdummy.copyarmor.json similarity index 100% rename from src/main/resources/mixins.mods.testdummy.copyarmor.json rename to src/main/resources/mixins/mods/mixins.testdummy.copyarmor.json diff --git a/src/main/resources/mixins.mods.thefarlanders.dupes.json b/src/main/resources/mixins/mods/mixins.thefarlanders.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.thefarlanders.dupes.json rename to src/main/resources/mixins/mods/mixins.thefarlanders.dupes.json diff --git a/src/main/resources/mixins.mods.thermalexpansion.dupes.json b/src/main/resources/mixins/mods/mixins.thermalexpansion.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.thermalexpansion.dupes.json rename to src/main/resources/mixins/mods/mixins.thermalexpansion.dupes.json diff --git a/src/main/resources/mixins.mods.thermalexpansion.json b/src/main/resources/mixins/mods/mixins.thermalexpansion.json similarity index 100% rename from src/main/resources/mixins.mods.thermalexpansion.json rename to src/main/resources/mixins/mods/mixins.thermalexpansion.json diff --git a/src/main/resources/mixins.mods.tinyprogressions.dupes.json b/src/main/resources/mixins/mods/mixins.tinyprogressions.dupes.json similarity index 100% rename from src/main/resources/mixins.mods.tinyprogressions.dupes.json rename to src/main/resources/mixins/mods/mixins.tinyprogressions.dupes.json diff --git a/src/main/resources/mixins.mods.woot.json b/src/main/resources/mixins/mods/mixins.woot.json similarity index 100% rename from src/main/resources/mixins.mods.woot.json rename to src/main/resources/mixins/mods/mixins.woot.json diff --git a/src/main/resources/mixins.tweaks.blocks.anvil.client.json b/src/main/resources/mixins/tweaks/mixins.blocks.anvil.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.anvil.client.json rename to src/main/resources/mixins/tweaks/mixins.blocks.anvil.client.json diff --git a/src/main/resources/mixins.tweaks.blocks.anvil.json b/src/main/resources/mixins/tweaks/mixins.blocks.anvil.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.anvil.json rename to src/main/resources/mixins/tweaks/mixins.blocks.anvil.json diff --git a/src/main/resources/mixins.tweaks.blocks.barrier.json b/src/main/resources/mixins/tweaks/mixins.blocks.barrier.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.barrier.json rename to src/main/resources/mixins/tweaks/mixins.blocks.barrier.json diff --git a/src/main/resources/mixins.tweaks.blocks.bedobstruction.json b/src/main/resources/mixins/tweaks/mixins.blocks.bedobstruction.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.bedobstruction.json rename to src/main/resources/mixins/tweaks/mixins.blocks.bedobstruction.json diff --git a/src/main/resources/mixins.tweaks.blocks.betterplacement.json b/src/main/resources/mixins/tweaks/mixins.blocks.betterplacement.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.betterplacement.json rename to src/main/resources/mixins/tweaks/mixins.blocks.betterplacement.json diff --git a/src/main/resources/mixins.tweaks.blocks.betterrailplacement.json b/src/main/resources/mixins/tweaks/mixins.blocks.betterrailplacement.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.betterrailplacement.json rename to src/main/resources/mixins/tweaks/mixins.blocks.betterrailplacement.json diff --git a/src/main/resources/mixins.tweaks.blocks.breakablebedrock.json b/src/main/resources/mixins/tweaks/mixins.blocks.breakablebedrock.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.breakablebedrock.json rename to src/main/resources/mixins/tweaks/mixins.blocks.breakablebedrock.json diff --git a/src/main/resources/mixins.tweaks.blocks.enchantmenttable.bookshelf.json b/src/main/resources/mixins/tweaks/mixins.blocks.enchantmenttable.bookshelf.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.enchantmenttable.bookshelf.json rename to src/main/resources/mixins/tweaks/mixins.blocks.enchantmenttable.bookshelf.json diff --git a/src/main/resources/mixins.tweaks.blocks.enchantmenttable.json b/src/main/resources/mixins/tweaks/mixins.blocks.enchantmenttable.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.enchantmenttable.json rename to src/main/resources/mixins/tweaks/mixins.blocks.enchantmenttable.json diff --git a/src/main/resources/mixins.tweaks.blocks.endcrystal.json b/src/main/resources/mixins/tweaks/mixins.blocks.endcrystal.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.endcrystal.json rename to src/main/resources/mixins/tweaks/mixins.blocks.endcrystal.json diff --git a/src/main/resources/mixins.tweaks.blocks.endportal.json b/src/main/resources/mixins/tweaks/mixins.blocks.endportal.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.endportal.json rename to src/main/resources/mixins/tweaks/mixins.blocks.endportal.json diff --git a/src/main/resources/mixins.tweaks.blocks.explosion.json b/src/main/resources/mixins/tweaks/mixins.blocks.explosion.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.explosion.json rename to src/main/resources/mixins/tweaks/mixins.blocks.explosion.json diff --git a/src/main/resources/mixins.tweaks.blocks.falling.json b/src/main/resources/mixins/tweaks/mixins.blocks.falling.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.falling.json rename to src/main/resources/mixins/tweaks/mixins.blocks.falling.json diff --git a/src/main/resources/mixins.tweaks.blocks.golemstructure.json b/src/main/resources/mixins/tweaks/mixins.blocks.golemstructure.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.golemstructure.json rename to src/main/resources/mixins/tweaks/mixins.blocks.golemstructure.json diff --git a/src/main/resources/mixins.tweaks.blocks.growthsize.json b/src/main/resources/mixins/tweaks/mixins.blocks.growthsize.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.growthsize.json rename to src/main/resources/mixins/tweaks/mixins.blocks.growthsize.json diff --git a/src/main/resources/mixins.tweaks.blocks.hitdelay.json b/src/main/resources/mixins/tweaks/mixins.blocks.hitdelay.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.hitdelay.json rename to src/main/resources/mixins/tweaks/mixins.blocks.hitdelay.json diff --git a/src/main/resources/mixins.tweaks.blocks.leafdecay.json b/src/main/resources/mixins/tweaks/mixins.blocks.leafdecay.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.leafdecay.json rename to src/main/resources/mixins/tweaks/mixins.blocks.leafdecay.json diff --git a/src/main/resources/mixins.tweaks.blocks.lenientpaths.json b/src/main/resources/mixins/tweaks/mixins.blocks.lenientpaths.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.lenientpaths.json rename to src/main/resources/mixins/tweaks/mixins.blocks.lenientpaths.json diff --git a/src/main/resources/mixins.tweaks.blocks.observer.json b/src/main/resources/mixins/tweaks/mixins.blocks.observer.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.observer.json rename to src/main/resources/mixins/tweaks/mixins.blocks.observer.json diff --git a/src/main/resources/mixins.tweaks.blocks.overhaulbeacon.json b/src/main/resources/mixins/tweaks/mixins.blocks.overhaulbeacon.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.overhaulbeacon.json rename to src/main/resources/mixins/tweaks/mixins.blocks.overhaulbeacon.json diff --git a/src/main/resources/mixins.tweaks.blocks.piston.json b/src/main/resources/mixins/tweaks/mixins.blocks.piston.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.piston.json rename to src/main/resources/mixins/tweaks/mixins.blocks.piston.json diff --git a/src/main/resources/mixins.tweaks.blocks.pumpkinplacing.json b/src/main/resources/mixins/tweaks/mixins.blocks.pumpkinplacing.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.pumpkinplacing.json rename to src/main/resources/mixins/tweaks/mixins.blocks.pumpkinplacing.json diff --git a/src/main/resources/mixins.tweaks.blocks.sapling.json b/src/main/resources/mixins/tweaks/mixins.blocks.sapling.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.sapling.json rename to src/main/resources/mixins/tweaks/mixins.blocks.sapling.json diff --git a/src/main/resources/mixins.tweaks.blocks.witherstructure.json b/src/main/resources/mixins/tweaks/mixins.blocks.witherstructure.json similarity index 100% rename from src/main/resources/mixins.tweaks.blocks.witherstructure.json rename to src/main/resources/mixins/tweaks/mixins.blocks.witherstructure.json diff --git a/src/main/resources/mixins.tweaks.entities.ai.json b/src/main/resources/mixins/tweaks/mixins.entities.ai.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.ai.json rename to src/main/resources/mixins/tweaks/mixins.entities.ai.json diff --git a/src/main/resources/mixins.tweaks.entities.ai.saddledwandering.json b/src/main/resources/mixins/tweaks/mixins.entities.ai.saddledwandering.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.ai.saddledwandering.json rename to src/main/resources/mixins/tweaks/mixins.entities.ai.saddledwandering.json diff --git a/src/main/resources/mixins.tweaks.entities.ai.wither.json b/src/main/resources/mixins/tweaks/mixins.entities.ai.wither.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.ai.wither.json rename to src/main/resources/mixins/tweaks/mixins.entities.ai.wither.json diff --git a/src/main/resources/mixins.tweaks.entities.armedarmorstands.json b/src/main/resources/mixins/tweaks/mixins.entities.armedarmorstands.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.armedarmorstands.json rename to src/main/resources/mixins/tweaks/mixins.entities.armedarmorstands.json diff --git a/src/main/resources/mixins.tweaks.entities.burning.horse.json b/src/main/resources/mixins/tweaks/mixins.entities.burning.horse.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.burning.horse.json rename to src/main/resources/mixins/tweaks/mixins.entities.burning.horse.json diff --git a/src/main/resources/mixins.tweaks.entities.burning.mobs.json b/src/main/resources/mixins/tweaks/mixins.entities.burning.mobs.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.burning.mobs.json rename to src/main/resources/mixins/tweaks/mixins.entities.burning.mobs.json diff --git a/src/main/resources/mixins.tweaks.entities.burning.player.json b/src/main/resources/mixins/tweaks/mixins.entities.burning.player.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.burning.player.json rename to src/main/resources/mixins/tweaks/mixins.entities.burning.player.json diff --git a/src/main/resources/mixins.tweaks.entities.damage.arrow.json b/src/main/resources/mixins/tweaks/mixins.entities.damage.arrow.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.damage.arrow.json rename to src/main/resources/mixins/tweaks/mixins.entities.damage.arrow.json diff --git a/src/main/resources/mixins.tweaks.entities.damage.falling.json b/src/main/resources/mixins/tweaks/mixins.entities.damage.falling.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.damage.falling.json rename to src/main/resources/mixins/tweaks/mixins.entities.damage.falling.json diff --git a/src/main/resources/mixins.tweaks.entities.damage.velocity.json b/src/main/resources/mixins/tweaks/mixins.entities.damage.velocity.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.damage.velocity.json rename to src/main/resources/mixins/tweaks/mixins.entities.damage.velocity.json diff --git a/src/main/resources/mixins.tweaks.entities.despawning.json b/src/main/resources/mixins/tweaks/mixins.entities.despawning.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.despawning.json rename to src/main/resources/mixins/tweaks/mixins.entities.despawning.json diff --git a/src/main/resources/mixins.tweaks.entities.exhaustion.regen.json b/src/main/resources/mixins/tweaks/mixins.entities.exhaustion.regen.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.exhaustion.regen.json rename to src/main/resources/mixins/tweaks/mixins.entities.exhaustion.regen.json diff --git a/src/main/resources/mixins.tweaks.entities.exhaustion.riding.json b/src/main/resources/mixins/tweaks/mixins.entities.exhaustion.riding.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.exhaustion.riding.json rename to src/main/resources/mixins/tweaks/mixins.entities.exhaustion.riding.json diff --git a/src/main/resources/mixins.tweaks.entities.jumping.autojump.json b/src/main/resources/mixins/tweaks/mixins.entities.jumping.autojump.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.jumping.autojump.json rename to src/main/resources/mixins/tweaks/mixins.entities.jumping.autojump.json diff --git a/src/main/resources/mixins.tweaks.entities.loot.json b/src/main/resources/mixins/tweaks/mixins.entities.loot.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.loot.json rename to src/main/resources/mixins/tweaks/mixins.entities.loot.json diff --git a/src/main/resources/mixins.tweaks.entities.minecart.json b/src/main/resources/mixins/tweaks/mixins.entities.minecart.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.minecart.json rename to src/main/resources/mixins/tweaks/mixins.entities.minecart.json diff --git a/src/main/resources/mixins.tweaks.entities.playerdismount.json b/src/main/resources/mixins/tweaks/mixins.entities.playerdismount.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.playerdismount.json rename to src/main/resources/mixins/tweaks/mixins.entities.playerdismount.json diff --git a/src/main/resources/mixins.tweaks.entities.playerf5.json b/src/main/resources/mixins/tweaks/mixins.entities.playerf5.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.playerf5.json rename to src/main/resources/mixins/tweaks/mixins.entities.playerf5.json diff --git a/src/main/resources/mixins.tweaks.entities.sleeping.json b/src/main/resources/mixins/tweaks/mixins.entities.sleeping.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.sleeping.json rename to src/main/resources/mixins/tweaks/mixins.entities.sleeping.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.caps.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.caps.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.caps.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.caps.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.creeper.confetti.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.creeper.confetti.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.creeper.confetti.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.creeper.confetti.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.golem.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.golem.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.golem.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.golem.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.husk.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.husk.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.husk.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.husk.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.portal.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.portal.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.portal.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.portal.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.skeletontrap.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.skeletontrap.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.skeletontrap.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.skeletontrap.json diff --git a/src/main/resources/mixins.tweaks.entities.spawning.stray.json b/src/main/resources/mixins/tweaks/mixins.entities.spawning.stray.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.spawning.stray.json rename to src/main/resources/mixins/tweaks/mixins.entities.spawning.stray.json diff --git a/src/main/resources/mixins.tweaks.entities.speed.boat.json b/src/main/resources/mixins/tweaks/mixins.entities.speed.boat.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.speed.boat.json rename to src/main/resources/mixins/tweaks/mixins.entities.speed.boat.json diff --git a/src/main/resources/mixins.tweaks.entities.speed.cobweb.json b/src/main/resources/mixins/tweaks/mixins.entities.speed.cobweb.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.speed.cobweb.json rename to src/main/resources/mixins/tweaks/mixins.entities.speed.cobweb.json diff --git a/src/main/resources/mixins.tweaks.entities.speed.player.json b/src/main/resources/mixins/tweaks/mixins.entities.speed.player.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.speed.player.json rename to src/main/resources/mixins/tweaks/mixins.entities.speed.player.json diff --git a/src/main/resources/mixins.tweaks.entities.sprint.json b/src/main/resources/mixins/tweaks/mixins.entities.sprint.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.sprint.json rename to src/main/resources/mixins/tweaks/mixins.entities.sprint.json diff --git a/src/main/resources/mixins.tweaks.entities.taming.horse.json b/src/main/resources/mixins/tweaks/mixins.entities.taming.horse.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.taming.horse.json rename to src/main/resources/mixins/tweaks/mixins.entities.taming.horse.json diff --git a/src/main/resources/mixins.tweaks.entities.trading.json b/src/main/resources/mixins/tweaks/mixins.entities.trading.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.trading.json rename to src/main/resources/mixins/tweaks/mixins.entities.trading.json diff --git a/src/main/resources/mixins.tweaks.entities.unsafesleeping.json b/src/main/resources/mixins/tweaks/mixins.entities.unsafesleeping.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.unsafesleeping.json rename to src/main/resources/mixins/tweaks/mixins.entities.unsafesleeping.json diff --git a/src/main/resources/mixins.tweaks.entities.villagerprofessions.json b/src/main/resources/mixins/tweaks/mixins.entities.villagerprofessions.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.villagerprofessions.json rename to src/main/resources/mixins/tweaks/mixins.entities.villagerprofessions.json diff --git a/src/main/resources/mixins.tweaks.entities.voidteleport.json b/src/main/resources/mixins/tweaks/mixins.entities.voidteleport.json similarity index 100% rename from src/main/resources/mixins.tweaks.entities.voidteleport.json rename to src/main/resources/mixins/tweaks/mixins.entities.voidteleport.json diff --git a/src/main/resources/mixins.tweaks.items.attackcooldown.client.json b/src/main/resources/mixins/tweaks/mixins.items.attackcooldown.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.attackcooldown.client.json rename to src/main/resources/mixins/tweaks/mixins.items.attackcooldown.client.json diff --git a/src/main/resources/mixins.tweaks.items.attackcooldown.server.json b/src/main/resources/mixins/tweaks/mixins.items.attackcooldown.server.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.attackcooldown.server.json rename to src/main/resources/mixins/tweaks/mixins.items.attackcooldown.server.json diff --git a/src/main/resources/mixins.tweaks.items.bottle.json b/src/main/resources/mixins/tweaks/mixins.items.bottle.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.bottle.json rename to src/main/resources/mixins/tweaks/mixins.items.bottle.json diff --git a/src/main/resources/mixins.tweaks.items.bucket.json b/src/main/resources/mixins/tweaks/mixins.items.bucket.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.bucket.json rename to src/main/resources/mixins/tweaks/mixins.items.bucket.json diff --git a/src/main/resources/mixins.tweaks.items.eating.json b/src/main/resources/mixins/tweaks/mixins.items.eating.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.eating.json rename to src/main/resources/mixins/tweaks/mixins.items.eating.json diff --git a/src/main/resources/mixins.tweaks.items.hardcorebuckets.json b/src/main/resources/mixins/tweaks/mixins.items.hardcorebuckets.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.hardcorebuckets.json rename to src/main/resources/mixins/tweaks/mixins.items.hardcorebuckets.json diff --git a/src/main/resources/mixins.tweaks.items.infinityallarrows.json b/src/main/resources/mixins/tweaks/mixins.items.infinityallarrows.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.infinityallarrows.json rename to src/main/resources/mixins/tweaks/mixins.items.infinityallarrows.json diff --git a/src/main/resources/mixins.tweaks.items.infinitymending.json b/src/main/resources/mixins/tweaks/mixins.items.infinitymending.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.infinitymending.json rename to src/main/resources/mixins/tweaks/mixins.items.infinitymending.json diff --git a/src/main/resources/mixins.tweaks.items.itementities.client.json b/src/main/resources/mixins/tweaks/mixins.items.itementities.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.itementities.client.json rename to src/main/resources/mixins/tweaks/mixins.items.itementities.client.json diff --git a/src/main/resources/mixins.tweaks.items.itementities.server.json b/src/main/resources/mixins/tweaks/mixins.items.itementities.server.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.itementities.server.json rename to src/main/resources/mixins/tweaks/mixins.items.itementities.server.json diff --git a/src/main/resources/mixins.tweaks.items.mobegg.json b/src/main/resources/mixins/tweaks/mixins.items.mobegg.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.mobegg.json rename to src/main/resources/mixins/tweaks/mixins.items.mobegg.json diff --git a/src/main/resources/mixins.tweaks.items.rarity.json b/src/main/resources/mixins/tweaks/mixins.items.rarity.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.rarity.json rename to src/main/resources/mixins/tweaks/mixins.items.rarity.json diff --git a/src/main/resources/mixins.tweaks.items.repairing.json b/src/main/resources/mixins/tweaks/mixins.items.repairing.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.repairing.json rename to src/main/resources/mixins/tweaks/mixins.items.repairing.json diff --git a/src/main/resources/mixins.tweaks.items.xpbottle.json b/src/main/resources/mixins/tweaks/mixins.items.xpbottle.json similarity index 100% rename from src/main/resources/mixins.tweaks.items.xpbottle.json rename to src/main/resources/mixins/tweaks/mixins.items.xpbottle.json diff --git a/src/main/resources/mixins.tweaks.misc.advancements.guisize.json b/src/main/resources/mixins/tweaks/mixins.misc.advancements.guisize.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.advancements.guisize.json rename to src/main/resources/mixins/tweaks/mixins.misc.advancements.guisize.json diff --git a/src/main/resources/mixins.tweaks.misc.advancements.json b/src/main/resources/mixins/tweaks/mixins.misc.advancements.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.advancements.json rename to src/main/resources/mixins/tweaks/mixins.misc.advancements.json diff --git a/src/main/resources/mixins.tweaks.misc.armorcurve.json b/src/main/resources/mixins/tweaks/mixins.misc.armorcurve.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.armorcurve.json rename to src/main/resources/mixins/tweaks/mixins.misc.armorcurve.json diff --git a/src/main/resources/mixins.tweaks.misc.armorswap.json b/src/main/resources/mixins/tweaks/mixins.misc.armorswap.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.armorswap.json rename to src/main/resources/mixins/tweaks/mixins.misc.armorswap.json diff --git a/src/main/resources/mixins.tweaks.misc.bannerlayers.json b/src/main/resources/mixins/tweaks/mixins.misc.bannerlayers.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.bannerlayers.json rename to src/main/resources/mixins/tweaks/mixins.misc.bannerlayers.json diff --git a/src/main/resources/mixins.tweaks.misc.buttons.anaglyph.json b/src/main/resources/mixins/tweaks/mixins.misc.buttons.anaglyph.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.buttons.anaglyph.json rename to src/main/resources/mixins/tweaks/mixins.misc.buttons.anaglyph.json diff --git a/src/main/resources/mixins.tweaks.misc.buttons.anaglyph.optifine.json b/src/main/resources/mixins/tweaks/mixins.misc.buttons.anaglyph.optifine.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.buttons.anaglyph.optifine.json rename to src/main/resources/mixins/tweaks/mixins.misc.buttons.anaglyph.optifine.json diff --git a/src/main/resources/mixins.tweaks.misc.buttons.realms.json b/src/main/resources/mixins/tweaks/mixins.misc.buttons.realms.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.buttons.realms.json rename to src/main/resources/mixins/tweaks/mixins.misc.buttons.realms.json diff --git a/src/main/resources/mixins.tweaks.misc.buttons.snooper.client.json b/src/main/resources/mixins/tweaks/mixins.misc.buttons.snooper.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.buttons.snooper.client.json rename to src/main/resources/mixins/tweaks/mixins.misc.buttons.snooper.client.json diff --git a/src/main/resources/mixins.tweaks.misc.buttons.snooper.server.json b/src/main/resources/mixins/tweaks/mixins.misc.buttons.snooper.server.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.buttons.snooper.server.json rename to src/main/resources/mixins/tweaks/mixins.misc.buttons.snooper.server.json diff --git a/src/main/resources/mixins.tweaks.misc.chat.bed.json b/src/main/resources/mixins/tweaks/mixins.misc.chat.bed.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.chat.bed.json rename to src/main/resources/mixins/tweaks/mixins.misc.chat.bed.json diff --git a/src/main/resources/mixins.tweaks.misc.chat.compactmessage.json b/src/main/resources/mixins/tweaks/mixins.misc.chat.compactmessage.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.chat.compactmessage.json rename to src/main/resources/mixins/tweaks/mixins.misc.chat.compactmessage.json diff --git a/src/main/resources/mixins.tweaks.misc.chat.keepsentmessages.json b/src/main/resources/mixins/tweaks/mixins.misc.chat.keepsentmessages.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.chat.keepsentmessages.json rename to src/main/resources/mixins/tweaks/mixins.misc.chat.keepsentmessages.json diff --git a/src/main/resources/mixins.tweaks.misc.chat.maximumlines.json b/src/main/resources/mixins/tweaks/mixins.misc.chat.maximumlines.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.chat.maximumlines.json rename to src/main/resources/mixins/tweaks/mixins.misc.chat.maximumlines.json diff --git a/src/main/resources/mixins.tweaks.misc.commands.seed.json b/src/main/resources/mixins/tweaks/mixins.misc.commands.seed.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.commands.seed.json rename to src/main/resources/mixins/tweaks/mixins.misc.commands.seed.json diff --git a/src/main/resources/mixins.tweaks.misc.credits.json b/src/main/resources/mixins/tweaks/mixins.misc.credits.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.credits.json rename to src/main/resources/mixins/tweaks/mixins.misc.credits.json diff --git a/src/main/resources/mixins.tweaks.misc.difficulty.multiplayer.json b/src/main/resources/mixins/tweaks/mixins.misc.difficulty.multiplayer.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.difficulty.multiplayer.json rename to src/main/resources/mixins/tweaks/mixins.misc.difficulty.multiplayer.json diff --git a/src/main/resources/mixins.tweaks.misc.difficulty.singleplayer.json b/src/main/resources/mixins/tweaks/mixins.misc.difficulty.singleplayer.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.difficulty.singleplayer.json rename to src/main/resources/mixins/tweaks/mixins.misc.difficulty.singleplayer.json diff --git a/src/main/resources/mixins.tweaks.misc.glint.enchantedbook.json b/src/main/resources/mixins/tweaks/mixins.misc.glint.enchantedbook.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.glint.enchantedbook.json rename to src/main/resources/mixins/tweaks/mixins.misc.glint.enchantedbook.json diff --git a/src/main/resources/mixins.tweaks.misc.glint.potion.json b/src/main/resources/mixins/tweaks/mixins.misc.glint.potion.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.glint.potion.json rename to src/main/resources/mixins/tweaks/mixins.misc.glint.potion.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.defaultguitextcolor.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.defaultguitextcolor.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.defaultguitextcolor.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.defaultguitextcolor.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.gamewindow.icon.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.gamewindow.icon.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.gamewindow.icon.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.gamewindow.icon.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.gamewindow.title.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.gamewindow.title.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.gamewindow.title.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.gamewindow.title.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.keybindlistentry.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.keybindlistentry.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.keybindlistentry.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.keybindlistentry.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.lanserverproperties.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.lanserverproperties.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.lanserverproperties.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.lanserverproperties.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.mainmenu.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.mainmenu.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.mainmenu.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.mainmenu.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.modlist.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.modlist.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.modlist.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.modlist.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.overlaymessage.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.overlaymessage.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.overlaymessage.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.overlaymessage.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.ping.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.ping.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.ping.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.ping.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.potionduration.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.potionduration.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.potionduration.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.potionduration.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.selecteditemtooltip.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.selecteditemtooltip.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.selecteditemtooltip.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.selecteditemtooltip.json diff --git a/src/main/resources/mixins.tweaks.misc.gui.textshadow.json b/src/main/resources/mixins/tweaks/mixins.misc.gui.textshadow.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.gui.textshadow.json rename to src/main/resources/mixins/tweaks/mixins.misc.gui.textshadow.json diff --git a/src/main/resources/mixins.tweaks.misc.hotbarscroll.json b/src/main/resources/mixins/tweaks/mixins.misc.hotbarscroll.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.hotbarscroll.json rename to src/main/resources/mixins/tweaks/mixins.misc.hotbarscroll.json diff --git a/src/main/resources/mixins.tweaks.misc.incurablepotions.json b/src/main/resources/mixins/tweaks/mixins.misc.incurablepotions.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.incurablepotions.json rename to src/main/resources/mixins/tweaks/mixins.misc.incurablepotions.json diff --git a/src/main/resources/mixins.tweaks.misc.lightning.damage.json b/src/main/resources/mixins/tweaks/mixins.misc.lightning.damage.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.lightning.damage.json rename to src/main/resources/mixins/tweaks/mixins.misc.lightning.damage.json diff --git a/src/main/resources/mixins.tweaks.misc.lightning.fire.json b/src/main/resources/mixins/tweaks/mixins.misc.lightning.fire.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.lightning.fire.json rename to src/main/resources/mixins/tweaks/mixins.misc.lightning.fire.json diff --git a/src/main/resources/mixins.tweaks.misc.lightning.flash.json b/src/main/resources/mixins/tweaks/mixins.misc.lightning.flash.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.lightning.flash.json rename to src/main/resources/mixins/tweaks/mixins.misc.lightning.flash.json diff --git a/src/main/resources/mixins.tweaks.misc.music.json b/src/main/resources/mixins/tweaks/mixins.misc.music.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.music.json rename to src/main/resources/mixins/tweaks/mixins.misc.music.json diff --git a/src/main/resources/mixins.tweaks.misc.narrator.json b/src/main/resources/mixins/tweaks/mixins.misc.narrator.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.narrator.json rename to src/main/resources/mixins/tweaks/mixins.misc.narrator.json diff --git a/src/main/resources/mixins.tweaks.misc.narratorkeybind.json b/src/main/resources/mixins/tweaks/mixins.misc.narratorkeybind.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.narratorkeybind.json rename to src/main/resources/mixins/tweaks/mixins.misc.narratorkeybind.json diff --git a/src/main/resources/mixins.tweaks.misc.nightvisionflash.json b/src/main/resources/mixins/tweaks/mixins.misc.nightvisionflash.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.nightvisionflash.json rename to src/main/resources/mixins/tweaks/mixins.misc.nightvisionflash.json diff --git a/src/main/resources/mixins.tweaks.misc.particlelimit.json b/src/main/resources/mixins/tweaks/mixins.misc.particlelimit.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.particlelimit.json rename to src/main/resources/mixins/tweaks/mixins.misc.particlelimit.json diff --git a/src/main/resources/mixins.tweaks.misc.personalpotionparticles.json b/src/main/resources/mixins/tweaks/mixins.misc.personalpotionparticles.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.personalpotionparticles.json rename to src/main/resources/mixins/tweaks/mixins.misc.personalpotionparticles.json diff --git a/src/main/resources/mixins.tweaks.misc.recipebook.betweenlands.client.json b/src/main/resources/mixins/tweaks/mixins.misc.recipebook.betweenlands.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.recipebook.betweenlands.client.json rename to src/main/resources/mixins/tweaks/mixins.misc.recipebook.betweenlands.client.json diff --git a/src/main/resources/mixins.tweaks.misc.recipebook.buildcraft.client.json b/src/main/resources/mixins/tweaks/mixins.misc.recipebook.buildcraft.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.recipebook.buildcraft.client.json rename to src/main/resources/mixins/tweaks/mixins.misc.recipebook.buildcraft.client.json diff --git a/src/main/resources/mixins.tweaks.misc.recipebook.client.json b/src/main/resources/mixins/tweaks/mixins.misc.recipebook.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.recipebook.client.json rename to src/main/resources/mixins/tweaks/mixins.misc.recipebook.client.json diff --git a/src/main/resources/mixins.tweaks.misc.recipebook.server.json b/src/main/resources/mixins/tweaks/mixins.misc.recipebook.server.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.recipebook.server.json rename to src/main/resources/mixins/tweaks/mixins.misc.recipebook.server.json diff --git a/src/main/resources/mixins.tweaks.misc.smoothscrolling.json b/src/main/resources/mixins/tweaks/mixins.misc.smoothscrolling.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.smoothscrolling.json rename to src/main/resources/mixins/tweaks/mixins.misc.smoothscrolling.json diff --git a/src/main/resources/mixins.tweaks.misc.sound.broadcast.dragon.json b/src/main/resources/mixins/tweaks/mixins.misc.sound.broadcast.dragon.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.sound.broadcast.dragon.json rename to src/main/resources/mixins/tweaks/mixins.misc.sound.broadcast.dragon.json diff --git a/src/main/resources/mixins.tweaks.misc.sound.broadcast.endportal.json b/src/main/resources/mixins/tweaks/mixins.misc.sound.broadcast.endportal.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.sound.broadcast.endportal.json rename to src/main/resources/mixins/tweaks/mixins.misc.sound.broadcast.endportal.json diff --git a/src/main/resources/mixins.tweaks.misc.sound.broadcast.wither.json b/src/main/resources/mixins/tweaks/mixins.misc.sound.broadcast.wither.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.sound.broadcast.wither.json rename to src/main/resources/mixins/tweaks/mixins.misc.sound.broadcast.wither.json diff --git a/src/main/resources/mixins.tweaks.misc.sound.pitch.json b/src/main/resources/mixins/tweaks/mixins.misc.sound.pitch.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.sound.pitch.json rename to src/main/resources/mixins/tweaks/mixins.misc.sound.pitch.json diff --git a/src/main/resources/mixins.tweaks.misc.timeouts.client.json b/src/main/resources/mixins/tweaks/mixins.misc.timeouts.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.timeouts.client.json rename to src/main/resources/mixins/tweaks/mixins.misc.timeouts.client.json diff --git a/src/main/resources/mixins.tweaks.misc.timeouts.json b/src/main/resources/mixins/tweaks/mixins.misc.timeouts.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.timeouts.json rename to src/main/resources/mixins/tweaks/mixins.misc.timeouts.json diff --git a/src/main/resources/mixins.tweaks.misc.toastcontrol.json b/src/main/resources/mixins/tweaks/mixins.misc.toastcontrol.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.toastcontrol.json rename to src/main/resources/mixins/tweaks/mixins.misc.toastcontrol.json diff --git a/src/main/resources/mixins.tweaks.misc.viewbobbing.json b/src/main/resources/mixins/tweaks/mixins.misc.viewbobbing.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.viewbobbing.json rename to src/main/resources/mixins/tweaks/mixins.misc.viewbobbing.json diff --git a/src/main/resources/mixins.tweaks.misc.xp.cap.json b/src/main/resources/mixins/tweaks/mixins.misc.xp.cap.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.xp.cap.json rename to src/main/resources/mixins/tweaks/mixins.misc.xp.cap.json diff --git a/src/main/resources/mixins.tweaks.misc.xp.drop.json b/src/main/resources/mixins/tweaks/mixins.misc.xp.drop.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.xp.drop.json rename to src/main/resources/mixins/tweaks/mixins.misc.xp.drop.json diff --git a/src/main/resources/mixins.tweaks.misc.xp.linear.json b/src/main/resources/mixins/tweaks/mixins.misc.xp.linear.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.xp.linear.json rename to src/main/resources/mixins/tweaks/mixins.misc.xp.linear.json diff --git a/src/main/resources/mixins.tweaks.misc.xp.smelting.json b/src/main/resources/mixins/tweaks/mixins.misc.xp.smelting.json similarity index 100% rename from src/main/resources/mixins.tweaks.misc.xp.smelting.json rename to src/main/resources/mixins/tweaks/mixins.misc.xp.smelting.json diff --git a/src/main/resources/mixins.tweaks.performance.advancements.logging.json b/src/main/resources/mixins/tweaks/mixins.performance.advancements.logging.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.advancements.logging.json rename to src/main/resources/mixins/tweaks/mixins.performance.advancements.logging.json diff --git a/src/main/resources/mixins.tweaks.performance.advancements.triggers.json b/src/main/resources/mixins/tweaks/mixins.performance.advancements.triggers.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.advancements.triggers.json rename to src/main/resources/mixins/tweaks/mixins.performance.advancements.triggers.json diff --git a/src/main/resources/mixins.tweaks.performance.audioreload.json b/src/main/resources/mixins/tweaks/mixins.performance.audioreload.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.audioreload.json rename to src/main/resources/mixins/tweaks/mixins.performance.audioreload.json diff --git a/src/main/resources/mixins.tweaks.performance.autosave.json b/src/main/resources/mixins/tweaks/mixins.performance.autosave.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.autosave.json rename to src/main/resources/mixins/tweaks/mixins.performance.autosave.json diff --git a/src/main/resources/mixins.tweaks.performance.connectionspeed.json b/src/main/resources/mixins/tweaks/mixins.performance.connectionspeed.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.connectionspeed.json rename to src/main/resources/mixins/tweaks/mixins.performance.connectionspeed.json diff --git a/src/main/resources/mixins.tweaks.performance.craftingcache.json b/src/main/resources/mixins/tweaks/mixins.performance.craftingcache.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.craftingcache.json rename to src/main/resources/mixins/tweaks/mixins.performance.craftingcache.json diff --git a/src/main/resources/mixins.tweaks.performance.dyeblending.json b/src/main/resources/mixins/tweaks/mixins.performance.dyeblending.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.dyeblending.json rename to src/main/resources/mixins/tweaks/mixins.performance.dyeblending.json diff --git a/src/main/resources/mixins.tweaks.performance.entityradiuscheck.lesscollisions.json b/src/main/resources/mixins/tweaks/mixins.performance.entityradiuscheck.lesscollisions.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.entityradiuscheck.lesscollisions.json rename to src/main/resources/mixins/tweaks/mixins.performance.entityradiuscheck.lesscollisions.json diff --git a/src/main/resources/mixins.tweaks.performance.entityradiuscheck.reducesearchsize.json b/src/main/resources/mixins/tweaks/mixins.performance.entityradiuscheck.reducesearchsize.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.entityradiuscheck.reducesearchsize.json rename to src/main/resources/mixins/tweaks/mixins.performance.entityradiuscheck.reducesearchsize.json diff --git a/src/main/resources/mixins.tweaks.performance.fps.json b/src/main/resources/mixins/tweaks/mixins.performance.fps.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.fps.json rename to src/main/resources/mixins/tweaks/mixins.performance.fps.json diff --git a/src/main/resources/mixins.tweaks.performance.languageswitching.json b/src/main/resources/mixins/tweaks/mixins.performance.languageswitching.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.languageswitching.json rename to src/main/resources/mixins/tweaks/mixins.performance.languageswitching.json diff --git a/src/main/resources/mixins.tweaks.performance.missingmodel.json b/src/main/resources/mixins/tweaks/mixins.performance.missingmodel.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.missingmodel.json rename to src/main/resources/mixins/tweaks/mixins.performance.missingmodel.json diff --git a/src/main/resources/mixins.tweaks.performance.mobspawnerrender.json b/src/main/resources/mixins/tweaks/mixins.performance.mobspawnerrender.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.mobspawnerrender.json rename to src/main/resources/mixins/tweaks/mixins.performance.mobspawnerrender.json diff --git a/src/main/resources/mixins.tweaks.performance.pathfinding.json b/src/main/resources/mixins/tweaks/mixins.performance.pathfinding.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.pathfinding.json rename to src/main/resources/mixins/tweaks/mixins.performance.pathfinding.json diff --git a/src/main/resources/mixins.tweaks.performance.prefixcheck.json b/src/main/resources/mixins/tweaks/mixins.performance.prefixcheck.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.prefixcheck.json rename to src/main/resources/mixins/tweaks/mixins.performance.prefixcheck.json diff --git a/src/main/resources/mixins.tweaks.performance.redstone.json b/src/main/resources/mixins/tweaks/mixins.performance.redstone.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.redstone.json rename to src/main/resources/mixins/tweaks/mixins.performance.redstone.json diff --git a/src/main/resources/mixins.tweaks.performance.resourcemanager.json b/src/main/resources/mixins/tweaks/mixins.performance.resourcemanager.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.resourcemanager.json rename to src/main/resources/mixins/tweaks/mixins.performance.resourcemanager.json diff --git a/src/main/resources/mixins.tweaks.performance.textureatlas.json b/src/main/resources/mixins/tweaks/mixins.performance.textureatlas.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.textureatlas.json rename to src/main/resources/mixins/tweaks/mixins.performance.textureatlas.json diff --git a/src/main/resources/mixins.tweaks.performance.texturemapcheck.json b/src/main/resources/mixins/tweaks/mixins.performance.texturemapcheck.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.texturemapcheck.json rename to src/main/resources/mixins/tweaks/mixins.performance.texturemapcheck.json diff --git a/src/main/resources/mixins.tweaks.performance.weathereffects.json b/src/main/resources/mixins/tweaks/mixins.performance.weathereffects.json similarity index 100% rename from src/main/resources/mixins.tweaks.performance.weathereffects.json rename to src/main/resources/mixins/tweaks/mixins.performance.weathereffects.json diff --git a/src/main/resources/mixins.tweaks.world.cavegen.json b/src/main/resources/mixins/tweaks/mixins.world.cavegen.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.cavegen.json rename to src/main/resources/mixins/tweaks/mixins.world.cavegen.json diff --git a/src/main/resources/mixins.tweaks.world.chunks.gen.json b/src/main/resources/mixins/tweaks/mixins.world.chunks.gen.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.chunks.gen.json rename to src/main/resources/mixins/tweaks/mixins.world.chunks.gen.json diff --git a/src/main/resources/mixins.tweaks.world.chunks.spawn.json b/src/main/resources/mixins/tweaks/mixins.world.chunks.spawn.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.chunks.spawn.json rename to src/main/resources/mixins/tweaks/mixins.world.chunks.spawn.json diff --git a/src/main/resources/mixins.tweaks.world.loading.client.json b/src/main/resources/mixins/tweaks/mixins.world.loading.client.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.loading.client.json rename to src/main/resources/mixins/tweaks/mixins.world.loading.client.json diff --git a/src/main/resources/mixins.tweaks.world.sealevel.json b/src/main/resources/mixins/tweaks/mixins.world.sealevel.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.sealevel.json rename to src/main/resources/mixins/tweaks/mixins.world.sealevel.json diff --git a/src/main/resources/mixins.tweaks.world.stronghold.json b/src/main/resources/mixins/tweaks/mixins.world.stronghold.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.stronghold.json rename to src/main/resources/mixins/tweaks/mixins.world.stronghold.json diff --git a/src/main/resources/mixins.tweaks.world.village.json b/src/main/resources/mixins/tweaks/mixins.world.village.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.village.json rename to src/main/resources/mixins/tweaks/mixins.world.village.json diff --git a/src/main/resources/mixins.tweaks.world.voidfog.json b/src/main/resources/mixins/tweaks/mixins.world.voidfog.json similarity index 100% rename from src/main/resources/mixins.tweaks.world.voidfog.json rename to src/main/resources/mixins/tweaks/mixins.world.voidfog.json