From ec014838b8269df6ab4182d96a0f7a5e668dcc7b Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:48:29 +0200 Subject: [PATCH 1/2] refactor mixins package to have all mixins related stuff under the same package --- gradle.properties | 4 ++-- .../com/mitchej123/hodgepodge/HodgepodgeLateMixins.java | 2 +- .../hodgepodge/client/biomesoplenty/BOPFogHandler.java | 2 +- .../java/com/mitchej123/hodgepodge/core/HodgepodgeCore.java | 2 +- .../com/mitchej123/hodgepodge/{mixins => mixin}/Mixins.java | 2 +- .../hodgepodge/{mixins => mixin}/TargetedMod.java | 2 +- .../ducks/BlockDuck_FixXray.java} | 4 ++-- .../hodgepodge/{common => mixin/ducks}/KeyBindingDuck.java | 2 +- .../hooks/ThaumcraftHook.java} | 4 ++-- .../mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java | 2 +- .../{ => mixin}/mixins/early/cofhcore/MixinProxyClient.java | 2 +- .../mixins/early/forge/FluidContainerRegistryAccessor.java | 2 +- .../{ => mixin}/mixins/early/forge/MixinASMDataTable.java | 2 +- .../{ => mixin}/mixins/early/forge/MixinFluidRegistry.java | 2 +- .../early/forge/MixinForgeVersion_FixUpdateCheck.java | 2 +- .../{ => mixin}/mixins/early/forge/MixinGuiIngameForge.java | 2 +- .../{ => mixin}/mixins/early/forge/MixinOpenGuiHandler.java | 2 +- .../mixins/early/ic2/MixinIc2NanoSuitNightVision.java | 2 +- .../mixins/early/ic2/MixinIc2NightVisionGoggles.java | 2 +- .../mixins/early/ic2/MixinIc2QuantumSuitNightVision.java | 2 +- .../{ => mixin}/mixins/early/ic2/MixinIc2WaterKinetic.java | 2 +- .../{ => mixin}/mixins/early/ic2/MixinItemCropSeed.java | 2 +- .../mixins/early/ic2/MixinItemIC2FluidContainer.java | 2 +- .../{ => mixin}/mixins/early/ic2/MixinTileEntityCrop.java | 2 +- .../early/ic2/MixinTileEntityNuclearReactorElectric.java | 2 +- .../MixinTileEntityReactorChamberElectricInvSpeedup.java | 2 +- .../ic2/MixinTileEntityReactorChamberElectricNoDupe.java | 2 +- .../mixins/early/ic2/textures/MixinRenderLiquidCell.java | 2 +- .../mixins/early/minecraft/FontRendererAccessor.java | 2 +- .../mixins/early/minecraft/MixinAbstractClientPlayer.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinBlockBed.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinBlockFence.java | 2 +- .../mixins/early/minecraft/MixinBlockFireSpread.java | 2 +- .../mixins/early/minecraft/MixinBlockHopper.java | 2 +- .../mixins/early/minecraft/MixinBlock_FixXray.java | 6 +++--- .../mixins/early/minecraft/MixinChunkCoordinates.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinContainer.java | 2 +- .../mixins/early/minecraft/MixinDimensionManager.java | 2 +- .../mixins/early/minecraft/MixinEffectRenderer.java | 2 +- .../early/minecraft/MixinEnchantment_FixRomanNumerals.java | 2 +- .../mixins/early/minecraft/MixinEntityFireball.java | 2 +- .../minecraft/MixinEntityLivingBase_FixHasteArmSwing.java | 2 +- .../minecraft/MixinEntityLivingBase_FixPotionException.java | 2 +- .../MixinEntityLivingBase_HidePotionParticles.java | 2 +- .../mixins/early/minecraft/MixinEntityLivingDrop.java | 2 +- .../mixins/early/minecraft/MixinEntityLivingPickup.java | 2 +- .../mixins/early/minecraft/MixinEntityPlayer.java | 2 +- .../mixins/early/minecraft/MixinEntityPlayerMP.java | 2 +- .../mixins/early/minecraft/MixinEntityRenderer.java | 2 +- .../minecraft/MixinEntityRenderer_EnhanceNightVision.java | 2 +- .../mixins/early/minecraft/MixinFontRenderer.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinForgeHooks.java | 2 +- .../mixins/early/minecraft/MixinFurnaceRecipes.java | 2 +- .../mixins/early/minecraft/MixinGameSettings.java | 2 +- .../mixins/early/minecraft/MixinGameSetttings.java | 2 +- .../mixins/early/minecraft/MixinGuiContainerCreative.java | 2 +- .../mixins/early/minecraft/MixinGuiGameOver.java | 2 +- .../mixins/early/minecraft/MixinGuiNewChat_CompactChat.java | 2 +- .../early/minecraft/MixinGuiNewChat_FixColorWrapping.java | 2 +- .../mixins/early/minecraft/MixinGuiNewChat_LongerChat.java | 2 +- .../early/minecraft/MixinGuiNewChat_TransparentChat.java | 2 +- .../mixins/early/minecraft/MixinGuiScreenResourcePacks.java | 2 +- .../mixins/early/minecraft/MixinGuiTextField.java | 2 +- ...ixinInventoryEffectRenderer_FixPotionEffectNumerals.java | 2 +- .../MixinInventoryEffectRenderer_PotionEffectRendering.java | 2 +- .../MixinInventoryEffectRenderer_PotionOffset.java | 2 +- .../early/minecraft/MixinItemPotion_FixRomanNumerals.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinItemSoup.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinKeyBinding.java | 4 ++-- .../early/minecraft/MixinMinecraft_ResizableFullscreen.java | 2 +- .../early/minecraft/MixinMinecraft_ToggleDebugMessage.java | 2 +- .../early/minecraft/MixinMinecraft_UnfocusedFullscreen.java | 2 +- .../mixins/early/minecraft/MixinMinecraft_UpdateKeys.java | 4 ++-- .../mixins/early/minecraft/MixinNBTTagCompound.java | 2 +- .../mixins/early/minecraft/MixinNetHandlePlayClient.java | 2 +- .../minecraft/MixinNetHandlerLoginServer_OfflineMode.java | 2 +- .../MixinNetHandlerPlayClient_FixHandleSetSlot.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinPotion.java | 2 +- .../mixins/early/minecraft/MixinPotionEffect.java | 2 +- .../early/minecraft/MixinRandomPositionGenerator.java | 2 +- .../mixins/early/minecraft/MixinRenderGlobal.java | 2 +- .../mixins/early/minecraft/MixinRenderManager.java | 2 +- .../mixins/early/minecraft/MixinRendererLivingEntity.java | 2 +- .../mixins/early/minecraft/MixinS02PacketChat.java | 2 +- .../early/minecraft/MixinServerConfigurationManager.java | 2 +- .../mixins/early/minecraft/MixinSoundHandler.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinTcpNoDelay.java | 2 +- .../early/minecraft/MixinTileEntityFurnacePollution.java | 2 +- .../mixins/early/minecraft/MixinTileEntityHopper.java | 2 +- .../early/minecraft/MixinTimeCommandGalacticraftFix.java | 2 +- .../{ => mixin}/mixins/early/minecraft/MixinVillage.java | 2 +- .../mixins/early/minecraft/MixinVillageCollection.java | 2 +- .../mixins/early/minecraft/MixinWorldClient.java | 2 +- .../mixins/early/minecraft/MixinWorldGetBlock.java | 2 +- .../mixins/early/minecraft/MixinWorldLightValue.java | 2 +- .../early/minecraft/MixinWorldServerUpdateEntities.java | 2 +- .../mixins/early/minecraft/MixinWorldUpdateEntities.java | 2 +- .../early/minecraft/MixinWorld_FixLightUpdateLag.java | 2 +- .../mixins/early/minecraft/MixinWorld_FixXray.java | 6 +++--- .../mixins/early/minecraft/packets/MixinDataWatcher.java | 2 +- .../minecraft/packets/MixinS3FPacketCustomPayload.java | 2 +- .../mixins/early/minecraft/profiler/MinecraftMixin.java | 2 +- .../profiler/TileEntityRendererDispatcherMixin.java | 2 +- .../mixins/early/minecraft/server/MixinHttpUtil.java | 2 +- .../early/minecraft/textures/client/MixinBlockFire.java | 2 +- .../early/minecraft/textures/client/MixinChunkCache.java | 2 +- .../textures/client/MixinMinecraftForgeClient.java | 2 +- .../minecraft/textures/client/MixinRenderBlockFluid.java | 2 +- .../early/minecraft/textures/client/MixinRenderBlocks.java | 2 +- .../early/minecraft/textures/client/MixinRenderItem.java | 2 +- .../minecraft/textures/client/MixinTextureAtlasSprite.java | 2 +- .../early/minecraft/textures/client/MixinTextureMap.java | 2 +- .../early/minecraft/textures/client/MixinTextureUtil.java | 2 +- .../early/minecraft/textures/client/MixinWorldRenderer.java | 2 +- .../textures/client/fastcraft/MixinTextureMap.java | 2 +- .../mixins/late/automagy/MixinAutomagyKeyHandler.java | 2 +- .../mixins/late/automagy/MixinItemBlockThirstyTank.java | 2 +- .../{ => mixin}/mixins/late/baubles/MixinGuiEvents.java | 2 +- .../bibliocraft/MixinBibliocraftPatchPacketExploits.java | 2 +- .../mixins/late/bibliocraft/MixinPathSanitization.java | 2 +- .../mixins/late/bibliocraft/MixinVersionCheck.java | 2 +- .../mixins/late/biomesoplenty/AccessorFogHandler.java | 2 +- .../mixins/late/biomesoplenty/MixinBOPBiomes.java | 2 +- .../mixins/late/biomesoplenty/MixinBOPReflectionHelper.java | 2 +- .../mixins/late/biomesoplenty/MixinBlockBOPSapling.java | 2 +- .../mixins/late/biomesoplenty/MixinBlockMud_FixXray.java | 5 ++--- .../mixins/late/biomesoplenty/MixinFogHandler.java | 2 +- .../mixins/late/biomesoplenty/MixinForestryIntegration.java | 2 +- .../mixins/late/extrautilities/MixinBlockSpike.java | 2 +- .../mixins/late/extrautilities/MixinRecipeUnEnchanting.java | 2 +- .../late/extrautilities/MixinTransparentItemRender.java | 2 +- .../galacticraftcore/MixinGalacticraftRocketPollution.java | 2 +- .../late/galacticraftcore/MixinGuiExtendedInventory.java | 2 +- .../late/harvestthenether/MixinBlockNetherLeaves.java | 2 +- .../mixins/late/harvestthenether/MixinBlockPamFruit.java | 2 +- .../late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java | 2 +- .../hungeroverhaul/MixinHungerOverhaulLowStatEffect.java | 2 +- .../MixinHungerOverhaulModuleHarvestCraft.java | 2 +- .../mixins/late/ic2/MixinElectricItemManager.java | 2 +- .../{ => mixin}/mixins/late/ic2/MixinIC2ArmorHazmat.java | 2 +- .../{ => mixin}/mixins/late/ic2/MixinIC2ArmorJetpack.java | 2 +- .../{ => mixin}/mixins/late/ic2/MixinIC2ArmorNanoSuit.java | 2 +- .../mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java | 2 +- .../mixins/late/ic2/MixinIC2ArmorQuantumSuit.java | 2 +- .../mixins/late/ic2/MixinIC2ArmorSolarHelmet.java | 2 +- .../mixins/late/ic2/MixinIC2ArmorStaticBoots.java | 2 +- .../mixins/late/ic2/MixinIC2IronFurnacePollution.java | 2 +- .../{ => mixin}/mixins/late/ic2/MixinIc2Hazmat.java | 2 +- .../mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java | 2 +- .../{ => mixin}/mixins/late/ic2/MixinKeyboardClient.java | 2 +- .../mixins/late/immersiveengineering/MixinIEPotions.java | 2 +- .../{ => mixin}/mixins/late/journeymap/MixinConstants.java | 2 +- .../mixins/late/journeymap/MixinVersionCheck.java | 2 +- .../mixins/late/journeymap/MixinWaypointManager.java | 4 ++-- .../{ => mixin}/mixins/late/journeymap/MixinWorldData.java | 2 +- .../mixins/late/lotr/MixinLOTRLogReflection.java | 2 +- .../{ => mixin}/mixins/late/lotr/MixinLOTRRecipes.java | 2 +- .../{ => mixin}/mixins/late/lotr/MixinRedirectHuornAI.java | 2 +- .../mixins/late/lotr/MixinRemoveUnlockFinalField.java | 2 +- .../mixins/late/minechem/MixinPotionInjector.java | 2 +- .../mixins/late/minecraft/MixinExplosionPollution.java | 2 +- .../{ => mixin}/mixins/late/mrtjpcore/MixinFXEngine.java | 2 +- .../mixins/late/mrtjpcore/MixinPlacementLib.java | 2 +- .../{ => mixin}/mixins/late/projecte/MixinObjHandler.java | 2 +- .../late/railcraft/MixinRailcraftBoilerPollution.java | 2 +- .../late/railcraft/MixinRailcraftCokeOvenPollution.java | 2 +- .../late/railcraft/MixinRailcraftTunnelBorePollution.java | 2 +- .../mixins/late/railcraft/MixinTileAnchorPassive.java | 2 +- .../mixins/late/railcraft/MixinTileAnchorPersonal.java | 2 +- .../mixins/late/tconstruct/MixinTabRegistry.java | 2 +- .../mixins/late/thaumcraft/MixinEntityGolemBase.java | 6 +++--- .../mixins/late/thaumcraft/MixinGuiFocalManipulator.java | 2 +- .../mixins/late/thaumcraft/MixinGuiResearchRecipe.java | 2 +- .../mixins/late/thaumcraft/MixinGuiResearchTable.java | 2 +- .../mixins/late/thaumcraft/MixinGuiThaumatorium.java | 2 +- .../mixins/late/thaumcraft/MixinItemGolemBell.java | 6 +++--- .../mixins/late/thaumcraft/MixinItem_SortAspectsByName.java | 2 +- .../mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java | 2 +- .../thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java | 2 +- .../mixins/late/thaumcraft/MixinTileWandPedestal.java | 2 +- .../mixins/late/travellersgear/MixinClientProxy.java | 2 +- .../mixins/late/travellersgear/MixinKeyHandler.java | 2 +- .../mixins/late/witchery/MixinPotionArrayExtender.java | 2 +- .../{ => mixin}/mixins/late/xaeroworldmap/MixinGuiMap.java | 2 +- .../mixins/late/ztones/MixinZtonesPatchPacketExploits.java | 2 +- src/main/resources/mixins.hodgepodge.early.json | 2 +- src/main/resources/mixins.hodgepodge.json | 2 +- src/main/resources/mixins.hodgepodge.late.json | 2 +- 188 files changed, 203 insertions(+), 204 deletions(-) rename src/main/java/com/mitchej123/hodgepodge/{mixins => mixin}/Mixins.java (99%) rename src/main/java/com/mitchej123/hodgepodge/{mixins => mixin}/TargetedMod.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{common/BlockInvoker_FixXray.java => mixin/ducks/BlockDuck_FixXray.java} (59%) rename src/main/java/com/mitchej123/hodgepodge/{common => mixin/ducks}/KeyBindingDuck.java (62%) rename src/main/java/com/mitchej123/hodgepodge/{common/ThaumcraftMixinMethods.java => mixin/hooks/ThaumcraftHook.java} (83%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java (85%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/cofhcore/MixinProxyClient.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/forge/FluidContainerRegistryAccessor.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/forge/MixinASMDataTable.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/forge/MixinFluidRegistry.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/forge/MixinGuiIngameForge.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/forge/MixinOpenGuiHandler.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinIc2NanoSuitNightVision.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinIc2NightVisionGoggles.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinIc2WaterKinetic.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinItemCropSeed.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinItemIC2FluidContainer.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinTileEntityCrop.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/ic2/textures/MixinRenderLiquidCell.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/FontRendererAccessor.java (85%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinAbstractClientPlayer.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinBlockBed.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinBlockFence.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinBlockFireSpread.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinBlockHopper.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinBlock_FixXray.java (72%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinChunkCoordinates.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinContainer.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinDimensionManager.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEffectRenderer.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityFireball.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityLivingDrop.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityLivingPickup.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityPlayer.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityPlayerMP.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityRenderer.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinFontRenderer.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinForgeHooks.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinFurnaceRecipes.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGameSettings.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGameSetttings.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiContainerCreative.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiGameOver.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiScreenResourcePacks.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinGuiTextField.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinItemSoup.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinKeyBinding.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java (84%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinNBTTagCompound.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinNetHandlePlayClient.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinPotion.java (82%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinPotionEffect.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinRandomPositionGenerator.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinRenderGlobal.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinRenderManager.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinRendererLivingEntity.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinS02PacketChat.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinServerConfigurationManager.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinSoundHandler.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinTcpNoDelay.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinTileEntityFurnacePollution.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinTileEntityHopper.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinVillage.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinVillageCollection.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorldClient.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorldGetBlock.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorldLightValue.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorldServerUpdateEntities.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorldUpdateEntities.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/MixinWorld_FixXray.java (80%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/packets/MixinDataWatcher.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/profiler/MinecraftMixin.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/server/MixinHttpUtil.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinBlockFire.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinChunkCache.java (86%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinRenderBlocks.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinRenderItem.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinTextureMap.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinTextureUtil.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/MixinWorldRenderer.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java (89%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/automagy/MixinAutomagyKeyHandler.java (89%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/automagy/MixinItemBlockThirstyTank.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/baubles/MixinGuiEvents.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/bibliocraft/MixinPathSanitization.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/bibliocraft/MixinVersionCheck.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/AccessorFogHandler.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/MixinBOPBiomes.java (97%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/MixinBlockBOPSapling.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java (81%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/MixinFogHandler.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/biomesoplenty/MixinForestryIntegration.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/extrautilities/MixinBlockSpike.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/extrautilities/MixinRecipeUnEnchanting.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/extrautilities/MixinTransparentItemRender.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/harvestthenether/MixinBlockNetherLeaves.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/harvestthenether/MixinBlockPamFruit.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java (99%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinElectricItemManager.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorHazmat.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorJetpack.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorNanoSuit.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2ArmorStaticBoots.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIC2IronFurnacePollution.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIc2Hazmat.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java (89%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ic2/MixinKeyboardClient.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/immersiveengineering/MixinIEPotions.java (89%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/journeymap/MixinConstants.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/journeymap/MixinVersionCheck.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/journeymap/MixinWaypointManager.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/journeymap/MixinWorldData.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/lotr/MixinLOTRLogReflection.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/lotr/MixinLOTRRecipes.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/lotr/MixinRedirectHuornAI.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/lotr/MixinRemoveUnlockFinalField.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/minechem/MixinPotionInjector.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/minecraft/MixinExplosionPollution.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/mrtjpcore/MixinFXEngine.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/mrtjpcore/MixinPlacementLib.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/projecte/MixinObjHandler.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/railcraft/MixinRailcraftBoilerPollution.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java (96%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java (94%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/railcraft/MixinTileAnchorPassive.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/railcraft/MixinTileAnchorPersonal.java (90%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/tconstruct/MixinTabRegistry.java (88%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinEntityGolemBase.java (83%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinGuiFocalManipulator.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinGuiResearchRecipe.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinGuiResearchTable.java (93%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinGuiThaumatorium.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinItemGolemBell.java (80%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java (92%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java (95%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/thaumcraft/MixinTileWandPedestal.java (98%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/travellersgear/MixinClientProxy.java (89%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/travellersgear/MixinKeyHandler.java (91%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/witchery/MixinPotionArrayExtender.java (87%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/xaeroworldmap/MixinGuiMap.java (86%) rename src/main/java/com/mitchej123/hodgepodge/{ => mixin}/mixins/late/ztones/MixinZtonesPatchPacketExploits.java (96%) diff --git a/gradle.properties b/gradle.properties index c77edb22..2c259735 100644 --- a/gradle.properties +++ b/gradle.properties @@ -46,9 +46,9 @@ usesMixins = true # Adds some debug arguments like verbose output and export usesMixinDebug = true # Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise. -mixinPlugin = +mixinPlugin = # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! -mixinsPackage = mixins +mixinsPackage = mixin.mixins # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! # This parameter is for legacy compatability only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin diff --git a/src/main/java/com/mitchej123/hodgepodge/HodgepodgeLateMixins.java b/src/main/java/com/mitchej123/hodgepodge/HodgepodgeLateMixins.java index 1c4345b0..ddf09279 100644 --- a/src/main/java/com/mitchej123/hodgepodge/HodgepodgeLateMixins.java +++ b/src/main/java/com/mitchej123/hodgepodge/HodgepodgeLateMixins.java @@ -7,7 +7,7 @@ import com.gtnewhorizon.gtnhmixins.ILateMixinLoader; import com.gtnewhorizon.gtnhmixins.LateMixin; -import com.mitchej123.hodgepodge.mixins.Mixins; +import com.mitchej123.hodgepodge.mixin.Mixins; @LateMixin public class HodgepodgeLateMixins implements ILateMixinLoader { diff --git a/src/main/java/com/mitchej123/hodgepodge/client/biomesoplenty/BOPFogHandler.java b/src/main/java/com/mitchej123/hodgepodge/client/biomesoplenty/BOPFogHandler.java index 4732d642..9c9e39c9 100644 --- a/src/main/java/com/mitchej123/hodgepodge/client/biomesoplenty/BOPFogHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/client/biomesoplenty/BOPFogHandler.java @@ -9,7 +9,7 @@ import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.client.event.EntityViewRenderEvent; -import com.mitchej123.hodgepodge.mixins.late.biomesoplenty.AccessorFogHandler; +import com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty.AccessorFogHandler; import biomesoplenty.client.fog.FogHandler; import biomesoplenty.client.fog.IBiomeFog; diff --git a/src/main/java/com/mitchej123/hodgepodge/core/HodgepodgeCore.java b/src/main/java/com/mitchej123/hodgepodge/core/HodgepodgeCore.java index c8357e4f..b1c73360 100644 --- a/src/main/java/com/mitchej123/hodgepodge/core/HodgepodgeCore.java +++ b/src/main/java/com/mitchej123/hodgepodge/core/HodgepodgeCore.java @@ -14,7 +14,7 @@ import com.gtnewhorizon.gtnhmixins.IEarlyMixinLoader; import com.mitchej123.hodgepodge.Common; -import com.mitchej123.hodgepodge.mixins.Mixins; +import com.mitchej123.hodgepodge.mixin.Mixins; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java b/src/main/java/com/mitchej123/hodgepodge/mixin/Mixins.java similarity index 99% rename from src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/Mixins.java index 86149a87..ec53c9b5 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/Mixins.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/Mixins.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins; +package com.mitchej123.hodgepodge.mixin; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java b/src/main/java/com/mitchej123/hodgepodge/mixin/TargetedMod.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/TargetedMod.java index f40d1e50..1dbf5fad 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/TargetedMod.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/TargetedMod.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins; +package com.mitchej123.hodgepodge.mixin; public enum TargetedMod { diff --git a/src/main/java/com/mitchej123/hodgepodge/common/BlockInvoker_FixXray.java b/src/main/java/com/mitchej123/hodgepodge/mixin/ducks/BlockDuck_FixXray.java similarity index 59% rename from src/main/java/com/mitchej123/hodgepodge/common/BlockInvoker_FixXray.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/ducks/BlockDuck_FixXray.java index ee2e850d..e2ecd2f1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/common/BlockInvoker_FixXray.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/ducks/BlockDuck_FixXray.java @@ -1,8 +1,8 @@ -package com.mitchej123.hodgepodge.common; +package com.mitchej123.hodgepodge.mixin.ducks; import net.minecraft.world.World; -public interface BlockInvoker_FixXray { +public interface BlockDuck_FixXray { boolean hodgepodge$shouldRayTraceStopOnBlock(World worldIn, int x, int y, int z); } diff --git a/src/main/java/com/mitchej123/hodgepodge/common/KeyBindingDuck.java b/src/main/java/com/mitchej123/hodgepodge/mixin/ducks/KeyBindingDuck.java similarity index 62% rename from src/main/java/com/mitchej123/hodgepodge/common/KeyBindingDuck.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/ducks/KeyBindingDuck.java index a79bbb1d..27c04e16 100644 --- a/src/main/java/com/mitchej123/hodgepodge/common/KeyBindingDuck.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/ducks/KeyBindingDuck.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.common; +package com.mitchej123.hodgepodge.mixin.ducks; public interface KeyBindingDuck { diff --git a/src/main/java/com/mitchej123/hodgepodge/common/ThaumcraftMixinMethods.java b/src/main/java/com/mitchej123/hodgepodge/mixin/hooks/ThaumcraftHook.java similarity index 83% rename from src/main/java/com/mitchej123/hodgepodge/common/ThaumcraftMixinMethods.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/hooks/ThaumcraftHook.java index 9113863d..e822311b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/common/ThaumcraftMixinMethods.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/hooks/ThaumcraftHook.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.common; +package com.mitchej123.hodgepodge.mixin.hooks; import java.util.ArrayList; @@ -6,7 +6,7 @@ import thaumcraft.common.entities.golems.Marker; -public class ThaumcraftMixinMethods { +public class ThaumcraftHook { public static ArrayList overwriteMarkersDimID(NBTTagList nbtTagList, ArrayList markers) { for (int i = 0; i < nbtTagList.tagCount(); i++) { diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java similarity index 85% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java index 9eab8d13..1ec8b65d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/cofhcore/MixinCoFHCoreUpdateCheck.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.cofhcore; +package com.mitchej123.hodgepodge.mixin.mixins.early.cofhcore; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinProxyClient.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/cofhcore/MixinProxyClient.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinProxyClient.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/cofhcore/MixinProxyClient.java index d57c5d54..3baf881e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/cofhcore/MixinProxyClient.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/cofhcore/MixinProxyClient.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.cofhcore; +package com.mitchej123.hodgepodge.mixin.mixins.early.cofhcore; import org.lwjgl.input.Keyboard; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/FluidContainerRegistryAccessor.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/FluidContainerRegistryAccessor.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/FluidContainerRegistryAccessor.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/FluidContainerRegistryAccessor.java index ba2a8d07..a196dafb 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/FluidContainerRegistryAccessor.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/FluidContainerRegistryAccessor.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.forge; +package com.mitchej123.hodgepodge.mixin.mixins.early.forge; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinASMDataTable.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinASMDataTable.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinASMDataTable.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinASMDataTable.java index 3aaaa7ba..54279ea8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinASMDataTable.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinASMDataTable.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.forge; +package com.mitchej123.hodgepodge.mixin.mixins.early.forge; import java.io.File; import java.util.HashMap; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinFluidRegistry.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinFluidRegistry.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinFluidRegistry.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinFluidRegistry.java index dfe6f846..33419f57 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinFluidRegistry.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinFluidRegistry.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.forge; +package com.mitchej123.hodgepodge.mixin.mixins.early.forge; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java index b0c297b1..f94266b3 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinForgeVersion_FixUpdateCheck.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.forge; +package com.mitchej123.hodgepodge.mixin.mixins.early.forge; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinGuiIngameForge.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinGuiIngameForge.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinGuiIngameForge.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinGuiIngameForge.java index cf633b0c..555b61df 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinGuiIngameForge.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinGuiIngameForge.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.forge; +package com.mitchej123.hodgepodge.mixin.mixins.early.forge; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiIngame; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinOpenGuiHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinOpenGuiHandler.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinOpenGuiHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinOpenGuiHandler.java index 94a6b1e1..2bfd6bf1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/forge/MixinOpenGuiHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/forge/MixinOpenGuiHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.forge; +package com.mitchej123.hodgepodge.mixin.mixins.early.forge; import static org.objectweb.asm.Opcodes.PUTFIELD; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2NanoSuitNightVision.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2NanoSuitNightVision.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2NanoSuitNightVision.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2NanoSuitNightVision.java index 6ec4b4db..dbea0ecb 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2NanoSuitNightVision.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2NanoSuitNightVision.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2NightVisionGoggles.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2NightVisionGoggles.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2NightVisionGoggles.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2NightVisionGoggles.java index af7d3f2e..13341ed0 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2NightVisionGoggles.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2NightVisionGoggles.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java index 36a21358..7b1b0fa9 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2QuantumSuitNightVision.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2WaterKinetic.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2WaterKinetic.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2WaterKinetic.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2WaterKinetic.java index 54a0a85a..091602c5 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinIc2WaterKinetic.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinIc2WaterKinetic.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinItemCropSeed.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinItemCropSeed.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinItemCropSeed.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinItemCropSeed.java index 0e3b55a0..8a078365 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinItemCropSeed.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinItemCropSeed.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinItemIC2FluidContainer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinItemIC2FluidContainer.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinItemIC2FluidContainer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinItemIC2FluidContainer.java index e47befa6..fd1159d0 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinItemIC2FluidContainer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinItemIC2FluidContainer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityCrop.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityCrop.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityCrop.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityCrop.java index 8f49ebaf..7ea63acf 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityCrop.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityCrop.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java index f390d848..7abdfb7a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityNuclearReactorElectric.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java index b0474e50..ef39e51b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityReactorChamberElectricInvSpeedup.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import java.lang.ref.WeakReference; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java index 864d9753..477a6902 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/MixinTileEntityReactorChamberElectricNoDupe.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2; import net.minecraft.block.Block; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/textures/MixinRenderLiquidCell.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/textures/MixinRenderLiquidCell.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/textures/MixinRenderLiquidCell.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/textures/MixinRenderLiquidCell.java index 0f5077da..2901ec75 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/ic2/textures/MixinRenderLiquidCell.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/ic2/textures/MixinRenderLiquidCell.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.ic2.textures; +package com.mitchej123.hodgepodge.mixin.mixins.early.ic2.textures; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/FontRendererAccessor.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/FontRendererAccessor.java similarity index 85% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/FontRendererAccessor.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/FontRendererAccessor.java index 214b8eae..353c338f 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/FontRendererAccessor.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/FontRendererAccessor.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinAbstractClientPlayer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinAbstractClientPlayer.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinAbstractClientPlayer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinAbstractClientPlayer.java index 25b250e5..769d42d9 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinAbstractClientPlayer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinAbstractClientPlayer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.entity.AbstractClientPlayer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockBed.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockBed.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockBed.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockBed.java index b417f7d7..821a23ae 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockBed.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockBed.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.BlockBed; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockFence.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockFence.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockFence.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockFence.java index fc770359..7bc4f2bc 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockFence.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockFence.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.Block; import net.minecraft.block.BlockFence; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockFireSpread.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockFireSpread.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockFireSpread.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockFireSpread.java index 28c66546..3b498415 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockFireSpread.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockFireSpread.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Random; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockHopper.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockHopper.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockHopper.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockHopper.java index 1f44877e..2786cc24 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlockHopper.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlockHopper.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.ArrayList; import java.util.EnumMap; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlock_FixXray.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlock_FixXray.java similarity index 72% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlock_FixXray.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlock_FixXray.java index 0235db2b..12cffdce 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlock_FixXray.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinBlock_FixXray.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.Block; import net.minecraft.util.AxisAlignedBB; @@ -7,10 +7,10 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.mitchej123.hodgepodge.common.BlockInvoker_FixXray; +import com.mitchej123.hodgepodge.mixin.ducks.BlockDuck_FixXray; @Mixin(Block.class) -public abstract class MixinBlock_FixXray implements BlockInvoker_FixXray { +public abstract class MixinBlock_FixXray implements BlockDuck_FixXray { @Shadow public abstract AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z); diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinChunkCoordinates.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinChunkCoordinates.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinChunkCoordinates.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinChunkCoordinates.java index 06cbc767..a91cbc4a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinChunkCoordinates.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinChunkCoordinates.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.util.ChunkCoordinates; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinContainer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinContainer.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinContainer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinContainer.java index de8f2bbb..66c69ea8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinContainer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinContainer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinDimensionManager.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinDimensionManager.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinDimensionManager.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinDimensionManager.java index 977a86db..309a85b8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinDimensionManager.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinDimensionManager.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEffectRenderer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEffectRenderer.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEffectRenderer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEffectRenderer.java index 997076ca..85ab880e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEffectRenderer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEffectRenderer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.particle.EffectRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java index 8882451e..6c5635b8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEnchantment_FixRomanNumerals.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.enchantment.Enchantment; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityFireball.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityFireball.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityFireball.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityFireball.java index 88776179..4dd2b738 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityFireball.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityFireball.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.projectile.EntityFireball; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java index f1b5efe6..cd76d2c3 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_FixHasteArmSwing.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java index 75b45751..d5b88275 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_FixPotionException.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.ConcurrentModificationException; import java.util.HashMap; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java index 85921dd4..f3eec889 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingBase_HidePotionParticles.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingDrop.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingDrop.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingDrop.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingDrop.java index 400c8fbd..5ef334fa 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingDrop.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingDrop.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import static org.objectweb.asm.Opcodes.PUTFIELD; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingPickup.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingPickup.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingPickup.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingPickup.java index 68014422..ddd003de 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityLivingPickup.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityLivingPickup.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.entity.EntityLiving; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityPlayer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityPlayer.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityPlayer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityPlayer.java index 2dbae662..0f4863f7 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityPlayer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityPlayer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityPlayerMP.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityPlayerMP.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityPlayerMP.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityPlayerMP.java index f6de2f1e..579c7997 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityPlayerMP.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityPlayerMP.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Collection; import java.util.Set; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityRenderer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityRenderer.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityRenderer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityRenderer.java index 27d6de34..81d7dff4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityRenderer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityRenderer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.client.renderer.EntityRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java index d789f47e..09545ece 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinEntityRenderer_EnhanceNightVision.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.renderer.EntityRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinFontRenderer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinFontRenderer.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinFontRenderer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinFontRenderer.java index a615a84b..eca1a879 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinFontRenderer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinFontRenderer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinForgeHooks.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinForgeHooks.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinForgeHooks.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinForgeHooks.java index 382bdb57..a6a8e735 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinForgeHooks.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinForgeHooks.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinFurnaceRecipes.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinFurnaceRecipes.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinFurnaceRecipes.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinFurnaceRecipes.java index 4d82972c..1339abdc 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinFurnaceRecipes.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinFurnaceRecipes.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGameSettings.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGameSettings.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGameSettings.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGameSettings.java index 3fd75770..6ebe19d6 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGameSettings.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGameSettings.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.settings.GameSettings; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGameSetttings.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGameSetttings.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGameSetttings.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGameSetttings.java index 8eadb508..9c4b6324 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGameSetttings.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGameSetttings.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.settings.GameSettings; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiContainerCreative.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiContainerCreative.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiContainerCreative.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiContainerCreative.java index ee4c0e4f..154d5735 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiContainerCreative.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiContainerCreative.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiGameOver.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiGameOver.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiGameOver.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiGameOver.java index 1212f369..ad9a72ae 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiGameOver.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiGameOver.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.GuiGameOver; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java index 7da289ae..b5d30c09 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_CompactChat.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java index deae0454..52663e6d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_FixColorWrapping.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.GuiNewChat; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java index fc48a90e..fb1edd8e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_LongerChat.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.GuiNewChat; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java index 1b0e6460..a8f95597 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiNewChat_TransparentChat.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.GuiNewChat; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiScreenResourcePacks.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiScreenResourcePacks.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiScreenResourcePacks.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiScreenResourcePacks.java index 61eb5e4d..6d643dd2 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiScreenResourcePacks.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiScreenResourcePacks.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.awt.Desktop; import java.io.IOException; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiTextField.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiTextField.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiTextField.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiTextField.java index 07c78bbc..c168de95 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinGuiTextField.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinGuiTextField.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java index 930c446d..468d2d3a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_FixPotionEffectNumerals.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.client.resources.I18n; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java index eebc1a5b..fc9d92fa 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionEffectRendering.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.InventoryEffectRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java index c07425f8..c7426822 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinInventoryEffectRenderer_PotionOffset.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.InventoryEffectRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java index fbb91214..9a6db71b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinItemPotion_FixRomanNumerals.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.item.ItemPotion; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinItemSoup.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinItemSoup.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinItemSoup.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinItemSoup.java index 8f97892d..e13f51dc 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinItemSoup.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinItemSoup.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinKeyBinding.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinKeyBinding.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinKeyBinding.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinKeyBinding.java index d6fff84c..6cbbeff2 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinKeyBinding.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinKeyBinding.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.List; @@ -16,7 +16,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; -import com.mitchej123.hodgepodge.common.KeyBindingDuck; +import com.mitchej123.hodgepodge.mixin.ducks.KeyBindingDuck; @Mixin(KeyBinding.class) public class MixinKeyBinding implements KeyBindingDuck { diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java index bb483f48..1badbd7d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_ResizableFullscreen.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; import net.minecraft.util.Util; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java index f1b3d1d5..f3513415 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_ToggleDebugMessage.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java index 7ff4657d..1898aff4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_UnfocusedFullscreen.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java similarity index 84% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java index a1933f8b..f80272e4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.mitchej123.hodgepodge.common.KeyBindingDuck; +import com.mitchej123.hodgepodge.mixin.ducks.KeyBindingDuck; @Mixin(Minecraft.class) public class MixinMinecraft_UpdateKeys { diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNBTTagCompound.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNBTTagCompound.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNBTTagCompound.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNBTTagCompound.java index bab29811..6e326f4d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNBTTagCompound.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNBTTagCompound.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.io.DataOutput; import java.io.IOException; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlePlayClient.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlePlayClient.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlePlayClient.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlePlayClient.java index fd8fcf01..05209de1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlePlayClient.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlePlayClient.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; import net.minecraft.client.network.NetHandlerPlayClient; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java index 0228f1aa..d7016f83 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlerLoginServer_OfflineMode.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Map; import java.util.UUID; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java index db91b135..65451c6d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinNetHandlerPlayClient_FixHandleSetSlot.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinPotion.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinPotion.java similarity index 82% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinPotion.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinPotion.java index 3571f9d4..0276c276 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinPotion.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinPotion.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Arrays; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinPotionEffect.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinPotionEffect.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinPotionEffect.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinPotionEffect.java index fb6efefc..5f858584 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinPotionEffect.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinPotionEffect.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRandomPositionGenerator.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRandomPositionGenerator.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRandomPositionGenerator.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRandomPositionGenerator.java index ed19d422..67ec4614 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRandomPositionGenerator.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRandomPositionGenerator.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.RandomPositionGenerator; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRenderGlobal.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRenderGlobal.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRenderGlobal.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRenderGlobal.java index f100d229..4809303b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRenderGlobal.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRenderGlobal.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Collections; import java.util.Set; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRenderManager.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRenderManager.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRenderManager.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRenderManager.java index 9bf864c9..9ff9fea5 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRenderManager.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRenderManager.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.client.renderer.entity.RenderManager; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRendererLivingEntity.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRendererLivingEntity.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRendererLivingEntity.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRendererLivingEntity.java index 0fa19da8..ae6f96a1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinRendererLivingEntity.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinRendererLivingEntity.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.renderer.entity.RendererLivingEntity; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinS02PacketChat.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinS02PacketChat.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinS02PacketChat.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinS02PacketChat.java index 712dfe4c..0e8e99ab 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinS02PacketChat.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinS02PacketChat.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.nio.charset.StandardCharsets; import java.util.concurrent.ThreadLocalRandom; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinServerConfigurationManager.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinServerConfigurationManager.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinServerConfigurationManager.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinServerConfigurationManager.java index e1d68ee2..7ad5850f 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinServerConfigurationManager.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinServerConfigurationManager.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Collection; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinSoundHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinSoundHandler.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinSoundHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinSoundHandler.java index a037f03e..f3b989d6 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinSoundHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinSoundHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.audio.SoundCategory; import net.minecraft.client.audio.SoundHandler; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTcpNoDelay.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTcpNoDelay.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTcpNoDelay.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTcpNoDelay.java index 00b2e270..1fbb2293 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTcpNoDelay.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTcpNoDelay.java @@ -18,7 +18,7 @@ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTileEntityFurnacePollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTileEntityFurnacePollution.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTileEntityFurnacePollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTileEntityFurnacePollution.java index aa3913ed..1cf0e3e4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTileEntityFurnacePollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTileEntityFurnacePollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityFurnace; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTileEntityHopper.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTileEntityHopper.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTileEntityHopper.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTileEntityHopper.java index b03e32da..ce7037c2 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTileEntityHopper.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTileEntityHopper.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.ISidedInventory; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java index f7c7225e..bfa8acc7 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinTimeCommandGalacticraftFix.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.command.CommandTime; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinVillage.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinVillage.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinVillage.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinVillage.java index d967d59c..74d757da 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinVillage.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinVillage.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinVillageCollection.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinVillageCollection.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinVillageCollection.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinVillageCollection.java index b65cee5f..1c82acf9 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinVillageCollection.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinVillageCollection.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldClient.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldClient.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldClient.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldClient.java index 5ad5d297..476d847e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldClient.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldClient.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.client.audio.ISound; import net.minecraft.client.audio.SoundHandler; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldGetBlock.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldGetBlock.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldGetBlock.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldGetBlock.java index c49083dc..344e5132 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldGetBlock.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldGetBlock.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldLightValue.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldLightValue.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldLightValue.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldLightValue.java index 2b3dede5..95d3903d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldLightValue.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldLightValue.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldServerUpdateEntities.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldServerUpdateEntities.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldServerUpdateEntities.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldServerUpdateEntities.java index 75242ebf..ff88c466 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldServerUpdateEntities.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldServerUpdateEntities.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.profiler.Profiler; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldUpdateEntities.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldUpdateEntities.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldUpdateEntities.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldUpdateEntities.java index d37d31a9..8b747ac4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorldUpdateEntities.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorldUpdateEntities.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java index 0aee7943..c2b89237 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorld_FixLightUpdateLag.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixXray.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorld_FixXray.java similarity index 80% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixXray.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorld_FixXray.java index e8948c59..4affd2e1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixXray.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/MixinWorld_FixXray.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft; import net.minecraft.block.Block; import net.minecraft.util.AxisAlignedBB; @@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import com.mitchej123.hodgepodge.common.BlockInvoker_FixXray; +import com.mitchej123.hodgepodge.mixin.ducks.BlockDuck_FixXray; @Mixin(World.class) public class MixinWorld_FixXray { @@ -23,7 +23,7 @@ public class MixinWorld_FixXray { value = "INVOKE", target = "Lnet/minecraft/block/Block;getCollisionBoundingBoxFromPool(Lnet/minecraft/world/World;III)Lnet/minecraft/util/AxisAlignedBB;")) private AxisAlignedBB hodgepodge$fixXray(Block block, World world, int x, int y, int z) { - if (((BlockInvoker_FixXray) block).hodgepodge$shouldRayTraceStopOnBlock(world, x, y, z)) { + if (((BlockDuck_FixXray) block).hodgepodge$shouldRayTraceStopOnBlock(world, x, y, z)) { return hodgepodge$DUMMY_AABB; } return null; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/packets/MixinDataWatcher.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/packets/MixinDataWatcher.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/packets/MixinDataWatcher.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/packets/MixinDataWatcher.java index c642e945..c0736f3a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/packets/MixinDataWatcher.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/packets/MixinDataWatcher.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.packets; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.packets; import net.minecraft.entity.DataWatcher; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java index 27a1d019..1c08f5c6 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/packets/MixinS3FPacketCustomPayload.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.packets; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.packets; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S3FPacketCustomPayload; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/profiler/MinecraftMixin.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/profiler/MinecraftMixin.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/profiler/MinecraftMixin.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/profiler/MinecraftMixin.java index 2c1d1af4..ee6a69b1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/profiler/MinecraftMixin.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/profiler/MinecraftMixin.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.profiler; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.profiler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java index 2da51a09..a1a4ce32 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/profiler/TileEntityRendererDispatcherMixin.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.profiler; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.profiler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/server/MixinHttpUtil.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/server/MixinHttpUtil.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/server/MixinHttpUtil.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/server/MixinHttpUtil.java index ebc7174d..11f69608 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/server/MixinHttpUtil.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/server/MixinHttpUtil.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.server; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.server; import java.io.IOException; import java.net.ServerSocket; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinBlockFire.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinBlockFire.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinBlockFire.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinBlockFire.java index 953a1a9f..932f5e28 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinBlockFire.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinBlockFire.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import net.minecraft.block.BlockFire; import net.minecraft.util.IIcon; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinChunkCache.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinChunkCache.java similarity index 86% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinChunkCache.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinChunkCache.java index ade1d854..1047d8da 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinChunkCache.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinChunkCache.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import java.util.HashSet; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java index bcd5fcbc..b2d872cd 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinMinecraftForgeClient.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.item.Item; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java index 8ed2eb55..8db973fb 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderBlockFluid.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderBlocks.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderBlocks.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderBlocks.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderBlocks.java index 92384217..98f142f0 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderBlocks.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderBlocks.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import net.minecraft.block.Block; import net.minecraft.block.BlockFire; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderItem.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderItem.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderItem.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderItem.java index d31d9314..357cbf29 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinRenderItem.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinRenderItem.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java index ebf1cf32..39ffaf1b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureAtlasSprite.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureMap.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureMap.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureMap.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureMap.java index d5252cdf..c2e23df4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureMap.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureMap.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureUtil.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureUtil.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureUtil.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureUtil.java index af989609..9edf9979 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinTextureUtil.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinTextureUtil.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import net.minecraft.client.renderer.texture.TextureUtil; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinWorldRenderer.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinWorldRenderer.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinWorldRenderer.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinWorldRenderer.java index aa88105b..94b2fb5d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/MixinWorldRenderer.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/MixinWorldRenderer.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client; import java.util.Set; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java similarity index 89% rename from src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java index 1b351ace..d95d5bf8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/early/minecraft/textures/client/fastcraft/MixinTextureMap.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.early.minecraft.textures.client.fastcraft; +package com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.textures.client.fastcraft; import net.minecraft.client.renderer.texture.TextureMap; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/automagy/MixinAutomagyKeyHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/automagy/MixinAutomagyKeyHandler.java similarity index 89% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/automagy/MixinAutomagyKeyHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/automagy/MixinAutomagyKeyHandler.java index 7af22645..d759408b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/automagy/MixinAutomagyKeyHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/automagy/MixinAutomagyKeyHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.automagy; +package com.mitchej123.hodgepodge.mixin.mixins.late.automagy; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/automagy/MixinItemBlockThirstyTank.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/automagy/MixinItemBlockThirstyTank.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/automagy/MixinItemBlockThirstyTank.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/automagy/MixinItemBlockThirstyTank.java index e3526e6f..9154159e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/automagy/MixinItemBlockThirstyTank.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/automagy/MixinItemBlockThirstyTank.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.automagy; +package com.mitchej123.hodgepodge.mixin.mixins.late.automagy; import java.util.Arrays; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/baubles/MixinGuiEvents.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/baubles/MixinGuiEvents.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/baubles/MixinGuiEvents.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/baubles/MixinGuiEvents.java index 6e8629c5..86ee86ec 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/baubles/MixinGuiEvents.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/baubles/MixinGuiEvents.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.baubles; +package com.mitchej123.hodgepodge.mixin.mixins.late.baubles; import java.util.Collection; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java index a2c4b765..1cb77734 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinBibliocraftPatchPacketExploits.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.bibliocraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.bibliocraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemMap; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinPathSanitization.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinPathSanitization.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinPathSanitization.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinPathSanitization.java index 46119302..577e7e84 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinPathSanitization.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinPathSanitization.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.bibliocraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.bibliocraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinVersionCheck.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinVersionCheck.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinVersionCheck.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinVersionCheck.java index 50f33d35..04c329ee 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/bibliocraft/MixinVersionCheck.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/bibliocraft/MixinVersionCheck.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.bibliocraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.bibliocraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.entity.EntityJoinWorldEvent; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/AccessorFogHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/AccessorFogHandler.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/AccessorFogHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/AccessorFogHandler.java index 8036ae57..2ee664b2 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/AccessorFogHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/AccessorFogHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBOPBiomes.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBOPBiomes.java similarity index 97% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBOPBiomes.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBOPBiomes.java index ac0beb4e..20433cf8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBOPBiomes.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBOPBiomes.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; import java.lang.reflect.Field; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java index 29c01fd2..d253a3e1 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBOPReflectionHelper.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBlockBOPSapling.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockBOPSapling.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBlockBOPSapling.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockBOPSapling.java index 7cb12f63..8068ba35 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBlockBOPSapling.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockBOPSapling.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java similarity index 81% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java index 49e9476f..497f0550 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java @@ -1,11 +1,10 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; +import com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.MixinBlock_FixXray; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; -import com.mitchej123.hodgepodge.mixins.early.minecraft.MixinBlock_FixXray; - import biomesoplenty.common.blocks.BlockMud; /** diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinFogHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinFogHandler.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinFogHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinFogHandler.java index 344e4543..785cc8dd 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinFogHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinFogHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; import net.minecraftforge.client.event.EntityViewRenderEvent; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinForestryIntegration.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinForestryIntegration.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinForestryIntegration.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinForestryIntegration.java index 5662418d..d5c72c48 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/biomesoplenty/MixinForestryIntegration.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinForestryIntegration.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.biomesoplenty; +package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinBlockSpike.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinBlockSpike.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinBlockSpike.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinBlockSpike.java index 79b5b34e..ead2b46e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinBlockSpike.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinBlockSpike.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.extrautilities; +package com.mitchej123.hodgepodge.mixin.mixins.late.extrautilities; import net.minecraft.entity.Entity; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinRecipeUnEnchanting.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinRecipeUnEnchanting.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinRecipeUnEnchanting.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinRecipeUnEnchanting.java index 99cd100a..540d0658 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinRecipeUnEnchanting.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinRecipeUnEnchanting.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.extrautilities; +package com.mitchej123.hodgepodge.mixin.mixins.late.extrautilities; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinTransparentItemRender.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinTransparentItemRender.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinTransparentItemRender.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinTransparentItemRender.java index ecb3d35e..a3b111a9 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/extrautilities/MixinTransparentItemRender.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/extrautilities/MixinTransparentItemRender.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.extrautilities; +package com.mitchej123.hodgepodge.mixin.mixins.late.extrautilities; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java index 2c8190d8..a9b1adff 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/galacticraftcore/MixinGalacticraftRocketPollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.galacticraftcore; +package com.mitchej123.hodgepodge.mixin.mixins.late.galacticraftcore; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java index b023d44a..0367e18d 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/galacticraftcore/MixinGuiExtendedInventory.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.galacticraftcore; +package com.mitchej123.hodgepodge.mixin.mixins.late.galacticraftcore; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/harvestthenether/MixinBlockNetherLeaves.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/harvestthenether/MixinBlockNetherLeaves.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/harvestthenether/MixinBlockNetherLeaves.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/harvestthenether/MixinBlockNetherLeaves.java index 18e35e5e..567867a0 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/harvestthenether/MixinBlockNetherLeaves.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/harvestthenether/MixinBlockNetherLeaves.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.harvestthenether; +package com.mitchej123.hodgepodge.mixin.mixins.late.harvestthenether; import net.minecraft.block.Block; import net.minecraft.block.BlockLeavesBase; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/harvestthenether/MixinBlockPamFruit.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/harvestthenether/MixinBlockPamFruit.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/harvestthenether/MixinBlockPamFruit.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/harvestthenether/MixinBlockPamFruit.java index e387ac8b..89f988ae 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/harvestthenether/MixinBlockPamFruit.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/harvestthenether/MixinBlockPamFruit.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.harvestthenether; +package com.mitchej123.hodgepodge.mixin.mixins.late.harvestthenether; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java index 2cb77793..ae81fc4a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulHealthRegen.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.hungeroverhaul; +package com.mitchej123.hodgepodge.mixin.mixins.late.hungeroverhaul; import net.minecraft.world.EnumDifficulty; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java similarity index 99% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java index 57be7dab..ed257f79 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulLowStatEffect.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.hungeroverhaul; +package com.mitchej123.hodgepodge.mixin.mixins.late.hungeroverhaul; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.passive.EntityAnimal; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java index 9a5226f2..fe97aaba 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/hungeroverhaul/MixinHungerOverhaulModuleHarvestCraft.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.hungeroverhaul; +package com.mitchej123.hodgepodge.mixin.mixins.late.hungeroverhaul; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinElectricItemManager.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinElectricItemManager.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinElectricItemManager.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinElectricItemManager.java index 5081b4ac..6b7ed669 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinElectricItemManager.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinElectricItemManager.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorHazmat.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorHazmat.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorHazmat.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorHazmat.java index bbd9b1b1..957d1398 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorHazmat.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorHazmat.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorJetpack.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorJetpack.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorJetpack.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorJetpack.java index ae7006b1..83cfbfd9 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorJetpack.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorJetpack.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorNanoSuit.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorNanoSuit.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorNanoSuit.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorNanoSuit.java index 8daabc91..b6edfa9b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorNanoSuit.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorNanoSuit.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java index ebba9785..b6d8b6cc 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorNightvisionGoggles.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java index f7dbd231..d4301087 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorQuantumSuit.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java index 201c2b46..e05b0978 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorSolarHelmet.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorStaticBoots.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorStaticBoots.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorStaticBoots.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorStaticBoots.java index 15822caa..53285b17 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2ArmorStaticBoots.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2ArmorStaticBoots.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2IronFurnacePollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2IronFurnacePollution.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2IronFurnacePollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2IronFurnacePollution.java index e1b9b669..6f8dbc9b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIC2IronFurnacePollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIC2IronFurnacePollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2Hazmat.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIc2Hazmat.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2Hazmat.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIc2Hazmat.java index 218f7362..96c0db33 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2Hazmat.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIc2Hazmat.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java similarity index 89% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java index 0f855ee3..111e57d7 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinIc2QuantumSuitHoverMode.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinKeyboardClient.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinKeyboardClient.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinKeyboardClient.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinKeyboardClient.java index 89175705..94f5497e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ic2/MixinKeyboardClient.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ic2/MixinKeyboardClient.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ic2; +package com.mitchej123.hodgepodge.mixin.mixins.late.ic2; import org.lwjgl.input.Keyboard; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/immersiveengineering/MixinIEPotions.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/immersiveengineering/MixinIEPotions.java similarity index 89% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/immersiveengineering/MixinIEPotions.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/immersiveengineering/MixinIEPotions.java index 9ba5f3e9..83fd5f8e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/immersiveengineering/MixinIEPotions.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/immersiveengineering/MixinIEPotions.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.immersiveengineering; +package com.mitchej123.hodgepodge.mixin.mixins.late.immersiveengineering; import net.minecraft.potion.Potion; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinConstants.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinConstants.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinConstants.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinConstants.java index d285acbf..3f70f26b 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinConstants.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinConstants.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.journeymap; +package com.mitchej123.hodgepodge.mixin.mixins.late.journeymap; import net.minecraft.client.settings.KeyBinding; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinVersionCheck.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinVersionCheck.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinVersionCheck.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinVersionCheck.java index f7526728..1446f5a6 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinVersionCheck.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinVersionCheck.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.journeymap; +package com.mitchej123.hodgepodge.mixin.mixins.late.journeymap; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinWaypointManager.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinWaypointManager.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinWaypointManager.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinWaypointManager.java index 3b0beff5..fd696698 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinWaypointManager.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinWaypointManager.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.journeymap; +package com.mitchej123.hodgepodge.mixin.mixins.late.journeymap; import net.minecraft.util.MathHelper; @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; -import com.mitchej123.hodgepodge.mixins.TargetedMod; +import com.mitchej123.hodgepodge.mixin.TargetedMod; import cpw.mods.fml.common.Loader; import journeymap.client.ui.component.JmUI; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinWorldData.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinWorldData.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinWorldData.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinWorldData.java index 6a9b9559..2e09126f 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/journeymap/MixinWorldData.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/journeymap/MixinWorldData.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.journeymap; +package com.mitchej123.hodgepodge.mixin.mixins.late.journeymap; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinLOTRLogReflection.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinLOTRLogReflection.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinLOTRLogReflection.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinLOTRLogReflection.java index a2a1a963..5ef14ab2 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinLOTRLogReflection.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinLOTRLogReflection.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.lotr; +package com.mitchej123.hodgepodge.mixin.mixins.late.lotr; import net.minecraft.server.MinecraftServer; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinLOTRRecipes.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinLOTRRecipes.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinLOTRRecipes.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinLOTRRecipes.java index 7fc02b95..fb37f6e5 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinLOTRRecipes.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinLOTRRecipes.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.lotr; +package com.mitchej123.hodgepodge.mixin.mixins.late.lotr; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinRedirectHuornAI.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinRedirectHuornAI.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinRedirectHuornAI.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinRedirectHuornAI.java index 31539072..7b63246e 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinRedirectHuornAI.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinRedirectHuornAI.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.lotr; +package com.mitchej123.hodgepodge.mixin.mixins.late.lotr; import java.lang.reflect.Field; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinRemoveUnlockFinalField.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinRemoveUnlockFinalField.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinRemoveUnlockFinalField.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinRemoveUnlockFinalField.java index 8f50ec72..c46b2dae 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/lotr/MixinRemoveUnlockFinalField.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/lotr/MixinRemoveUnlockFinalField.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.lotr; +package com.mitchej123.hodgepodge.mixin.mixins.late.lotr; import static com.mitchej123.hodgepodge.util.FinalValueHelper.setPrivateFinalValue; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/minechem/MixinPotionInjector.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/minechem/MixinPotionInjector.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/minechem/MixinPotionInjector.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/minechem/MixinPotionInjector.java index 9b5883ea..f9cabdee 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/minechem/MixinPotionInjector.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/minechem/MixinPotionInjector.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.minechem; +package com.mitchej123.hodgepodge.mixin.mixins.late.minechem; import net.minecraft.potion.Potion; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/minecraft/MixinExplosionPollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/minecraft/MixinExplosionPollution.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/minecraft/MixinExplosionPollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/minecraft/MixinExplosionPollution.java index 75ed4f1d..8a413334 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/minecraft/MixinExplosionPollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/minecraft/MixinExplosionPollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.minecraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.minecraft; import net.minecraft.world.Explosion; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/mrtjpcore/MixinFXEngine.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/mrtjpcore/MixinFXEngine.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/mrtjpcore/MixinFXEngine.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/mrtjpcore/MixinFXEngine.java index f73c7e5b..88181119 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/mrtjpcore/MixinFXEngine.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/mrtjpcore/MixinFXEngine.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.mrtjpcore; +package com.mitchej123.hodgepodge.mixin.mixins.late.mrtjpcore; import org.lwjgl.opengl.GL11; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/mrtjpcore/MixinPlacementLib.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/mrtjpcore/MixinPlacementLib.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/mrtjpcore/MixinPlacementLib.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/mrtjpcore/MixinPlacementLib.java index 3f62c081..b05b42c4 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/mrtjpcore/MixinPlacementLib.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/mrtjpcore/MixinPlacementLib.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.mrtjpcore; +package com.mitchej123.hodgepodge.mixin.mixins.late.mrtjpcore; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/projecte/MixinObjHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/projecte/MixinObjHandler.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/projecte/MixinObjHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/projecte/MixinObjHandler.java index 91f31fd3..548bbfad 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/projecte/MixinObjHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/projecte/MixinObjHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.projecte; +package com.mitchej123.hodgepodge.mixin.mixins.late.projecte; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftBoilerPollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftBoilerPollution.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftBoilerPollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftBoilerPollution.java index 6fb2d507..5477fd40 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftBoilerPollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftBoilerPollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.railcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.railcraft; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java index bce64937..db356d34 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftCokeOvenPollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.railcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.railcraft; import java.util.List; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java similarity index 94% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java index 37de2d86..a1e1a713 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinRailcraftTunnelBorePollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.railcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.railcraft; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.world.World; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinTileAnchorPassive.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinTileAnchorPassive.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinTileAnchorPassive.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinTileAnchorPassive.java index e95e112c..e099ca2c 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinTileAnchorPassive.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinTileAnchorPassive.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.railcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.railcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinTileAnchorPersonal.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinTileAnchorPersonal.java similarity index 90% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinTileAnchorPersonal.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinTileAnchorPersonal.java index e60a080b..4b766336 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/railcraft/MixinTileAnchorPersonal.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/railcraft/MixinTileAnchorPersonal.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.railcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.railcraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/tconstruct/MixinTabRegistry.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/tconstruct/MixinTabRegistry.java similarity index 88% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/tconstruct/MixinTabRegistry.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/tconstruct/MixinTabRegistry.java index 814bf22d..0be3a8b8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/tconstruct/MixinTabRegistry.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/tconstruct/MixinTabRegistry.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.tconstruct; +package com.mitchej123.hodgepodge.mixin.mixins.late.tconstruct; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinEntityGolemBase.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinEntityGolemBase.java similarity index 83% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinEntityGolemBase.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinEntityGolemBase.java index 47e928c5..aed5c76a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinEntityGolemBase.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinEntityGolemBase.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import java.util.ArrayList; @@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.mitchej123.hodgepodge.common.ThaumcraftMixinMethods; +import com.mitchej123.hodgepodge.mixin.hooks.ThaumcraftHook; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.Marker; @@ -31,7 +31,7 @@ public MixinEntityGolemBase(World p_i1686_1_) { @Inject(method = "readEntityFromNBT", at = @At(value = "TAIL")) public void hodgepodge$readEntityFromNBT(NBTTagCompound nbt, CallbackInfo ci) { NBTTagList nbtTagList = nbt.getTagList("markers", 10); - ThaumcraftMixinMethods.overwriteMarkersDimID(nbtTagList, this.markers); + ThaumcraftHook.overwriteMarkersDimID(nbtTagList, this.markers); } } diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiFocalManipulator.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiFocalManipulator.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiFocalManipulator.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiFocalManipulator.java index 7298296e..a6262828 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiFocalManipulator.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiFocalManipulator.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiResearchRecipe.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiResearchRecipe.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiResearchRecipe.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiResearchRecipe.java index 7d374d20..0d6fc0ec 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiResearchRecipe.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiResearchRecipe.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiResearchTable.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiResearchTable.java similarity index 93% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiResearchTable.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiResearchTable.java index f231a0f5..76c37445 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiResearchTable.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiResearchTable.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiThaumatorium.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiThaumatorium.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiThaumatorium.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiThaumatorium.java index 1a33e302..37ce75df 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinGuiThaumatorium.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinGuiThaumatorium.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItemGolemBell.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinItemGolemBell.java similarity index 80% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItemGolemBell.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinItemGolemBell.java index 00dd299f..b09a2bae 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItemGolemBell.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinItemGolemBell.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import java.util.ArrayList; @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.mitchej123.hodgepodge.common.ThaumcraftMixinMethods; +import com.mitchej123.hodgepodge.mixin.hooks.ThaumcraftHook; import thaumcraft.common.entities.golems.ItemGolemBell; import thaumcraft.common.entities.golems.Marker; @@ -23,7 +23,7 @@ public class MixinItemGolemBell { ArrayList markers = cir.getReturnValue(); if (stack.hasTagCompound()) { NBTTagList nbtTagList = stack.stackTagCompound.getTagList("markers", 10); - cir.setReturnValue(ThaumcraftMixinMethods.overwriteMarkersDimID(nbtTagList, markers)); + cir.setReturnValue(ThaumcraftHook.overwriteMarkersDimID(nbtTagList, markers)); } } diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java index 71e294aa..3721fe53 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinItem_SortAspectsByName.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java similarity index 92% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java index 53ae4418..f5707306 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinKeyHandlerThaumcraft.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import org.lwjgl.input.Keyboard; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java similarity index 95% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java index 730c4bf9..b3ac95a7 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinThaumcraftAlchemyFurnacePollution.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinTileWandPedestal.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinTileWandPedestal.java similarity index 98% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinTileWandPedestal.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinTileWandPedestal.java index aa491df0..9726e8f8 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinTileWandPedestal.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/thaumcraft/MixinTileWandPedestal.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.thaumcraft; +package com.mitchej123.hodgepodge.mixin.mixins.late.thaumcraft; import java.util.ArrayList; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/travellersgear/MixinClientProxy.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/travellersgear/MixinClientProxy.java similarity index 89% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/travellersgear/MixinClientProxy.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/travellersgear/MixinClientProxy.java index 2b6beed9..2c58fac7 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/travellersgear/MixinClientProxy.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/travellersgear/MixinClientProxy.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.travellersgear; +package com.mitchej123.hodgepodge.mixin.mixins.late.travellersgear; import java.util.Collection; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/travellersgear/MixinKeyHandler.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/travellersgear/MixinKeyHandler.java similarity index 91% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/travellersgear/MixinKeyHandler.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/travellersgear/MixinKeyHandler.java index 4a1ea43c..1cd3ee57 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/travellersgear/MixinKeyHandler.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/travellersgear/MixinKeyHandler.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.travellersgear; +package com.mitchej123.hodgepodge.mixin.mixins.late.travellersgear; import org.lwjgl.input.Keyboard; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/witchery/MixinPotionArrayExtender.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/witchery/MixinPotionArrayExtender.java similarity index 87% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/witchery/MixinPotionArrayExtender.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/witchery/MixinPotionArrayExtender.java index fea638e8..08bdf2ba 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/witchery/MixinPotionArrayExtender.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/witchery/MixinPotionArrayExtender.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.witchery; +package com.mitchej123.hodgepodge.mixin.mixins.late.witchery; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/xaeroworldmap/MixinGuiMap.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/xaeroworldmap/MixinGuiMap.java similarity index 86% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/xaeroworldmap/MixinGuiMap.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/xaeroworldmap/MixinGuiMap.java index 7a6c9fb5..ca9dcaaf 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/xaeroworldmap/MixinGuiMap.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/xaeroworldmap/MixinGuiMap.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.xaeroworldmap; +package com.mitchej123.hodgepodge.mixin.mixins.late.xaeroworldmap; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; diff --git a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ztones/MixinZtonesPatchPacketExploits.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ztones/MixinZtonesPatchPacketExploits.java similarity index 96% rename from src/main/java/com/mitchej123/hodgepodge/mixins/late/ztones/MixinZtonesPatchPacketExploits.java rename to src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ztones/MixinZtonesPatchPacketExploits.java index c9739e06..0b57a95c 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixins/late/ztones/MixinZtonesPatchPacketExploits.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/ztones/MixinZtonesPatchPacketExploits.java @@ -1,4 +1,4 @@ -package com.mitchej123.hodgepodge.mixins.late.ztones; +package com.mitchej123.hodgepodge.mixin.mixins.late.ztones; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/resources/mixins.hodgepodge.early.json b/src/main/resources/mixins.hodgepodge.early.json index 51219eeb..f1802f6f 100644 --- a/src/main/resources/mixins.hodgepodge.early.json +++ b/src/main/resources/mixins.hodgepodge.early.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8.3-GTNH", - "package": "com.mitchej123.hodgepodge.mixins.early", + "package": "com.mitchej123.hodgepodge.mixin.mixins.early", "refmap": "mixins.hodgepodge.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8" diff --git a/src/main/resources/mixins.hodgepodge.json b/src/main/resources/mixins.hodgepodge.json index 798fd33a..e9023d1e 100644 --- a/src/main/resources/mixins.hodgepodge.json +++ b/src/main/resources/mixins.hodgepodge.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8.3-GTNH", - "package": "com.mitchej123.hodgepodge.mixins", + "package": "com.mitchej123.hodgepodge.mixin.mixins", "refmap": "mixins.hodgepodge.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8" diff --git a/src/main/resources/mixins.hodgepodge.late.json b/src/main/resources/mixins.hodgepodge.late.json index 04f88073..1031a20f 100644 --- a/src/main/resources/mixins.hodgepodge.late.json +++ b/src/main/resources/mixins.hodgepodge.late.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8.3-GTNH", - "package": "com.mitchej123.hodgepodge.mixins.late", + "package": "com.mitchej123.hodgepodge.mixin.mixins.late", "refmap": "mixins.hodgepodge.refmap.json", "target": "@env(DEFAULT)", "compatibilityLevel": "JAVA_8" From b9b426130c0270583f76eb9f3417b299121e7d7f Mon Sep 17 00:00:00 2001 From: Alexdoru <57050655+Alexdoru@users.noreply.github.com> Date: Mon, 18 Sep 2023 15:58:24 +0200 Subject: [PATCH 2/2] i love spotless --- .../mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java index 497f0550..a79cb45a 100644 --- a/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java +++ b/src/main/java/com/mitchej123/hodgepodge/mixin/mixins/late/biomesoplenty/MixinBlockMud_FixXray.java @@ -1,10 +1,11 @@ package com.mitchej123.hodgepodge.mixin.mixins.late.biomesoplenty; -import com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.MixinBlock_FixXray; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; +import com.mitchej123.hodgepodge.mixin.mixins.early.minecraft.MixinBlock_FixXray; + import biomesoplenty.common.blocks.BlockMud; /**