From e97bb4e7549bec94ff0cb74e94659769281672d9 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:19:45 -0400 Subject: [PATCH] changed maven group and package names --- .../gtreimagined}/gtcore/GTCore.java | 104 ++++++++++++------ .../gtreimagined}/gtcore/GTCoreConfig.java | 2 +- .../gtreimagined}/gtcore/GTCoreRemapping.java | 14 ++- .../BehaviourElectricWrenchSwitching.java | 6 +- .../behaviour/BehaviourKnifeTooltip.java | 2 +- .../BehaviourMultitoolSwitching.java | 4 +- .../gtcore/block/BlockMaterialChest.java | 10 +- .../gtcore/block/BlockRedstoneWire.java | 5 +- .../gtcore/block/BlockSapBag.java | 11 +- .../gtcore/block/RedstoneWire.java | 5 +- .../gtcore/blockentity/BlockEntityBarrel.java | 4 +- .../gtcore/blockentity/BlockEntityChest.java | 4 +- .../gtcore/blockentity/BlockEntityDrum.java | 4 +- .../gtcore/blockentity/BlockEntityLocker.java | 4 +- .../blockentity/BlockEntityMassStorage.java | 16 +-- .../blockentity/BlockEntityMaterial.java | 4 +- .../BlockEntityMaterialBasicMultiMachine.java | 4 +- .../blockentity/BlockEntityPlasticBin.java | 6 +- .../blockentity/BlockEntityRedstoneWire.java | 10 +- .../gtcore/blockentity/BlockEntitySapBag.java | 10 +- .../blockentity/BlockEntityTrashCan.java | 2 +- .../blockentity/BlockEntityWorkbench.java | 6 +- .../blockentity/IInventorySyncTile.java | 2 +- .../gtcore/client/BakedModels.java | 4 +- .../gtcore/client/ClientHandler.java | 6 +- .../gtcore/client/MassStorageRenderer.java | 13 ++- .../gtcore/client/MaterialChestRenderer.java | 9 +- .../gtcore/client/SapBagBakedModel.java | 2 +- .../gtcore/cover/CoverRedstoneTorch.java | 7 +- .../gtcore/cover/CoverSelectorTag.java | 7 +- .../gtcore/data/GTCoreBlocks.java | 43 ++++++-- .../gtcore/data/GTCoreCables.java | 16 +-- .../gtcore/data/GTCoreCovers.java | 7 +- .../gtreimagined}/gtcore/data/GTCoreData.java | 5 +- .../gtcore/data/GTCoreFluids.java | 4 +- .../gtcore/data/GTCoreItems.java | 51 +++++---- .../gtcore/data/GTCoreMaterials.java | 4 +- .../gtreimagined}/gtcore/data/GTCoreTags.java | 5 +- .../gtcore/data/GTCoreTools.java | 31 +++--- .../gtreimagined}/gtcore/data/Guis.java | 4 +- .../gtcore/data/IGTBlockInit.java | 2 +- .../gtcore/data/MenuHandlers.java | 9 +- .../gtcore/data/RecipeBuilders.java | 2 +- .../gtreimagined}/gtcore/data/RecipeMaps.java | 4 +- .../gtreimagined}/gtcore/data/SlotTypes.java | 9 +- .../gtcore/data/TextureSets.java | 4 +- .../gtcore/data/client/ScreenFactories.java | 8 +- .../datagen/GTCoreBlockLootProvider.java | 12 +- .../datagen/GTCoreBlockTagProvider.java | 12 +- .../gtcore/datagen/GTCoreItemTagProvider.java | 18 +-- .../gtcore/datagen/GTCoreLang.java | 16 +-- .../gtcore/events/GTCommonEvents.java | 8 +- .../gtcore/gui/ContainerWorkbench.java | 8 +- .../gtcore/gui/InventoryWorkbench.java | 8 +- .../screen/ScreenChargingMaterialBlock.java | 5 +- .../gtcore/gui/slots/SlotCrafting.java | 2 +- .../gtcore/gui/slots/SlotUnlimited.java | 2 +- .../gtcore/gui/slots/SlotWorkTableResult.java | 2 +- .../integration/jei/GTCoreJeiPlugin.java | 6 +- .../jei/GTCoreRecipeTransferInfo.java | 4 +- .../integration/rei/GTCoreReiPlugin.java | 6 +- .../integration/top/MassStorageProvider.java | 9 +- .../gtcore/item/ItemBlockDrum.java | 5 +- .../gtcore/item/ItemBlockMassStorage.java | 7 +- .../gtcore/item/ItemFertilizer.java | 4 +- .../gtcore/item/ItemHazmatArmor.java | 4 +- .../gtcore/item/ItemMagnifyingGlass.java | 4 +- .../gtreimagined}/gtcore/item/ItemMatch.java | 6 +- .../gtcore/item/ItemPowerUnit.java | 4 +- .../gtcore/item/ItemRadaway.java | 4 +- .../gtcore/item/ItemSelectorTag.java | 4 +- .../gtreimagined}/gtcore/item/ItemTape.java | 2 +- .../loader/crafting/CircuitRecipes.java | 24 ++-- .../loader/crafting/MachineRecipes.java | 6 +- .../loader/crafting/MaterialRecipes.java | 6 +- .../gtcore/loader/crafting/Pipes.java | 2 +- .../gtcore/loader/crafting/RubberRecipes.java | 16 +-- .../gtcore/loader/crafting/Tools.java | 6 +- .../loader/crafting/VanillaRecipes.java | 14 +-- .../loader/machines/AssemblyLoader.java | 2 +- .../gtcore/machine/BarrelMachine.java | 7 +- .../gtcore/machine/BlockMachineMaterial.java | 4 +- .../machine/BlockMultiMachineMaterial.java | 2 +- .../gtcore/machine/ChargingMachine.java | 4 +- .../gtcore/machine/ChestMachine.java | 9 +- .../gtcore/machine/DrumMachine.java | 9 +- .../machine/InfiniteSlotTrackedHandler.java | 8 +- .../gtcore/machine/LockerMachine.java | 5 +- .../machine/MassStorageItemHandler.java | 7 +- .../gtcore/machine/MassStorageMachine.java | 9 +- .../machine/MaterialBasicMultiMachine.java | 5 +- .../gtcore/machine/MaterialMachine.java | 5 +- .../gtcore/machine/WorkbenchMachine.java | 11 +- .../AbstractClientPlayerEntityMixin.java | 4 +- .../gtcore/mixin/MixinBlock.java | 4 +- .../gtcore/mixin/MixinComposterBlock.java | 6 +- .../gtcore/mixin/MixinHoneycombItem.java | 4 +- .../gtcore/mixin/MixinMerchantOffer.java | 6 +- .../mixin/jei/FocusInputHandlerMixin.java | 4 +- .../gtcore/mixin/jei/JEIMixinPlugin.java | 2 +- .../gtcore/network/MessageCraftingSync.java | 4 +- .../gtcore/network/MessageInventorySync.java | 4 +- .../network/MessageTriggerInventorySync.java | 9 +- .../gtcore/proxy/ClientHandler.java | 30 +++-- .../gtcore/proxy/CommonHandler.java | 8 +- .../gtreimagined}/gtcore/tree/ResinState.java | 2 +- .../gtcore/tree/RubberFoliagePlacer.java | 2 +- .../gtreimagined}/gtcore/tree/RubberTree.java | 8 +- .../gtcore/tree/RubberTreeFeature.java | 2 +- .../gtcore/tree/RubberTreeWorldGen.java | 7 +- .../gtcore/tree/RubberTrunkPlacer.java | 5 +- .../gtcore/tree/block/BlockRubberButton.java | 4 +- .../gtcore/tree/block/BlockRubberDoor.java | 4 +- .../gtcore/tree/block/BlockRubberFence.java | 6 +- .../tree/block/BlockRubberFenceGate.java | 6 +- .../gtcore/tree/block/BlockRubberLeaves.java | 4 +- .../gtcore/tree/block/BlockRubberLog.java | 10 +- .../tree/block/BlockRubberPressurePlate.java | 4 +- .../gtcore/tree/block/BlockRubberSapling.java | 6 +- .../gtcore/tree/block/BlockRubberSign.java | 8 +- .../gtcore/tree/block/BlockRubberSlab.java | 4 +- .../gtcore/tree/block/BlockRubberStairs.java | 6 +- .../tree/block/BlockRubberTrapDoor.java | 4 +- .../tree/block/BlockRubberWallSign.java | 6 +- .../gtcore/tree/block/BlockRubberWood.java | 4 +- .../gtcore/tree/item/ItemRubberBoat.java | 4 +- .../gtcore/tree/item/ItemRubberSign.java | 7 +- .../src/main/resources/gtcore.jei.mixins.json | 4 +- common/src/main/resources/gtcore.mixins.json | 10 +- .../fabric/GTCoreClientInitializer.java | 6 +- .../gtcore/fabric/GTCoreFabric.java | 6 +- .../mixin/fabric/BlockRedstoneWireMixin.java | 4 +- fabric/src/main/resources/fabric.mod.json | 8 +- .../main/resources/gtcore-fabric.mixins.json | 2 +- .../gtcore/data/forge/GTCoreBlocksImpl.java | 11 -- .../rei/forge/GTCoreReiPluginForge.java | 8 -- .../gtcore/data/forge/GTCoreBlocksImpl.java | 11 ++ .../gtcore/forge/GTCoreForge.java | 13 +-- .../rei/forge/GTCoreReiPluginForge.java | 8 ++ .../tfc/BlockFallenRubberLeaves.java | 4 +- .../integration/tfc/BlockRubberLogFence.java | 6 +- .../integration/tfc/BlockRubberTwig.java | 4 +- .../integration/tfc/BlockTFCRubberLoaves.java | 4 +- .../tfc/BlockTFCRubberSapling.java | 4 +- .../gtcore/integration/tfc/TFCRubberData.java | 6 +- .../gtcore/integration/tfc/TFCRubberTree.java | 4 +- ...chintergalactical.gtcore.data.IGTBlockInit | 1 - .../org.gtreimagined.gtcore.data.IGTBlockInit | 1 + gradle.properties | 2 +- 149 files changed, 633 insertions(+), 510 deletions(-) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/GTCore.java (74%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/GTCoreConfig.java (98%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/GTCoreRemapping.java (83%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/behaviour/BehaviourElectricWrenchSwitching.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/behaviour/BehaviourKnifeTooltip.java (93%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/behaviour/BehaviourMultitoolSwitching.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/block/BlockMaterialChest.java (95%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/block/BlockRedstoneWire.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/block/BlockSapBag.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/block/RedstoneWire.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityBarrel.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityChest.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityDrum.java (98%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityLocker.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityMassStorage.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityMaterial.java (80%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java (81%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityPlasticBin.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityRedstoneWire.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntitySapBag.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityTrashCan.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/BlockEntityWorkbench.java (90%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/blockentity/IInventorySyncTile.java (57%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/client/BakedModels.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/client/ClientHandler.java (85%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/client/MassStorageRenderer.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/client/MaterialChestRenderer.java (95%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/client/SapBagBakedModel.java (90%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/cover/CoverRedstoneTorch.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/cover/CoverSelectorTag.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreBlocks.java (83%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreCables.java (62%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreCovers.java (75%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreData.java (87%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreFluids.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreItems.java (93%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreMaterials.java (99%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreTags.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/GTCoreTools.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/Guis.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/IGTBlockInit.java (79%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/MenuHandlers.java (76%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/RecipeBuilders.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/RecipeMaps.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/SlotTypes.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/TextureSets.java (74%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/data/client/ScreenFactories.java (61%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/datagen/GTCoreBlockLootProvider.java (83%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/datagen/GTCoreBlockTagProvider.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/datagen/GTCoreItemTagProvider.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/datagen/GTCoreLang.java (91%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/events/GTCommonEvents.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/gui/ContainerWorkbench.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/gui/InventoryWorkbench.java (91%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/gui/screen/ScreenChargingMaterialBlock.java (79%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/gui/slots/SlotCrafting.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/gui/slots/SlotUnlimited.java (99%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/gui/slots/SlotWorkTableResult.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/jei/GTCoreJeiPlugin.java (90%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/jei/GTCoreRecipeTransferInfo.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/rei/GTCoreReiPlugin.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/top/MassStorageProvider.java (91%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemBlockDrum.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemBlockMassStorage.java (81%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemFertilizer.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemHazmatArmor.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemMagnifyingGlass.java (93%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemMatch.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemPowerUnit.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemRadaway.java (87%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemSelectorTag.java (95%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/item/ItemTape.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/CircuitRecipes.java (85%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/MachineRecipes.java (85%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/MaterialRecipes.java (98%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/Pipes.java (98%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/RubberRecipes.java (90%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/Tools.java (99%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/crafting/VanillaRecipes.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/loader/machines/AssemblyLoader.java (52%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/BarrelMachine.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/BlockMachineMaterial.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/BlockMultiMachineMaterial.java (95%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/ChargingMachine.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/ChestMachine.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/DrumMachine.java (93%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/InfiniteSlotTrackedHandler.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/LockerMachine.java (84%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/MassStorageItemHandler.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/MassStorageMachine.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/MaterialBasicMultiMachine.java (85%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/MaterialMachine.java (87%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/machine/WorkbenchMachine.java (84%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/AbstractClientPlayerEntityMixin.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/MixinBlock.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/MixinComposterBlock.java (78%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/MixinHoneycombItem.java (87%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/MixinMerchantOffer.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/jei/FocusInputHandlerMixin.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/jei/JEIMixinPlugin.java (95%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/network/MessageCraftingSync.java (93%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/network/MessageInventorySync.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/network/MessageTriggerInventorySync.java (86%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/proxy/ClientHandler.java (69%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/proxy/CommonHandler.java (89%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/ResinState.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/RubberFoliagePlacer.java (98%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/RubberTree.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/RubberTreeFeature.java (99%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/RubberTreeWorldGen.java (97%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/RubberTrunkPlacer.java (96%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberButton.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberDoor.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberFence.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberFenceGate.java (84%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberLeaves.java (88%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberLog.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberPressurePlate.java (91%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberSapling.java (93%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberSign.java (82%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberSlab.java (90%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberStairs.java (85%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberTrapDoor.java (92%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberWallSign.java (86%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/block/BlockRubberWood.java (95%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/item/ItemRubberBoat.java (94%) rename common/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/tree/item/ItemRubberSign.java (83%) rename fabric/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/fabric/GTCoreClientInitializer.java (77%) rename fabric/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/fabric/GTCoreFabric.java (86%) rename fabric/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/mixin/fabric/BlockRedstoneWireMixin.java (62%) delete mode 100644 forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java delete mode 100644 forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/forge/GTCoreReiPluginForge.java create mode 100644 forge/src/main/java/org/gtreimagined/gtcore/data/forge/GTCoreBlocksImpl.java rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/forge/GTCoreForge.java (87%) create mode 100644 forge/src/main/java/org/gtreimagined/gtcore/integration/rei/forge/GTCoreReiPluginForge.java rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/BlockFallenRubberLeaves.java (94%) rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/BlockRubberLogFence.java (85%) rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/BlockRubberTwig.java (93%) rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/BlockTFCRubberLoaves.java (93%) rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/BlockTFCRubberSapling.java (94%) rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/TFCRubberData.java (76%) rename forge/src/main/java/{io/github/gregtechintergalactical => org/gtreimagined}/gtcore/integration/tfc/TFCRubberTree.java (76%) delete mode 100644 forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit create mode 100644 forge/src/main/resources/META-INF/services/org.gtreimagined.gtcore.data.IGTBlockInit diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCore.java b/common/src/main/java/org/gtreimagined/gtcore/GTCore.java similarity index 74% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCore.java rename to common/src/main/java/org/gtreimagined/gtcore/GTCore.java index b98aea4..aa3d62b 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCore.java +++ b/common/src/main/java/org/gtreimagined/gtcore/GTCore.java @@ -1,31 +1,35 @@ -package io.github.gregtechintergalactical.gtcore; +package org.gtreimagined.gtcore; import com.google.common.collect.ImmutableMap; import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.teamresourceful.resourcefullib.common.networking.base.NetworkDirection; -import io.github.gregtechintergalactical.gtcore.client.BakedModels; -import io.github.gregtechintergalactical.gtcore.data.*; -import io.github.gregtechintergalactical.gtcore.data.client.ScreenFactories; -import io.github.gregtechintergalactical.gtcore.datagen.GTCoreBlockLootProvider; -import io.github.gregtechintergalactical.gtcore.datagen.GTCoreBlockTagProvider; -import io.github.gregtechintergalactical.gtcore.datagen.GTCoreItemTagProvider; -import io.github.gregtechintergalactical.gtcore.datagen.GTCoreLang; -import io.github.gregtechintergalactical.gtcore.events.GTCommonEvents; -import io.github.gregtechintergalactical.gtcore.integration.top.MassStorageProvider; -import io.github.gregtechintergalactical.gtcore.loader.crafting.MachineRecipes; -import io.github.gregtechintergalactical.gtcore.loader.crafting.MaterialRecipes; -import io.github.gregtechintergalactical.gtcore.loader.crafting.Pipes; -import io.github.gregtechintergalactical.gtcore.loader.crafting.RubberRecipes; -import io.github.gregtechintergalactical.gtcore.loader.crafting.Tools; -import io.github.gregtechintergalactical.gtcore.loader.crafting.VanillaRecipes; -import io.github.gregtechintergalactical.gtcore.loader.machines.AssemblyLoader; -import io.github.gregtechintergalactical.gtcore.network.MessageCraftingSync; -import io.github.gregtechintergalactical.gtcore.network.MessageInventorySync; -import io.github.gregtechintergalactical.gtcore.network.MessageTriggerInventorySync; -import io.github.gregtechintergalactical.gtcore.proxy.CommonHandler; -import io.github.gregtechintergalactical.gtcore.tree.RubberTree; -import io.github.gregtechintergalactical.gtcore.tree.RubberTreeWorldGen; +import org.gtreimagined.gtcore.client.BakedModels; +import org.gtreimagined.gtcore.data.GTCoreCables; +import org.gtreimagined.gtcore.data.GTCoreData; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTools; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.data.client.ScreenFactories; +import org.gtreimagined.gtcore.datagen.GTCoreBlockLootProvider; +import org.gtreimagined.gtcore.datagen.GTCoreBlockTagProvider; +import org.gtreimagined.gtcore.datagen.GTCoreItemTagProvider; +import org.gtreimagined.gtcore.datagen.GTCoreLang; +import org.gtreimagined.gtcore.events.GTCommonEvents; +import org.gtreimagined.gtcore.integration.top.MassStorageProvider; +import org.gtreimagined.gtcore.loader.crafting.MachineRecipes; +import org.gtreimagined.gtcore.loader.crafting.MaterialRecipes; +import org.gtreimagined.gtcore.loader.crafting.Pipes; +import org.gtreimagined.gtcore.loader.crafting.RubberRecipes; +import org.gtreimagined.gtcore.loader.crafting.Tools; +import org.gtreimagined.gtcore.loader.crafting.VanillaRecipes; +import org.gtreimagined.gtcore.loader.machines.AssemblyLoader; +import org.gtreimagined.gtcore.network.MessageCraftingSync; +import org.gtreimagined.gtcore.network.MessageInventorySync; +import org.gtreimagined.gtcore.network.MessageTriggerInventorySync; +import org.gtreimagined.gtcore.proxy.CommonHandler; +import org.gtreimagined.gtcore.tree.RubberTree; +import org.gtreimagined.gtcore.tree.RubberTreeWorldGen; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterMod; import muramasa.antimatter.Ref; @@ -60,12 +64,40 @@ import net.minecraft.world.level.block.state.properties.WoodType; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.gtreimagined.gtcore.client.BakedModels; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreCovers; +import org.gtreimagined.gtcore.data.GTCoreFluids; +import org.gtreimagined.gtcore.data.GTCoreMaterials; +import org.gtreimagined.gtcore.data.Guis; +import org.gtreimagined.gtcore.data.MenuHandlers; +import org.gtreimagined.gtcore.data.RecipeMaps; +import org.gtreimagined.gtcore.data.client.ScreenFactories; +import org.gtreimagined.gtcore.datagen.GTCoreBlockLootProvider; +import org.gtreimagined.gtcore.datagen.GTCoreBlockTagProvider; +import org.gtreimagined.gtcore.datagen.GTCoreItemTagProvider; +import org.gtreimagined.gtcore.datagen.GTCoreLang; +import org.gtreimagined.gtcore.events.GTCommonEvents; +import org.gtreimagined.gtcore.integration.top.MassStorageProvider; +import org.gtreimagined.gtcore.loader.crafting.MachineRecipes; +import org.gtreimagined.gtcore.loader.crafting.MaterialRecipes; +import org.gtreimagined.gtcore.loader.crafting.Pipes; +import org.gtreimagined.gtcore.loader.crafting.RubberRecipes; +import org.gtreimagined.gtcore.loader.crafting.Tools; +import org.gtreimagined.gtcore.loader.crafting.VanillaRecipes; +import org.gtreimagined.gtcore.loader.machines.AssemblyLoader; +import org.gtreimagined.gtcore.network.MessageCraftingSync; +import org.gtreimagined.gtcore.network.MessageInventorySync; +import org.gtreimagined.gtcore.network.MessageTriggerInventorySync; +import org.gtreimagined.gtcore.proxy.CommonHandler; +import org.gtreimagined.gtcore.tree.RubberTree; +import org.gtreimagined.gtcore.tree.RubberTreeWorldGen; import java.util.Arrays; import java.util.function.BiConsumer; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.Steeleaf; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.*; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.Steeleaf; import static muramasa.antimatter.data.AntimatterDefaultTools.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.material.MaterialTags.RUBBERTOOLS; @@ -157,28 +189,28 @@ public String getId() { @Override public void onMaterialEvent(MaterialEvent event) { event.setMaterial(GTCoreMaterials.Rubber).asSolid(295, PLATE, RING); - event.setMaterial(Plastic).flags(RUBBERTOOLS); - event.setMaterial(Beeswax).asDust(); + event.setMaterial(GTCoreMaterials.Plastic).flags(RUBBERTOOLS); + event.setMaterial(GTCoreMaterials.Beeswax).asDust(); event.setMaterial(GTCoreMaterials.FierySteel).asMetal().tool().toolDamage(4).toolSpeed(9).toolDurability(1024).toolQuality(4) .toolEnchantments(ImmutableMap.of(Enchantments.FIRE_ASPECT, 2)).handleMaterial(AntimatterMaterials.Blaze) .blacklistToolTypes(PICKAXE, SWORD).build(); event.setMaterial(GTCoreMaterials.Knightmetal).asMetal(GEAR).tool().toolDamage(3).toolSpeed(8).toolDurability(512).toolQuality(3) .blacklistToolTypes(AXE, PICKAXE, SWORD).build(); - event.setMaterial(Ironwood).asMetal(WOOD).tool().toolDamage(2).toolSpeed(6.5f).toolDurability(512).toolQuality(2) + event.setMaterial(GTCoreMaterials.Ironwood).asMetal(WOOD).tool().toolDamage(2).toolSpeed(6.5f).toolDurability(512).toolQuality(2) .toolEnchantments(ImmutableMap.of(Enchantments.KNOCKBACK, 1)) .blacklistToolTypes(AXE, PICKAXE, SHOVEL, SWORD, HOE).build(); event.setMaterial(GTCoreMaterials.Steeleaf).asMetal().tool().toolDamage(4).toolSpeed(8).toolDurability(131).toolQuality(3) .toolEnchantments(ImmutableMap.of(Enchantments.MOB_LOOTING, 2, Enchantments.BLOCK_FORTUNE, 2)) .blacklistToolTypes(AXE, PICKAXE, SHOVEL, SWORD, HOE).build(); if (AntimatterAPI.isModLoaded("twilightforest")){ - INGOT.replacement(Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_ingot")); - BLOCK.replacement(Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_block")); - INGOT.replacement(Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_ingot")); - BLOCK.replacement(Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_block")); - INGOT.replacement(Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_ingot")); - BLOCK.replacement(Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_block")); - INGOT.replacement(FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_ingot")); - BLOCK.replacement(FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_block")); + INGOT.replacement(GTCoreMaterials.Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_ingot")); + BLOCK.replacement(GTCoreMaterials.Ironwood, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "ironwood_block")); + INGOT.replacement(GTCoreMaterials.Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_ingot")); + BLOCK.replacement(GTCoreMaterials.Knightmetal, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "knightmetal_block")); + INGOT.replacement(GTCoreMaterials.Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_ingot")); + BLOCK.replacement(GTCoreMaterials.Steeleaf, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "steeleaf_block")); + INGOT.replacement(GTCoreMaterials.FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_ingot")); + BLOCK.replacement(GTCoreMaterials.FierySteel, () -> AntimatterPlatformUtils.getItemFromID("twilightforest", "fiery_block")); } GTCoreBlocks.initItemBarrels(); Guis.init(); diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCoreConfig.java b/common/src/main/java/org/gtreimagined/gtcore/GTCoreConfig.java similarity index 98% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCoreConfig.java rename to common/src/main/java/org/gtreimagined/gtcore/GTCoreConfig.java index 0a6769c..bcf0349 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCoreConfig.java +++ b/common/src/main/java/org/gtreimagined/gtcore/GTCoreConfig.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore; +package org.gtreimagined.gtcore; import carbonconfiglib.config.*; import carbonconfiglib.config.ConfigEntry.BoolValue; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCoreRemapping.java b/common/src/main/java/org/gtreimagined/gtcore/GTCoreRemapping.java similarity index 83% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCoreRemapping.java rename to common/src/main/java/org/gtreimagined/gtcore/GTCoreRemapping.java index 60076d4..3f10f17 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/GTCoreRemapping.java +++ b/common/src/main/java/org/gtreimagined/gtcore/GTCoreRemapping.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore; +package org.gtreimagined.gtcore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.machine.DrumMachine; -import io.github.gregtechintergalactical.gtcore.machine.LockerMachine; -import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.machine.DrumMachine; +import org.gtreimagined.gtcore.machine.LockerMachine; +import org.gtreimagined.gtcore.machine.WorkbenchMachine; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterRemapping; import muramasa.antimatter.machine.BlockMachine; @@ -11,6 +11,10 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.machine.DrumMachine; +import org.gtreimagined.gtcore.machine.LockerMachine; +import org.gtreimagined.gtcore.machine.WorkbenchMachine; public class GTCoreRemapping { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourElectricWrenchSwitching.java b/common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourElectricWrenchSwitching.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourElectricWrenchSwitching.java rename to common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourElectricWrenchSwitching.java index 3e3c585..a0ab690 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourElectricWrenchSwitching.java +++ b/common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourElectricWrenchSwitching.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.behaviour; +package org.gtreimagined.gtcore.behaviour; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.behaviour.IItemRightClick; @@ -14,8 +14,8 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.ELECTRIC_WRENCH; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.ELECTRIC_WRENCH_ALT; +import static org.gtreimagined.gtcore.data.GTCoreTools.ELECTRIC_WRENCH; +import static org.gtreimagined.gtcore.data.GTCoreTools.ELECTRIC_WRENCH_ALT; import static muramasa.antimatter.data.AntimatterDefaultTools.WRENCH; import static muramasa.antimatter.data.AntimatterDefaultTools.WRENCH_ALT; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourKnifeTooltip.java b/common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourKnifeTooltip.java similarity index 93% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourKnifeTooltip.java rename to common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourKnifeTooltip.java index 307c0d9..ef18632 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourKnifeTooltip.java +++ b/common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourKnifeTooltip.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.behaviour; +package org.gtreimagined.gtcore.behaviour; import muramasa.antimatter.behaviour.IAddInformation; import muramasa.antimatter.tool.IAntimatterTool; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourMultitoolSwitching.java b/common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourMultitoolSwitching.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourMultitoolSwitching.java rename to common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourMultitoolSwitching.java index 1bdd8c8..5f3a98b 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/behaviour/BehaviourMultitoolSwitching.java +++ b/common/src/main/java/org/gtreimagined/gtcore/behaviour/BehaviourMultitoolSwitching.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.behaviour; +package org.gtreimagined.gtcore.behaviour; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.behaviour.IItemRightClick; @@ -12,7 +12,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.*; +import static org.gtreimagined.gtcore.data.GTCoreTools.*; public class BehaviourMultitoolSwitching implements IItemRightClick { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java b/common/src/main/java/org/gtreimagined/gtcore/block/BlockMaterialChest.java similarity index 95% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java rename to common/src/main/java/org/gtreimagined/gtcore/block/BlockMaterialChest.java index 19d8bdc..969b06a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockMaterialChest.java +++ b/common/src/main/java/org/gtreimagined/gtcore/block/BlockMaterialChest.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.block; +package org.gtreimagined.gtcore.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityChest; -import io.github.gregtechintergalactical.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; import it.unimi.dsi.fastutil.floats.Float2FloatFunction; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; import muramasa.antimatter.gui.SlotType; @@ -33,6 +33,8 @@ import net.minecraft.world.level.pathfinder.PathComputationType; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; import java.util.function.BiPredicate; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockRedstoneWire.java b/common/src/main/java/org/gtreimagined/gtcore/block/BlockRedstoneWire.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockRedstoneWire.java rename to common/src/main/java/org/gtreimagined/gtcore/block/BlockRedstoneWire.java index cbb6871..cee63d0 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockRedstoneWire.java +++ b/common/src/main/java/org/gtreimagined/gtcore/block/BlockRedstoneWire.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.block; +package org.gtreimagined.gtcore.block; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityRedstoneWire; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import muramasa.antimatter.Data; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; @@ -16,6 +16,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import org.jetbrains.annotations.Nullable; public class BlockRedstoneWire> extends BlockPipe { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockSapBag.java b/common/src/main/java/org/gtreimagined/gtcore/block/BlockSapBag.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockSapBag.java rename to common/src/main/java/org/gtreimagined/gtcore/block/BlockSapBag.java index 56e292d..1a34065 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/BlockSapBag.java +++ b/common/src/main/java/org/gtreimagined/gtcore/block/BlockSapBag.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.block; +package org.gtreimagined.gtcore.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntitySapBag; -import io.github.gregtechintergalactical.gtcore.client.BakedModels; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntitySapBag; +import org.gtreimagined.gtcore.client.BakedModels; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.datagen.builder.AntimatterBlockModelBuilder; import muramasa.antimatter.datagen.builder.DynamicConfigBuilder; import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder; @@ -42,6 +42,7 @@ import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; +import org.gtreimagined.gtcore.blockentity.BlockEntitySapBag; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/RedstoneWire.java b/common/src/main/java/org/gtreimagined/gtcore/block/RedstoneWire.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/block/RedstoneWire.java rename to common/src/main/java/org/gtreimagined/gtcore/block/RedstoneWire.java index 1ed85fa..c4749d9 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/block/RedstoneWire.java +++ b/common/src/main/java/org/gtreimagined/gtcore/block/RedstoneWire.java @@ -1,10 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.block; +package org.gtreimagined.gtcore.block; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityRedstoneWire; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import muramasa.antimatter.material.Material; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.PipeType; import net.minecraft.world.level.block.Block; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import java.util.Set; import java.util.stream.Collectors; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityBarrel.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityBarrel.java index 50027dc..aea6d3f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityBarrel.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityBarrel.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; +import org.gtreimagined.gtcore.machine.MaterialMachine; import muramasa.antimatter.gui.container.ContainerMachine; import muramasa.antimatter.machine.MachineState; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityChest.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityChest.java index dc9795d..74dc96a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityChest.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityChest.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; +import org.gtreimagined.gtcore.machine.MaterialMachine; import muramasa.antimatter.capability.item.ITrackedHandler; import muramasa.antimatter.capability.item.TrackedItemHandler; import muramasa.antimatter.capability.machine.MachineItemHandler; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityDrum.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityDrum.java similarity index 98% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityDrum.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityDrum.java index 9317898..de19779 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityDrum.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityDrum.java @@ -1,11 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; import earth.terrarium.botarium.common.fluid.base.FluidContainer; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.base.PlatformFluidHandler; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; import earth.terrarium.botarium.common.item.ItemStackHolder; -import io.github.gregtechintergalactical.gtcore.machine.DrumMachine; +import org.gtreimagined.gtcore.machine.DrumMachine; import muramasa.antimatter.Ref; import muramasa.antimatter.capability.fluid.FluidTank; import muramasa.antimatter.capability.fluid.FluidTanks; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityLocker.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityLocker.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityLocker.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityLocker.java index 4790027..381c879 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityLocker.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityLocker.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; +import org.gtreimagined.gtcore.machine.MaterialMachine; import muramasa.antimatter.capability.machine.MachineCoverHandler; import muramasa.antimatter.cover.ICover; import muramasa.antimatter.gui.SlotType; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMassStorage.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMassStorage.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMassStorage.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMassStorage.java index 6c62f33..5d51a1b 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMassStorage.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMassStorage.java @@ -1,13 +1,13 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; import earth.terrarium.botarium.common.fluid.base.FluidHolder; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTools; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; -import io.github.gregtechintergalactical.gtcore.item.ItemTape; -import io.github.gregtechintergalactical.gtcore.machine.MassStorageMachine; -import io.github.gregtechintergalactical.gtcore.machine.MassStorageItemHandler; -import io.github.gregtechintergalactical.gtcore.network.MessageInventorySync; -import io.github.gregtechintergalactical.gtcore.network.MessageTriggerInventorySync; +import org.gtreimagined.gtcore.data.GTCoreTools; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.item.ItemTape; +import org.gtreimagined.gtcore.machine.MassStorageMachine; +import org.gtreimagined.gtcore.machine.MassStorageItemHandler; +import org.gtreimagined.gtcore.network.MessageInventorySync; +import org.gtreimagined.gtcore.network.MessageTriggerInventorySync; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.gui.SlotType; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMaterial.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMaterial.java similarity index 80% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMaterial.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMaterial.java index f2311fb..4cccb0f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMaterial.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMaterial.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; +import org.gtreimagined.gtcore.machine.MaterialMachine; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.material.Material; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java similarity index 81% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java index ba6360c..f01ca00 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityMaterialBasicMultiMachine.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.machine.MaterialBasicMultiMachine; +import org.gtreimagined.gtcore.machine.MaterialBasicMultiMachine; import muramasa.antimatter.blockentity.multi.BlockEntityBasicMultiMachine; import muramasa.antimatter.material.Material; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityPlasticBin.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityPlasticBin.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityPlasticBin.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityPlasticBin.java index 31cdac1..551264c 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityPlasticBin.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityPlasticBin.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; -import io.github.gregtechintergalactical.gtcore.machine.MassStorageMachine; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.machine.MassStorageMachine; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.tool.AntimatterToolType; import muramasa.antimatter.util.Utils; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityRedstoneWire.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityRedstoneWire.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityRedstoneWire.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityRedstoneWire.java index 12e2d02..f81d808 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityRedstoneWire.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityRedstoneWire.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.block.BlockRedstoneWire; -import io.github.gregtechintergalactical.gtcore.block.RedstoneWire; -import io.github.gregtechintergalactical.gtcore.cover.CoverRedstoneTorch; -import io.github.gregtechintergalactical.gtcore.cover.CoverSelectorTag; +import org.gtreimagined.gtcore.block.BlockRedstoneWire; +import org.gtreimagined.gtcore.block.RedstoneWire; +import org.gtreimagined.gtcore.cover.CoverRedstoneTorch; +import org.gtreimagined.gtcore.cover.CoverSelectorTag; import muramasa.antimatter.Antimatter; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.blockentity.pipe.BlockEntityPipe; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntitySapBag.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntitySapBag.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntitySapBag.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntitySapBag.java index 660ea88..87e1102 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntitySapBag.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntitySapBag.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.tree.ResinState; -import io.github.gregtechintergalactical.gtcore.tree.block.BlockRubberLog; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.tree.ResinState; +import org.gtreimagined.gtcore.tree.block.BlockRubberLog; import muramasa.antimatter.blockentity.BlockEntityBase; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityTrashCan.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityTrashCan.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityTrashCan.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityTrashCan.java index 1118ab4..f48e4c9 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityTrashCan.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityTrashCan.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import muramasa.antimatter.blockentity.BlockEntityMachine; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityWorkbench.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityWorkbench.java similarity index 90% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityWorkbench.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityWorkbench.java index 9335398..961443e 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/BlockEntityWorkbench.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/BlockEntityWorkbench.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; -import io.github.gregtechintergalactical.gtcore.gui.ContainerWorkbench; -import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine; +import org.gtreimagined.gtcore.gui.ContainerWorkbench; +import org.gtreimagined.gtcore.machine.MaterialMachine; import muramasa.antimatter.capability.machine.MachineCoverHandler; import muramasa.antimatter.cover.ICover; import muramasa.antimatter.gui.event.GuiEvents; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/IInventorySyncTile.java b/common/src/main/java/org/gtreimagined/gtcore/blockentity/IInventorySyncTile.java similarity index 57% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/IInventorySyncTile.java rename to common/src/main/java/org/gtreimagined/gtcore/blockentity/IInventorySyncTile.java index fa20add..f37704a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/blockentity/IInventorySyncTile.java +++ b/common/src/main/java/org/gtreimagined/gtcore/blockentity/IInventorySyncTile.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.blockentity; +package org.gtreimagined.gtcore.blockentity; public interface IInventorySyncTile { void setSyncSlots(boolean syncSlots); diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/BakedModels.java b/common/src/main/java/org/gtreimagined/gtcore/client/BakedModels.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/client/BakedModels.java rename to common/src/main/java/org/gtreimagined/gtcore/client/BakedModels.java index d13750a..450dd80 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/BakedModels.java +++ b/common/src/main/java/org/gtreimagined/gtcore/client/BakedModels.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.client; +package org.gtreimagined.gtcore.client; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonObject; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.client.AntimatterModelManager; import muramasa.antimatter.client.model.IModelConfiguration; import muramasa.antimatter.client.model.loader.DynamicModelLoader; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/ClientHandler.java b/common/src/main/java/org/gtreimagined/gtcore/client/ClientHandler.java similarity index 85% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/client/ClientHandler.java rename to common/src/main/java/org/gtreimagined/gtcore/client/ClientHandler.java index 3a89144..70f7880 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/ClientHandler.java +++ b/common/src/main/java/org/gtreimagined/gtcore/client/ClientHandler.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.client; +package org.gtreimagined.gtcore.client; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.client.ModelUtils; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.Sheets; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/MassStorageRenderer.java b/common/src/main/java/org/gtreimagined/gtcore/client/MassStorageRenderer.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/client/MassStorageRenderer.java rename to common/src/main/java/org/gtreimagined/gtcore/client/MassStorageRenderer.java index ee9df64..ae038b7 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/MassStorageRenderer.java +++ b/common/src/main/java/org/gtreimagined/gtcore/client/MassStorageRenderer.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.client; +package org.gtreimagined.gtcore.client; import com.mojang.blaze3d.platform.Lighting; import com.mojang.blaze3d.vertex.PoseStack; @@ -6,10 +6,10 @@ import com.mojang.math.Matrix4f; import com.mojang.math.Quaternion; import com.mojang.math.Vector3f; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityPlasticBin; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; -import io.github.gregtechintergalactical.gtcore.machine.MassStorageMachine; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.blockentity.BlockEntityPlasticBin; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.machine.MassStorageMachine; import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.machine.MachineState; import net.minecraft.ChatFormatting; @@ -28,6 +28,9 @@ import net.minecraft.network.chat.TextComponent; import net.minecraft.util.Mth; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.blockentity.BlockEntityPlasticBin; +import org.gtreimagined.gtcore.machine.MassStorageMachine; import static muramasa.antimatter.material.MaterialTags.WOOD; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/MaterialChestRenderer.java b/common/src/main/java/org/gtreimagined/gtcore/client/MaterialChestRenderer.java similarity index 95% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/client/MaterialChestRenderer.java rename to common/src/main/java/org/gtreimagined/gtcore/client/MaterialChestRenderer.java index 65256df..e1e29d4 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/MaterialChestRenderer.java +++ b/common/src/main/java/org/gtreimagined/gtcore/client/MaterialChestRenderer.java @@ -1,11 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.client; +package org.gtreimagined.gtcore.client; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.math.Vector3f; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.BlockMaterialChest; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityChest; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.BlockMaterialChest; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; import muramasa.antimatter.machine.Tier; import net.minecraft.client.model.geom.ModelLayers; import net.minecraft.client.model.geom.ModelPart; @@ -25,6 +25,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; import java.awt.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/SapBagBakedModel.java b/common/src/main/java/org/gtreimagined/gtcore/client/SapBagBakedModel.java similarity index 90% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/client/SapBagBakedModel.java rename to common/src/main/java/org/gtreimagined/gtcore/client/SapBagBakedModel.java index b6ec8f0..2228c9a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/client/SapBagBakedModel.java +++ b/common/src/main/java/org/gtreimagined/gtcore/client/SapBagBakedModel.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.client; +package org.gtreimagined.gtcore.client; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import muramasa.antimatter.dynamic.DynamicBakedModel; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/cover/CoverRedstoneTorch.java b/common/src/main/java/org/gtreimagined/gtcore/cover/CoverRedstoneTorch.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/cover/CoverRedstoneTorch.java rename to common/src/main/java/org/gtreimagined/gtcore/cover/CoverRedstoneTorch.java index 8d12f0d..fd4d5bc 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/cover/CoverRedstoneTorch.java +++ b/common/src/main/java/org/gtreimagined/gtcore/cover/CoverRedstoneTorch.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.cover; +package org.gtreimagined.gtcore.cover; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityRedstoneWire; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; import muramasa.antimatter.cover.CoverFactory; @@ -9,6 +9,7 @@ import muramasa.antimatter.texture.Texture; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/cover/CoverSelectorTag.java b/common/src/main/java/org/gtreimagined/gtcore/cover/CoverSelectorTag.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/cover/CoverSelectorTag.java rename to common/src/main/java/org/gtreimagined/gtcore/cover/CoverSelectorTag.java index c2b8c84..d7af6ef 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/cover/CoverSelectorTag.java +++ b/common/src/main/java/org/gtreimagined/gtcore/cover/CoverSelectorTag.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.cover; +package org.gtreimagined.gtcore.cover; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityRedstoneWire; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import muramasa.antimatter.capability.ICoverHandler; import muramasa.antimatter.cover.BaseCover; import muramasa.antimatter.cover.CoverFactory; @@ -9,6 +9,7 @@ import muramasa.antimatter.texture.Texture; import net.minecraft.core.Direction; import net.minecraft.resources.ResourceLocation; +import org.gtreimagined.gtcore.blockentity.BlockEntityRedstoneWire; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreBlocks.java similarity index 83% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreBlocks.java index b1a4fc2..87e9ac9 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreBlocks.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreBlocks.java @@ -1,12 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.data; - -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.BlockSapBag; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityPlasticBin; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntitySapBag; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityTrashCan; -import io.github.gregtechintergalactical.gtcore.machine.*; -import io.github.gregtechintergalactical.gtcore.tree.block.*; +package org.gtreimagined.gtcore.data; + +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.BlockSapBag; +import org.gtreimagined.gtcore.blockentity.BlockEntityPlasticBin; +import org.gtreimagined.gtcore.blockentity.BlockEntitySapBag; +import org.gtreimagined.gtcore.blockentity.BlockEntityTrashCan; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.block.BlockBasic; import muramasa.antimatter.data.AntimatterMaterials; @@ -25,9 +23,34 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.WoodType; +import org.gtreimagined.gtcore.block.BlockSapBag; +import org.gtreimagined.gtcore.blockentity.BlockEntityPlasticBin; +import org.gtreimagined.gtcore.blockentity.BlockEntitySapBag; +import org.gtreimagined.gtcore.blockentity.BlockEntityTrashCan; +import org.gtreimagined.gtcore.machine.BarrelMachine; +import org.gtreimagined.gtcore.machine.ChestMachine; +import org.gtreimagined.gtcore.machine.DrumMachine; +import org.gtreimagined.gtcore.machine.LockerMachine; +import org.gtreimagined.gtcore.machine.MassStorageMachine; +import org.gtreimagined.gtcore.machine.MaterialMachine; +import org.gtreimagined.gtcore.machine.WorkbenchMachine; +import org.gtreimagined.gtcore.tree.block.BlockRubberButton; +import org.gtreimagined.gtcore.tree.block.BlockRubberDoor; +import org.gtreimagined.gtcore.tree.block.BlockRubberFence; +import org.gtreimagined.gtcore.tree.block.BlockRubberFenceGate; +import org.gtreimagined.gtcore.tree.block.BlockRubberLeaves; +import org.gtreimagined.gtcore.tree.block.BlockRubberLog; +import org.gtreimagined.gtcore.tree.block.BlockRubberPressurePlate; +import org.gtreimagined.gtcore.tree.block.BlockRubberSapling; +import org.gtreimagined.gtcore.tree.block.BlockRubberSign; +import org.gtreimagined.gtcore.tree.block.BlockRubberSlab; +import org.gtreimagined.gtcore.tree.block.BlockRubberStairs; +import org.gtreimagined.gtcore.tree.block.BlockRubberTrapDoor; +import org.gtreimagined.gtcore.tree.block.BlockRubberWallSign; +import org.gtreimagined.gtcore.tree.block.BlockRubberWood; import org.jetbrains.annotations.Nullable; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.*; public class GTCoreBlocks { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreCables.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreCables.java similarity index 62% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreCables.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreCables.java index 1fda716..ed2afba 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreCables.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreCables.java @@ -1,15 +1,17 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.RedstoneWire; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.RedstoneWire; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.SubTag; import muramasa.antimatter.pipe.types.Cable; import muramasa.antimatter.pipe.types.Wire; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.RedstoneWire; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.*; import static muramasa.antimatter.material.MaterialTags.CABLE; import static muramasa.antimatter.material.MaterialTags.WIRE; @@ -18,10 +20,10 @@ public class GTCoreCables { public static final SubTag TIN_WIRE = new SubTag("tin_wire"); public static final SubTag TIN_CABLE = new SubTag("tin_cable"); - public static final RedstoneWire WIRE_RED_ALLOY = AntimatterAPI.register(RedstoneWire.class, new RedstoneWire<>(GTCore.ID, RedAlloy, 0xd00000)).range(16); + public static final RedstoneWire WIRE_RED_ALLOY = AntimatterAPI.register(RedstoneWire.class, new RedstoneWire<>(GTCore.ID, GTCoreMaterials.RedAlloy, 0xd00000)).range(16); public static void init(){ - WIRE.subTag(TIN_WIRE, Tin); - CABLE.subTag(TIN_CABLE, Tin); + WIRE.subTag(TIN_WIRE, GTCoreMaterials.Tin); + CABLE.subTag(TIN_CABLE, GTCoreMaterials.Tin); } } diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreCovers.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreCovers.java similarity index 75% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreCovers.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreCovers.java index 43f4e56..ef9a30d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreCovers.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreCovers.java @@ -1,11 +1,12 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.cover.CoverRedstoneTorch; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.cover.CoverRedstoneTorch; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.item.ItemCover; import muramasa.antimatter.texture.Texture; import net.minecraft.world.item.Items; +import org.gtreimagined.gtcore.cover.CoverRedstoneTorch; public class GTCoreCovers { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreData.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreData.java similarity index 87% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreData.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreData.java index 5e166fd..f205f42 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreData.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreData.java @@ -1,7 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import net.minecraft.resources.ResourceLocation; +import org.gtreimagined.gtcore.GTCore; import java.util.HashSet; import java.util.Set; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreFluids.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreFluids.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreFluids.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreFluids.java index b972b0d..5b359f8 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreFluids.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreFluids.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; import earth.terrarium.botarium.common.registry.fluid.FluidProperties; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.fluid.AntimatterFluid; import muramasa.antimatter.fluid.AntimatterMaterialFluid; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreItems.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreItems.java similarity index 93% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreItems.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreItems.java index bb41957..e7e4400 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreItems.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreItems.java @@ -1,18 +1,18 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.cover.CoverRedstoneTorch; -import io.github.gregtechintergalactical.gtcore.cover.CoverSelectorTag; -import io.github.gregtechintergalactical.gtcore.item.ItemFertilizer; -import io.github.gregtechintergalactical.gtcore.item.ItemHazmatArmor; -import io.github.gregtechintergalactical.gtcore.item.ItemMagnifyingGlass; -import io.github.gregtechintergalactical.gtcore.item.ItemMatch; -import io.github.gregtechintergalactical.gtcore.item.ItemPowerUnit; -import io.github.gregtechintergalactical.gtcore.item.ItemRadaway; -import io.github.gregtechintergalactical.gtcore.item.ItemSelectorTag; -import io.github.gregtechintergalactical.gtcore.item.ItemTape; -import io.github.gregtechintergalactical.gtcore.tree.item.ItemRubberBoat; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.cover.CoverRedstoneTorch; +import org.gtreimagined.gtcore.cover.CoverSelectorTag; +import org.gtreimagined.gtcore.item.ItemFertilizer; +import org.gtreimagined.gtcore.item.ItemHazmatArmor; +import org.gtreimagined.gtcore.item.ItemMagnifyingGlass; +import org.gtreimagined.gtcore.item.ItemMatch; +import org.gtreimagined.gtcore.item.ItemPowerUnit; +import org.gtreimagined.gtcore.item.ItemRadaway; +import org.gtreimagined.gtcore.item.ItemSelectorTag; +import org.gtreimagined.gtcore.item.ItemTape; +import org.gtreimagined.gtcore.tree.item.ItemRubberBoat; import muramasa.antimatter.Ref; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.item.ItemBasic; @@ -23,8 +23,19 @@ import muramasa.antimatter.texture.Texture; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.Item; - -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.cover.CoverSelectorTag; +import org.gtreimagined.gtcore.item.ItemFertilizer; +import org.gtreimagined.gtcore.item.ItemHazmatArmor; +import org.gtreimagined.gtcore.item.ItemMagnifyingGlass; +import org.gtreimagined.gtcore.item.ItemMatch; +import org.gtreimagined.gtcore.item.ItemPowerUnit; +import org.gtreimagined.gtcore.item.ItemRadaway; +import org.gtreimagined.gtcore.item.ItemSelectorTag; +import org.gtreimagined.gtcore.item.ItemTape; +import org.gtreimagined.gtcore.tree.item.ItemRubberBoat; + +import static org.gtreimagined.gtcore.data.GTCoreMaterials.*; import static muramasa.antimatter.data.AntimatterMaterials.Diamond; public class GTCoreItems { @@ -65,7 +76,7 @@ public class GTCoreItems { public static ItemBasic Match = new ItemMatch(GTCore.ID, "match", new Item.Properties().tab(Ref.TAB_ITEMS)); public static ItemBasic MatchBook = new ItemMatch(GTCore.ID, "match_book", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(64)); public static ItemBasic Lighter = new ItemMatch(GTCore.ID, "lighter", new Item.Properties().tab(Ref.TAB_ITEMS).defaultDurability(100)); - public static ItemMagnifyingGlass GlassMagnifyingGlass = new ItemMagnifyingGlass(Glass, 64); + public static ItemMagnifyingGlass GlassMagnifyingGlass = new ItemMagnifyingGlass(GTCoreMaterials.Glass, 64); public static ItemMagnifyingGlass DiamondMagnifyingGlass = new ItemMagnifyingGlass(Diamond, 1561); public static ItemBasic TapeEmpty = new ItemTape(GTCore.ID, "tape_empty"); @@ -131,10 +142,10 @@ public class GTCoreItems { public static ItemBasic MotorEV = new ItemBasic<>(GTCore.ID, "motor_ev"); public static ItemBasic MotorIV = new ItemBasic<>(GTCore.ID, "motor_iv"); - public static ItemPowerUnit PowerUnitLV = new ItemPowerUnit(GTCore.ID, "power_unit_lv", Aluminium); - public static ItemPowerUnit PowerUnitMV = new ItemPowerUnit(GTCore.ID, "power_unit_mv", StainlessSteel); - public static ItemPowerUnit PowerUnitHV = new ItemPowerUnit(GTCore.ID, "power_unit_hv", Titanium); - public static ItemPowerUnit SmallPowerUnit = new ItemPowerUnit(GTCore.ID, "small_power_unit", Aluminium); + public static ItemPowerUnit PowerUnitLV = new ItemPowerUnit(GTCore.ID, "power_unit_lv", GTCoreMaterials.Aluminium); + public static ItemPowerUnit PowerUnitMV = new ItemPowerUnit(GTCore.ID, "power_unit_mv", GTCoreMaterials.StainlessSteel); + public static ItemPowerUnit PowerUnitHV = new ItemPowerUnit(GTCore.ID, "power_unit_hv", GTCoreMaterials.Titanium); + public static ItemPowerUnit SmallPowerUnit = new ItemPowerUnit(GTCore.ID, "small_power_unit", GTCoreMaterials.Aluminium); public static ItemPowerUnit JackhammerPowerUnit = new ItemPowerUnit(GTCore.ID, "jackhammer_power_unit", Material.NULL); public static ItemBasic RawLapotronCrustal = new ItemBasic<>(GTCore.ID, "raw_lapotron_crystal"); diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreMaterials.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreMaterials.java similarity index 99% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreMaterials.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreMaterials.java index 8b9ce9f..192fafa 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreMaterials.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreMaterials.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.material.Material; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreTags.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreTags.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreTags.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreTags.java index c6169fb..91893df 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreTags.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreTags.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.util.AntimatterPlatformUtils; import muramasa.antimatter.util.TagUtils; import net.minecraft.core.Registry; @@ -8,6 +8,7 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.level.material.Fluid; +import org.gtreimagined.gtcore.GTCore; public class GTCoreTags { public static final TagKey STEAM = TagKey.create(Registry.FLUID_REGISTRY, new ResourceLocation((AntimatterPlatformUtils.isForge() ? "forge" : "c"), "steam")); diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreTools.java b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreTools.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreTools.java rename to common/src/main/java/org/gtreimagined/gtcore/data/GTCoreTools.java index 9517859..a29688f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/GTCoreTools.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/GTCoreTools.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.behaviour.BehaviourElectricWrenchSwitching; -import io.github.gregtechintergalactical.gtcore.behaviour.BehaviourKnifeTooltip; -import io.github.gregtechintergalactical.gtcore.behaviour.BehaviourMultitoolSwitching; +import org.gtreimagined.gtcore.behaviour.BehaviourElectricWrenchSwitching; +import org.gtreimagined.gtcore.behaviour.BehaviourKnifeTooltip; +import org.gtreimagined.gtcore.behaviour.BehaviourMultitoolSwitching; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Data; import muramasa.antimatter.Ref; @@ -37,6 +37,9 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import org.gtreimagined.gtcore.behaviour.BehaviourElectricWrenchSwitching; +import org.gtreimagined.gtcore.behaviour.BehaviourKnifeTooltip; +import org.gtreimagined.gtcore.behaviour.BehaviourMultitoolSwitching; import org.jetbrains.annotations.Nullable; import tesseract.TesseractCapUtils; import tesseract.api.gt.IEnergyHandlerItem; @@ -45,7 +48,7 @@ import java.util.List; import java.util.Map; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; +import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static muramasa.antimatter.data.AntimatterDefaultTools.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static net.minecraft.world.level.material.Material.*; @@ -144,13 +147,13 @@ public static void init(Side side){ POCKET_MULTITOOL_WIRE_CUTTER.addBehaviour(BehaviourMultitoolSwitching.INSTANCE); POCKET_MULTITOOL_SCISSORS.addBehaviour(BehaviourMultitoolSwitching.INSTANCE); POCKET_MULTITOOL_SCISSORS.addBehaviour(BehaviourShearing.INSTANCE); - GTCoreTools.DRILL.setBrokenItems(ImmutableMap.of("drill_lv", i -> getBrokenItem(i, PowerUnitLV), "drill_mv", i -> getBrokenItem(i, PowerUnitMV), "drill_hv", i -> getBrokenItem(i, PowerUnitHV))); - GTCoreTools.CHAINSAW.setBrokenItems(ImmutableMap.of("chainsaw_lv", i -> getBrokenItem(i, PowerUnitLV), "chainsaw_mv", i -> getBrokenItem(i, PowerUnitMV), "chainsaw_hv", i -> getBrokenItem(i, PowerUnitHV))); - GTCoreTools.ELECTRIC_WRENCH.setBrokenItems(ImmutableMap.of("electric_wrench_lv", i -> getBrokenItem(i, PowerUnitLV), "electric_wrench_mv", i -> getBrokenItem(i, PowerUnitMV), "electric_wrench_hv", i -> getBrokenItem(i, PowerUnitHV))); - GTCoreTools.ELECTRIC_WRENCH_ALT.setBrokenItems(ImmutableMap.of("electric_wrench_alt_lv", i -> getBrokenItem(i, PowerUnitLV), "electric_wrench_alt_mv", i -> getBrokenItem(i, PowerUnitMV), "electric_wrench_alt_hv", i -> getBrokenItem(i, PowerUnitHV))); - GTCoreTools.BUZZSAW.setBrokenItems(ImmutableMap.of("buzzsaw_lv", i -> getBrokenItem(i, PowerUnitLV), "buzzsaw_mv", i -> getBrokenItem(i, PowerUnitMV), "buzzsaw_hv", i -> getBrokenItem(i, PowerUnitHV))); - GTCoreTools.ELECTRIC_SCREWDRIVER.setBrokenItems(ImmutableMap.of("electric_screwdriver_lv", i -> getBrokenItem(i, SmallPowerUnit))); - GTCoreTools.JACKHAMMER.setBrokenItems(ImmutableMap.of("jackhammer_hv", i -> getBrokenItem(i, JackhammerPowerUnit))); + GTCoreTools.DRILL.setBrokenItems(ImmutableMap.of("drill_lv", i -> getBrokenItem(i, GTCoreItems.PowerUnitLV), "drill_mv", i -> getBrokenItem(i, GTCoreItems.PowerUnitMV), "drill_hv", i -> getBrokenItem(i, GTCoreItems.PowerUnitHV))); + GTCoreTools.CHAINSAW.setBrokenItems(ImmutableMap.of("chainsaw_lv", i -> getBrokenItem(i, GTCoreItems.PowerUnitLV), "chainsaw_mv", i -> getBrokenItem(i, GTCoreItems.PowerUnitMV), "chainsaw_hv", i -> getBrokenItem(i, GTCoreItems.PowerUnitHV))); + GTCoreTools.ELECTRIC_WRENCH.setBrokenItems(ImmutableMap.of("electric_wrench_lv", i -> getBrokenItem(i, GTCoreItems.PowerUnitLV), "electric_wrench_mv", i -> getBrokenItem(i, GTCoreItems.PowerUnitMV), "electric_wrench_hv", i -> getBrokenItem(i, GTCoreItems.PowerUnitHV))); + GTCoreTools.ELECTRIC_WRENCH_ALT.setBrokenItems(ImmutableMap.of("electric_wrench_alt_lv", i -> getBrokenItem(i, GTCoreItems.PowerUnitLV), "electric_wrench_alt_mv", i -> getBrokenItem(i, GTCoreItems.PowerUnitMV), "electric_wrench_alt_hv", i -> getBrokenItem(i, GTCoreItems.PowerUnitHV))); + GTCoreTools.BUZZSAW.setBrokenItems(ImmutableMap.of("buzzsaw_lv", i -> getBrokenItem(i, GTCoreItems.PowerUnitLV), "buzzsaw_mv", i -> getBrokenItem(i, GTCoreItems.PowerUnitMV), "buzzsaw_hv", i -> getBrokenItem(i, GTCoreItems.PowerUnitHV))); + GTCoreTools.ELECTRIC_SCREWDRIVER.setBrokenItems(ImmutableMap.of("electric_screwdriver_lv", i -> getBrokenItem(i, GTCoreItems.SmallPowerUnit))); + GTCoreTools.JACKHAMMER.setBrokenItems(ImmutableMap.of("jackhammer_hv", i -> getBrokenItem(i, GTCoreItems.JackhammerPowerUnit))); KNIFE.addBehaviour(BehaviourKnifeTooltip.INSTANCE); if (side.isClient()) clientInit(); } @@ -175,8 +178,8 @@ private static ItemStack getBrokenItem(ItemStack tool, ItemLike broken){ dataTag.putLong(muramasa.antimatter.Ref.KEY_ITEM_ENERGY, tuple.getA()); dataTag.putLong(muramasa.antimatter.Ref.KEY_ITEM_MAX_ENERGY, tuple.getB()); } - if (broken.asItem() == SmallPowerUnit){ - PowerUnitHV.setMaterial(((IAntimatterTool)tool.getItem()).getSecondaryMaterial(tool), powerUnit); + if (broken.asItem() == GTCoreItems.SmallPowerUnit){ + GTCoreItems.PowerUnitHV.setMaterial(((IAntimatterTool)tool.getItem()).getSecondaryMaterial(tool), powerUnit); } return powerUnit; } diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/Guis.java b/common/src/main/java/org/gtreimagined/gtcore/data/Guis.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/Guis.java rename to common/src/main/java/org/gtreimagined/gtcore/data/Guis.java index 973ce9d..6d130d1 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/Guis.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/Guis.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.gui.GuiData; import muramasa.antimatter.gui.slot.ISlotProvider; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/IGTBlockInit.java b/common/src/main/java/org/gtreimagined/gtcore/data/IGTBlockInit.java similarity index 79% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/IGTBlockInit.java rename to common/src/main/java/org/gtreimagined/gtcore/data/IGTBlockInit.java index 4017dfa..9c8db9e 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/IGTBlockInit.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/IGTBlockInit.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; import tesseract.TesseractCapUtils; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/MenuHandlers.java b/common/src/main/java/org/gtreimagined/gtcore/data/MenuHandlers.java similarity index 76% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/MenuHandlers.java rename to common/src/main/java/org/gtreimagined/gtcore/data/MenuHandlers.java index ed29063..332d674 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/MenuHandlers.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/MenuHandlers.java @@ -1,11 +1,12 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMaterial; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.gui.ContainerWorkbench; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.gui.ContainerWorkbench; import muramasa.antimatter.capability.IGuiHandler; import muramasa.antimatter.gui.MenuHandlerMachine; import net.minecraft.world.entity.player.Inventory; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; public class MenuHandlers { public static MenuHandlerMachine WORKBENCH_HANDLER = new MenuHandlerMachine(GTCore.ID, "container_workbench") { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/RecipeBuilders.java b/common/src/main/java/org/gtreimagined/gtcore/data/RecipeBuilders.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/RecipeBuilders.java rename to common/src/main/java/org/gtreimagined/gtcore/data/RecipeBuilders.java index c6c701b..6dd8b90 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/RecipeBuilders.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/RecipeBuilders.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.recipe.IRecipe; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/RecipeMaps.java b/common/src/main/java/org/gtreimagined/gtcore/data/RecipeMaps.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/RecipeMaps.java rename to common/src/main/java/org/gtreimagined/gtcore/data/RecipeMaps.java index 062d3d4..e02a0e8 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/RecipeMaps.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/RecipeMaps.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import it.unimi.dsi.fastutil.objects.ObjectArrayList; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.integration.jeirei.renderer.InfoRenderers; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/SlotTypes.java b/common/src/main/java/org/gtreimagined/gtcore/data/SlotTypes.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/SlotTypes.java rename to common/src/main/java/org/gtreimagined/gtcore/data/SlotTypes.java index 0a131c9..13c76ca 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/SlotTypes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/SlotTypes.java @@ -1,14 +1,15 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.gui.slots.SlotCrafting; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.gui.slots.SlotUnlimited; +import org.gtreimagined.gtcore.gui.slots.SlotCrafting; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.gui.slots.SlotUnlimited; import muramasa.antimatter.capability.item.EmptyContainer; import muramasa.antimatter.gui.SlotType; import muramasa.antimatter.gui.slot.AbstractSlot; import muramasa.antimatter.tool.IAntimatterTool; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.entity.BlockEntity; +import org.gtreimagined.gtcore.GTCore; import tesseract.TesseractCapUtils; public class SlotTypes { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/TextureSets.java b/common/src/main/java/org/gtreimagined/gtcore/data/TextureSets.java similarity index 74% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/TextureSets.java rename to common/src/main/java/org/gtreimagined/gtcore/data/TextureSets.java index fc3964a..394b8c8 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/TextureSets.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/TextureSets.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.data; +package org.gtreimagined.gtcore.data; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.material.TextureSet; public class TextureSets { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/client/ScreenFactories.java b/common/src/main/java/org/gtreimagined/gtcore/data/client/ScreenFactories.java similarity index 61% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/data/client/ScreenFactories.java rename to common/src/main/java/org/gtreimagined/gtcore/data/client/ScreenFactories.java index 1f1f56f..431a458 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/data/client/ScreenFactories.java +++ b/common/src/main/java/org/gtreimagined/gtcore/data/client/ScreenFactories.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.data.client; +package org.gtreimagined.gtcore.data.client; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.gui.ContainerWorkbench; -import io.github.gregtechintergalactical.gtcore.gui.screen.ScreenChargingMaterialBlock; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.gui.ContainerWorkbench; +import org.gtreimagined.gtcore.gui.screen.ScreenChargingMaterialBlock; import muramasa.antimatter.AntimatterAPI; import net.minecraft.client.gui.screens.MenuScreens; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockLootProvider.java b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreBlockLootProvider.java similarity index 83% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockLootProvider.java rename to common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreBlockLootProvider.java index 7eddebe..82cbff5 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockLootProvider.java +++ b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreBlockLootProvider.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.datagen; +package org.gtreimagined.gtcore.datagen; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.BlockMaterialChest; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.machine.BlockMachineMaterial; -import io.github.gregtechintergalactical.gtcore.machine.BlockMultiMachineMaterial; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.BlockMaterialChest; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMultiMachineMaterial; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockLootProvider; import net.minecraft.data.loot.BlockLoot; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockTagProvider.java b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreBlockTagProvider.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockTagProvider.java rename to common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreBlockTagProvider.java index 4b3b824..738b5ee 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreBlockTagProvider.java +++ b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreBlockTagProvider.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.datagen; +package org.gtreimagined.gtcore.datagen; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.BlockMaterialChest; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.machine.BlockMachineMaterial; -import io.github.gregtechintergalactical.gtcore.machine.BlockMultiMachineMaterial; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.BlockMaterialChest; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMultiMachineMaterial; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreItemTagProvider.java b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreItemTagProvider.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreItemTagProvider.java rename to common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreItemTagProvider.java index a753452..9651402 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreItemTagProvider.java +++ b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreItemTagProvider.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.datagen; +package org.gtreimagined.gtcore.datagen; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreCables; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreCables; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTags; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterDefaultTools; @@ -26,9 +26,9 @@ import java.util.Objects; import java.util.Set; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*; +import static org.gtreimagined.gtcore.data.GTCoreItems.*; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.*; +import static org.gtreimagined.gtcore.data.GTCoreTags.*; import static muramasa.antimatter.material.MaterialTags.*; public class GTCoreItemTagProvider extends AntimatterItemTagProvider { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreLang.java b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreLang.java similarity index 91% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreLang.java rename to common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreLang.java index 8f69971..cf0057d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/datagen/GTCoreLang.java +++ b/common/src/main/java/org/gtreimagined/gtcore/datagen/GTCoreLang.java @@ -1,11 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.datagen; +package org.gtreimagined.gtcore.datagen; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.BlockRedstoneWire; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.item.ItemHazmatArmor; -import io.github.gregtechintergalactical.gtcore.item.ItemSelectorTag; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.BlockRedstoneWire; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.item.ItemHazmatArmor; +import org.gtreimagined.gtcore.item.ItemSelectorTag; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.datagen.providers.AntimatterLanguageProvider; @@ -17,7 +17,7 @@ import muramasa.antimatter.util.Utils; import org.apache.commons.lang3.StringUtils; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.Beeswax; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.Beeswax; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.util.Utils.lowerUnderscoreToUpperSpaced; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/events/GTCommonEvents.java b/common/src/main/java/org/gtreimagined/gtcore/events/GTCommonEvents.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/events/GTCommonEvents.java rename to common/src/main/java/org/gtreimagined/gtcore/events/GTCommonEvents.java index d46b468..49c81f0 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/events/GTCommonEvents.java +++ b/common/src/main/java/org/gtreimagined/gtcore/events/GTCommonEvents.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.events; +package org.gtreimagined.gtcore.events; -import io.github.gregtechintergalactical.gtcore.machine.BlockMachineMaterial; -import io.github.gregtechintergalactical.gtcore.machine.BlockMultiMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMultiMachineMaterial; import muramasa.antimatter.block.BlockStorage; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.material.Material; @@ -19,6 +19,8 @@ import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMultiMachineMaterial; import java.util.UUID; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/ContainerWorkbench.java b/common/src/main/java/org/gtreimagined/gtcore/gui/ContainerWorkbench.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/ContainerWorkbench.java rename to common/src/main/java/org/gtreimagined/gtcore/gui/ContainerWorkbench.java index 1afe5d9..4b14991 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/ContainerWorkbench.java +++ b/common/src/main/java/org/gtreimagined/gtcore/gui/ContainerWorkbench.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.gui; +package org.gtreimagined.gtcore.gui; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMaterial; -import io.github.gregtechintergalactical.gtcore.gui.slots.SlotWorkTableResult; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; +import org.gtreimagined.gtcore.gui.slots.SlotWorkTableResult; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; import muramasa.antimatter.Antimatter; @@ -25,6 +25,8 @@ import net.minecraft.world.item.crafting.CraftingRecipe; import net.minecraft.world.item.crafting.RecipeType; import net.minecraft.world.level.Level; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; +import org.gtreimagined.gtcore.gui.slots.SlotWorkTableResult; import java.util.Collections; import java.util.Optional; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/InventoryWorkbench.java b/common/src/main/java/org/gtreimagined/gtcore/gui/InventoryWorkbench.java similarity index 91% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/InventoryWorkbench.java rename to common/src/main/java/org/gtreimagined/gtcore/gui/InventoryWorkbench.java index 6252748..c8f5e7f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/InventoryWorkbench.java +++ b/common/src/main/java/org/gtreimagined/gtcore/gui/InventoryWorkbench.java @@ -1,13 +1,15 @@ -package io.github.gregtechintergalactical.gtcore.gui; +package org.gtreimagined.gtcore.gui; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; -import io.github.gregtechintergalactical.gtcore.network.MessageCraftingSync; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.network.MessageCraftingSync; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.capability.machine.MachineItemHandler; import muramasa.antimatter.network.AntimatterNetwork; import net.minecraft.world.inventory.AbstractContainerMenu; import net.minecraft.world.inventory.CraftingContainer; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.network.MessageCraftingSync; import org.jetbrains.annotations.NotNull; public class InventoryWorkbench extends CraftingContainer { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/screen/ScreenChargingMaterialBlock.java b/common/src/main/java/org/gtreimagined/gtcore/gui/screen/ScreenChargingMaterialBlock.java similarity index 79% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/screen/ScreenChargingMaterialBlock.java rename to common/src/main/java/org/gtreimagined/gtcore/gui/screen/ScreenChargingMaterialBlock.java index 2cf19b9..18b2146 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/screen/ScreenChargingMaterialBlock.java +++ b/common/src/main/java/org/gtreimagined/gtcore/gui/screen/ScreenChargingMaterialBlock.java @@ -1,12 +1,13 @@ -package io.github.gregtechintergalactical.gtcore.gui.screen; +package org.gtreimagined.gtcore.gui.screen; import com.mojang.blaze3d.vertex.PoseStack; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMaterial; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; import muramasa.antimatter.gui.container.ContainerMachine; import muramasa.antimatter.gui.screen.ScreenMachine; import muramasa.antimatter.machine.MachineFlag; import net.minecraft.network.chat.Component; import net.minecraft.world.entity.player.Inventory; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; public class ScreenChargingMaterialBlock> extends ScreenMachine> { public ScreenChargingMaterialBlock(ContainerMachine container, Inventory inv, Component name, String location) { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotCrafting.java b/common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotCrafting.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotCrafting.java rename to common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotCrafting.java index bd4e690..1f470c1 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotCrafting.java +++ b/common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotCrafting.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.gui.slots; +package org.gtreimagined.gtcore.gui.slots; import muramasa.antimatter.capability.IGuiHandler; import muramasa.antimatter.gui.SlotType; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotUnlimited.java b/common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotUnlimited.java similarity index 99% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotUnlimited.java rename to common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotUnlimited.java index fb0f889..c383058 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotUnlimited.java +++ b/common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotUnlimited.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.gui.slots; +package org.gtreimagined.gtcore.gui.slots; import muramasa.antimatter.capability.IGuiHandler; import muramasa.antimatter.gui.SlotType; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotWorkTableResult.java b/common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotWorkTableResult.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotWorkTableResult.java rename to common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotWorkTableResult.java index 0b6a1eb..49049ed 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/gui/slots/SlotWorkTableResult.java +++ b/common/src/main/java/org/gtreimagined/gtcore/gui/slots/SlotWorkTableResult.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.gui.slots; +package org.gtreimagined.gtcore.gui.slots; import muramasa.antimatter.capability.machine.MachineItemHandler; import muramasa.antimatter.gui.SlotType; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/jei/GTCoreJeiPlugin.java b/common/src/main/java/org/gtreimagined/gtcore/integration/jei/GTCoreJeiPlugin.java similarity index 90% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/jei/GTCoreJeiPlugin.java rename to common/src/main/java/org/gtreimagined/gtcore/integration/jei/GTCoreJeiPlugin.java index 8f9b07d..3066423 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/jei/GTCoreJeiPlugin.java +++ b/common/src/main/java/org/gtreimagined/gtcore/integration/jei/GTCoreJeiPlugin.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.integration.jei; +package org.gtreimagined.gtcore.integration.jei; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.machine.WorkbenchMachine; import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.RecipeTypes; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/jei/GTCoreRecipeTransferInfo.java b/common/src/main/java/org/gtreimagined/gtcore/integration/jei/GTCoreRecipeTransferInfo.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/jei/GTCoreRecipeTransferInfo.java rename to common/src/main/java/org/gtreimagined/gtcore/integration/jei/GTCoreRecipeTransferInfo.java index 8cb51b4..26eb240 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/jei/GTCoreRecipeTransferInfo.java +++ b/common/src/main/java/org/gtreimagined/gtcore/integration/jei/GTCoreRecipeTransferInfo.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.integration.jei; +package org.gtreimagined.gtcore.integration.jei; -import io.github.gregtechintergalactical.gtcore.gui.ContainerWorkbench; +import org.gtreimagined.gtcore.gui.ContainerWorkbench; import mezz.jei.api.constants.RecipeTypes; import mezz.jei.api.constants.VanillaRecipeCategoryUid; import mezz.jei.api.recipe.RecipeType; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/GTCoreReiPlugin.java b/common/src/main/java/org/gtreimagined/gtcore/integration/rei/GTCoreReiPlugin.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/GTCoreReiPlugin.java rename to common/src/main/java/org/gtreimagined/gtcore/integration/rei/GTCoreReiPlugin.java index 23a1f58..4950d93 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/GTCoreReiPlugin.java +++ b/common/src/main/java/org/gtreimagined/gtcore/integration/rei/GTCoreReiPlugin.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.integration.rei; +package org.gtreimagined.gtcore.integration.rei; -import io.github.gregtechintergalactical.gtcore.gui.ContainerWorkbench; -import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine; +import org.gtreimagined.gtcore.gui.ContainerWorkbench; +import org.gtreimagined.gtcore.machine.WorkbenchMachine; import me.shedaniel.rei.api.client.plugins.REIClientPlugin; import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; import me.shedaniel.rei.api.client.registry.transfer.TransferHandler; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/top/MassStorageProvider.java b/common/src/main/java/org/gtreimagined/gtcore/integration/top/MassStorageProvider.java similarity index 91% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/top/MassStorageProvider.java rename to common/src/main/java/org/gtreimagined/gtcore/integration/top/MassStorageProvider.java index 5862baf..9d5fc5a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/integration/top/MassStorageProvider.java +++ b/common/src/main/java/org/gtreimagined/gtcore/integration/top/MassStorageProvider.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.integration.top; +package org.gtreimagined.gtcore.integration.top; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.data.SlotTypes; import mcjty.theoneprobe.api.CompoundText; import mcjty.theoneprobe.api.ElementAlignment; import mcjty.theoneprobe.api.IProbeHitData; @@ -28,6 +28,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; import java.awt.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemBlockDrum.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemBlockDrum.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemBlockDrum.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemBlockDrum.java index 018ef9e..0a223a7 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemBlockDrum.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemBlockDrum.java @@ -1,11 +1,12 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; import earth.terrarium.botarium.common.fluid.base.FluidHolder; -import io.github.gregtechintergalactical.gtcore.machine.DrumMachine; +import org.gtreimagined.gtcore.machine.DrumMachine; import muramasa.antimatter.block.AntimatterItemBlock; import muramasa.antimatter.data.AntimatterTags; import muramasa.antimatter.item.IFluidItem; import muramasa.antimatter.machine.BlockMachine; +import org.gtreimagined.gtcore.machine.DrumMachine; import tesseract.TesseractGraphWrappers; import java.util.function.BiPredicate; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemBlockMassStorage.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemBlockMassStorage.java similarity index 81% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemBlockMassStorage.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemBlockMassStorage.java index 9f42170..1f76337 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemBlockMassStorage.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemBlockMassStorage.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.machine.MassStorageMachine; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.machine.MassStorageMachine; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.block.AntimatterItemBlock; import muramasa.antimatter.client.RenderHelper; @@ -9,6 +9,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; +import org.gtreimagined.gtcore.machine.MassStorageMachine; public class ItemBlockMassStorage extends AntimatterItemBlock { public ItemBlockMassStorage(BlockMachine block) { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemFertilizer.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemFertilizer.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemFertilizer.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemFertilizer.java index 8292eed..2fff16f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemFertilizer.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemFertilizer.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemHazmatArmor.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemHazmatArmor.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemHazmatArmor.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemHazmatArmor.java index 78f705b..e66ea75 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemHazmatArmor.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemHazmatArmor.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemMagnifyingGlass.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemMagnifyingGlass.java similarity index 93% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemMagnifyingGlass.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemMagnifyingGlass.java index 26eecc8..8a0e46d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemMagnifyingGlass.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemMagnifyingGlass.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.Ref; import muramasa.antimatter.item.ItemBasic; import muramasa.antimatter.item.ScannerItem; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemMatch.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemMatch.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemMatch.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemMatch.java index 46c7655..0962c7d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemMatch.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemMatch.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.datagen.builder.AntimatterItemModelBuilder; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; import muramasa.antimatter.item.ItemBasic; @@ -22,7 +22,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockStateProperties; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; +import static org.gtreimagined.gtcore.data.GTCoreItems.*; public class ItemMatch extends ItemBasic { public ItemMatch(String domain, String id, Properties properties) { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemPowerUnit.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemPowerUnit.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemPowerUnit.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemPowerUnit.java index 5a14be5..7339e1a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemPowerUnit.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemPowerUnit.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; import muramasa.antimatter.Ref; import muramasa.antimatter.capability.energy.ItemEnergyHandler; @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.SmallPowerUnit; +import static org.gtreimagined.gtcore.data.GTCoreItems.SmallPowerUnit; public class ItemPowerUnit extends ItemBasic implements IColorHandler, IEnergyItem { Material material; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemRadaway.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemRadaway.java similarity index 87% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemRadaway.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemRadaway.java index 86c48dd..631b19e 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemRadaway.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemRadaway.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.Ref; import muramasa.antimatter.entity.IRadiationEntity; import muramasa.antimatter.item.ItemBasic; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemSelectorTag.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemSelectorTag.java similarity index 95% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemSelectorTag.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemSelectorTag.java index ef5e98b..3fbbf4f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemSelectorTag.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemSelectorTag.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreItems; import muramasa.antimatter.cover.CoverFactory; import muramasa.antimatter.cover.ICover; import muramasa.antimatter.cover.IHaveCover; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemTape.java b/common/src/main/java/org/gtreimagined/gtcore/item/ItemTape.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemTape.java rename to common/src/main/java/org/gtreimagined/gtcore/item/ItemTape.java index d0c72d3..eabf618 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/item/ItemTape.java +++ b/common/src/main/java/org/gtreimagined/gtcore/item/ItemTape.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.item; +package org.gtreimagined.gtcore.item; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/CircuitRecipes.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/CircuitRecipes.java similarity index 85% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/CircuitRecipes.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/CircuitRecipes.java index 1daeb8f..2fd3240 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/CircuitRecipes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/CircuitRecipes.java @@ -1,13 +1,13 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig.CircuitRecipeMode; -import io.github.gregtechintergalactical.gtcore.data.GTCoreCables; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; -import io.github.gregtechintergalactical.gtcore.data.RecipeMaps; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCoreConfig; +import org.gtreimagined.gtcore.GTCoreConfig.CircuitRecipeMode; +import org.gtreimagined.gtcore.data.GTCoreCables; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTags; +import org.gtreimagined.gtcore.data.RecipeMaps; import muramasa.antimatter.Ref; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; import muramasa.antimatter.material.SubTag; @@ -23,10 +23,10 @@ import java.util.function.Consumer; import static com.google.common.collect.ImmutableMap.of; -import static io.github.gregtechintergalactical.gtcore.GTCoreConfig.CircuitRecipeMode.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreCables.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.*; +import static org.gtreimagined.gtcore.GTCoreConfig.CircuitRecipeMode.*; +import static org.gtreimagined.gtcore.data.GTCoreCables.*; +import static org.gtreimagined.gtcore.data.GTCoreItems.*; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/MachineRecipes.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/MachineRecipes.java similarity index 85% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/MachineRecipes.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/MachineRecipes.java index 0731d0f..b079297 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/MachineRecipes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/MachineRecipes.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.machine.DrumMachine; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.machine.DrumMachine; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.data.AntimatterMaterialTypes; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/MaterialRecipes.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/MaterialRecipes.java similarity index 98% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/MaterialRecipes.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/MaterialRecipes.java index 5cdc6fa..788c725 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/MaterialRecipes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/MaterialRecipes.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCoreConfig; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterDefaultTools; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Pipes.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/Pipes.java similarity index 98% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Pipes.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/Pipes.java index 9817de1..3e546d9 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Pipes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/Pipes.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/RubberRecipes.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/RubberRecipes.java similarity index 90% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/RubberRecipes.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/RubberRecipes.java index f3d14bd..11c3f12 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/RubberRecipes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/RubberRecipes.java @@ -1,11 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; -import io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTags; +import org.gtreimagined.gtcore.data.GTCoreMaterials; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.ForgeCTags; import muramasa.antimatter.datagen.builder.AntimatterCookingRecipeBuilder; @@ -21,8 +21,8 @@ import java.util.function.Consumer; import static com.google.common.collect.ImmutableMap.of; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks.SAP_BAG; -import static io.github.gregtechintergalactical.gtcore.loader.crafting.VanillaRecipes.addWoodRecipe; +import static org.gtreimagined.gtcore.data.GTCoreBlocks.SAP_BAG; +import static org.gtreimagined.gtcore.loader.crafting.VanillaRecipes.addWoodRecipe; import static muramasa.antimatter.data.AntimatterDefaultTools.SAW; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Tools.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/Tools.java similarity index 99% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Tools.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/Tools.java index 40aadf5..1ec1a90 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Tools.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/Tools.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTools; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreTools; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterDefaultTools; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/VanillaRecipes.java b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/VanillaRecipes.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/VanillaRecipes.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/crafting/VanillaRecipes.java index dc75bca..a5e2b6d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/VanillaRecipes.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/crafting/VanillaRecipes.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.loader.crafting; +package org.gtreimagined.gtcore.loader.crafting; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCoreConfig; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTags; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.data.AntimatterDefaultTools; @@ -25,7 +25,7 @@ import java.util.function.Consumer; import static com.google.common.collect.ImmutableMap.of; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.Beeswax; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.Beeswax; import static muramasa.antimatter.data.AntimatterDefaultTools.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/machines/AssemblyLoader.java b/common/src/main/java/org/gtreimagined/gtcore/loader/machines/AssemblyLoader.java similarity index 52% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/machines/AssemblyLoader.java rename to common/src/main/java/org/gtreimagined/gtcore/loader/machines/AssemblyLoader.java index 863e435..d958107 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/machines/AssemblyLoader.java +++ b/common/src/main/java/org/gtreimagined/gtcore/loader/machines/AssemblyLoader.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.loader.machines; +package org.gtreimagined.gtcore.loader.machines; public class AssemblyLoader { public static void init() { diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BarrelMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/BarrelMachine.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BarrelMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/BarrelMachine.java index 0b2d354..c1bbe6f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BarrelMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/BarrelMachine.java @@ -1,12 +1,13 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityBarrel; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityBarrel; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; +import org.gtreimagined.gtcore.blockentity.BlockEntityBarrel; import static muramasa.antimatter.gui.SlotType.STORAGE; import static muramasa.antimatter.machine.MachineFlag.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMachineMaterial.java b/common/src/main/java/org/gtreimagined/gtcore/machine/BlockMachineMaterial.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMachineMaterial.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/BlockMachineMaterial.java index 491daa7..4960e31 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMachineMaterial.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/BlockMachineMaterial.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.datagen.builder.AntimatterItemModelBuilder; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMultiMachineMaterial.java b/common/src/main/java/org/gtreimagined/gtcore/machine/BlockMultiMachineMaterial.java similarity index 95% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMultiMachineMaterial.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/BlockMultiMachineMaterial.java index 5452d9d..c1a8ebd 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/BlockMultiMachineMaterial.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/BlockMultiMachineMaterial.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; import muramasa.antimatter.machine.BlockMultiMachine; import muramasa.antimatter.machine.Tier; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/ChargingMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/ChargingMachine.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/ChargingMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/ChargingMachine.java index 63834ae..5f3de4b 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/ChargingMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/ChargingMachine.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.Texture; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/ChestMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/ChestMachine.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/ChestMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/ChestMachine.java index 6370e87..fc8e7f1 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/ChestMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/ChestMachine.java @@ -1,14 +1,15 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.block.BlockMaterialChest; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityChest; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.block.BlockMaterialChest; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.Material; import muramasa.antimatter.texture.ITextureHandler; import muramasa.antimatter.texture.Texture; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; import static muramasa.antimatter.gui.SlotType.STORAGE; import static muramasa.antimatter.machine.MachineFlag.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/DrumMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/DrumMachine.java similarity index 93% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/DrumMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/DrumMachine.java index 5dcec47..67e6f8a 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/DrumMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/DrumMachine.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; import earth.terrarium.botarium.common.fluid.base.FluidHolder; import earth.terrarium.botarium.common.fluid.utils.FluidHooks; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityDrum; -import io.github.gregtechintergalactical.gtcore.item.ItemBlockDrum; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityDrum; +import org.gtreimagined.gtcore.item.ItemBlockDrum; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.machine.Tier; import muramasa.antimatter.material.Material; @@ -13,6 +13,7 @@ import net.minecraft.ChatFormatting; import net.minecraft.nbt.CompoundTag; import net.minecraft.world.level.block.state.BlockBehaviour; +import org.gtreimagined.gtcore.blockentity.BlockEntityDrum; import tesseract.FluidPlatformUtils; import tesseract.TesseractGraphWrappers; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/InfiniteSlotTrackedHandler.java b/common/src/main/java/org/gtreimagined/gtcore/machine/InfiniteSlotTrackedHandler.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/InfiniteSlotTrackedHandler.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/InfiniteSlotTrackedHandler.java index e8001d8..3cfb3a2 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/InfiniteSlotTrackedHandler.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/InfiniteSlotTrackedHandler.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityPlasticBin; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.blockentity.BlockEntityPlasticBin; import muramasa.antimatter.blockentity.BlockEntityMachine; import muramasa.antimatter.capability.IGuiHandler; import muramasa.antimatter.capability.item.TrackedItemHandler; @@ -13,6 +13,8 @@ import net.minecraft.nbt.Tag; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.entity.BlockEntity; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.blockentity.BlockEntityPlasticBin; import org.jetbrains.annotations.NotNull; import java.util.function.BiPredicate; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/LockerMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/LockerMachine.java similarity index 84% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/LockerMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/LockerMachine.java index bafffa7..a73ac38 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/LockerMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/LockerMachine.java @@ -1,9 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityLocker; +import org.gtreimagined.gtcore.blockentity.BlockEntityLocker; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.machine.MachineFlag; import muramasa.antimatter.material.Material; +import org.gtreimagined.gtcore.blockentity.BlockEntityLocker; import static muramasa.antimatter.gui.SlotType.ENERGY; import static muramasa.antimatter.gui.SlotType.STORAGE; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MassStorageItemHandler.java b/common/src/main/java/org/gtreimagined/gtcore/machine/MassStorageItemHandler.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MassStorageItemHandler.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/MassStorageItemHandler.java index fbff48c..a3fc3cd 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MassStorageItemHandler.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/MassStorageItemHandler.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.data.SlotTypes; import muramasa.antimatter.capability.item.FakeTrackedItemHandler; import muramasa.antimatter.capability.item.SidedCombinedInvWrapper; import muramasa.antimatter.capability.machine.MachineItemHandler; @@ -10,6 +10,7 @@ import muramasa.antimatter.machine.MachineState; import net.minecraft.core.Direction; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; import org.jetbrains.annotations.NotNull; import tesseract.api.item.ExtendedItemContainer; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MassStorageMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/MassStorageMachine.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MassStorageMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/MassStorageMachine.java index 84b440f..6c7dbeb 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MassStorageMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/MassStorageMachine.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.item.ItemBlockMassStorage; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.item.ItemBlockMassStorage; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.machine.MachineState; import muramasa.antimatter.machine.Tier; @@ -13,6 +13,7 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; public class MassStorageMachine extends MaterialMachine{ final int capacity; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MaterialBasicMultiMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/MaterialBasicMultiMachine.java similarity index 85% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MaterialBasicMultiMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/MaterialBasicMultiMachine.java index 102f39c..e09a072 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MaterialBasicMultiMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/MaterialBasicMultiMachine.java @@ -1,10 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMaterialBasicMultiMachine; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterialBasicMultiMachine; import muramasa.antimatter.Data; import muramasa.antimatter.machine.types.BasicMultiMachine; import muramasa.antimatter.material.Material; import muramasa.antimatter.util.Utils; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterialBasicMultiMachine; import static muramasa.antimatter.machine.MachineFlag.COVERABLE; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MaterialMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/MaterialMachine.java similarity index 87% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MaterialMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/MaterialMachine.java index ffb61dc..99298ca 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/MaterialMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/MaterialMachine.java @@ -1,10 +1,11 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMaterial; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; import muramasa.antimatter.Data; import muramasa.antimatter.machine.types.Machine; import muramasa.antimatter.material.Material; import muramasa.antimatter.util.Utils; +import org.gtreimagined.gtcore.blockentity.BlockEntityMaterial; import static muramasa.antimatter.machine.MachineFlag.COVERABLE; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/WorkbenchMachine.java b/common/src/main/java/org/gtreimagined/gtcore/machine/WorkbenchMachine.java similarity index 84% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/WorkbenchMachine.java rename to common/src/main/java/org/gtreimagined/gtcore/machine/WorkbenchMachine.java index 03901bf..7921dd7 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/machine/WorkbenchMachine.java +++ b/common/src/main/java/org/gtreimagined/gtcore/machine/WorkbenchMachine.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.machine; +package org.gtreimagined.gtcore.machine; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityWorkbench; -import io.github.gregtechintergalactical.gtcore.data.MenuHandlers; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityWorkbench; +import org.gtreimagined.gtcore.data.MenuHandlers; +import org.gtreimagined.gtcore.data.SlotTypes; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.gui.ButtonOverlay; import muramasa.antimatter.gui.SlotData; @@ -11,6 +11,7 @@ import muramasa.antimatter.machine.MachineFlag; import muramasa.antimatter.material.Material; import net.minecraft.resources.ResourceLocation; +import org.gtreimagined.gtcore.blockentity.BlockEntityWorkbench; import static muramasa.antimatter.gui.SlotType.STORAGE; import static muramasa.antimatter.machine.MachineFlag.*; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/AbstractClientPlayerEntityMixin.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/AbstractClientPlayerEntityMixin.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/AbstractClientPlayerEntityMixin.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/AbstractClientPlayerEntityMixin.java index 774dd5a..da84fd8 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/AbstractClientPlayerEntityMixin.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/AbstractClientPlayerEntityMixin.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.mixin; +package org.gtreimagined.gtcore.mixin; import com.mojang.authlib.GameProfile; -import io.github.gregtechintergalactical.gtcore.data.GTCoreData; +import org.gtreimagined.gtcore.data.GTCoreData; import muramasa.antimatter.util.AntimatterPlatformUtils; import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.core.BlockPos; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinBlock.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinBlock.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinBlock.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/MixinBlock.java index 11fc398..1454038 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinBlock.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinBlock.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.mixin; +package org.gtreimagined.gtcore.mixin; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; +import org.gtreimagined.gtcore.data.GTCoreTags; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.util.Mth; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinComposterBlock.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinComposterBlock.java similarity index 78% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinComposterBlock.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/MixinComposterBlock.java index 11ddfd4..439c089 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinComposterBlock.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinComposterBlock.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.mixin; +package org.gtreimagined.gtcore.mixin; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.GTCoreConfig; +import org.gtreimagined.gtcore.data.GTCoreItems; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.ComposterBlock; import org.spongepowered.asm.mixin.Mixin; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinHoneycombItem.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinHoneycombItem.java similarity index 87% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinHoneycombItem.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/MixinHoneycombItem.java index f445103..f089d32 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinHoneycombItem.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinHoneycombItem.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.mixin; +package org.gtreimagined.gtcore.mixin; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; +import org.gtreimagined.gtcore.GTCoreConfig; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.HoneycombItem; import net.minecraft.world.item.Items; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinMerchantOffer.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinMerchantOffer.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinMerchantOffer.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/MixinMerchantOffer.java index e90d558..d99fd79 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/MixinMerchantOffer.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/MixinMerchantOffer.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.mixin; +package org.gtreimagined.gtcore.mixin; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.GTCoreConfig; +import org.gtreimagined.gtcore.data.GTCoreItems; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.trading.MerchantOffer; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/jei/FocusInputHandlerMixin.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/jei/FocusInputHandlerMixin.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/jei/FocusInputHandlerMixin.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/jei/FocusInputHandlerMixin.java index 16cf018..eaeb5f7 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/jei/FocusInputHandlerMixin.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/jei/FocusInputHandlerMixin.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.mixin.jei; +package org.gtreimagined.gtcore.mixin.jei; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import mezz.jei.api.ingredients.ITypedIngredient; import mezz.jei.common.input.IClickedIngredient; import mezz.jei.common.input.handlers.FocusInputHandler; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/jei/JEIMixinPlugin.java b/common/src/main/java/org/gtreimagined/gtcore/mixin/jei/JEIMixinPlugin.java similarity index 95% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/jei/JEIMixinPlugin.java rename to common/src/main/java/org/gtreimagined/gtcore/mixin/jei/JEIMixinPlugin.java index 88e67fa..5461106 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/jei/JEIMixinPlugin.java +++ b/common/src/main/java/org/gtreimagined/gtcore/mixin/jei/JEIMixinPlugin.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.mixin.jei; +package org.gtreimagined.gtcore.mixin.jei; import muramasa.antimatter.Ref; import muramasa.antimatter.util.AntimatterPreLaunchUtil; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageCraftingSync.java b/common/src/main/java/org/gtreimagined/gtcore/network/MessageCraftingSync.java similarity index 93% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageCraftingSync.java rename to common/src/main/java/org/gtreimagined/gtcore/network/MessageCraftingSync.java index 8c87356..c5245b7 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageCraftingSync.java +++ b/common/src/main/java/org/gtreimagined/gtcore/network/MessageCraftingSync.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.network; +package org.gtreimagined.gtcore.network; import com.teamresourceful.resourcefullib.common.networking.base.Packet; import com.teamresourceful.resourcefullib.common.networking.base.PacketContext; import com.teamresourceful.resourcefullib.common.networking.base.PacketHandler; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.AbstractContainerMenu; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageInventorySync.java b/common/src/main/java/org/gtreimagined/gtcore/network/MessageInventorySync.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageInventorySync.java rename to common/src/main/java/org/gtreimagined/gtcore/network/MessageInventorySync.java index bc7e934..6f12940 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageInventorySync.java +++ b/common/src/main/java/org/gtreimagined/gtcore/network/MessageInventorySync.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.network; +package org.gtreimagined.gtcore.network; import com.teamresourceful.resourcefullib.common.networking.base.Packet; import com.teamresourceful.resourcefullib.common.networking.base.PacketContext; import com.teamresourceful.resourcefullib.common.networking.base.PacketHandler; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.blockentity.BlockEntityMachine; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageTriggerInventorySync.java b/common/src/main/java/org/gtreimagined/gtcore/network/MessageTriggerInventorySync.java similarity index 86% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageTriggerInventorySync.java rename to common/src/main/java/org/gtreimagined/gtcore/network/MessageTriggerInventorySync.java index b99815e..e476768 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/network/MessageTriggerInventorySync.java +++ b/common/src/main/java/org/gtreimagined/gtcore/network/MessageTriggerInventorySync.java @@ -1,15 +1,16 @@ -package io.github.gregtechintergalactical.gtcore.network; +package org.gtreimagined.gtcore.network; import com.teamresourceful.resourcefullib.common.networking.base.Packet; import com.teamresourceful.resourcefullib.common.networking.base.PacketContext; import com.teamresourceful.resourcefullib.common.networking.base.PacketHandler; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.blockentity.IInventorySyncTile; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.blockentity.IInventorySyncTile; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.inventory.AbstractContainerMenu; +import org.gtreimagined.gtcore.blockentity.IInventorySyncTile; public class MessageTriggerInventorySync implements Packet { public static final PacketHandler HANDLER = new Handler(); diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/proxy/ClientHandler.java b/common/src/main/java/org/gtreimagined/gtcore/proxy/ClientHandler.java similarity index 69% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/proxy/ClientHandler.java rename to common/src/main/java/org/gtreimagined/gtcore/proxy/ClientHandler.java index 2680811..b8e5857 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/proxy/ClientHandler.java +++ b/common/src/main/java/org/gtreimagined/gtcore/proxy/ClientHandler.java @@ -1,16 +1,16 @@ -package io.github.gregtechintergalactical.gtcore.proxy; +package org.gtreimagined.gtcore.proxy; import com.terraformersmc.terraform.sign.SpriteIdentifierRegistry; -import io.github.gregtechintergalactical.gtcore.block.BlockMaterialChest; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityChest; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.client.MassStorageRenderer; -import io.github.gregtechintergalactical.gtcore.client.MaterialChestRenderer; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.machine.BlockMachineMaterial; -import io.github.gregtechintergalactical.gtcore.machine.BlockMultiMachineMaterial; -import io.github.gregtechintergalactical.gtcore.machine.ChestMachine; -import io.github.gregtechintergalactical.gtcore.machine.MassStorageMachine; +import org.gtreimagined.gtcore.block.BlockMaterialChest; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.client.MassStorageRenderer; +import org.gtreimagined.gtcore.client.MaterialChestRenderer; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMultiMachineMaterial; +import org.gtreimagined.gtcore.machine.ChestMachine; +import org.gtreimagined.gtcore.machine.MassStorageMachine; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.client.ModelUtils; import net.minecraft.client.renderer.RenderType; @@ -19,6 +19,14 @@ import net.minecraft.client.resources.model.Material; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.entity.BlockEntityType; +import org.gtreimagined.gtcore.blockentity.BlockEntityChest; +import org.gtreimagined.gtcore.blockentity.BlockEntityMassStorage; +import org.gtreimagined.gtcore.client.MassStorageRenderer; +import org.gtreimagined.gtcore.client.MaterialChestRenderer; +import org.gtreimagined.gtcore.machine.BlockMachineMaterial; +import org.gtreimagined.gtcore.machine.BlockMultiMachineMaterial; +import org.gtreimagined.gtcore.machine.ChestMachine; +import org.gtreimagined.gtcore.machine.MassStorageMachine; import java.util.function.Consumer; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/proxy/CommonHandler.java b/common/src/main/java/org/gtreimagined/gtcore/proxy/CommonHandler.java similarity index 89% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/proxy/CommonHandler.java rename to common/src/main/java/org/gtreimagined/gtcore/proxy/CommonHandler.java index b9d91a3..79a70f1 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/proxy/CommonHandler.java +++ b/common/src/main/java/org/gtreimagined/gtcore/proxy/CommonHandler.java @@ -1,14 +1,14 @@ -package io.github.gregtechintergalactical.gtcore.proxy; +package org.gtreimagined.gtcore.proxy; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import net.minecraft.core.NonNullList; import java.net.URL; import java.util.List; import java.util.Scanner; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreData.SupporterListGold; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreData.SupporterListSilver; +import static org.gtreimagined.gtcore.data.GTCoreData.SupporterListGold; +import static org.gtreimagined.gtcore.data.GTCoreData.SupporterListSilver; public class CommonHandler { public static void setup(){ diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/ResinState.java b/common/src/main/java/org/gtreimagined/gtcore/tree/ResinState.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/ResinState.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/ResinState.java index 56c7102..6197d77 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/ResinState.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/ResinState.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.tree; +package org.gtreimagined.gtcore.tree; import net.minecraft.util.StringRepresentable; import net.minecraft.world.level.block.state.properties.EnumProperty; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberFoliagePlacer.java b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberFoliagePlacer.java similarity index 98% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberFoliagePlacer.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/RubberFoliagePlacer.java index 250e70c..a901457 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberFoliagePlacer.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberFoliagePlacer.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.tree; +package org.gtreimagined.gtcore.tree; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTree.java b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTree.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTree.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/RubberTree.java index e08ab86..8661522 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTree.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTree.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.tree; +package org.gtreimagined.gtcore.tree; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.tree.block.BlockRubberLog; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.tree.block.BlockRubberLog; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.worldgen.feature.IAntimatterFeature; import net.minecraft.core.BlockPos; @@ -19,6 +19,8 @@ import net.minecraft.world.level.levelgen.feature.TreeFeature; import net.minecraft.world.level.levelgen.feature.configurations.TreeConfiguration; import net.minecraft.world.level.levelgen.feature.stateproviders.WeightedStateProvider; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.tree.block.BlockRubberLog; import java.util.Random; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTreeFeature.java b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTreeFeature.java similarity index 99% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTreeFeature.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/RubberTreeFeature.java index 52c972c..8a440ca 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTreeFeature.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTreeFeature.java @@ -1,4 +1,4 @@ -package io.github.gregtechintergalactical.gtcore.tree; +package org.gtreimagined.gtcore.tree; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.util.TagUtils; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTreeWorldGen.java b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTreeWorldGen.java similarity index 97% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTreeWorldGen.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/RubberTreeWorldGen.java index 26fc3f5..09447ff 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTreeWorldGen.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTreeWorldGen.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.tree; +package org.gtreimagined.gtcore.tree; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import muramasa.antimatter.mixin.BiomeAccessor; import muramasa.antimatter.util.AntimatterPlatformUtils; @@ -26,6 +26,7 @@ import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; import net.minecraft.world.level.levelgen.feature.treedecorators.LeaveVineDecorator; import net.minecraft.world.level.levelgen.placement.*; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import java.util.Random; import java.util.Set; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTrunkPlacer.java b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTrunkPlacer.java similarity index 96% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTrunkPlacer.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/RubberTrunkPlacer.java index 791a3f4..ba5bf75 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/RubberTrunkPlacer.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/RubberTrunkPlacer.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.tree; +package org.gtreimagined.gtcore.tree; import com.google.common.collect.ImmutableList; import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.util.TagUtils; import net.minecraft.core.BlockPos; @@ -17,6 +17,7 @@ import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacer; import net.minecraft.world.level.levelgen.feature.trunkplacers.StraightTrunkPlacer; import net.minecraft.world.level.levelgen.feature.trunkplacers.TrunkPlacerType; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import java.util.List; import java.util.Random; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberButton.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberButton.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberButton.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberButton.java index 7ef18ca..9d2a8e8 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberButton.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberButton.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberDoor.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberDoor.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberDoor.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberDoor.java index 10325d9..ebfff71 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberDoor.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberDoor.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberFence.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberFence.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberFence.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberFence.java index 03ae3d4..4c8fb9e 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberFence.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberFence.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberFenceGate.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberFenceGate.java similarity index 84% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberFenceGate.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberFenceGate.java index bc1453f..084b213 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberFenceGate.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberFenceGate.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberLeaves.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberLeaves.java similarity index 88% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberLeaves.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberLeaves.java index a3ed2e9..1c427e6 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberLeaves.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberLeaves.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.block.BlockPropertiesHelper; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberLog.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberLog.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberLog.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberLog.java index 119e25b..9a4f9af 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberLog.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberLog.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.tree.ResinState; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.tree.ResinState; import muramasa.antimatter.datagen.builder.VariantBlockStateBuilder; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.util.Utils; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberPressurePlate.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberPressurePlate.java similarity index 91% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberPressurePlate.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberPressurePlate.java index 65252ce..c69472d 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberPressurePlate.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberPressurePlate.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSapling.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSapling.java similarity index 93% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSapling.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSapling.java index 1de2302..2c4de84 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSapling.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSapling.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.tree.RubberTree; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.tree.RubberTree; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSign.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSign.java similarity index 82% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSign.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSign.java index 61b918d..72d62a3 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSign.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSign.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; import com.terraformersmc.terraform.sign.block.TerraformSignBlock; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.tree.item.ItemRubberSign; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.tree.item.ItemRubberSign; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.registration.IAntimatterObject; import muramasa.antimatter.registration.IItemBlockProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSlab.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSlab.java similarity index 90% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSlab.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSlab.java index 81fe86a..af65e7f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberSlab.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberSlab.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberStairs.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberStairs.java similarity index 85% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberStairs.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberStairs.java index c393494..506a03f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberStairs.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberStairs.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberTrapDoor.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberTrapDoor.java similarity index 92% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberTrapDoor.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberTrapDoor.java index 856f0b5..7391d25 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberTrapDoor.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberTrapDoor.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberWallSign.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberWallSign.java similarity index 86% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberWallSign.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberWallSign.java index 455ae38..578d4eb 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberWallSign.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberWallSign.java @@ -1,8 +1,8 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; import com.terraformersmc.terraform.sign.block.TerraformWallSignBlock; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.registration.IAntimatterObject; import muramasa.antimatter.registration.IItemBlockProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberWood.java b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberWood.java similarity index 95% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberWood.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberWood.java index e9883a4..cafa43f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/block/BlockRubberWood.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/block/BlockRubberWood.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.tree.block; +package org.gtreimagined.gtcore.tree.block; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.registration.IAntimatterObject; import muramasa.antimatter.registration.IModelProvider; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/item/ItemRubberBoat.java b/common/src/main/java/org/gtreimagined/gtcore/tree/item/ItemRubberBoat.java similarity index 94% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/item/ItemRubberBoat.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/item/ItemRubberBoat.java index 3474732..0091c5f 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/item/ItemRubberBoat.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/item/ItemRubberBoat.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.tree.item; +package org.gtreimagined.gtcore.tree.item; import com.terraformersmc.terraform.boat.api.TerraformBoatType; import com.terraformersmc.terraform.boat.api.TerraformBoatTypeRegistry; import com.terraformersmc.terraform.boat.api.item.TerraformBoatItemHelper; import com.terraformersmc.terraform.boat.impl.item.TerraformBoatItem; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.Ref; import muramasa.antimatter.registration.IAntimatterObject; diff --git a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/item/ItemRubberSign.java b/common/src/main/java/org/gtreimagined/gtcore/tree/item/ItemRubberSign.java similarity index 83% rename from common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/item/ItemRubberSign.java rename to common/src/main/java/org/gtreimagined/gtcore/tree/item/ItemRubberSign.java index 476f58a..73363a3 100644 --- a/common/src/main/java/io/github/gregtechintergalactical/gtcore/tree/item/ItemRubberSign.java +++ b/common/src/main/java/org/gtreimagined/gtcore/tree/item/ItemRubberSign.java @@ -1,13 +1,14 @@ -package io.github.gregtechintergalactical.gtcore.tree.item; +package org.gtreimagined.gtcore.tree.item; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; import muramasa.antimatter.registration.IAntimatterObject; import muramasa.antimatter.registration.IModelProvider; import muramasa.antimatter.registration.ITextureProvider; import muramasa.antimatter.texture.Texture; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.SignItem; +import org.gtreimagined.gtcore.data.GTCoreBlocks; public class ItemRubberSign extends SignItem implements IAntimatterObject, ITextureProvider, IModelProvider { public ItemRubberSign() { diff --git a/common/src/main/resources/gtcore.jei.mixins.json b/common/src/main/resources/gtcore.jei.mixins.json index 87c80e6..0e3bd1c 100644 --- a/common/src/main/resources/gtcore.jei.mixins.json +++ b/common/src/main/resources/gtcore.jei.mixins.json @@ -3,8 +3,8 @@ "package": "io.github.gregtechintergalactical.gtcore.mixin.jei", "compatibilityLevel": "JAVA_17", "minVersion": "0.8", - "plugin": "io.github.gregtechintergalactical.gtcore.mixin.jei.JEIMixinPlugin", + "plugin": "org.gtreimagined.gtcore.mixin.jei.JEIMixinPlugin", "mixins": [ - "FocusInputHandlerMixin" + "org.gtreimagined.gtcore.mixin.jei.FocusInputHandlerMixin" ] } \ No newline at end of file diff --git a/common/src/main/resources/gtcore.mixins.json b/common/src/main/resources/gtcore.mixins.json index 761a919..a063893 100644 --- a/common/src/main/resources/gtcore.mixins.json +++ b/common/src/main/resources/gtcore.mixins.json @@ -4,13 +4,13 @@ "compatibilityLevel": "JAVA_17", "minVersion": "0.8", "mixins": [ - "MixinBlock", - "MixinComposterBlock", - "MixinHoneycombItem", - "MixinMerchantOffer" + "org.gtreimagined.gtcore.mixin.MixinBlock", + "org.gtreimagined.gtcore.mixin.MixinComposterBlock", + "org.gtreimagined.gtcore.mixin.MixinHoneycombItem", + "org.gtreimagined.gtcore.mixin.MixinMerchantOffer" ], "client": [ - "AbstractClientPlayerEntityMixin" + "org.gtreimagined.gtcore.mixin.AbstractClientPlayerEntityMixin" ], "refmap": "gtcore.refmap.json" } \ No newline at end of file diff --git a/fabric/src/main/java/io/github/gregtechintergalactical/gtcore/fabric/GTCoreClientInitializer.java b/fabric/src/main/java/org/gtreimagined/gtcore/fabric/GTCoreClientInitializer.java similarity index 77% rename from fabric/src/main/java/io/github/gregtechintergalactical/gtcore/fabric/GTCoreClientInitializer.java rename to fabric/src/main/java/org/gtreimagined/gtcore/fabric/GTCoreClientInitializer.java index 2ff2c8c..6650b9e 100644 --- a/fabric/src/main/java/io/github/gregtechintergalactical/gtcore/fabric/GTCoreClientInitializer.java +++ b/fabric/src/main/java/org/gtreimagined/gtcore/fabric/GTCoreClientInitializer.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.fabric; +package org.gtreimagined.gtcore.fabric; import com.terraformersmc.terraform.boat.api.client.TerraformBoatClientHelper; import io.github.fabricators_of_create.porting_lib.event.client.TextureStitchCallback; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.proxy.ClientHandler; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.proxy.ClientHandler; import muramasa.antimatter.client.fabric.IAntimatterClientInitializer; import net.minecraft.resources.ResourceLocation; diff --git a/fabric/src/main/java/io/github/gregtechintergalactical/gtcore/fabric/GTCoreFabric.java b/fabric/src/main/java/org/gtreimagined/gtcore/fabric/GTCoreFabric.java similarity index 86% rename from fabric/src/main/java/io/github/gregtechintergalactical/gtcore/fabric/GTCoreFabric.java rename to fabric/src/main/java/org/gtreimagined/gtcore/fabric/GTCoreFabric.java index af6bcbd..46e48b6 100644 --- a/fabric/src/main/java/io/github/gregtechintergalactical/gtcore/fabric/GTCoreFabric.java +++ b/fabric/src/main/java/org/gtreimagined/gtcore/fabric/GTCoreFabric.java @@ -1,6 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.fabric; +package org.gtreimagined.gtcore.fabric; -import io.github.gregtechintergalactical.gtcore.GTCore; +import org.gtreimagined.gtcore.GTCore; import muramasa.antimatter.event.fabric.CraftingEvents; import muramasa.antimatter.event.fabric.LoaderEvents; import muramasa.antimatter.event.fabric.ProviderEvents; @@ -11,7 +11,7 @@ import net.minecraft.world.item.Items; import net.minecraft.world.item.context.UseOnContext; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.Beeswax; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.Beeswax; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; //initializer class for non antimatter related stuff diff --git a/fabric/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/fabric/BlockRedstoneWireMixin.java b/fabric/src/main/java/org/gtreimagined/gtcore/mixin/fabric/BlockRedstoneWireMixin.java similarity index 62% rename from fabric/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/fabric/BlockRedstoneWireMixin.java rename to fabric/src/main/java/org/gtreimagined/gtcore/mixin/fabric/BlockRedstoneWireMixin.java index e840f85..b7e1a42 100644 --- a/fabric/src/main/java/io/github/gregtechintergalactical/gtcore/mixin/fabric/BlockRedstoneWireMixin.java +++ b/fabric/src/main/java/org/gtreimagined/gtcore/mixin/fabric/BlockRedstoneWireMixin.java @@ -1,7 +1,7 @@ -package io.github.gregtechintergalactical.gtcore.mixin.fabric; +package org.gtreimagined.gtcore.mixin.fabric; import io.github.fabricators_of_create.porting_lib.block.LightEmissiveBlock; -import io.github.gregtechintergalactical.gtcore.block.BlockRedstoneWire; +import org.gtreimagined.gtcore.block.BlockRedstoneWire; import org.spongepowered.asm.mixin.Mixin; @Mixin(BlockRedstoneWire.class) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 65f75f3..0dd2993 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -22,16 +22,16 @@ "environment": "*", "entrypoints": { "antimatter": [ - "io.github.gregtechintergalactical.gtcore.GTCore" + "org.gtreimagined.gtcore.GTCore" ], "antimatter_client": [ - "io.github.gregtechintergalactical.gtcore.fabric.GTCoreClientInitializer" + "org.gtreimagined.gtcore.fabric.GTCoreClientInitializer" ], "rei_client": [ - "io.github.gregtechintergalactical.gtcore.integration.rei.GTCoreReiPlugin" + "org.gtreimagined.gtcore.integration.rei.GTCoreReiPlugin" ], "main": [ - "io.github.gregtechintergalactical.gtcore.fabric.GTCoreFabric" + "org.gtreimagined.gtcore.fabric.GTCoreFabric" ] }, diff --git a/fabric/src/main/resources/gtcore-fabric.mixins.json b/fabric/src/main/resources/gtcore-fabric.mixins.json index 56d0022..0729632 100644 --- a/fabric/src/main/resources/gtcore-fabric.mixins.json +++ b/fabric/src/main/resources/gtcore-fabric.mixins.json @@ -4,6 +4,6 @@ "compatibilityLevel": "JAVA_17", "minVersion": "0.8", "mixins": [ - "BlockRedstoneWireMixin" + "org.gtreimagined.gtcore.mixin.fabric.BlockRedstoneWireMixin" ] } \ No newline at end of file diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java b/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java deleted file mode 100644 index 492f85a..0000000 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/data/forge/GTCoreBlocksImpl.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.github.gregtechintergalactical.gtcore.data.forge; - - -import io.github.gregtechintergalactical.gtcore.data.IGTBlockInit; -import io.github.gregtechintergalactical.gtcore.integration.tfc.TFCRubberData; - -public class GTCoreBlocksImpl implements IGTBlockInit { - public void init(){ - TFCRubberData.init(); - } -} diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/forge/GTCoreReiPluginForge.java b/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/forge/GTCoreReiPluginForge.java deleted file mode 100644 index 8956de4..0000000 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/rei/forge/GTCoreReiPluginForge.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.github.gregtechintergalactical.gtcore.integration.rei.forge; - -import io.github.gregtechintergalactical.gtcore.integration.rei.GTCoreReiPlugin; -import me.shedaniel.rei.forge.REIPluginClient; - -@REIPluginClient -public class GTCoreReiPluginForge extends GTCoreReiPlugin { -} diff --git a/forge/src/main/java/org/gtreimagined/gtcore/data/forge/GTCoreBlocksImpl.java b/forge/src/main/java/org/gtreimagined/gtcore/data/forge/GTCoreBlocksImpl.java new file mode 100644 index 0000000..7ccb77b --- /dev/null +++ b/forge/src/main/java/org/gtreimagined/gtcore/data/forge/GTCoreBlocksImpl.java @@ -0,0 +1,11 @@ +package org.gtreimagined.gtcore.data.forge; + + +import org.gtreimagined.gtcore.data.IGTBlockInit; +import org.gtreimagined.gtcore.integration.tfc.TFCRubberData; + +public class GTCoreBlocksImpl implements IGTBlockInit { + public void init(){ + TFCRubberData.init(); + } +} diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/forge/GTCoreForge.java b/forge/src/main/java/org/gtreimagined/gtcore/forge/GTCoreForge.java similarity index 87% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/forge/GTCoreForge.java rename to forge/src/main/java/org/gtreimagined/gtcore/forge/GTCoreForge.java index 58c2cc3..2ef3024 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/forge/GTCoreForge.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/forge/GTCoreForge.java @@ -1,15 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.forge; +package org.gtreimagined.gtcore.forge; import com.terraformersmc.terraform.boat.api.client.TerraformBoatClientHelper; -import io.github.gregtechintergalactical.gtcore.blockentity.BlockEntityMassStorage; -import io.github.gregtechintergalactical.gtcore.proxy.ClientHandler; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.tree.RubberFoliagePlacer; import muramasa.antimatter.event.forge.AntimatterCraftingEvent; import muramasa.antimatter.event.forge.AntimatterLoaderEvent; import muramasa.antimatter.event.forge.AntimatterProvidersEvent; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.InteractionResult; import net.minecraft.world.item.Items; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.level.levelgen.feature.foliageplacers.FoliagePlacerType; @@ -18,16 +13,18 @@ import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegistryEvent; -import net.minecraftforge.event.entity.item.ItemEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.ChunkWatchEvent; import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.proxy.ClientHandler; +import org.gtreimagined.gtcore.tree.RubberFoliagePlacer; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials.Beeswax; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; +import static org.gtreimagined.gtcore.data.GTCoreMaterials.Beeswax; // The value here should match an entry in the META-INF/mods.toml file @Mod(GTCore.ID) diff --git a/forge/src/main/java/org/gtreimagined/gtcore/integration/rei/forge/GTCoreReiPluginForge.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/rei/forge/GTCoreReiPluginForge.java new file mode 100644 index 0000000..aaba480 --- /dev/null +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/rei/forge/GTCoreReiPluginForge.java @@ -0,0 +1,8 @@ +package org.gtreimagined.gtcore.integration.rei.forge; + +import me.shedaniel.rei.forge.REIPluginClient; +import org.gtreimagined.gtcore.integration.rei.GTCoreReiPlugin; + +@REIPluginClient +public class GTCoreReiPluginForge extends GTCoreReiPlugin { +} diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockFallenRubberLeaves.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockFallenRubberLeaves.java similarity index 94% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockFallenRubberLeaves.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockFallenRubberLeaves.java index 6b4ce7c..5db68c8 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockFallenRubberLeaves.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockFallenRubberLeaves.java @@ -1,7 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; @@ -17,6 +16,7 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; +import org.gtreimagined.gtcore.GTCore; import org.jetbrains.annotations.Nullable; public class BlockFallenRubberLeaves extends FallenLeavesBlock implements IAntimatterObject, IModelProvider, IColorHandler { diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockRubberLogFence.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockRubberLogFence.java similarity index 85% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockRubberLogFence.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockRubberLogFence.java index 22a9ada..7aa1f94 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockRubberLogFence.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockRubberLogFence.java @@ -1,14 +1,14 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.tree.block.BlockRubberFence; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; import muramasa.antimatter.texture.Texture; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.tree.block.BlockRubberFence; public class BlockRubberLogFence extends BlockRubberFence { diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockRubberTwig.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockRubberTwig.java similarity index 93% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockRubberTwig.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockRubberTwig.java index 1ba3365..242072a 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockRubberTwig.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockRubberTwig.java @@ -1,7 +1,6 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; import com.google.common.collect.ImmutableMap; -import io.github.gregtechintergalactical.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; @@ -14,6 +13,7 @@ import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.SoundType; +import org.gtreimagined.gtcore.GTCore; public class BlockRubberTwig extends GroundcoverBlock implements IModelProvider, IAntimatterObject { public BlockRubberTwig() { diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockTFCRubberLoaves.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockTFCRubberLoaves.java similarity index 93% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockTFCRubberLoaves.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockTFCRubberLoaves.java index 0339396..f307e0e 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockTFCRubberLoaves.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockTFCRubberLoaves.java @@ -1,6 +1,5 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; -import io.github.gregtechintergalactical.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.registration.IAntimatterObject; import muramasa.antimatter.registration.IModelProvider; @@ -13,6 +12,7 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.properties.IntegerProperty; import net.minecraft.world.level.material.Material; +import org.gtreimagined.gtcore.GTCore; public class BlockTFCRubberLoaves extends TFCLeavesBlock implements IAntimatterObject, ITextureProvider, IModelProvider { protected final String domain, id; diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockTFCRubberSapling.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockTFCRubberSapling.java similarity index 94% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockTFCRubberSapling.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockTFCRubberSapling.java index 7737a95..a9c14d4 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/BlockTFCRubberSapling.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/BlockTFCRubberSapling.java @@ -1,6 +1,5 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; -import io.github.gregtechintergalactical.gtcore.GTCore; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterBlockStateProvider; import muramasa.antimatter.datagen.providers.AntimatterItemModelProvider; @@ -17,6 +16,7 @@ import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.material.Material; import net.minecraft.world.level.material.MaterialColor; +import org.gtreimagined.gtcore.GTCore; public class BlockTFCRubberSapling extends TFCSaplingBlock implements IAntimatterObject, IModelProvider, ITextureProvider { public BlockTFCRubberSapling() { diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/TFCRubberData.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/TFCRubberData.java similarity index 76% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/TFCRubberData.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/TFCRubberData.java index e844b3e..202657c 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/TFCRubberData.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/TFCRubberData.java @@ -1,9 +1,9 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; -import io.github.gregtechintergalactical.gtcore.GTCore; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; import muramasa.antimatter.item.ItemBasic; import net.minecraft.world.level.block.Block; +import org.gtreimagined.gtcore.GTCore; +import org.gtreimagined.gtcore.data.GTCoreBlocks; public class TFCRubberData { diff --git a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/TFCRubberTree.java b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/TFCRubberTree.java similarity index 76% rename from forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/TFCRubberTree.java rename to forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/TFCRubberTree.java index 7cfc7f1..ce3449a 100644 --- a/forge/src/main/java/io/github/gregtechintergalactical/gtcore/integration/tfc/TFCRubberTree.java +++ b/forge/src/main/java/org/gtreimagined/gtcore/integration/tfc/TFCRubberTree.java @@ -1,10 +1,10 @@ -package io.github.gregtechintergalactical.gtcore.integration.tfc; +package org.gtreimagined.gtcore.integration.tfc; -import io.github.gregtechintergalactical.gtcore.tree.RubberTreeWorldGen; import net.dries007.tfc.world.feature.tree.TFCTreeGrower; import net.minecraft.core.Registry; import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import org.gtreimagined.gtcore.tree.RubberTreeWorldGen; public class TFCRubberTree extends TFCTreeGrower { public TFCRubberTree() { diff --git a/forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit b/forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit deleted file mode 100644 index 6663ab5..0000000 --- a/forge/src/main/resources/META-INF/services/io.github.gregtechintergalactical.gtcore.data.IGTBlockInit +++ /dev/null @@ -1 +0,0 @@ -io.github.gregtechintergalactical.gtcore.data.forge.GTCoreBlocksImpl \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/services/org.gtreimagined.gtcore.data.IGTBlockInit b/forge/src/main/resources/META-INF/services/org.gtreimagined.gtcore.data.IGTBlockInit new file mode 100644 index 0000000..0ef2df8 --- /dev/null +++ b/forge/src/main/resources/META-INF/services/org.gtreimagined.gtcore.data.IGTBlockInit @@ -0,0 +1 @@ +org.gtreimagined.gtcore.data.forge.GTCoreBlocksImpl \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 8e4a95c..5581228 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,7 +30,7 @@ architectury_file=3208686 kubejs_file=3253837 top_file=3157997 -maven_group=io.github.gregtechintergalactical +maven_group=org.gt-reimagined archive_base_name=gtcore mod_version=0.1.1-pre.42 mod_id=gtcore